[LTP] [PATCH] commands/sysctl: Add new regression test for invalid sched_time_avg

[LTP] [PATCH] commands/sysctl: Add new regression test for invalid sched_time_avg

[Xiao Yang]

The kernel bug has been fixed in kernel:
'5ccba44ba118("sched/sysctl: Check user input value of sysctl_sched_time_avg")'

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
---
 runtest/commands                      |  1 +
 testcases/commands/sysctl/Makefile    | 25 ++++++++++++++
 testcases/commands/sysctl/sysctl01.sh | 65 +++++++++++++++++++++++++++++++++++
 3 files changed, 91 insertions(+)
 create mode 100644 testcases/commands/sysctl/Makefile
 create mode 100755 testcases/commands/sysctl/sysctl01.sh

diff --git a/runtest/commands b/runtest/commands
index 92df3af..fde8063 100644
--- a/runtest/commands
+++ b/runtest/commands
@@ -44,3 +44,4 @@ wc01 wc01.sh
 keyctl01 keyctl01.sh
 gdb01 gdb01.sh
 unshare01 unshare01.sh
+sysctl01 sysctl01.sh
diff --git a/testcases/commands/sysctl/Makefile b/testcases/commands/sysctl/Makefile
new file mode 100644
index 0000000..61ff705
--- /dev/null
+++ b/testcases/commands/sysctl/Makefile
@@ -0,0 +1,25 @@
+#
+# Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
+# Author: Xiao Yang <yangx.jy@cn.fujitsu.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+
+top_srcdir		?= ../../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+INSTALL_TARGETS		:= *.sh
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/commands/sysctl/sysctl01.sh b/testcases/commands/sysctl/sysctl01.sh
new file mode 100755
index 0000000..2bcf9a7
--- /dev/null
+++ b/testcases/commands/sysctl/sysctl01.sh
@@ -0,0 +1,65 @@
+#!/bin/sh
+#
+# Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
+# Author: Xiao Yang <yangx.jy@cn.fujitsu.com>
+#
+# This program is free software;  you can redistribute it and#or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# Description:
+# This is a regression test for invalid value of sched_time_avg.
+# System will hang if user set sched_time_avg to 0 on buggy kernel.
+#
+# The kernel bug has been fixed in kernel:
+# '5ccba44ba118("sched/sysctl: Check user input value of sysctl_sched_time_avg")'
+
+TST_TESTFUNC=sysctl_test
+TST_NEEDS_CMDS="sysctl"
+
+. tst_test.sh
+
+get_value()
+{
+	local value=$(sysctl -n $1)
+	[ -z "$value" ] && tst_brk TBROK \
+		"Failed to get the value of sched_time_avg(_ms)"
+
+	echo $value
+}
+
+sysctl_test()
+{
+	# With commit d00535d, sched_time_avg was renamed as sched_time_avg_ms
+	local name=$(sysctl -a 2>&1 | egrep -o \
+		'kernel.(sched_time_avg|sched_time_avg_ms)')
+	[ -z "$name" ] && tst_brk TCONF \
+		"sched_time_avg(_ms) was not supported"
+
+	local orig_value=$(get_value $name)
+
+	sysctl -w $name=0 >/dev/null 2>&1
+
+	# Increase the chance of exposing the problem on RHEL6
+	sleep 3
+
+	local curr_value=$(get_value $name)
+
+	if [ ${curr_value} -eq ${orig_value} ]; then
+		tst_res TPASS "Setting sched_time_avg(_ms) failed"
+	else
+		tst_res TFAIL "Setting sched_time_avg(_ms) succeeded"
+		sysctl -w $name=${orig_value} >/dev/null 2>&1
+	fi
+}
+
+tst_run
-- 
1.8.3.1

[LTP] [PATCH] commands/sysctl: Add new regression test for invalid sched_time_avg

[Xiao Yang]

Hi,

Ping :-)

