[GIT PULL] kselftest fixes update for Linux 6.19-rc5

[Shuah Khan <skhan@linuxfoundation.org>]

[-- Attachment #1: Type: text/plain, Size: 1206 bytes --]

Hi Linus,

Please pull the fixes kselftest fixes update for Linux 6.19-rc5.

Fixes tracing test_multiple_writes stalls when buffer_size_kb is less
than 12KB.

diff is attached.

thanks,
-- Shuah

----------------------------------------------------------------
The following changes since commit 9ace4753a5202b02191d54e9fdf7f9e3d02b85eb:

   Linux 6.19-rc4 (2026-01-04 14:41:55 -0800)

are available in the Git repository at:

   git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest tags/linux_kselftest-fixes-6.19-rc5

for you to fetch changes up to 6e39903c73df08b256322d04c4dfe4a82ec63a45:

   selftests/tracing: Fix test_multiple_writes stall (2026-01-09 15:49:32 -0700)

----------------------------------------------------------------
linux_kselftest-fixes-6.19-rc5

Fixes tracing test_multiple_writes stalls when buffer_size_kb is less
than 12KB.

----------------------------------------------------------------
Fushuai Wang (1):
       selftests/tracing: Fix test_multiple_writes stall

  .../ftrace/test.d/00basic/trace_marker_raw.tc          | 18 +++++++++++++++++-
  1 file changed, 17 insertions(+), 1 deletion(-)
----------------------------------------------------------------

[-- Attachment #2: linux_kselftest-fixes-6.19-rc5.diff --]
[-- Type: text/x-patch, Size: 1105 bytes --]

diff --git a/tools/testing/selftests/ftrace/test.d/00basic/trace_marker_raw.tc b/tools/testing/selftests/ftrace/test.d/00basic/trace_marker_raw.tc
index 7daf7292209e..a2c42e13f614 100644
--- a/tools/testing/selftests/ftrace/test.d/00basic/trace_marker_raw.tc
+++ b/tools/testing/selftests/ftrace/test.d/00basic/trace_marker_raw.tc
@@ -89,6 +89,7 @@ test_buffer() {
 	# The id must be four bytes, test that 3 bytes fails a write
 	if echo -n abc > ./trace_marker_raw ; then
 		echo "Too small of write expected to fail but did not"
+		echo ${ORIG} > buffer_size_kb
 		exit_fail
 	fi
 
@@ -99,9 +100,24 @@ test_buffer() {
 
 	if write_buffer 0xdeadbeef $size ; then
 		echo "Too big of write expected to fail but did not"
+		echo ${ORIG} > buffer_size_kb
 		exit_fail
 	fi
 }
 
+ORIG=`cat buffer_size_kb`
+
+# test_multiple_writes test needs at least 12KB buffer
+NEW_SIZE=12
+
+if [ ${ORIG} -lt ${NEW_SIZE} ]; then
+	echo ${NEW_SIZE} > buffer_size_kb
+fi
+
 test_buffer
-test_multiple_writes
+if ! test_multiple_writes; then
+	echo ${ORIG} > buffer_size_kb
+	exit_fail
+fi
+
+echo ${ORIG} > buffer_size_kb