[DTrace-devel] [PATCH 2/5] test: Adjust skip file for lockmem problem

[Kris Van Hees]

On Wed, Oct 01, 2025 at 02:24:15AM -0400, eugene.loh at oracle.com wrote:
> From: Eugene Loh <eugene.loh at oracle.com>
> 
> dtrace seems to work for recent kernel versions even when lockmem
> is set too low.  The .x skip files for the lockmem tests say:
>   - UEKR6 (5.4.17) we should test
>   - UEKR7 (5.15.0) we should skip
> and so it starts skipping with 5.15.
> 
> Apparently, however, lockmem does not impede dtrace on RHCK 5.14
> either.
> 
> So, tweak the skip file to skip on 5.14 as well.

But this seems to make the assumption that RHCK 5.14 is the same as upstream
5.14, which I highly doubt to be the case.  So, we should not change this
unless it has been verified that upstream 5.14 indeed also does not impede
dtrace when lockmem is set too low.

> Signed-off-by: Eugene Loh <eugene.loh at oracle.com>
> ---
>  test/unittest/misc/tst.lockmem-envvar.x | 4 ++--
>  test/unittest/misc/tst.lockmem-x.x      | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/test/unittest/misc/tst.lockmem-envvar.x b/test/unittest/misc/tst.lockmem-envvar.x
> index a779416b9..494ac67fa 100755
> --- a/test/unittest/misc/tst.lockmem-envvar.x
> +++ b/test/unittest/misc/tst.lockmem-envvar.x
> @@ -5,12 +5,12 @@ read MAJOR MINOR <<< `uname -r | grep -Eo '^[0-9]+\.[0-9]+' | tr '.' ' '`
>  if [ $MAJOR -lt 5 ]; then
>          exit 0
>  fi
> -if [ $MAJOR -eq 5 -a $MINOR -lt 15 ]; then
> +if [ $MAJOR -eq 5 -a $MINOR -lt 14 ]; then
>          exit 0
>  fi
>  
>  # Somehow, UEKR6 (5.4.17) has problems with the the locked-memory limit,
> -# but UEKR7 (5.15.0) does not
> +# but UEKR7 (5.15.0) and RHCK 5.14 do not
>  
>  echo "no locked-memory limit on newer kernels?"
>  exit 1
> diff --git a/test/unittest/misc/tst.lockmem-x.x b/test/unittest/misc/tst.lockmem-x.x
> index a779416b9..494ac67fa 100755
> --- a/test/unittest/misc/tst.lockmem-x.x
> +++ b/test/unittest/misc/tst.lockmem-x.x
> @@ -5,12 +5,12 @@ read MAJOR MINOR <<< `uname -r | grep -Eo '^[0-9]+\.[0-9]+' | tr '.' ' '`
>  if [ $MAJOR -lt 5 ]; then
>          exit 0
>  fi
> -if [ $MAJOR -eq 5 -a $MINOR -lt 15 ]; then
> +if [ $MAJOR -eq 5 -a $MINOR -lt 14 ]; then
>          exit 0
>  fi
>  
>  # Somehow, UEKR6 (5.4.17) has problems with the the locked-memory limit,
> -# but UEKR7 (5.15.0) does not
> +# but UEKR7 (5.15.0) and RHCK 5.14 do not
>  
>  echo "no locked-memory limit on newer kernels?"
>  exit 1
> -- 
> 2.47.3
>