Thanks,
Xiao Yang
On 2018/01/23 16:17, Xiao Yang wrote:
> The kernel bug has been fixed in kernel:
> '5ccba44ba118("sched/sysctl: Check user input value of sysctl_sched_time_avg")'
>
> Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
> ---
>  runtest/commands                      |  1 +
>  testcases/commands/sysctl/Makefile    | 25 ++++++++++++++
>  testcases/commands/sysctl/sysctl01.sh | 65 +++++++++++++++++++++++++++++++++++
>  3 files changed, 91 insertions(+)
>  create mode 100644 testcases/commands/sysctl/Makefile
>  create mode 100755 testcases/commands/sysctl/sysctl01.sh
>
> diff --git a/runtest/commands b/runtest/commands
> index 92df3af..fde8063 100644
> --- a/runtest/commands
> +++ b/runtest/commands
> @@ -44,3 +44,4 @@ wc01 wc01.sh
>  keyctl01 keyctl01.sh
>  gdb01 gdb01.sh
>  unshare01 unshare01.sh
> +sysctl01 sysctl01.sh
> diff --git a/testcases/commands/sysctl/Makefile b/testcases/commands/sysctl/Makefile
> new file mode 100644
> index 0000000..61ff705
> --- /dev/null
> +++ b/testcases/commands/sysctl/Makefile
> @@ -0,0 +1,25 @@
> +#
> +# Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
> +# Author: Xiao Yang <yangx.jy@cn.fujitsu.com>
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; either version 2 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> +# General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License along
> +# with this program; if not, see <http://www.gnu.org/licenses/>.
> +#
> +
> +top_srcdir		?= ../../..
> +
> +include $(top_srcdir)/include/mk/env_pre.mk
> +
> +INSTALL_TARGETS		:= *.sh
> +
> +include $(top_srcdir)/include/mk/generic_leaf_target.mk
> diff --git a/testcases/commands/sysctl/sysctl01.sh b/testcases/commands/sysctl/sysctl01.sh
> new file mode 100755
> index 0000000..2bcf9a7
> --- /dev/null
> +++ b/testcases/commands/sysctl/sysctl01.sh
> @@ -0,0 +1,65 @@
> +#!/bin/sh
> +#
> +# Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
> +# Author: Xiao Yang <yangx.jy@cn.fujitsu.com>
> +#
> +# This program is free software;  you can redistribute it and#or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; either version 2 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful, but
> +# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
> +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
> +# for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, see <http://www.gnu.org/licenses/>.
> +#
> +# Description:
> +# This is a regression test for invalid value of sched_time_avg.
> +# System will hang if user set sched_time_avg to 0 on buggy kernel.
> +#
> +# The kernel bug has been fixed in kernel:
> +# '5ccba44ba118("sched/sysctl: Check user input value of sysctl_sched_time_avg")'
> +
> +TST_TESTFUNC=sysctl_test
> +TST_NEEDS_CMDS="sysctl"
> +
> +. tst_test.sh
> +
> +get_value()
> +{
> +	local value=$(sysctl -n $1)
> +	[ -z "$value" ] && tst_brk TBROK \
> +		"Failed to get the value of sched_time_avg(_ms)"
> +
> +	echo $value
> +}
> +
> +sysctl_test()
> +{
> +	# With commit d00535d, sched_time_avg was renamed as sched_time_avg_ms
> +	local name=$(sysctl -a 2>&1 | egrep -o \
> +		'kernel.(sched_time_avg|sched_time_avg_ms)')
> +	[ -z "$name" ] && tst_brk TCONF \
> +		"sched_time_avg(_ms) was not supported"
> +
> +	local orig_value=$(get_value $name)
> +
> +	sysctl -w $name=0 >/dev/null 2>&1
> +
> +	# Increase the chance of exposing the problem on RHEL6
> +	sleep 3
> +
> +	local curr_value=$(get_value $name)
> +
> +	if [ ${curr_value} -eq ${orig_value} ]; then
> +		tst_res TPASS "Setting sched_time_avg(_ms) failed"
> +	else
> +		tst_res TFAIL "Setting sched_time_avg(_ms) succeeded"
> +		sysctl -w $name=${orig_value} >/dev/null 2>&1
> +	fi
> +}
> +
> +tst_run

