4.19-stable patches

added patches:
	selftests-ftrace-limit-length-in-subsystem-enable-tests.patch

3 files changed, 58 insertions, 7 deletions

diff --git a/queue-4.19/btrfs-record-delayed-inode-root-in-transaction.patch b/queue-4.19/btrfs-record-delayed-inode-root-in-transaction.patch
index c912f5799a..ae6bf46340 100644
--- a/queue-4.19/btrfs-record-delayed-inode-root-in-transaction.patch
+++ b/queue-4.19/btrfs-record-delayed-inode-root-in-transaction.patch
@@ -19,14 +19,12 @@ Signed-off-by: Boris Burkov <boris@bur.io>
 Signed-off-by: David Sterba <dsterba@suse.com>
 Signed-off-by: Sasha Levin <sashal@kernel.org>
 ---
- fs/btrfs/delayed-inode.c | 3 +++
+ fs/btrfs/delayed-inode.c |    3 +++
  1 file changed, 3 insertions(+)
 
-diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c
-index 469a90b07d3f0..fec62782fc86c 100644
 --- a/fs/btrfs/delayed-inode.c
 +++ b/fs/btrfs/delayed-inode.c
-@@ -1133,6 +1133,9 @@ __btrfs_commit_inode_delayed_items(struct btrfs_trans_handle *trans,
+@@ -1133,6 +1133,9 @@ __btrfs_commit_inode_delayed_items(struc
  	if (ret)
  		return ret;
  
@@ -36,6 +34,3 @@ index 469a90b07d3f0..fec62782fc86c 100644
  	ret = btrfs_update_delayed_inode(trans, node->root, path, node);
  	return ret;
  }
--- 
-2.43.0
-
diff --git a/queue-4.19/selftests-ftrace-limit-length-in-subsystem-enable-tests.patch b/queue-4.19/selftests-ftrace-limit-length-in-subsystem-enable-tests.patch
new file mode 100644
index 0000000000..a91e351d77
--- /dev/null
+++ b/queue-4.19/selftests-ftrace-limit-length-in-subsystem-enable-tests.patch
@@ -0,0 +1,55 @@
+From 1a4ea83a6e67f1415a1f17c1af5e9c814c882bb5 Mon Sep 17 00:00:00 2001
+From: Yuanhe Shu <xiangzao@linux.alibaba.com>
+Date: Mon, 26 Feb 2024 11:18:16 +0800
+Subject: selftests/ftrace: Limit length in subsystem-enable tests
+
+From: Yuanhe Shu <xiangzao@linux.alibaba.com>
+
+commit 1a4ea83a6e67f1415a1f17c1af5e9c814c882bb5 upstream.
+
+While sched* events being traced and sched* events continuously happen,
+"[xx] event tracing - enable/disable with subsystem level files" would
+not stop as on some slower systems it seems to take forever.
+Select the first 100 lines of output would be enough to judge whether
+there are more than 3 types of sched events.
+
+Fixes: 815b18ea66d6 ("ftracetest: Add basic event tracing test cases")
+Cc: stable@vger.kernel.org
+Signed-off-by: Yuanhe Shu <xiangzao@linux.alibaba.com>
+Acked-by: Masami Hiramatsu (Google) <mhiramat@kernel.org>
+Acked-by: Steven Rostedt (Google) <rostedt@goodmis.org>
+Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- a/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
++++ b/tools/testing/selftests/ftrace/test.d/event/subsystem-enable.tc
+@@ -30,7 +30,7 @@ echo 'sched:*' > set_event
+ 
+ yield
+ 
+-count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
++count=`head -n 100 trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
+ if [ $count -lt 3 ]; then
+     fail "at least fork, exec and exit events should be recorded"
+ fi
+@@ -41,7 +41,7 @@ echo 1 > events/sched/enable
+ 
+ yield
+ 
+-count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
++count=`head -n 100 trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
+ if [ $count -lt 3 ]; then
+     fail "at least fork, exec and exit events should be recorded"
+ fi
+@@ -52,7 +52,7 @@ echo 0 > events/sched/enable
+ 
+ yield
+ 
+-count=`cat trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
++count=`head -n 100 trace | grep -v ^# | awk '{ print $5 }' | sort -u | wc -l`
+ if [ $count -ne 0 ]; then
+     fail "any of scheduler events should not be recorded"
+ fi
diff --git a/queue-4.19/series b/queue-4.19/series
index d6f1f45772..7e823562d8 100644
--- a/queue-4.19/series
+++ b/queue-4.19/series
@@ -11,3 +11,4 @@ vhost-add-smp_rmb-in-vhost_vq_avail_empty.patch
 selftests-timers-fix-abs-warning-in-posix_timers-test.patch
 x86-apic-force-native_apic_mem_read-to-use-the-mov-instruction.patch
 btrfs-record-delayed-inode-root-in-transaction.patch
+selftests-ftrace-limit-length-in-subsystem-enable-tests.patch