Skip to contentSkip to conversation

selftests: vm: Build fixes for powerpc64

PATCH In review Sandipan Das 3 participants 8 messages Jan 30, 2020 – Apr 10, 2020

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

cover selftests: vm: Build fixes for powerpc64

The second patch was already posted independently but because of the changes in the first patch, the second one now depends on it. Hence posting it now as a part of this series.

The last version (v2) of the second patch can be found at:
https://patchwork.ozlabs.org/patch/1225969/

Sandipan Das (2):
selftests: vm: Do not override definition of ARCH
selftests: vm: Fix 64-bit test builds for powerpc64le

 tools/testing/selftests/vm/Makefile    | 4 ++--
 tools/testing/selftests/vm/run_vmtests | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/2 selftests: vm: Do not override definition of ARCH

Independent builds of the vm selftests is currently broken because commit 7549b3364201 overrides the value of ARCH with the machine name from uname. This does not always match the architecture names used for tasks like header installation.

E.g. for building tests on powerpc64, we need ARCH=powerpc and not ARCH=ppc64 or ARCH=ppc64le. Otherwise, the build fails as shown below.

  $ uname -m
  ppc64le
  $ make -C tools/testing/selftests/vm
  make: Entering directory '/home/sandipan/linux/tools/testing/selftests/vm'
  make --no-builtin-rules ARCH=ppc64le -C ../../../.. headers_install
  make[1]: Entering directory '/home/sandipan/linux'
  Makefile:653: arch/ppc64le/Makefile: No such file or directory
  make[1]: *** No rule to make target 'arch/ppc64le/Makefile'.  Stop.
  make[1]: Leaving directory '/home/sandipan/linux'
  ../lib.mk:50: recipe for target 'khdr' failed
  make: *** [khdr] Error 2
  make: Leaving directory '/home/sandipan/linux/tools/testing/selftests/vm'
Fixes 7549b3364201 ("selftests: vm: Build/Run 64bit tests only on 64bit arch")
---
 tools/testing/selftests/vm/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/vm/Makefile +2 -2
index 7f9a8a8c31da..3f2e2f0ccbc9 100644
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 # Makefile for vm selftests
 uname_M := $(shell uname -m 2>/dev/null || echo not)
-ARCH ?= $(shell echo $(uname_M) | sed -e 's/aarch64.*/arm64/')
+MACHINE ?= $(shell echo $(uname_M) | sed -e 's/aarch64.*/arm64/')
 
 CFLAGS = -Wall -I ../../../../usr/include $(EXTRA_CFLAGS)
 LDLIBS = -lrt
@@ -19,7 +19,7 @@ TEST_GEN_FILES += thuge-gen
 TEST_GEN_FILES += transhuge-stress
 TEST_GEN_FILES += userfaultfd
 
-ifneq (,$(filter $(ARCH),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sh64 sparc64 x86_64))
+ifneq (,$(filter $(MACHINE),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sh64 sparc64 x86_64))
 TEST_GEN_FILES += va_128TBswitch
 TEST_GEN_FILES += virtual_address_range
 endif
Signature · 1 line
2.17.1
Tested-by on v1 1/2
#2 lore raw

Re: [PATCH 1/2] selftests: vm: Do not override definition of ARCH

Quoted 23 lines · Sandipan Das

Independent builds of the vm selftests is currently broken because commit 7549b3364201 overrides the value of ARCH with the machine name from uname. This does not always match the architecture names used for tasks like header installation.

E.g. for building tests on powerpc64, we need ARCH=powerpc and not ARCH=ppc64 or ARCH=ppc64le. Otherwise, the build fails as shown below.

  $ uname -m
  ppc64le
  $ make -C tools/testing/selftests/vm
  make: Entering directory '/home/sandipan/linux/tools/testing/selftests/vm'
  make --no-builtin-rules ARCH=ppc64le -C ../../../.. headers_install
  make[1]: Entering directory '/home/sandipan/linux'
  Makefile:653: arch/ppc64le/Makefile: No such file or directory
  make[1]: *** No rule to make target 'arch/ppc64le/Makefile'.  Stop.
  make[1]: Leaving directory '/home/sandipan/linux'
  ../lib.mk:50: recipe for target 'khdr' failed
  make: *** [khdr] Error 2
  make: Leaving directory '/home/sandipan/linux/tools/testing/selftests/vm'