[LTP] [PATCH] commands/sysctl: Add new regression test for invalid sched_time_avg

[Xiao Yang]

Hi,

Ping! :-)

Thanks,
Xiao Yang
On 2018/01/23 16:17, Xiao Yang wrote:
> The kernel bug has been fixed in kernel:
> '5ccba44ba118("sched/sysctl: Check user input value of sysctl_sched_time_avg")'
>
> Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
> ---
>  runtest/commands                      |  1 +
>  testcases/commands/sysctl/Makefile    | 25 ++++++++++++++
>  testcases/commands/sysctl/sysctl01.sh | 65 +++++++++++++++++++++++++++++++++++
>  3 files changed, 91 insertions(+)
>  create mode 100644 testcases/commands/sysctl/Makefile
>  create mode 100755 testcases/commands/sysctl/sysctl01.sh
>
> diff --git a/runtest/commands b/runtest/commands
> index 92df3af..fde8063 100644
> --- a/runtest/commands
> +++ b/runtest/commands
> @@ -44,3 +44,4 @@ wc01 wc01.sh
>  keyctl01 keyctl01.sh
>  gdb01 gdb01.sh
>  unshare01 unshare01.sh
> +sysctl01 sysctl01.sh
> diff --git a/testcases/commands/sysctl/Makefile b/testcases/commands/sysctl/Makefile
> new file mode 100644
> index 0000000..61ff705
> --- /dev/null
> +++ b/testcases/commands/sysctl/Makefile
> @@ -0,0 +1,25 @@
> +#
> +# Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
> +# Author: Xiao Yang <yangx.jy@cn.fujitsu.com>
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; either version 2 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> +# General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License along
> +# with this program; if not, see <http://www.gnu.org/licenses/>.
> +#
> +
> +top_srcdir		?= ../../..
> +
> +include $(top_srcdir)/include/mk/env_pre.mk
> +
> +INSTALL_TARGETS		:= *.sh
> +
> +include $(top_srcdir)/include/mk/generic_leaf_target.mk
> diff --git a/testcases/commands/sysctl/sysctl01.sh b/testcases/commands/sysctl/sysctl01.sh
> new file mode 100755
> index 0000000..2bcf9a7
> --- /dev/null
> +++ b/testcases/commands/sysctl/sysctl01.sh
> @@ -0,0 +1,65 @@
> +#!/bin/sh
> +#
> +# Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
> +# Author: Xiao Yang <yangx.jy@cn.fujitsu.com>
> +#
> +# This program is free software;  you can redistribute it and#or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; either version 2 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful, but
> +# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
> +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
> +# for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, see <http://www.gnu.org/licenses/>.
> +#
> +# Description:
> +# This is a regression test for invalid value of sched_time_avg.
> +# System will hang if user set sched_time_avg to 0 on buggy kernel.
> +#
> +# The kernel bug has been fixed in kernel:
> +# '5ccba44ba118("sched/sysctl: Check user input value of sysctl_sched_time_avg")'
> +
> +TST_TESTFUNC=sysctl_test
> +TST_NEEDS_CMDS="sysctl"
> +
> +. tst_test.sh
> +
> +get_value()
> +{
> +	local value=$(sysctl -n $1)
> +	[ -z "$value" ] && tst_brk TBROK \
> +		"Failed to get the value of sched_time_avg(_ms)"
> +
> +	echo $value
> +}
> +
> +sysctl_test()
> +{
> +	# With commit d00535d, sched_time_avg was renamed as sched_time_avg_ms
> +	local name=$(sysctl -a 2>&1 | egrep -o \
> +		'kernel.(sched_time_avg|sched_time_avg_ms)')
> +	[ -z "$name" ] && tst_brk TCONF \
> +		"sched_time_avg(_ms) was not supported"
> +
> +	local orig_value=$(get_value $name)
> +
> +	sysctl -w $name=0 >/dev/null 2>&1
> +
> +	# Increase the chance of exposing the problem on RHEL6
> +	sleep 3
> +
> +	local curr_value=$(get_value $name)
> +
> +	if [ ${curr_value} -eq ${orig_value} ]; then
> +		tst_res TPASS "Setting sched_time_avg(_ms) failed"
> +	else
> +		tst_res TFAIL "Setting sched_time_avg(_ms) succeeded"
> +		sysctl -w $name=${orig_value} >/dev/null 2>&1
> +	fi
> +}
> +
> +tst_run

