]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.15-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 7 Jan 2023 11:04:54 +0000 (12:04 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 7 Jan 2023 11:04:54 +0000 (12:04 +0100)
added patches:
arm-renumber-bits-related-to-_tif_work_mask.patch

queue-5.15/arm-renumber-bits-related-to-_tif_work_mask.patch [new file with mode: 0644]
queue-5.15/series

diff --git a/queue-5.15/arm-renumber-bits-related-to-_tif_work_mask.patch b/queue-5.15/arm-renumber-bits-related-to-_tif_work_mask.patch
new file mode 100644 (file)
index 0000000..f3cd849
--- /dev/null
@@ -0,0 +1,50 @@
+From 191f8453fc99a537ea78b727acea739782378b0d Mon Sep 17 00:00:00 2001
+From: Jens Axboe <axboe@kernel.dk>
+Date: Wed, 4 Jan 2023 07:48:37 -0700
+Subject: ARM: renumber bits related to _TIF_WORK_MASK
+
+From: Jens Axboe <axboe@kernel.dk>
+
+commit 191f8453fc99a537ea78b727acea739782378b0d upstream.
+
+We want to ensure that the mask related to calling do_work_pending()
+is within the first 16 bits. Move bits unrelated to that outside of
+that range, to avoid spuriously calling do_work_pending() when we don't
+need to.
+
+Cc: stable@vger.kernel.org
+Fixes: 32d59773da38 ("arm: add support for TIF_NOTIFY_SIGNAL")
+Reported-and-tested-by: Hui Tang <tanghui20@huawei.com>
+Suggested-by: Russell King (Oracle) <linux@armlinux.org.uk>
+Link: https://lore.kernel.org/lkml/7ecb8f3c-2aeb-a905-0d4a-aa768b9649b5@huawei.com/
+Signed-off-by: Jens Axboe <axboe@kernel.dk>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ arch/arm/include/asm/thread_info.h |   13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+--- a/arch/arm/include/asm/thread_info.h
++++ b/arch/arm/include/asm/thread_info.h
+@@ -129,15 +129,16 @@ extern int vfp_restore_user_hwstate(stru
+ #define TIF_NEED_RESCHED      1       /* rescheduling necessary */
+ #define TIF_NOTIFY_RESUME     2       /* callback before returning to user */
+ #define TIF_UPROBE            3       /* breakpointed or singlestepping */
+-#define TIF_SYSCALL_TRACE     4       /* syscall trace active */
+-#define TIF_SYSCALL_AUDIT     5       /* syscall auditing active */
+-#define TIF_SYSCALL_TRACEPOINT        6       /* syscall tracepoint instrumentation */
+-#define TIF_SECCOMP           7       /* seccomp syscall filtering active */
+-#define TIF_NOTIFY_SIGNAL     8       /* signal notifications exist */
++#define TIF_NOTIFY_SIGNAL     4       /* signal notifications exist */
+ #define TIF_USING_IWMMXT      17
+ #define TIF_MEMDIE            18      /* is terminating due to OOM killer */
+-#define TIF_RESTORE_SIGMASK   20
++#define TIF_RESTORE_SIGMASK   19
++#define TIF_SYSCALL_TRACE     20      /* syscall trace active */
++#define TIF_SYSCALL_AUDIT     21      /* syscall auditing active */
++#define TIF_SYSCALL_TRACEPOINT        22      /* syscall tracepoint instrumentation */
++#define TIF_SECCOMP           23      /* seccomp syscall filtering active */
++
+ #define _TIF_SIGPENDING               (1 << TIF_SIGPENDING)
+ #define _TIF_NEED_RESCHED     (1 << TIF_NEED_RESCHED)
index 31cfb86b343f2c7dd283191c83a8eea3395b97fe..1a9089982a7102f583df4b91f58911b3a12c69b8 100644 (file)
@@ -175,3 +175,4 @@ ext4-add-missing-validation-of-fast-commit-record-lengths.patch
 ext4-fix-unaligned-memory-access-in-ext4_fc_reserve_space.patch
 ext4-fix-off-by-one-errors-in-fast-commit-block-filling.patch
 cifs-prevent-copying-past-input-buffer-boundaries.patch
+arm-renumber-bits-related-to-_tif_work_mask.patch