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

Commit 9e9671ce authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

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

Pull kselftest fixes from Shuah Khan:
 "A fix to the Kselftest framework to save and restore errno and a fix
  to livepatch to push and pop dynamic debug config"

* tag 'linux-kselftest-5.3-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/livepatch: push and pop dynamic debug config
  kselftest: save-and-restore errno to allow for %m formatting
parents e21a712a fbb01c52

tools/testing/selftests/kselftest.h

+15 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#ifndef __KSELFTEST_H

#define __KSELFTEST_H



#include <errno.h>

#include <stdlib.h>

#include <unistd.h>

#include <stdarg.h>
@@ -81,58 +82,68 @@ static inline void ksft_print_cnts(void) 


static inline void ksft_print_msg(const char *msg, ...)

{

	int saved_errno = errno;

	va_list args;



	va_start(args, msg);

	printf("# ");

	errno = saved_errno;

	vprintf(msg, args);

	va_end(args);

}



static inline void ksft_test_result_pass(const char *msg, ...)

{

	int saved_errno = errno;

	va_list args;



	ksft_cnt.ksft_pass++;



	va_start(args, msg);

	printf("ok %d ", ksft_test_num());

	errno = saved_errno;

	vprintf(msg, args);

	va_end(args);

}



static inline void ksft_test_result_fail(const char *msg, ...)

{

	int saved_errno = errno;

	va_list args;



	ksft_cnt.ksft_fail++;



	va_start(args, msg);

	printf("not ok %d ", ksft_test_num());

	errno = saved_errno;

	vprintf(msg, args);

	va_end(args);

}



static inline void ksft_test_result_skip(const char *msg, ...)

{

	int saved_errno = errno;

	va_list args;



	ksft_cnt.ksft_xskip++;



	va_start(args, msg);

	printf("not ok %d # SKIP ", ksft_test_num());

	errno = saved_errno;

	vprintf(msg, args);

	va_end(args);

}



static inline void ksft_test_result_error(const char *msg, ...)

{

	int saved_errno = errno;

	va_list args;



	ksft_cnt.ksft_error++;



	va_start(args, msg);

	printf("not ok %d # error ", ksft_test_num());

	errno = saved_errno;

	vprintf(msg, args);

	va_end(args);

}
@@ -152,10 +163,12 @@ static inline int ksft_exit_fail(void) 


static inline int ksft_exit_fail_msg(const char *msg, ...)

{

	int saved_errno = errno;

	va_list args;



	va_start(args, msg);

	printf("Bail out! ");

	errno = saved_errno;

	vprintf(msg, args);

	va_end(args);
@@ -178,10 +191,12 @@ static inline int ksft_exit_xpass(void) 
static inline int ksft_exit_skip(const char *msg, ...)

{

	if (msg) {

		int saved_errno = errno;

		va_list args;



		va_start(args, msg);

		printf("not ok %d # SKIP ", 1 + ksft_test_num());

		errno = saved_errno;

		vprintf(msg, args);

		va_end(args);

	} else {

tools/testing/selftests/livepatch/functions.sh

+20 −6
Original line number Diff line number Diff line
@@ -29,10 +29,24 @@ function die() { 
	exit 1

}



# set_dynamic_debug() - setup kernel dynamic debug

#	TODO - push and pop this config?

function push_dynamic_debug() {

        DYNAMIC_DEBUG=$(grep '^kernel/livepatch' /sys/kernel/debug/dynamic_debug/control | \

                awk -F'[: ]' '{print "file " $1 " line " $2 " " $4}')

}



function pop_dynamic_debug() {

	if [[ -n "$DYNAMIC_DEBUG" ]]; then

		echo -n "$DYNAMIC_DEBUG" > /sys/kernel/debug/dynamic_debug/control

	fi

}



# set_dynamic_debug() - save the current dynamic debug config and tweak

# 			it for the self-tests.  Set a script exit trap

#			that restores the original config.

function set_dynamic_debug() {

	cat << EOF > /sys/kernel/debug/dynamic_debug/control

        push_dynamic_debug

        trap pop_dynamic_debug EXIT INT TERM HUP

        cat <<-EOF > /sys/kernel/debug/dynamic_debug/control

		file kernel/livepatch/* +p

		func klp_try_switch_task -p

		EOF