[LTP] [PATCH] commands/sysctl: Add new regression test for invalid sched_time_avg

[Cyril Hrubis]

Hi!
> +TST_TESTFUNC=sysctl_test
> +TST_NEEDS_CMDS="sysctl"
> +
> +. tst_test.sh
> +
> +get_value()
> +{
> +	local value=$(sysctl -n $1)
> +	[ -z "$value" ] && tst_brk TBROK \
> +		"Failed to get the value of sched_time_avg(_ms)"
> +
> +	echo $value
> +}
> +
> +sysctl_test()
> +{
> +	# With commit d00535d, sched_time_avg was renamed as sched_time_avg_ms
> +	local name=$(sysctl -a 2>&1 | egrep -o \
> +		'kernel.(sched_time_avg|sched_time_avg_ms)')
> +	[ -z "$name" ] && tst_brk TCONF \
> +		"sched_time_avg(_ms) was not supported"

Can't we just do?

if [ -e /proc/sys/kernel/sched_time_avg_ms ]; then
	name=...
fi

if [ -e /proc/sys/kernel/sched_time_avg ]; then
	name=...
fi

[ -z "$name" ] ...

> +	local orig_value=$(get_value $name)
> +
> +	sysctl -w $name=0 >/dev/null 2>&1
> +
> +	# Increase the chance of exposing the problem on RHEL6
> +	sleep 3

What is this sleep good for? Do we wait here for the kernel to crash?

> +	local curr_value=$(get_value $name)
> +
> +	if [ ${curr_value} -eq ${orig_value} ]; then
> +		tst_res TPASS "Setting sched_time_avg(_ms) failed"
> +	else
> +		tst_res TFAIL "Setting sched_time_avg(_ms) succeeded"
> +		sysctl -w $name=${orig_value} >/dev/null 2>&1
> +	fi
> +}
> +
> +tst_run
> -- 
> 1.8.3.1
> 
> 
> 
> 
> -- 
> Mailing list info: https://lists.linux.it/listinfo/ltp

-- 
Cyril Hrubis
chrubis@suse.cz

[LTP] [PATCH] commands/sysctl: Add new regression test for invalid sched_time_avg

[Xiao Yang]