Quoted 5 lines
Fixes 7549b3364201 ("selftests: vm: Build/Run 64bit tests only on 64bit arch")
---
 tools/testing/selftests/vm/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

cheers

Quoted 24 lines
tools/testing/selftests/vm/Makefile +2 -2
index 7f9a8a8c31da..3f2e2f0ccbc9 100644
@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: GPL-2.0
 # Makefile for vm selftests
 uname_M := $(shell uname -m 2>/dev/null || echo not)
-ARCH ?= $(shell echo $(uname_M) | sed -e 's/aarch64.*/arm64/')
+MACHINE ?= $(shell echo $(uname_M) | sed -e 's/aarch64.*/arm64/')
 
 CFLAGS = -Wall -I ../../../../usr/include $(EXTRA_CFLAGS)
 LDLIBS = -lrt
@@ -19,7 +19,7 @@ TEST_GEN_FILES += thuge-gen
 TEST_GEN_FILES += transhuge-stress
 TEST_GEN_FILES += userfaultfd
 
-ifneq (,$(filter $(ARCH),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sh64 sparc64 x86_64))
+ifneq (,$(filter $(MACHINE),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sh64 sparc64 x86_64))
 TEST_GEN_FILES += va_128TBswitch
 TEST_GEN_FILES += virtual_address_range
 endif
Signature · 1 line
2.17.1
maintainer
#3 lore raw

Re: [PATCH 1/2] selftests: vm: Do not override definition of ARCH

Quoted 6 lines · Michael Ellerman
Quoted 5 lines · Sandipan Das

Independent builds of the vm selftests is currently broken because commit 7549b3364201 overrides the value of ARCH with the machine name from uname. This does not always match the architecture names used for tasks like header installation.

In the interest not adding more delays to this patch, I fixed up the commit log for the following error and applied it. I hope to send this up for next rc.

ERROR: Please use git commit description style 'commit <12+ chars of sha1> ("<title line>")' - ie: 'commit 7549b3364201 ("selftests: vm: Build/Run 64bit tests only on 64bit arch")' #93:
because commit 7549b3364201 overrides the value of ARCH with

The fixed up now looks as follows:

Independent builds of the vm selftests is currently broken because commit 7549b3364201 ("selftests: vm: Build/Run 64bit tests only on 64bit arch") overrides the value of ARCH with the machine name from uname. This does not always match the architecture names used for tasks like header installation.

Please make sure to run checkpatch with --strict to catch these kinds of errors in the future.

thanks,
-- Shuah

#4 lore raw

PATCH 2/2 selftests: vm: Fix 64-bit test builds for powerpc64le

In reply to Sandipan Das

Some tests are built only for 64-bit systems. This makes sure that these tests are built for both big and little endian variants of powerpc64.

Fixes 7549b3364201 ("selftests: vm: Build/Run 64bit tests only on 64bit arch")
---
 tools/testing/selftests/vm/Makefile    | 2 +-
 tools/testing/selftests/vm/run_vmtests | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
tools/testing/selftests/vm/Makefile +1 -1
index 3f2e2f0ccbc9..8074340c6b3a 100644
@@ -19,7 +19,7 @@ TEST_GEN_FILES += thuge-gen
 TEST_GEN_FILES += transhuge-stress
 TEST_GEN_FILES += userfaultfd
 
-ifneq (,$(filter $(MACHINE),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sh64 sparc64 x86_64))
+ifneq (,$(filter $(MACHINE),arm64 ia64 mips64 parisc64 ppc64 ppc64le riscv64 s390x sh64 sparc64 x86_64))
 TEST_GEN_FILES += va_128TBswitch
 TEST_GEN_FILES += virtual_address_range
 endif
tools/testing/selftests/vm/run_vmtests +1 -1
index a692ea828317..db8e0d1c7b39 100755
@@ -59,7 +59,7 @@ else
 fi
 
 #filter 64bit architectures
