linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH V2 0/2] selftests: sgx: Fix build of test_sgx
@ 2022-02-14 18:41 Muhammad Usama Anjum
  2022-02-14 18:41 ` [PATCH V2 1/2] selftests: x86: add validity check and allow field splitting Muhammad Usama Anjum
  2022-02-14 18:41 ` [PATCH V2 2/2] selftests: sgx: Treat CC as one argument Muhammad Usama Anjum
  0 siblings, 2 replies; 7+ messages in thread
From: Muhammad Usama Anjum @ 2022-02-14 18:41 UTC (permalink / raw)
  To: Jarkko Sakkinen, Dave Hansen, Shuah Khan, Andy Lutomirski,
	Jethro Beekman, Borislav Petkov, open list:INTEL SGX,
	open list:KERNEL SELFTEST FRAMEWORK, open list, David.Laight
  Cc: Muhammad Usama Anjum, kernel, kernelci

CC can have multiple sub-strings like "ccache gcc". Build system of sgx
selftest is unable to support this use case and test_sgx isn't built.
Then rsync gives an erorr:

rsync: [sender] link_stat "//linux/build/kselftest/sgx/test_sgx" failed: No such file or directory (2)
rsync error: some files/attrs were not transferred (see previous errors) (code 23) at main.c(1333) [sender=3.2.3]

This can be fixed if CC is considered to have one string while passing to
check_cc.sh script and inside this script, CC is expanded before execution.

Following build tests have been performed to confirm that these patches
don't break anything else. The verification has also been done through
KernelCI scripts locally as KernelCI has caught this bug:
1) cd tools/testing/selftests && make
2) make -C tools/testing/selftests
3) make -C tools/testing/selftests O=build
4) make -C tools/testing/selftests O=build CC="ccache gcc"
5) ./kci_build make_kselftest

Muhammad Usama Anjum (2):
  selftests: x86: add validity check and allow field splitting
  selftests: sgx: Treat CC as one argument

 tools/testing/selftests/sgx/Makefile    | 2 +-
 tools/testing/selftests/x86/check_cc.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

-- 
2.30.2


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [PATCH V2 1/2] selftests: x86: add validity check and allow field splitting
  2022-02-14 18:41 [PATCH V2 0/2] selftests: sgx: Fix build of test_sgx Muhammad Usama Anjum
@ 2022-02-14 18:41 ` Muhammad Usama Anjum
  2022-02-14 20:59   ` Shuah Khan
  2022-02-17 20:03   ` [tip: x86/sgx] selftests/x86: Add " tip-bot2 for Muhammad Usama Anjum
  2022-02-14 18:41 ` [PATCH V2 2/2] selftests: sgx: Treat CC as one argument Muhammad Usama Anjum
  1 sibling, 2 replies; 7+ messages in thread
From: Muhammad Usama Anjum @ 2022-02-14 18:41 UTC (permalink / raw)
  To: Jarkko Sakkinen, Dave Hansen, Shuah Khan, Andy Lutomirski,
	Jethro Beekman, Borislav Petkov, open list:INTEL SGX,
	open list:KERNEL SELFTEST FRAMEWORK, open list, David.Laight
  Cc: Muhammad Usama Anjum, kernel, kernelci, kernelci.org bot

Add check to test if CC has a string. CC can have multiple sub-strings
like "ccache gcc". Erorr pops up if it is treated as single string and
double quotes are used around it. This can be fixed by removing the
quotes and not treating CC as a single string.

Fixes: e9886ace222e ("selftests, x86: Rework x86 target architecture detection")
Reported-by: "kernelci.org bot" <bot@kernelci.org>
Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
---
Changes in V2:
Update if condition to check if CC has a string
---
 tools/testing/selftests/x86/check_cc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/x86/check_cc.sh b/tools/testing/selftests/x86/check_cc.sh
index 3e2089c8cf549..8c669c0d662ee 100755
--- a/tools/testing/selftests/x86/check_cc.sh
+++ b/tools/testing/selftests/x86/check_cc.sh
@@ -7,7 +7,7 @@ CC="$1"
 TESTPROG="$2"
 shift 2
 
-if "$CC" -o /dev/null "$TESTPROG" -O0 "$@" 2>/dev/null; then
+if [ -n "$CC" ] && $CC -o /dev/null "$TESTPROG" -O0 "$@" 2>/dev/null; then
     echo 1
 else
     echo 0