On 2018/03/06 20:42, Cyril Hrubis wrote:
> Hi!
>> +TST_TESTFUNC=sysctl_test
>> +TST_NEEDS_CMDS="sysctl"
>> +
>> +. tst_test.sh
>> +
>> +get_value()
>> +{
>> +	local value=$(sysctl -n $1)
>> +	[ -z "$value" ]&&  tst_brk TBROK \
>> +		"Failed to get the value of sched_time_avg(_ms)"
>> +
>> +	echo $value
>> +}
>> +
>> +sysctl_test()
>> +{
>> +	# With commit d00535d, sched_time_avg was renamed as sched_time_avg_ms
>> +	local name=$(sysctl -a 2>&1 | egrep -o \
>> +		'kernel.(sched_time_avg|sched_time_avg_ms)')
>> +	[ -z "$name" ]&&  tst_brk TCONF \
>> +		"sched_time_avg(_ms) was not supported"
> Can't we just do?
>
> if [ -e /proc/sys/kernel/sched_time_avg_ms ]; then
> 	name=...
> fi
>
> if [ -e /proc/sys/kernel/sched_time_avg ]; then
> 	name=...
> fi
>
> [ -z "$name" ] ...
Hi Cyril,

Agreed.  Using /proc/sys/ instead of sysctl command seems better.
>> +	local orig_value=$(get_value $name)
>> +
>> +	sysctl -w $name=0>/dev/null 2>&1
>> +
>> +	# Increase the chance of exposing the problem on RHEL6
>> +	sleep 3
> What is this sleep good for? Do we wait here for the kernel to crash?
On my RHEL6, restoring the original value immediately after setting an 
invalid value always didn't
trigger a hang in time, so we just wait a moment for kernel to hang.

Thanks,
Xiao Yang
>> +	local curr_value=$(get_value $name)
>> +
>> +	if [ ${curr_value} -eq ${orig_value} ]; then
>> +		tst_res TPASS "Setting sched_time_avg(_ms) failed"
>> +	else
>> +		tst_res TFAIL "Setting sched_time_avg(_ms) succeeded"
>> +		sysctl -w $name=${orig_value}>/dev/null 2>&1
>> +	fi
>> +}
>> +
>> +tst_run
>> -- 
>> 1.8.3.1
>>
>>
>>
>>
>> -- 
>> Mailing list info: https://lists.linux.it/listinfo/ltp

[LTP] [PATCH v2] commands/sysctl: Add new regression test for invalid sched_time_avg

[Xiao Yang]

The kernel bug has been fixed in kernel:
'5ccba44ba118("sched/sysctl: Check user input value of sysctl_sched_time_avg")'

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
---
 runtest/commands                      |  1 +
 testcases/commands/sysctl/Makefile    | 25 +++++++++++++++
 testcases/commands/sysctl/sysctl01.sh | 58 +++++++++++++++++++++++++++++++++++
 3 files changed, 84 insertions(+)
 create mode 100644 testcases/commands/sysctl/Makefile
 create mode 100755 testcases/commands/sysctl/sysctl01.sh

diff --git a/runtest/commands b/runtest/commands
index 92df3af..fde8063 100644
--- a/runtest/commands
+++ b/runtest/commands
@@ -44,3 +44,4 @@ wc01 wc01.sh
 keyctl01 keyctl01.sh
 gdb01 gdb01.sh
 unshare01 unshare01.sh
+sysctl01 sysctl01.sh
diff --git a/testcases/commands/sysctl/Makefile b/testcases/commands/sysctl/Makefile
new file mode 100644
index 0000000..61ff705
--- /dev/null
+++ b/testcases/commands/sysctl/Makefile
@@ -0,0 +1,25 @@
+#
+# Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
+# Author: Xiao Yang <yangx.jy@cn.fujitsu.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+
+top_srcdir		?= ../../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+INSTALL_TARGETS		:= *.sh
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/commands/sysctl/sysctl01.sh b/testcases/commands/sysctl/sysctl01.sh
new file mode 100755
index 0000000..6fa5a02
--- /dev/null
+++ b/testcases/commands/sysctl/sysctl01.sh
@@ -0,0 +1,58 @@
+#!/bin/sh
+
+# Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
+# Author: Xiao Yang <yangx.jy@cn.fujitsu.com>
+#
+# This program is free software;  you can redistribute it and#or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# Description:
+# This is a regression test for invalid value of sysctl_sched_time_avg.
+# System will hang if user set sysctl_sched_time_avg to 0 on buggy kernel.
+#
+# The kernel bug has been fixed in kernel:
+# '5ccba44ba118("sched/sysctl: Check user input value of sysctl_sched_time_avg")'
+
+TST_TESTFUNC=sysctl_test
+TST_NEEDS_ROOT=1
+TST_NEEDS_CMDS="sysctl"
+
+. tst_test.sh
+
+sysctl_test()
+{
+	# With commit d00535d, sched_time_avg was renamed as sched_time_avg_ms
+	local dir="/proc/sys/kernel/"
+	[ -e "$dir""sched_time_avg_ms" ] && local name="sched_time_avg_ms"
+	[ -e "$dir""sched_time_avg" ] && local name="sched_time_avg"
+	[ -z "$name" ] && tst_brk TCONF \
+		"sched_time_avg(_ms) was not supported"
+
+	local orig_value=$(cat "$dir""$name")
+
+	sysctl -w "kernel.""$name"=0 >/dev/null 2>&1
+
+	# Increase the chance of exposing the problem on RHEL6
+	sleep 3
+
+	local test_value=$(cat "$dir""$name")
+
+	if [ ${test_value} -eq ${orig_value} ]; then
+		tst_res TPASS "Setting $name failed"
+	else
+		tst_res TFAIL "Setting $name succeeded"
+		sysctl -w "kernel.""$name"=${orig_value} >/dev/null 2>&1
+	fi
+}
+
+tst_run
-- 
1.8.3.1

