| Message ID | 20220127030858.3269036-2-ricarkol@google.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | kvm: selftests: aarch64: some fixes for vgic_irq | expand |
On Wed, Jan 26, 2022 at 07:08:54PM -0800, Ricardo Koller wrote: > The val argument in gicv3_access_reg can have any value when used for a > read, not necessarily 0. Fix the assert by checking val only for > writes. > > Signed-off-by: Ricardo Koller <ricarkol@google.com> > Reported-by: Reiji Watanabe <reijiw@google.com> > Cc: Andrew Jones <drjones@redhat.com> Commit message said my r-b would be here, but it doesn't appear to be. Here it is again Reviewed-by: Andrew Jones <drjones@redhat.com> > --- > tools/testing/selftests/kvm/lib/aarch64/gic_v3.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/tools/testing/selftests/kvm/lib/aarch64/gic_v3.c b/tools/testing/selftests/kvm/lib/aarch64/gic_v3.c > index 00f613c0583c..e4945fe66620 100644 > --- a/tools/testing/selftests/kvm/lib/aarch64/gic_v3.c > +++ b/tools/testing/selftests/kvm/lib/aarch64/gic_v3.c > @@ -159,7 +159,7 @@ static void gicv3_access_reg(uint32_t intid, uint64_t offset, > uint32_t cpu_or_dist; > > GUEST_ASSERT(bits_per_field <= reg_bits); > - GUEST_ASSERT(*val < (1U << bits_per_field)); > + GUEST_ASSERT(!write || *val < (1U << bits_per_field)); > /* Some registers like IROUTER are 64 bit long. Those are currently not > * supported by readl nor writel, so just asserting here until then. > */ > -- > 2.35.0.rc0.227.g00780c9af4-goog >
diff --git a/tools/testing/selftests/kvm/lib/aarch64/gic_v3.c b/tools/testing/selftests/kvm/lib/aarch64/gic_v3.c index 00f613c0583c..e4945fe66620 100644 --- a/tools/testing/selftests/kvm/lib/aarch64/gic_v3.c +++ b/tools/testing/selftests/kvm/lib/aarch64/gic_v3.c @@ -159,7 +159,7 @@ static void gicv3_access_reg(uint32_t intid, uint64_t offset, uint32_t cpu_or_dist; GUEST_ASSERT(bits_per_field <= reg_bits); - GUEST_ASSERT(*val < (1U << bits_per_field)); + GUEST_ASSERT(!write || *val < (1U << bits_per_field)); /* Some registers like IROUTER are 64 bit long. Those are currently not * supported by readl nor writel, so just asserting here until then. */
The val argument in gicv3_access_reg can have any value when used for a read, not necessarily 0. Fix the assert by checking val only for writes. Signed-off-by: Ricardo Koller <ricarkol@google.com> Reported-by: Reiji Watanabe <reijiw@google.com> Cc: Andrew Jones <drjones@redhat.com> --- tools/testing/selftests/kvm/lib/aarch64/gic_v3.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)