From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.2 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE, SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id BA608C433E7 for ; Fri, 10 Jul 2020 15:27:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A547820842 for ; Fri, 10 Jul 2020 15:27:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727839AbgGJP1h (ORCPT ); Fri, 10 Jul 2020 11:27:37 -0400 Received: from mx2.suse.de ([195.135.220.15]:56972 "EHLO mx2.suse.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728013AbgGJP1h (ORCPT ); Fri, 10 Jul 2020 11:27:37 -0400 X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 502F9AC24; Fri, 10 Jul 2020 15:27:36 +0000 (UTC) Date: Fri, 10 Jul 2020 17:27:35 +0200 From: Petr Mladek To: Kamalesh Babulal Cc: Josh Poimboeuf , Jiri Kosina , Miroslav Benes , Joe Lawrence , Shuah Khan , live-patching@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] selftests/livepatch: adopt to newer sysctl error format Message-ID: <20200710152735.GA20226@alley> References: <20200710051043.899291-1-kamalesh@linux.vnet.ibm.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200710051043.899291-1-kamalesh@linux.vnet.ibm.com> User-Agent: Mutt/1.10.1 (2018-07-13) Sender: live-patching-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: live-patching@vger.kernel.org On Fri 2020-07-10 10:40:43, Kamalesh Babulal wrote: > With procfs v3.3.16, the sysctl command doesn't prints the set key and > value on error. This change breaks livepatch selftest test-ftrace.sh, > that tests the interaction of sysctl ftrace_enabled: > > # selftests: livepatch: test-ftrace.sh > # TEST: livepatch interaction with ftrace_enabled sysctl ... not ok > # > # --- expected > # +++ result > # @@ -16,7 +16,7 @@ livepatch: 'test_klp_livepatch': initial > # livepatch: 'test_klp_livepatch': starting patching transition > # livepatch: 'test_klp_livepatch': completing patching transition > # livepatch: 'test_klp_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/test_klp_livepatch/enabled > # livepatch: 'test_klp_livepatch': initializing unpatching transition > # livepatch: 'test_klp_livepatch': starting unpatching transition > # > # ERROR: livepatch kselftest(s) failed > > on setting sysctl kernel.ftrace_enabled={0,1} value successfully, the > set key and value is displayed. > > This patch fixes it by limiting the output from both the cases to eight > words, that includes the error message or set key and value on failure > and success. The upper bound of eight words is enough to display the > only tracked error message. Also, adjust the check_result string in > test-ftrace.sh to match the expected output. This looks really tricky. I wonder if we could use "sysctl -q" to refuse printing the value even with older versions. The following patch works here with sysctl 3.3.15: diff --git a/tools/testing/selftests/livepatch/functions.sh b/tools/testing/selftests/livepatch/functions.sh index 2aab9791791d..47aa4c762bb4 100644 --- a/tools/testing/selftests/livepatch/functions.sh +++ b/tools/testing/selftests/livepatch/functions.sh @@ -64,7 +64,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 e2a76887f40a..aa967c5d0558 100755 --- a/tools/testing/selftests/livepatch/test-ftrace.sh +++ b/tools/testing/selftests/livepatch/test-ftrace.sh @@ -53,7 +53,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 Best Regards, Petr