[LTP] [PATCH v2] commands/sysctl: Add new regression test for invalid sched_time_avg

[Xiao Yang]

Hi Cyril,

Could you help me review the v2 patch? :-)

Thanks,
Xiao Yang
On 2018/03/07 12:35, Xiao Yang wrote:
> The kernel bug has been fixed in kernel:
> '5ccba44ba118("sched/sysctl: Check user input value of sysctl_sched_time_avg")'
>
> Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
> ---
>  runtest/commands                      |  1 +
>  testcases/commands/sysctl/Makefile    | 25 +++++++++++++++
>  testcases/commands/sysctl/sysctl01.sh | 58 +++++++++++++++++++++++++++++++++++
>  3 files changed, 84 insertions(+)
>  create mode 100644 testcases/commands/sysctl/Makefile
>  create mode 100755 testcases/commands/sysctl/sysctl01.sh
>
> diff --git a/runtest/commands b/runtest/commands
> index 92df3af..fde8063 100644
> --- a/runtest/commands
> +++ b/runtest/commands
> @@ -44,3 +44,4 @@ wc01 wc01.sh
>  keyctl01 keyctl01.sh
>  gdb01 gdb01.sh
>  unshare01 unshare01.sh
> +sysctl01 sysctl01.sh
> diff --git a/testcases/commands/sysctl/Makefile b/testcases/commands/sysctl/Makefile
> new file mode 100644
> index 0000000..61ff705
> --- /dev/null
> +++ b/testcases/commands/sysctl/Makefile
> @@ -0,0 +1,25 @@
> +#
> +# Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
> +# Author: Xiao Yang <yangx.jy@cn.fujitsu.com>
> +#
> +# This program is free software; you can redistribute it and/or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; either version 2 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful,
> +# but WITHOUT ANY WARRANTY; without even the implied warranty of
> +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> +# General Public License for more details.
> +#
> +# You should have received a copy of the GNU General Public License along
> +# with this program; if not, see <http://www.gnu.org/licenses/>.
> +#
> +
> +top_srcdir		?= ../../..
> +
> +include $(top_srcdir)/include/mk/env_pre.mk
> +
> +INSTALL_TARGETS		:= *.sh
> +
> +include $(top_srcdir)/include/mk/generic_leaf_target.mk
> diff --git a/testcases/commands/sysctl/sysctl01.sh b/testcases/commands/sysctl/sysctl01.sh
> new file mode 100755
> index 0000000..6fa5a02
> --- /dev/null
> +++ b/testcases/commands/sysctl/sysctl01.sh
> @@ -0,0 +1,58 @@
> +#!/bin/sh
> +
> +# Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
> +# Author: Xiao Yang <yangx.jy@cn.fujitsu.com>
> +#
> +# This program is free software;  you can redistribute it and#or modify
> +# it under the terms of the GNU General Public License as published by
> +# the Free Software Foundation; either version 2 of the License, or
> +# (at your option) any later version.
> +#
> +# This program is distributed in the hope that it will be useful, but
> +# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
> +# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
> +# for more details.
> +#
> +# You should have received a copy of the GNU General Public License
> +# along with this program; if not, see <http://www.gnu.org/licenses/>.
> +#
> +# Description:
> +# This is a regression test for invalid value of sysctl_sched_time_avg.
> +# System will hang if user set sysctl_sched_time_avg to 0 on buggy kernel.
> +#
> +# The kernel bug has been fixed in kernel:
> +# '5ccba44ba118("sched/sysctl: Check user input value of sysctl_sched_time_avg")'
> +
> +TST_TESTFUNC=sysctl_test
> +TST_NEEDS_ROOT=1
> +TST_NEEDS_CMDS="sysctl"
> +
> +. tst_test.sh
> +
> +sysctl_test()
> +{
> +	# With commit d00535d, sched_time_avg was renamed as sched_time_avg_ms
> +	local dir="/proc/sys/kernel/"
> +	[ -e "$dir""sched_time_avg_ms" ] && local name="sched_time_avg_ms"
> +	[ -e "$dir""sched_time_avg" ] && local name="sched_time_avg"
> +	[ -z "$name" ] && tst_brk TCONF \
> +		"sched_time_avg(_ms) was not supported"
> +
> +	local orig_value=$(cat "$dir""$name")
> +
> +	sysctl -w "kernel.""$name"=0 >/dev/null 2>&1
> +
> +	# Increase the chance of exposing the problem on RHEL6
> +	sleep 3
> +
> +	local test_value=$(cat "$dir""$name")
> +
> +	if [ ${test_value} -eq ${orig_value} ]; then
> +		tst_res TPASS "Setting $name failed"
> +	else
> +		tst_res TFAIL "Setting $name succeeded"
> +		sysctl -w "kernel.""$name"=${orig_value} >/dev/null 2>&1
> +	fi
> +}
> +
> +tst_run