-- 
2.30.2


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [PATCH V2 2/2] selftests: sgx: Treat CC as one argument
  2022-02-14 18:41 [PATCH V2 0/2] selftests: sgx: Fix build of test_sgx Muhammad Usama Anjum
  2022-02-14 18:41 ` [PATCH V2 1/2] selftests: x86: add validity check and allow field splitting Muhammad Usama Anjum
@ 2022-02-14 18:41 ` Muhammad Usama Anjum
  2022-02-14 21:00   ` Shuah Khan
  2022-02-17 20:03   ` [tip: x86/sgx] selftests/sgx: " tip-bot2 for Muhammad Usama Anjum
  1 sibling, 2 replies; 7+ messages in thread
From: Muhammad Usama Anjum @ 2022-02-14 18:41 UTC (permalink / raw)
  To: Jarkko Sakkinen, Dave Hansen, Shuah Khan, Andy Lutomirski,
	Jethro Beekman, Borislav Petkov, open list:INTEL SGX,
	open list:KERNEL SELFTEST FRAMEWORK, open list, David.Laight
  Cc: Muhammad Usama Anjum, kernel, kernelci, kernelci.org bot

CC can have multiple sub-strings like "ccache gcc". For check_cc.sh,
CC needs to be treated like one argument. Put double quotes around it to
make CC one string and hence one argument.

Fixes: 2adcba79e69d ("selftests/x86: Add a selftest for SGX")
Reported-by: "kernelci.org bot" <bot@kernelci.org>
Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
---
 tools/testing/selftests/sgx/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/sgx/Makefile b/tools/testing/selftests/sgx/Makefile
index 2956584e1e37f..75af864e07b65 100644
--- a/tools/testing/selftests/sgx/Makefile
+++ b/tools/testing/selftests/sgx/Makefile
@@ -4,7 +4,7 @@ include ../lib.mk
 
 .PHONY: all clean
 
