* [PATCH] RISC-V: KVM: fix PMU snapshot_set_shmem on 32-bit hosts
@ 2026-03-07 23:43 Osama Abdelkader
2026-03-09 21:12 ` Andrew Jones
0 siblings, 1 reply; 3+ messages in thread
From: Osama Abdelkader @ 2026-03-07 23:43 UTC (permalink / raw)
To: Anup Patel, Atish Patra, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Andrew Jones, kvm, kvm-riscv, linux-riscv,
linux-kernel
Cc: Osama Abdelkader
When saddr_high != 0 on RV32, the goto out was unconditional, causing
valid 64-bit addresses to be rejected. Only goto out when the address
is invalid (64-bit host with saddr_high != 0).
Fixes: c2f41ddbcdd7 ("RISC-V: KVM: Implement SBI PMU Snapshot feature")
Signed-off-by: Osama Abdelkader <osama.abdelkader@gmail.com>
---
arch/riscv/kvm/vcpu_pmu.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/arch/riscv/kvm/vcpu_pmu.c b/arch/riscv/kvm/vcpu_pmu.c
index 4d8d5e9aa53d..045099ca904b 100644
--- a/arch/riscv/kvm/vcpu_pmu.c
+++ b/arch/riscv/kvm/vcpu_pmu.c
@@ -425,9 +425,10 @@ int kvm_riscv_vcpu_pmu_snapshot_set_shmem(struct kvm_vcpu *vcpu, unsigned long s
if (saddr_high != 0) {
if (IS_ENABLED(CONFIG_32BIT))
saddr |= ((gpa_t)saddr_high << 32);
- else
+ else {
sbiret = SBI_ERR_INVALID_ADDRESS;
- goto out;
+ goto out;
+ }
}
kvpmu->sdata = kzalloc(snapshot_area_size, GFP_ATOMIC);
--
2.43.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] RISC-V: KVM: fix PMU snapshot_set_shmem on 32-bit hosts
2026-03-07 23:43 [PATCH] RISC-V: KVM: fix PMU snapshot_set_shmem on 32-bit hosts Osama Abdelkader
@ 2026-03-09 21:12 ` Andrew Jones
2026-03-11 23:17 ` Osama Abdelkader
0 siblings, 1 reply; 3+ messages in thread
From: Andrew Jones @ 2026-03-09 21:12 UTC (permalink / raw)
To: Osama Abdelkader
Cc: Anup Patel, Atish Patra, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Andrew Jones, kvm, kvm-riscv, linux-riscv,
linux-kernel
On Sun, Mar 08, 2026 at 12:43:54AM +0100, Osama Abdelkader wrote:
> When saddr_high != 0 on RV32, the goto out was unconditional, causing
> valid 64-bit addresses to be rejected. Only goto out when the address
> is invalid (64-bit host with saddr_high != 0).
>
> Fixes: c2f41ddbcdd7 ("RISC-V: KVM: Implement SBI PMU Snapshot feature")
> Signed-off-by: Osama Abdelkader <osama.abdelkader@gmail.com>
> ---
> arch/riscv/kvm/vcpu_pmu.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/arch/riscv/kvm/vcpu_pmu.c b/arch/riscv/kvm/vcpu_pmu.c
> index 4d8d5e9aa53d..045099ca904b 100644
> --- a/arch/riscv/kvm/vcpu_pmu.c
> +++ b/arch/riscv/kvm/vcpu_pmu.c
> @@ -425,9 +425,10 @@ int kvm_riscv_vcpu_pmu_snapshot_set_shmem(struct kvm_vcpu *vcpu, unsigned long s
> if (saddr_high != 0) {
> if (IS_ENABLED(CONFIG_32BIT))
> saddr |= ((gpa_t)saddr_high << 32);
> - else
> + else {
> sbiret = SBI_ERR_INVALID_ADDRESS;
> - goto out;
> + goto out;
> + }
nit: Could add the {} to the if-arm too in order to keep things balanced.
Otherwise,
Reviewed-by: Andrew Jones <andrew.jones@oss.qualcomm.com>
Thanks,
drew
> }
>
> kvpmu->sdata = kzalloc(snapshot_area_size, GFP_ATOMIC);
> --
> 2.43.0
>
>
> --
> kvm-riscv mailing list
> kvm-riscv@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/kvm-riscv
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] RISC-V: KVM: fix PMU snapshot_set_shmem on 32-bit hosts
2026-03-09 21:12 ` Andrew Jones
@ 2026-03-11 23:17 ` Osama Abdelkader
0 siblings, 0 replies; 3+ messages in thread
From: Osama Abdelkader @ 2026-03-11 23:17 UTC (permalink / raw)
To: Andrew Jones
Cc: Anup Patel, Atish Patra, Paul Walmsley, Palmer Dabbelt, Albert Ou,
Alexandre Ghiti, Andrew Jones, kvm, kvm-riscv, linux-riscv,
linux-kernel
On Mon, Mar 09, 2026 at 04:12:43PM -0500, Andrew Jones wrote:
> On Sun, Mar 08, 2026 at 12:43:54AM +0100, Osama Abdelkader wrote:
> > When saddr_high != 0 on RV32, the goto out was unconditional, causing
> > valid 64-bit addresses to be rejected. Only goto out when the address
> > is invalid (64-bit host with saddr_high != 0).
> >
> > Fixes: c2f41ddbcdd7 ("RISC-V: KVM: Implement SBI PMU Snapshot feature")
> > Signed-off-by: Osama Abdelkader <osama.abdelkader@gmail.com>
> > ---
> > arch/riscv/kvm/vcpu_pmu.c | 5 +++--
> > 1 file changed, 3 insertions(+), 2 deletions(-)
> >
> > diff --git a/arch/riscv/kvm/vcpu_pmu.c b/arch/riscv/kvm/vcpu_pmu.c
> > index 4d8d5e9aa53d..045099ca904b 100644
> > --- a/arch/riscv/kvm/vcpu_pmu.c
> > +++ b/arch/riscv/kvm/vcpu_pmu.c
> > @@ -425,9 +425,10 @@ int kvm_riscv_vcpu_pmu_snapshot_set_shmem(struct kvm_vcpu *vcpu, unsigned long s
> > if (saddr_high != 0) {
> > if (IS_ENABLED(CONFIG_32BIT))
> > saddr |= ((gpa_t)saddr_high << 32);
> > - else
> > + else {
> > sbiret = SBI_ERR_INVALID_ADDRESS;
> > - goto out;
> > + goto out;
> > + }
>
> nit: Could add the {} to the if-arm too in order to keep things balanced.
> Otherwise,
>
> Reviewed-by: Andrew Jones <andrew.jones@oss.qualcomm.com>
>
> Thanks,
> drew
>
Hi Andrew,
I'm going to do that in v2, thanks.
Thanks,
Osama
> > }
> >
> > kvpmu->sdata = kzalloc(snapshot_area_size, GFP_ATOMIC);
> > --
> > 2.43.0
> >
> >
> > --
> > kvm-riscv mailing list
> > kvm-riscv@lists.infradead.org
> > http://lists.infradead.org/mailman/listinfo/kvm-riscv
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2026-03-11 23:17 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2026-03-07 23:43 [PATCH] RISC-V: KVM: fix PMU snapshot_set_shmem on 32-bit hosts Osama Abdelkader
2026-03-09 21:12 ` Andrew Jones
2026-03-11 23:17 ` Osama Abdelkader
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox