Skip to content

Commit 0835ee2

Browse files
osamakaderavpatel
authored andcommitted
riscv: kvm: return SBI_ERR_FAILURE for pmu_snapshot_set_shmem() when OOM
kvm_riscv_vcpu_pmu_snapshot_set_shmem() returned -ENOMEM from the SBI extension handler, which caused kvm_riscv_vcpu_sbi_ecall() to abort KVM_RUN and surface the error to userspace instead of ompleting the ECALL with a negative SBI error in a0. Use SBI_ERR_FAILURE and the normal retdata path, matching other PMU handlers and kvm_sbi_ext_pmu_handler comment. Fixes: c2f41dd ("RISC-V: KVM: Implement SBI PMU Snapshot feature") Cc: stable@vger.kernel.org Signed-off-by: Osama Abdelkader <osama.abdelkader@gmail.com> Reviewed-by: Anup Patel <anup@brainfault.org> Link: https://lore.kernel.org/r/20260514173642.41448-1-osama.abdelkader@gmail.com Signed-off-by: Anup Patel <anup@brainfault.org>
1 parent 653f17c commit 0835ee2

1 file changed

Lines changed: 4 additions & 2 deletions

File tree

arch/riscv/kvm/vcpu_pmu.c

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -453,8 +453,10 @@ int kvm_riscv_vcpu_pmu_snapshot_set_shmem(struct kvm_vcpu *vcpu, unsigned long s
453453
}
454454

455455
kvpmu->sdata = kzalloc(snapshot_area_size, GFP_ATOMIC);
456-
if (!kvpmu->sdata)
457-
return -ENOMEM;
456+
if (!kvpmu->sdata) {
457+
sbiret = SBI_ERR_FAILURE;
458+
goto out;
459+
}
458460

459461
/* No need to check writable slot explicitly as kvm_vcpu_write_guest does it internally */
460462
if (kvm_vcpu_write_guest(vcpu, saddr, kvpmu->sdata, snapshot_area_size)) {

0 commit comments

Comments
 (0)