-CAN_BUILD_X86_64 := $(shell ../x86/check_cc.sh $(CC) \
+CAN_BUILD_X86_64 := $(shell ../x86/check_cc.sh "$(CC)" \
 			    ../x86/trivial_64bit_program.c)
 
 ifndef OBJCOPY
-- 
2.30.2


^ permalink raw reply related	[flat|nested] 7+ messages in thread

* Re: [PATCH V2 1/2] selftests: x86: add validity check and allow field splitting
  2022-02-14 18:41 ` [PATCH V2 1/2] selftests: x86: add validity check and allow field splitting Muhammad Usama Anjum
@ 2022-02-14 20:59   ` Shuah Khan
  2022-02-17 20:03   ` [tip: x86/sgx] selftests/x86: Add " tip-bot2 for Muhammad Usama Anjum
  1 sibling, 0 replies; 7+ messages in thread
From: Shuah Khan @ 2022-02-14 20:59 UTC (permalink / raw)
  To: Muhammad Usama Anjum, Jarkko Sakkinen, Dave Hansen, Shuah Khan,
	Andy Lutomirski, Jethro Beekman, Borislav Petkov,
	open list:INTEL SGX, open list:KERNEL SELFTEST FRAMEWORK,
	open list, David.Laight
  Cc: kernel, kernelci, kernelci.org bot, Shuah Khan

On 2/14/22 11:41 AM, Muhammad Usama Anjum wrote:
> Add check to test if CC has a string. CC can have multiple sub-strings
> like "ccache gcc". Erorr pops up if it is treated as single string and
> double quotes are used around it. This can be fixed by removing the
> quotes and not treating CC as a single string.
> 
> Fixes: e9886ace222e ("selftests, x86: Rework x86 target architecture detection")
> Reported-by: "kernelci.org bot" <bot@kernelci.org>
> Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
> ---
> Changes in V2:
> Update if condition to check if CC has a string
> ---
>   tools/testing/selftests/x86/check_cc.sh | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/testing/selftests/x86/check_cc.sh b/tools/testing/selftests/x86/check_cc.sh
> index 3e2089c8cf549..8c669c0d662ee 100755
> --- a/tools/testing/selftests/x86/check_cc.sh
> +++ b/tools/testing/selftests/x86/check_cc.sh
> @@ -7,7 +7,7 @@ CC="$1"
>   TESTPROG="$2"
>   shift 2
>   
> -if "$CC" -o /dev/null "$TESTPROG" -O0 "$@" 2>/dev/null; then
> +if [ -n "$CC" ] && $CC -o /dev/null "$TESTPROG" -O0 "$@" 2>/dev/null; then
>       echo 1
>   else
>       echo 0
> 

Looks good to me.

Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>

thanks,
-- Shuah

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: [PATCH V2 2/2] selftests: sgx: Treat CC as one argument
  2022-02-14 18:41 ` [PATCH V2 2/2] selftests: sgx: Treat CC as one argument Muhammad Usama Anjum
@ 2022-02-14 21:00   ` Shuah Khan
  2022-02-17 20:03   ` [tip: x86/sgx] selftests/sgx: " tip-bot2 for Muhammad Usama Anjum
  1 sibling, 0 replies; 7+ messages in thread
From: Shuah Khan @ 2022-02-14 21:00 UTC (permalink / raw)
  To: Muhammad Usama Anjum, Jarkko Sakkinen, Dave Hansen, Shuah Khan,
	Andy Lutomirski, Jethro Beekman, Borislav Petkov,
	open list:INTEL SGX, open list:KERNEL SELFTEST FRAMEWORK,
	open list, David.Laight
  Cc: kernel, kernelci, kernelci.org bot, Shuah Khan

On 2/14/22 11:41 AM, Muhammad Usama Anjum wrote:
> CC can have multiple sub-strings like "ccache gcc". For check_cc.sh,
> CC needs to be treated like one argument. Put double quotes around it to
> make CC one string and hence one argument.
> 
> Fixes: 2adcba79e69d ("selftests/x86: Add a selftest for SGX")
> Reported-by: "kernelci.org bot" <bot@kernelci.org>
> Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
> ---
>   tools/testing/selftests/sgx/Makefile | 2 +-
>   1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tools/testing/selftests/sgx/Makefile b/tools/testing/selftests/sgx/Makefile
> index 2956584e1e37f..75af864e07b65 100644
> --- a/tools/testing/selftests/sgx/Makefile
> +++ b/tools/testing/selftests/sgx/Makefile
> @@ -4,7 +4,7 @@ include ../lib.mk
>   
>   .PHONY: all clean
>   
> -CAN_BUILD_X86_64 := $(shell ../x86/check_cc.sh $(CC) \
> +CAN_BUILD_X86_64 := $(shell ../x86/check_cc.sh "$(CC)" \
>   			    ../x86/trivial_64bit_program.c)
>   
>   ifndef OBJCOPY
> 

Looks good to me.

Reviewed-by: Shuah Khan <skhan@linuxfoundation.org>

thanks,
-- Shuah


^ permalink raw reply	[flat|nested] 7+ messages in thread

* [tip: x86/sgx] selftests/sgx: Treat CC as one argument
  2022-02-14 18:41 ` [PATCH V2 2/2] selftests: sgx: Treat CC as one argument Muhammad Usama Anjum
  2022-02-14 21:00   ` Shuah Khan
@ 2022-02-17 20:03   ` tip-bot2 for Muhammad Usama Anjum
  1 sibling, 0 replies; 7+ messages in thread
From: tip-bot2 for Muhammad Usama Anjum @ 2022-02-17 20:03 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: kernelci.org bot, Muhammad Usama Anjum, Dave Hansen, x86, linux-kernel

The following commit has been merged into the x86/sgx branch of tip:

Commit-ID:     6170abb21e2380477080b25145da9747ad467d3d
Gitweb:        https://git.kernel.org/tip/6170abb21e2380477080b25145da9747ad467d3d
Author:        Muhammad Usama Anjum <usama.anjum@collabora.com>
AuthorDate:    Mon, 14 Feb 2022 23:41:09 +05:00
Committer:     Dave Hansen <dave.hansen@linux.intel.com>
CommitterDate: Thu, 17 Feb 2022 11:55:17 -08:00

selftests/sgx: Treat CC as one argument

CC can have multiple sub-strings like "ccache gcc". For check_cc.sh,
CC needs to be treated like one argument. Put double quotes around it to
make CC one string and hence one argument.

Fixes: 2adcba79e69d ("selftests/x86: Add a selftest for SGX")
Reported-by: "kernelci.org bot" <bot@kernelci.org>
Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lkml.kernel.org/r/20220214184109.3739179-3-usama.anjum@collabora.com
---
 tools/testing/selftests/sgx/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/sgx/Makefile b/tools/testing/selftests/sgx/Makefile
index 2956584..75af864 100644
--- a/tools/testing/selftests/sgx/Makefile
+++ b/tools/testing/selftests/sgx/Makefile
@@ -4,7 +4,7 @@ include ../lib.mk
 
 .PHONY: all clean
 
-CAN_BUILD_X86_64 := $(shell ../x86/check_cc.sh $(CC) \
+CAN_BUILD_X86_64 := $(shell ../x86/check_cc.sh "$(CC)" \
 			    ../x86/trivial_64bit_program.c)
 
 ifndef OBJCOPY

^ permalink raw reply related	[flat|nested] 7+ messages in thread

* [tip: x86/sgx] selftests/x86: Add validity check and allow field splitting
  2022-02-14 18:41 ` [PATCH V2 1/2] selftests: x86: add validity check and allow field splitting Muhammad Usama Anjum
  2022-02-14 20:59   ` Shuah Khan
@ 2022-02-17 20:03   ` tip-bot2 for Muhammad Usama Anjum
  1 sibling, 0 replies; 7+ messages in thread
From: tip-bot2 for Muhammad Usama Anjum @ 2022-02-17 20:03 UTC (permalink / raw)
  To: linux-tip-commits
  Cc: kernelci.org bot, Muhammad Usama Anjum, Dave Hansen, x86, linux-kernel

The following commit has been merged into the x86/sgx branch of tip:

Commit-ID:     b06e15ebd5bfb670f93c7f11a29b8299c1178bc6
Gitweb:        https://git.kernel.org/tip/b06e15ebd5bfb670f93c7f11a29b8299c1178bc6
Author:        Muhammad Usama Anjum <usama.anjum@collabora.com>
AuthorDate:    Mon, 14 Feb 2022 23:41:08 +05:00
Committer:     Dave Hansen <dave.hansen@linux.intel.com>
CommitterDate: Thu, 17 Feb 2022 11:55:17 -08:00

selftests/x86: Add validity check and allow field splitting

Add check to test if CC has a string. CC can have multiple sub-strings
like "ccache gcc". Erorr pops up if it is treated as single string and
double quotes are used around it. This can be fixed by removing the
quotes and not treating CC as a single string.

Fixes: e9886ace222e ("selftests, x86: Rework x86 target architecture detection")
Reported-by: "kernelci.org bot" <bot@kernelci.org>
Signed-off-by: Muhammad Usama Anjum <usama.anjum@collabora.com>
Signed-off-by: Dave Hansen <dave.hansen@linux.intel.com>
Link: https://lkml.kernel.org/r/20220214184109.3739179-2-usama.anjum@collabora.com
---
 tools/testing/selftests/x86/check_cc.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/testing/selftests/x86/check_cc.sh b/tools/testing/selftests/x86/check_cc.sh
index 3e2089c..8c669c0 100755
--- a/tools/testing/selftests/x86/check_cc.sh
+++ b/tools/testing/selftests/x86/check_cc.sh
@@ -7,7 +7,7 @@ CC="$1"
 TESTPROG="$2"
 shift 2
 
-if "$CC" -o /dev/null "$TESTPROG" -O0 "$@" 2>/dev/null; then
+if [ -n "$CC" ] && $CC -o /dev/null "$TESTPROG" -O0 "$@" 2>/dev/null; then
     echo 1
 else
     echo 0

^ permalink raw reply related	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2022-02-17 20:03 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-02-14 18:41 [PATCH V2 0/2] selftests: sgx: Fix build of test_sgx Muhammad Usama Anjum
2022-02-14 18:41 ` [PATCH V2 1/2] selftests: x86: add validity check and allow field splitting Muhammad Usama Anjum
2022-02-14 20:59   ` Shuah Khan
2022-02-17 20:03   ` [tip: x86/sgx] selftests/x86: Add " tip-bot2 for Muhammad Usama Anjum
2022-02-14 18:41 ` [PATCH V2 2/2] selftests: sgx: Treat CC as one argument Muhammad Usama Anjum
2022-02-14 21:00   ` Shuah Khan
2022-02-17 20:03   ` [tip: x86/sgx] selftests/sgx: " tip-bot2 for Muhammad Usama Anjum

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).