Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2f6f0a99 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-5.3-rc3' of... 

Merge tag 'linux-kselftest-5.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull kselftest fixes from Shuah Khan:
 "Minor fixes to tests and one major fix to livepatch test to add skip
  handling to avoid false fail reports when livepatch is disabled"

* tag 'linux-kselftest-5.3-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/livepatch: add test skip handling
  selftests: mlxsw: Fix typo in qos_mc_aware.sh
  selftests/x86: fix spelling mistake "FAILT" -> "FAIL"
  selftests: kmod: Fix typo in kmod.sh
parents 32a024b9 527d37e9

tools/testing/selftests/drivers/net/mlxsw/qos_mc_aware.sh

+2 −2
Original line number Diff line number Diff line
@@ -262,7 +262,7 @@ test_mc_aware() 


	stop_traffic



	log_test "UC performace under MC overload"

	log_test "UC performance under MC overload"



	echo "UC-only throughput  $(humanize $ucth1)"

	echo "UC+MC throughput    $(humanize $ucth2)"
@@ -316,7 +316,7 @@ test_uc_aware() 


	stop_traffic



	log_test "MC performace under UC overload"

	log_test "MC performance under UC overload"

	echo "    ingress UC throughput $(humanize ${uc_ir})"

	echo "    egress UC throughput  $(humanize ${uc_er})"

	echo "    sent $attempts BC ARPs, got $passes responses"

tools/testing/selftests/kmod/kmod.sh

+3 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
# override by exporting to your environment prior running this script.

# For instance this script assumes you do not have xfs loaded upon boot.

# If this is false, export DEFAULT_KMOD_FS="ext4" prior to running this

# script if the filesyste module you don't have loaded upon bootup

# script if the filesystem module you don't have loaded upon bootup

# is ext4 instead. Refer to allow_user_defaults() for a list of user

# override variables possible.

#
@@ -263,7 +263,7 @@ config_get_test_result() 
config_reset()

{

	if ! echo -n "1" >"$DIR"/reset; then

		echo "$0: reset shuld have worked" >&2

		echo "$0: reset should have worked" >&2

		exit 1

	fi

}
@@ -488,7 +488,7 @@ usage() 
	echo Example uses:

	echo

	echo "${TEST_NAME}.sh		-- executes all tests"

	echo "${TEST_NAME}.sh -t 0008	-- Executes test ID 0008 number of times is recomended"

	echo "${TEST_NAME}.sh -t 0008	-- Executes test ID 0008 number of times is recommended"

	echo "${TEST_NAME}.sh -w 0008	-- Watch test ID 0008 run until an error occurs"

	echo "${TEST_NAME}.sh -s 0008	-- Run test ID 0008 once"

	echo "${TEST_NAME}.sh -c 0008 3	-- Run test ID 0008 three times"

tools/testing/selftests/livepatch/functions.sh

+20 −0
Original line number Diff line number Diff line
@@ -13,6 +13,14 @@ function log() { 
	echo "$1" > /dev/kmsg

}



# skip(msg) - testing can't proceed

#	msg - explanation

function skip() {

	log "SKIP: $1"

	echo "SKIP: $1" >&2

	exit 4

}



# die(msg) - game over, man

#	msg - dying words

function die() {
@@ -43,6 +51,12 @@ function loop_until() { 
	done

}



function assert_mod() {

	local mod="$1"



	modprobe --dry-run "$mod" &>/dev/null

}



function is_livepatch_mod() {

	local mod="$1"
@@ -75,6 +89,9 @@ function __load_mod() { 
function load_mod() {

	local mod="$1"; shift



	assert_mod "$mod" ||

		skip "unable to load module ${mod}, verify CONFIG_TEST_LIVEPATCH=m and run self-tests as root"



	is_livepatch_mod "$mod" &&

		die "use load_lp() to load the livepatch module $mod"
@@ -88,6 +105,9 @@ function load_mod() { 
function load_lp_nowait() {

	local mod="$1"; shift



	assert_mod "$mod" ||

		skip "unable to load module ${mod}, verify CONFIG_TEST_LIVEPATCH=m and run self-tests as root"



	is_livepatch_mod "$mod" ||

		die "module $mod is not a livepatch"

tools/testing/selftests/x86/test_vsyscall.c

+1 −1
Original line number Diff line number Diff line
@@ -451,7 +451,7 @@ static int test_vsys_x(void) 
		printf("[OK]\tExecuting the vsyscall page failed: #PF(0x%lx)\n",

		       segv_err);

	} else {

		printf("[FAILT]\tExecution failed with the wrong error: #PF(0x%lx)\n",

		printf("[FAIL]\tExecution failed with the wrong error: #PF(0x%lx)\n",

		       segv_err);

		return 1;

	}