Live-Patching Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH v2] selftests/livepatch: adopt to newer sysctl error format
@ 2020-07-14  9:10 Petr Mladek
  2020-07-14  9:57 ` Kamalesh Babulal
                   ` (3 more replies)
  0 siblings, 4 replies; 5+ messages in thread
From: Petr Mladek @ 2020-07-14  9:10 UTC (permalink / raw)
  To: Kamalesh Babulal, Josh Poimboeuf, Jiri Kosina, Miroslav Benes
  Cc: Joe Lawrence, Shuah Khan, live-patching, linux-kselftest,
	linux-kernel, Petr Mladek

With procfs v3.3.16, the sysctl command doesn't print the set key and
value on error.  This change breaks livepatch selftest test-ftrace.sh,
that tests the interaction of sysctl ftrace_enabled:

Make it work with all sysctl versions using '-q' option.

Explicitly print the final status on success so that it can be verified
in the log. The error message is enough on failure.

Reported-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
Signed-off-by: Petr Mladek <pmladek@suse.com>
---
The patch has been created against livepatch.git,
branch for-5.9/selftests-cleanup. But it applies also against
the current Linus' tree.

tools/testing/selftests/livepatch/functions.sh   | 3 ++-
 tools/testing/selftests/livepatch/test-ftrace.sh | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/tools/testing/selftests/livepatch/functions.sh b/tools/testing/selftests/livepatch/functions.sh
index 408529d94ddb..1aba83c87ad3 100644
--- a/tools/testing/selftests/livepatch/functions.sh
+++ b/tools/testing/selftests/livepatch/functions.sh
@@ -75,7 +75,8 @@ function set_dynamic_debug() {
 }
 
 function set_ftrace_enabled() {
-	result=$(sysctl kernel.ftrace_enabled="$1" 2>&1 | paste --serial --delimiters=' ')
+	result=$(sysctl -q kernel.ftrace_enabled="$1" 2>&1 && \
+		 sysctl kernel.ftrace_enabled 2>&1)
 	echo "livepatch: $result" > /dev/kmsg
 }
 
diff --git a/tools/testing/selftests/livepatch/test-ftrace.sh b/tools/testing/selftests/livepatch/test-ftrace.sh
index 9160c9ec3b6f..552e165512f4 100755
--- a/tools/testing/selftests/livepatch/test-ftrace.sh
+++ b/tools/testing/selftests/livepatch/test-ftrace.sh
@@ -51,7 +51,7 @@ livepatch: '$MOD_LIVEPATCH': initializing patching transition
 livepatch: '$MOD_LIVEPATCH': starting patching transition
 livepatch: '$MOD_LIVEPATCH': completing patching transition
 livepatch: '$MOD_LIVEPATCH': patching complete
-livepatch: sysctl: setting key \"kernel.ftrace_enabled\": Device or resource busy kernel.ftrace_enabled = 0
+livepatch: sysctl: setting key \"kernel.ftrace_enabled\": Device or resource busy
 % echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled
 livepatch: '$MOD_LIVEPATCH': initializing unpatching transition
 livepatch: '$MOD_LIVEPATCH': starting unpatching transition
-- 
2.26.2


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

* Re: [PATCH v2] selftests/livepatch: adopt to newer sysctl error format
  2020-07-14  9:10 [PATCH v2] selftests/livepatch: adopt to newer sysctl error format Petr Mladek
