tools/testing/selftests/mm/virtual_address_range.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-)
validate_addr() function checks whether the address returned by mmap()
lies in the low or high VA space, according to whether a high addr hint
was passed or not. The fix commit mentioned below changed the code in
such a way that this function will always return failure when passed
high_addr == 1; addr will be >= HIGH_ADDR_MARK always, we will fall
down to "if (addr < HIGH_ADDR_MARK)" and return failure. Fix this.
Fixes: d1d86ce28d0f ("selftests/mm: virtual_address_range: conform to TAP format output")
Signed-off-by: Dev Jain <dev.jain@arm.com>
---
tools/testing/selftests/mm/virtual_address_range.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/tools/testing/selftests/mm/virtual_address_range.c b/tools/testing/selftests/mm/virtual_address_range.c
index b380e102b22f..169dbd692bf5 100644
--- a/tools/testing/selftests/mm/virtual_address_range.c
+++ b/tools/testing/selftests/mm/virtual_address_range.c
@@ -77,8 +77,11 @@ static void validate_addr(char *ptr, int high_addr)
{
unsigned long addr = (unsigned long) ptr;
- if (high_addr && addr < HIGH_ADDR_MARK)
- ksft_exit_fail_msg("Bad address %lx\n", addr);
+ if (high_addr) {
+ if (addr < HIGH_ADDR_MARK)
+ ksft_exit_fail_msg("Bad address %lx\n", addr);
+ return;
+ }
if (addr > HIGH_ADDR_MARK)
ksft_exit_fail_msg("Bad address %lx\n", addr);
--
2.30.2
On 20.06.25 13:11, Dev Jain wrote: > validate_addr() function checks whether the address returned by mmap() > lies in the low or high VA space, according to whether a high addr hint > was passed or not. The fix commit mentioned below changed the code in > such a way that this function will always return failure when passed > high_addr == 1; addr will be >= HIGH_ADDR_MARK always, we will fall > down to "if (addr < HIGH_ADDR_MARK)" and return failure. Fix this. > > Fixes: d1d86ce28d0f ("selftests/mm: virtual_address_range: conform to TAP format output") > Signed-off-by: Dev Jain <dev.jain@arm.com> > --- > tools/testing/selftests/mm/virtual_address_range.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/mm/virtual_address_range.c b/tools/testing/selftests/mm/virtual_address_range.c > index b380e102b22f..169dbd692bf5 100644 > --- a/tools/testing/selftests/mm/virtual_address_range.c > +++ b/tools/testing/selftests/mm/virtual_address_range.c > @@ -77,8 +77,11 @@ static void validate_addr(char *ptr, int high_addr) > { > unsigned long addr = (unsigned long) ptr; > > - if (high_addr && addr < HIGH_ADDR_MARK) > - ksft_exit_fail_msg("Bad address %lx\n", addr); > + if (high_addr) { > + if (addr < HIGH_ADDR_MARK) > + ksft_exit_fail_msg("Bad address %lx\n", addr); > + return; > + } > > if (addr > HIGH_ADDR_MARK) > ksft_exit_fail_msg("Bad address %lx\n", addr); LGTM, the logic corresponds to the way we would handle it pre d1d86ce28d0f Acked-by: David Hildenbrand <david@redhat.com> -- Cheers, David / dhildenb
On 6/20/25 4:41 PM, Dev Jain wrote: > validate_addr() function checks whether the address returned by mmap() > lies in the low or high VA space, according to whether a high addr hint > was passed or not. The fix commit mentioned below changed the code in > such a way that this function will always return failure when passed > high_addr == 1; addr will be >= HIGH_ADDR_MARK always, we will fall > down to "if (addr < HIGH_ADDR_MARK)" and return failure. Fix this. > > Fixes: d1d86ce28d0f ("selftests/mm: virtual_address_range: conform to TAP format output") > Signed-off-by: Dev Jain <dev.jain@arm.com> > --- > tools/testing/selftests/mm/virtual_address_range.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/mm/virtual_address_range.c b/tools/testing/selftests/mm/virtual_address_range.c > index b380e102b22f..169dbd692bf5 100644 > --- a/tools/testing/selftests/mm/virtual_address_range.c > +++ b/tools/testing/selftests/mm/virtual_address_range.c > @@ -77,8 +77,11 @@ static void validate_addr(char *ptr, int high_addr) > { > unsigned long addr = (unsigned long) ptr; > > - if (high_addr && addr < HIGH_ADDR_MARK) > - ksft_exit_fail_msg("Bad address %lx\n", addr); > + if (high_addr) { > + if (addr < HIGH_ADDR_MARK) > + ksft_exit_fail_msg("Bad address %lx\n", addr); > + return; > + } > > if (addr > HIGH_ADDR_MARK) > ksft_exit_fail_msg("Bad address %lx\n", addr); This looks good to me. Feel free to add Reviewed-by: Donet Tom <donettom@linux.ibm.com>
On 20/06/25 4:41 pm, Dev Jain wrote: > validate_addr() function checks whether the address returned by mmap() > lies in the low or high VA space, according to whether a high addr hint > was passed or not. The fix commit mentioned below changed the code in > such a way that this function will always return failure when passed > high_addr == 1; addr will be >= HIGH_ADDR_MARK always, we will fall > down to "if (addr < HIGH_ADDR_MARK)" and return failure. Fix this. Correction: We will fall down to if (addr > HIGH_ADDR_MASK). > > Fixes: d1d86ce28d0f ("selftests/mm: virtual_address_range: conform to TAP format output") > Signed-off-by: Dev Jain <dev.jain@arm.com> > --- > tools/testing/selftests/mm/virtual_address_range.c | 7 +++++-- > 1 file changed, 5 insertions(+), 2 deletions(-) > > diff --git a/tools/testing/selftests/mm/virtual_address_range.c b/tools/testing/selftests/mm/virtual_address_range.c > index b380e102b22f..169dbd692bf5 100644 > --- a/tools/testing/selftests/mm/virtual_address_range.c > +++ b/tools/testing/selftests/mm/virtual_address_range.c > @@ -77,8 +77,11 @@ static void validate_addr(char *ptr, int high_addr) > { > unsigned long addr = (unsigned long) ptr; > > - if (high_addr && addr < HIGH_ADDR_MARK) > - ksft_exit_fail_msg("Bad address %lx\n", addr); > + if (high_addr) { > + if (addr < HIGH_ADDR_MARK) > + ksft_exit_fail_msg("Bad address %lx\n", addr); > + return; > + } > > if (addr > HIGH_ADDR_MARK) > ksft_exit_fail_msg("Bad address %lx\n", addr);
© 2016 - 2025 Red Hat, Inc.