Re: [PATCH v2 51/53] selftests/mm: va_high_addr_switch.sh: drop huge pages setup

Luiz Capitulino
2026-04-24T17:21:58Z

On 2026-04-18 06:55, Mike Rapoport wrote:
> From: "Mike Rapoport (Microsoft)" <rppt@kernel.org>
>
> Since va_high_addr_switch takes care of setting up huge pages, there is
> no need to set them up in the va_high_addr_switch.sh wrapper script.
>
> Signed-off-by: Mike Rapoport (Microsoft) <rppt@kernel.org>
> ---
> .../selftests/mm/va_high_addr_switch.sh | 39 +------------------
> 1 file changed, 1 insertion(+), 38 deletions(-)
>
> diff --git a/tools/testing/selftests/mm/va_high_addr_switch.sh b/tools/testing/selftests/mm/va_high_addr_switch.sh
> index 9492c2d72634..d66c0fd3cb4d 100755
> --- a/tools/testing/selftests/mm/va_high_addr_switch.sh
> +++ b/tools/testing/selftests/mm/va_high_addr_switch.sh
> @@ -9,7 +9,6 @@
>
> # Kselftest framework requirement - SKIP code is 4.
> ksft_skip=4
> -orig_nr_hugepages=0
>
> skip()
> {
> @@ -77,43 +76,7 @@ check_test_requirements()
> esac
> }
>
> -save_nr_hugepages()
> -{
> - orig_nr_hugepages=$(cat /proc/sys/vm/nr_hugepages)
> -}
> -
> -restore_nr_hugepages()
> -{
> - echo "$orig_nr_hugepages" > /proc/sys/vm/nr_hugepages
> -}
> -
> -setup_nr_hugepages()
> -{
> - local needpgs=$1
> - while read -r name size unit; do
> - if [ "$name" = "HugePages_Free:" ]; then
> - freepgs="$size"
> - break
> - fi
> - done < /proc/meminfo
> - if [ "$freepgs" -ge "$needpgs" ]; then
> - return
> - fi
> - local hpgs=$((orig_nr_hugepages + needpgs))
> - echo $hpgs > /proc/sys/vm/nr_hugepages
> -
> - local nr_hugepgs=$(cat /proc/sys/vm/nr_hugepages)
> - if [ "$nr_hugepgs" != "$hpgs" ]; then
> - restore_nr_hugepages
> - skip "$0: no enough hugepages for testing"
> - fi
> -}
> -
> check_test_requirements
> -save_nr_hugepages
> -# The HugeTLB tests require 6 pages
> -setup_nr_hugepages 6
> -./va_high_addr_switch --run-hugetlb
> +./va_high_addr_switch
> retcode=$?
> -restore_nr_hugepages
> exit $retcode

The retcode=$? and the last line are deadcode now and can be removed.