Commit 57d88e8a authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-fixes-6.6-rc2' of... 

Merge tag 'linux-kselftest-fixes-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull more kselftest fixes from Shuah Khan
 "Fixes to user_events test and ftrace test.

  The user_events test was enabled by default in Linux 6.6-rc1. The
  following fixes are for bugs found since then:

   - add checks for dependencies and skip the test if they aren't met.

     The user_events test requires root access, and tracefs and
     user_events enabled. It leaves tracefs mounted and a fix is in
     progress for that missing piece.

   - create user_events test-specific Kconfig fragments

  ftrace test fixes:

   - unmount tracefs for recovering environment. Fix identified during
     the above mentioned user_events dependencies fix.

   - adds softlink to latest log directory improving usage"

* tag 'linux-kselftest-fixes-6.6-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests: tracing: Fix to unmount tracefs for recovering environment
  selftests: user_events: create test-specific Kconfig fragments
  ftrace/selftests: Add softlink to latest log directory
  selftests/user_events: Fix failures when user_events is not installed
parents d8d7cd65 7e021da8

tools/testing/selftests/ftrace/ftracetest

+17 −1
Original line number Diff line number Diff line
@@ -31,6 +31,9 @@ err_ret=1 
# kselftest skip code is 4

err_skip=4



# umount required

UMOUNT_DIR=""



# cgroup RT scheduling prevents chrt commands from succeeding, which

# induces failures in test wakeup tests.  Disable for the duration of

# the tests.
@@ -45,6 +48,9 @@ setup() { 


cleanup() {

  echo $sched_rt_runtime_orig > $sched_rt_runtime

  if [ -n "${UMOUNT_DIR}" ]; then

    umount ${UMOUNT_DIR} ||:

  fi

}



errexit() { # message
@@ -124,6 +130,7 @@ parse_opts() { # opts 
    ;;

    --logdir|-l)

      LOG_DIR=$2

      LINK_PTR=

      shift 2

    ;;

    *.tc)
@@ -160,11 +167,13 @@ if [ -z "$TRACING_DIR" ]; then 
	    mount -t tracefs nodev /sys/kernel/tracing ||

	      errexit "Failed to mount /sys/kernel/tracing"

	    TRACING_DIR="/sys/kernel/tracing"

	    UMOUNT_DIR=${TRACING_DIR}

	# If debugfs exists, then so does /sys/kernel/debug

	elif [ -d "/sys/kernel/debug" ]; then

	    mount -t debugfs nodev /sys/kernel/debug ||

	      errexit "Failed to mount /sys/kernel/debug"

	    TRACING_DIR="/sys/kernel/debug/tracing"

	    UMOUNT_DIR=${TRACING_DIR}

	else

	    err_ret=$err_skip

	    errexit "debugfs and tracefs are not configured in this kernel"
@@ -181,7 +190,10 @@ fi 
TOP_DIR=`absdir $0`

TEST_DIR=$TOP_DIR/test.d

TEST_CASES=`find_testcases $TEST_DIR`

LOG_DIR=$TOP_DIR/logs/`date +%Y%m%d-%H%M%S`/

LOG_TOP_DIR=$TOP_DIR/logs

LOG_DATE=`date +%Y%m%d-%H%M%S`

LOG_DIR=$LOG_TOP_DIR/$LOG_DATE/

LINK_PTR=$LOG_TOP_DIR/latest

KEEP_LOG=0

KTAP=0

DEBUG=0
@@ -207,6 +219,10 @@ else 
  LOG_FILE=$LOG_DIR/ftracetest.log

  mkdir -p $LOG_DIR || errexit "Failed to make a log directory: $LOG_DIR"

  date > $LOG_FILE

  if [ "x-$LINK_PTR" != "x-" ]; then

    unlink $LINK_PTR

    ln -fs $LOG_DATE $LINK_PTR

  fi

fi



# Define text colors

tools/testing/selftests/user_events/abi_test.c

+3 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include <asm/unistd.h>



#include "../kselftest_harness.h"

#include "user_events_selftests.h"



const char *data_file = "/sys/kernel/tracing/user_events_data";

const char *enable_file = "/sys/kernel/tracing/events/user_events/__abi_event/enable";
@@ -93,6 +94,8 @@ FIXTURE(user) { 
};



FIXTURE_SETUP(user) {

	USER_EVENT_FIXTURE_SETUP(return);



	change_event(false);

	self->check = 0;

}

tools/testing/selftests/user_events/config

0 → 100644
+1 −0
Original line number Diff line number Diff line 
CONFIG_USER_EVENTS=y

tools/testing/selftests/user_events/dyn_test.c

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include <unistd.h>



#include "../kselftest_harness.h"

#include "user_events_selftests.h"



const char *abi_file = "/sys/kernel/tracing/user_events_data";

const char *enable_file = "/sys/kernel/tracing/events/user_events/__test_event/enable";
@@ -146,6 +147,7 @@ FIXTURE(user) { 
};



FIXTURE_SETUP(user) {

	USER_EVENT_FIXTURE_SETUP(return);

}



FIXTURE_TEARDOWN(user) {

tools/testing/selftests/user_events/ftrace_test.c

+3 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
#include <unistd.h>



#include "../kselftest_harness.h"

#include "user_events_selftests.h"



const char *data_file = "/sys/kernel/tracing/user_events_data";

const char *status_file = "/sys/kernel/tracing/user_events_status";
@@ -206,6 +207,8 @@ FIXTURE(user) { 
};



FIXTURE_SETUP(user) {

	USER_EVENT_FIXTURE_SETUP(return);



	self->status_fd = open(status_file, O_RDONLY);

	ASSERT_NE(-1, self->status_fd);