diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2025-03-20 12:53:34 -0400 |
|---|---|---|
| committer | Paolo Bonzini <pbonzini@redhat.com> | 2025-03-20 12:53:34 -0400 |
| commit | c0f99fb4e55d482fa7033c57b4dd775df0743ccf (patch) | |
| tree | c592b072497d16645de69eb45dcc3193303169c4 /arch/riscv | |
| parent | 3ecf162a3162d9ec8ec6ef6e12a722e6255940d5 (diff) | |
| parent | b3f263a98d30fe2e33eefea297598c590ee3560e (diff) | |
| download | ath-c0f99fb4e55d482fa7033c57b4dd775df0743ccf.tar.gz | |
Merge tag 'kvm-riscv-6.15-1' of https://github.com/kvm-riscv/linux into HEAD
KVM/riscv changes for 6.15
- Disable the kernel perf counter during configure
- KVM selftests improvements for PMU
- Fix warning at the time of KVM module removal
Diffstat (limited to 'arch/riscv')
| -rw-r--r-- | arch/riscv/kvm/main.c | 4 | ||||
| -rw-r--r-- | arch/riscv/kvm/vcpu_onereg.c | 2 | ||||
| -rw-r--r-- | arch/riscv/kvm/vcpu_pmu.c | 1 |
3 files changed, 4 insertions, 3 deletions
diff --git a/arch/riscv/kvm/main.c b/arch/riscv/kvm/main.c index 1fa8be5ee5097..4b24705dc63a9 100644 --- a/arch/riscv/kvm/main.c +++ b/arch/riscv/kvm/main.c @@ -172,8 +172,8 @@ module_init(riscv_kvm_init); static void __exit riscv_kvm_exit(void) { - kvm_riscv_teardown(); - kvm_exit(); + + kvm_riscv_teardown(); } module_exit(riscv_kvm_exit); diff --git a/arch/riscv/kvm/vcpu_onereg.c b/arch/riscv/kvm/vcpu_onereg.c index f6d27b59c6419..43ee8e33ba238 100644 --- a/arch/riscv/kvm/vcpu_onereg.c +++ b/arch/riscv/kvm/vcpu_onereg.c @@ -203,7 +203,7 @@ static bool kvm_riscv_vcpu_isa_disable_allowed(unsigned long ext) case KVM_RISCV_ISA_EXT_SVADE: /* * The henvcfg.ADUE is read-only zero if menvcfg.ADUE is zero. - * Svade is not allowed to disable when the platform use Svade. + * Svade can't be disabled unless we support Svadu. */ return arch_has_hw_pte_young(); default: diff --git a/arch/riscv/kvm/vcpu_pmu.c b/arch/riscv/kvm/vcpu_pmu.c index 2707a51b082ca..78ac3216a54dd 100644 --- a/arch/riscv/kvm/vcpu_pmu.c +++ b/arch/riscv/kvm/vcpu_pmu.c @@ -666,6 +666,7 @@ int kvm_riscv_vcpu_pmu_ctr_cfg_match(struct kvm_vcpu *vcpu, unsigned long ctr_ba .type = etype, .size = sizeof(struct perf_event_attr), .pinned = true, + .disabled = true, /* * It should never reach here if the platform doesn't support the sscofpmf * extension as mode filtering won't work without it. |