-ARCH64STR="arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sh64 sparc64 x86_64"
+ARCH64STR="arm64 ia64 mips64 parisc64 ppc64 ppc64le riscv64 s390x sh64 sparc64 x86_64"
 if [ -z $ARCH ]; then
   ARCH=`uname -m 2>/dev/null | sed -e 's/aarch64.*/arm64/'`
 fi
Signature · 1 line
2.17.1
Tested-by on v1 2/2
#5 lore raw

Re: [PATCH 2/2] selftests: vm: Fix 64-bit test builds for powerpc64le

Quoted 11 lines · Sandipan Das

Some tests are built only for 64-bit systems. This makes sure that these tests are built for both big and little endian variants of powerpc64.

Fixes 7549b3364201 ("selftests: vm: Build/Run 64bit tests only on 64bit arch")
---
 tools/testing/selftests/vm/Makefile    | 2 +-
 tools/testing/selftests/vm/run_vmtests | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

cheers

Quoted 28 lines
tools/testing/selftests/vm/Makefile +1 -1
index 3f2e2f0ccbc9..8074340c6b3a 100644
@@ -19,7 +19,7 @@ TEST_GEN_FILES += thuge-gen
 TEST_GEN_FILES += transhuge-stress
 TEST_GEN_FILES += userfaultfd
 
-ifneq (,$(filter $(MACHINE),arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sh64 sparc64 x86_64))
+ifneq (,$(filter $(MACHINE),arm64 ia64 mips64 parisc64 ppc64 ppc64le riscv64 s390x sh64 sparc64 x86_64))
 TEST_GEN_FILES += va_128TBswitch
 TEST_GEN_FILES += virtual_address_range
 endif
tools/testing/selftests/vm/run_vmtests +1 -1
index a692ea828317..db8e0d1c7b39 100755
@@ -59,7 +59,7 @@ else
 fi
 
 #filter 64bit architectures
-ARCH64STR="arm64 ia64 mips64 parisc64 ppc64 riscv64 s390x sh64 sparc64 x86_64"
+ARCH64STR="arm64 ia64 mips64 parisc64 ppc64 ppc64le riscv64 s390x sh64 sparc64 x86_64"
 if [ -z $ARCH ]; then
   ARCH=`uname -m 2>/dev/null | sed -e 's/aarch64.*/arm64/'`
 fi
Signature · 1 line
2.17.1
maintainer
#6 lore raw
In reply to Sandipan Das
Quoted 7 lines · Sandipan Das

The second patch was already posted independently but because of the changes in the first patch, the second one now depends on it. Hence posting it now as a part of this series.

The last version (v2) of the second patch can be found at:
https://patchwork.ozlabs.org/patch/1225969/

Quoted 8 lines

Sandipan Das (2):
selftests: vm: Do not override definition of ARCH
selftests: vm: Fix 64-bit test builds for powerpc64le

  tools/testing/selftests/vm/Makefile    | 4 ++--
  tools/testing/selftests/vm/run_vmtests | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)

Michael,

I see your tested-by on these two patches. I will take these through kselftest fixes.

Sorry for the delay. I assumed these will go through ppc64 or vm.

thanks,
-- Shuah

#7 lore raw
Quoted 17 lines · Shuah Khan
Quoted 7 lines · Sandipan Das

The second patch was already posted independently but because of the changes in the first patch, the second one now depends on it. Hence posting it now as a part of this series.

The last version (v2) of the second patch can be found at:
https://patchwork.ozlabs.org/patch/1225969/

Quoted 8 lines

Sandipan Das (2):
selftests: vm: Do not override definition of ARCH
selftests: vm: Fix 64-bit test builds for powerpc64le

  tools/testing/selftests/vm/Makefile    | 4 ++--
  tools/testing/selftests/vm/run_vmtests | 2 +-
  2 files changed, 3 insertions(+), 3 deletions(-)
Quoted 4 lines

Michael,

I see your tested-by on these two patches. I will take these through kselftest fixes.

Thanks.

cheers