[LTP] [PATCH] commands/sysctl: Add new regression test for invalid sched_time_avg

[Cyril Hrubis]

Hi!
> > What is this sleep good for? Do we wait here for the kernel to crash?
> On my RHEL6, restoring the original value immediately after setting an 
> invalid value always didn't
> trigger a hang in time, so we just wait a moment for kernel to hang.

Shouldn't the kernel crash just by setting the avg_ms to 0 or do I
misunderstand the kernel commit changelog?

Or is the offending code that crashes the kernel invoked asynchronously
so that the value is picked up later by the scheduller? If so I would
prefer removing the sleep anyways since the test will fail if we happen
to be able to write 0 to the file anyways which is IMHO enough to inform
the user about the present bug.

Other than that the test looks fine.

-- 
Cyril Hrubis
chrubis@suse.cz

[LTP] [PATCH v3] commands/sysctl: Add new regression test for invalid sched_time_avg

[Xiao Yang]

The kernel bug has been fixed in kernel:
'5ccba44ba118("sched/sysctl: Check user input value of sysctl_sched_time_avg")'

Signed-off-by: Xiao Yang <yangx.jy@cn.fujitsu.com>
---
 runtest/commands                      |  1 +
 testcases/commands/sysctl/Makefile    | 25 ++++++++++++++++
 testcases/commands/sysctl/sysctl01.sh | 55 +++++++++++++++++++++++++++++++++++
 3 files changed, 81 insertions(+)
 create mode 100644 testcases/commands/sysctl/Makefile
 create mode 100755 testcases/commands/sysctl/sysctl01.sh

diff --git a/runtest/commands b/runtest/commands
index 92df3af..fde8063 100644
--- a/runtest/commands
+++ b/runtest/commands
@@ -44,3 +44,4 @@ wc01 wc01.sh
 keyctl01 keyctl01.sh
 gdb01 gdb01.sh
 unshare01 unshare01.sh