@ 2020-07-14  9:57 ` Kamalesh Babulal
  2020-07-14 12:36 ` Joe Lawrence
                   ` (2 subsequent siblings)
  3 siblings, 0 replies; 5+ messages in thread
From: Kamalesh Babulal @ 2020-07-14  9:57 UTC (permalink / raw)
  To: Petr Mladek, Josh Poimboeuf, Jiri Kosina, Miroslav Benes
  Cc: Joe Lawrence, Shuah Khan, live-patching, linux-kselftest, linux-kernel

On 14/07/20 2:40 pm, Petr Mladek wrote:
> With procfs v3.3.16, the sysctl command doesn't print the set key and
> value on error.  This change breaks livepatch selftest test-ftrace.sh,
> that tests the interaction of sysctl ftrace_enabled:
> 
> Make it work with all sysctl versions using '-q' option.
> 
> Explicitly print the final status on success so that it can be verified
> in the log. The error message is enough on failure.
> 
> Reported-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
> Signed-off-by: Petr Mladek <pmladek@suse.com>

Reviewed-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>

-- 
Kamalesh

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

* Re: [PATCH v2] selftests/livepatch: adopt to newer sysctl error format
  2020-07-14  9:10 [PATCH v2] selftests/livepatch: adopt to newer sysctl error format Petr Mladek
  2020-07-14  9:57 ` Kamalesh Babulal
@ 2020-07-14 12:36 ` Joe Lawrence
  2020-07-14 13:57 ` Miroslav Benes
  2020-07-15  7:03 ` Petr Mladek
  3 siblings, 0 replies; 5+ messages in thread
From: Joe Lawrence @ 2020-07-14 12:36 UTC (permalink / raw)
  To: Petr Mladek, Kamalesh Babulal, Josh Poimboeuf, Jiri Kosina,
	Miroslav Benes
  Cc: Shuah Khan, live-patching, linux-kselftest, linux-kernel

On 7/14/20 5:10 AM, Petr Mladek wrote:
> With procfs v3.3.16, the sysctl command doesn't print the set key and
> value on error.  This change breaks livepatch selftest test-ftrace.sh,
> that tests the interaction of sysctl ftrace_enabled:
> 
> Make it work with all sysctl versions using '-q' option.
> 
> Explicitly print the final status on success so that it can be verified
> in the log. The error message is enough on failure.
> 
> Reported-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
> Signed-off-by: Petr Mladek <pmladek@suse.com>
> ---
> The patch has been created against livepatch.git,
> branch for-5.9/selftests-cleanup. But it applies also against
> the current Linus' tree.
> 
> tools/testing/selftests/livepatch/functions.sh   | 3 ++-
>   tools/testing/selftests/livepatch/test-ftrace.sh | 2 +-
>   2 files changed, 3 insertions(+), 2 deletions(-)
> 
> diff --git a/tools/testing/selftests/livepatch/functions.sh b/tools/testing/selftests/livepatch/functions.sh
> index 408529d94ddb..1aba83c87ad3 100644
> --- a/tools/testing/selftests/livepatch/functions.sh
> +++ b/tools/testing/selftests/livepatch/functions.sh
> @@ -75,7 +75,8 @@ function set_dynamic_debug() {
>   }
>   
>   function set_ftrace_enabled() {
> -	result=$(sysctl kernel.ftrace_enabled="$1" 2>&1 | paste --serial --delimiters=' ')
> +	result=$(sysctl -q kernel.ftrace_enabled="$1" 2>&1 && \
> +		 sysctl kernel.ftrace_enabled 2>&1)
>   	echo "livepatch: $result" > /dev/kmsg
>   }
>   
> diff --git a/tools/testing/selftests/livepatch/test-ftrace.sh b/tools/testing/selftests/livepatch/test-ftrace.sh
> index 9160c9ec3b6f..552e165512f4 100755
> --- a/tools/testing/selftests/livepatch/test-ftrace.sh
> +++ b/tools/testing/selftests/livepatch/test-ftrace.sh
> @@ -51,7 +51,7 @@ livepatch: '$MOD_LIVEPATCH': initializing patching transition
>   livepatch: '$MOD_LIVEPATCH': starting patching transition
>   livepatch: '$MOD_LIVEPATCH': completing patching transition
>   livepatch: '$MOD_LIVEPATCH': patching complete
> -livepatch: sysctl: setting key \"kernel.ftrace_enabled\": Device or resource busy kernel.ftrace_enabled = 0
> +livepatch: sysctl: setting key \"kernel.ftrace_enabled\": Device or resource busy
>   % echo 0 > /sys/kernel/livepatch/$MOD_LIVEPATCH/enabled
>   livepatch: '$MOD_LIVEPATCH': initializing unpatching transition
>   livepatch: '$MOD_LIVEPATCH': starting unpatching transition
> 

Looks good, thanks.

Reviewed-by: Joe Lawrence <joe.lawrence@redhat.com>

-- Joe


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

* Re: [PATCH v2] selftests/livepatch: adopt to newer sysctl error format
  2020-07-14  9:10 [PATCH v2] selftests/livepatch: adopt to newer sysctl error format Petr Mladek
  2020-07-14  9:57 ` Kamalesh Babulal
  2020-07-14 12:36 ` Joe Lawrence
@ 2020-07-14 13:57 ` Miroslav Benes
  2020-07-15  7:03 ` Petr Mladek
  3 siblings, 0 replies; 5+ messages in thread
From: Miroslav Benes @ 2020-07-14 13:57 UTC (permalink / raw)
  To: Petr Mladek
  Cc: Kamalesh Babulal, Josh Poimboeuf, Jiri Kosina, Joe Lawrence,
	Shuah Khan, live-patching, linux-kselftest, linux-kernel

On Tue, 14 Jul 2020, Petr Mladek wrote:

> With procfs v3.3.16, the sysctl command doesn't print the set key and
> value on error.  This change breaks livepatch selftest test-ftrace.sh,
> that tests the interaction of sysctl ftrace_enabled:
> 
> Make it work with all sysctl versions using '-q' option.
> 
> Explicitly print the final status on success so that it can be verified
> in the log. The error message is enough on failure.
> 
> Reported-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
> Signed-off-by: Petr Mladek <pmladek@suse.com>

Acked-by: Miroslav Benes <mbenes@suse.cz>

M

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

* Re: [PATCH v2] selftests/livepatch: adopt to newer sysctl error format
  2020-07-14  9:10 [PATCH v2] selftests/livepatch: adopt to newer sysctl error format Petr Mladek
                   ` (2 preceding siblings ...)
  2020-07-14 13:57 ` Miroslav Benes
@ 2020-07-15  7:03 ` Petr Mladek
  3 siblings, 0 replies; 5+ messages in thread
