From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754849AbdFWRkx (ORCPT ); Fri, 23 Jun 2017 13:40:53 -0400 Received: from mail-oi0-f49.google.com ([209.85.218.49]:36719 "EHLO mail-oi0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754601AbdFWRkv (ORCPT ); Fri, 23 Jun 2017 13:40:51 -0400 MIME-Version: 1.0 In-Reply-To: <1bc754dd-26e0-e88e-7db8-29509c763d69@kernel.org> References: <1bc754dd-26e0-e88e-7db8-29509c763d69@kernel.org> From: Orson Zhai Date: Sat, 24 Jun 2017 01:40:50 +0800 Message-ID: Subject: Re: [PATCH V3] tools/testing/selftests/sysctl: Add pre-check to the value of writes_strict To: Shuah Khan Cc: Kees Cook , LKML , Sumit Semwal , linux-kselftest@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 23 June 2017 at 23:55, Shuah Khan wrote: > Hi Orson, > > On 06/22/2017 10:24 PM, Orson Zhai wrote: >> Sysctl test will fail in some items if the value of /proc/sys/kernel >> /sysctrl_writes_strict is 0 as the default value in kernel older than v4.5. >> >> Make this test more robust and compatible with older kernels by checking and >> update sysctrl_writes_strict value and restore it when test is done. >> >> Signed-off-by: Orson Zhai >> Reviewed-by: Sumit Semwal >> Tested-by: Sumit Semwal > > This patch failed to apply on linux-kselftest next. Could you please > rebase and send it. No problem. I will do that with V4. Orson > > thanks, > -- Shuah > >> --- >> tools/testing/selftests/sysctl/common_tests | 22 ++++++++++++++++++++++ >> tools/testing/selftests/sysctl/run_numerictests | 2 +- >> tools/testing/selftests/sysctl/run_stringtests | 2 +- >> 3 files changed, 24 insertions(+), 2 deletions(-) >> >> diff --git a/tools/testing/selftests/sysctl/common_tests >> b/tools/testing/selftests/sysctl/common_tests >> index 17d534b1b7b4..dfb1fcfc3142 100644 >> --- a/tools/testing/selftests/sysctl/common_tests >> +++ b/tools/testing/selftests/sysctl/common_tests >> @@ -24,6 +24,14 @@ verify() >> return 0 >> } >> >> +exit_test() >> +{ >> + if [ ! -z ${old_strict} ]; then >> + echo ${old_strict} > ${WRITES_STRICT} >> + fi >> + exit $rc >> +} >> + >> trap 'set_orig; rm -f "${TEST_FILE}"' EXIT >> >> rc=0 >> @@ -63,6 +71,20 @@ else >> echo "ok" >> fi >> >> +echo -n "Checking write strict setting ... " >> +WRITES_STRICT="${SYSCTL}/kernel/sysctl_writes_strict" >> +if [ ! -e ${WRITES_STRICT} ]; then >> + echo "FAIL, but skip in case of old kernel" >&2 >> +else >> + old_strict=$(cat ${WRITES_STRICT}) >> + if [ "$old_strict" = "1" ]; then >> + echo "ok" >> + else >> + echo "FAIL, strict value is 0 but force to 1 to continue" >&2 >> + echo "1" > ${WRITES_STRICT} >> + fi >> +fi >> + >> # Now that we've validated the sanity of "set_test" and "set_orig", >> # we can use those functions to set starting states before running >> # specific behavioral tests. >> diff --git a/tools/testing/selftests/sysctl/run_numerictests >> b/tools/testing/selftests/sysctl/run_numerictests >> index 8510f93f2d14..e6e76c93d948 100755 >> --- a/tools/testing/selftests/sysctl/run_numerictests >> +++ b/tools/testing/selftests/sysctl/run_numerictests >> @@ -7,4 +7,4 @@ TEST_STR=$(( $ORIG + 1 )) >> >> . ./common_tests >> >> -exit $rc >> +exit_test >> diff --git a/tools/testing/selftests/sysctl/run_stringtests >> b/tools/testing/selftests/sysctl/run_stringtests >> index 90a9293d520c..857ec667fb02 100755 >> --- a/tools/testing/selftests/sysctl/run_stringtests >> +++ b/tools/testing/selftests/sysctl/run_stringtests >> @@ -74,4 +74,4 @@ else >> echo "ok" >> fi >> >> -exit $rc >> +exit_test >> -- >> 2.12.2 >> >> >