+sysctl01 sysctl01.sh
diff --git a/testcases/commands/sysctl/Makefile b/testcases/commands/sysctl/Makefile
new file mode 100644
index 0000000..61ff705
--- /dev/null
+++ b/testcases/commands/sysctl/Makefile
@@ -0,0 +1,25 @@
+#
+# Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
+# Author: Xiao Yang <yangx.jy@cn.fujitsu.com>
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+
+top_srcdir		?= ../../..
+
+include $(top_srcdir)/include/mk/env_pre.mk
+
+INSTALL_TARGETS		:= *.sh
+
+include $(top_srcdir)/include/mk/generic_leaf_target.mk
diff --git a/testcases/commands/sysctl/sysctl01.sh b/testcases/commands/sysctl/sysctl01.sh
new file mode 100755
index 0000000..7522da5
--- /dev/null
+++ b/testcases/commands/sysctl/sysctl01.sh
@@ -0,0 +1,55 @@
+#!/bin/sh
+
+# Copyright (c) 2018 FUJITSU LIMITED. All rights reserved.
+# Author: Xiao Yang <yangx.jy@cn.fujitsu.com>
+#
+# This program is free software;  you can redistribute it and#or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+# or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
+# for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
+#
+# Description:
+# This is a regression test for invalid value of sysctl_sched_time_avg.
+# System will hang if user set sysctl_sched_time_avg to 0 on buggy kernel.
+#
+# The kernel bug has been fixed in kernel:
+# '5ccba44ba118("sched/sysctl: Check user input value of sysctl_sched_time_avg")'
+
+TST_TESTFUNC=sysctl_test
+TST_NEEDS_ROOT=1
+TST_NEEDS_CMDS="sysctl"
+
+. tst_test.sh
+
+sysctl_test()
+{
+	# With commit d00535d, sched_time_avg was renamed as sched_time_avg_ms
+	local dir="/proc/sys/kernel/"
+	[ -e "$dir""sched_time_avg_ms" ] && local name="sched_time_avg_ms"
+	[ -e "$dir""sched_time_avg" ] && local name="sched_time_avg"
+	[ -z "$name" ] && tst_brk TCONF \
+		"sched_time_avg(_ms) was not supported"
+
+	local orig_value=$(cat "$dir""$name")
+
+	sysctl -w "kernel.""$name"=0 >/dev/null 2>&1
+
+	local test_value=$(cat "$dir""$name")
+
+	if [ ${test_value} -eq ${orig_value} ]; then
+		tst_res TPASS "Setting $name failed"
+	else
+		tst_res TFAIL "Setting $name succeeded"
+		sysctl -w "kernel.""$name"=${orig_value} >/dev/null 2>&1
+	fi
+}
+
+tst_run
-- 
1.8.3.1

[LTP] [PATCH] commands/sysctl: Add new regression test for invalid sched_time_avg

[Xiao Yang]

On 2018/03/15 1:01, Cyril Hrubis wrote:
> Hi!
>>> What is this sleep good for? Do we wait here for the kernel to crash?
>> On my RHEL6, restoring the original value immediately after setting an
>> invalid value always didn't
>> trigger a hang in time, so we just wait a moment for kernel to hang.
Hi,
> Shouldn't the kernel crash just by setting the avg_ms to 0 or do I
> misunderstand the kernel commit changelog?
Yes,  if the value which is set to 0 is picked up  by the scheduller, 
the kernel shouldn't crash.
> Or is the offending code that crashes the kernel invoked asynchronously
> so that the value is picked up later by the scheduller? If so I would
> prefer removing the sleep anyways since the test will fail if we happen
> to be able to write 0 to the file anyways which is IMHO enough to inform
> the user about the present bug.
It seems reasonable, and i will remove the sleep.

Thanks,
Xiao Yang
> Other than that the test looks fine.
>

[LTP] [PATCH v3] commands/sysctl: Add new regression test for invalid sched_time_avg

[Cyril Hrubis]

Hi!
Pushed, thanks.

-- 
Cyril Hrubis
chrubis@suse.cz