From: Petr Mladek @ 2020-07-15  7:03 UTC (permalink / raw)
  To: Kamalesh Babulal, Josh Poimboeuf, Jiri Kosina, Miroslav Benes
  Cc: Joe Lawrence, Shuah Khan, live-patching, linux-kselftest, linux-kernel

On Tue 2020-07-14 11:10:30, Petr Mladek wrote:
> With procfs v3.3.16, the sysctl command doesn't print the set key and
> value on error.  This change breaks livepatch selftest test-ftrace.sh,
> that tests the interaction of sysctl ftrace_enabled:
> 
> Make it work with all sysctl versions using '-q' option.
> 
> Explicitly print the final status on success so that it can be verified
> in the log. The error message is enough on failure.
> 
> Reported-by: Kamalesh Babulal <kamalesh@linux.vnet.ibm.com>
> Signed-off-by: Petr Mladek <pmladek@suse.com>

The patch is commited in livepatch.git,
branch for-5.9/selftests-cleanup.

Best Regards,
Petr

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

end of thread, back to index

Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-07-14  9:10 [PATCH v2] selftests/livepatch: adopt to newer sysctl error format Petr Mladek
2020-07-14  9:57 ` Kamalesh Babulal
2020-07-14 12:36 ` Joe Lawrence
2020-07-14 13:57 ` Miroslav Benes
2020-07-15  7:03 ` Petr Mladek

Live-Patching Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/live-patching/0 live-patching/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 live-patching live-patching/ https://lore.kernel.org/live-patching \
		live-patching@vger.kernel.org
	public-inbox-index live-patching

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.live-patching


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git