From: Greg Kroah-Hartman Date: Sat, 7 Jan 2023 11:05:04 +0000 (+0100) Subject: 6.0-stable patches X-Git-Tag: v4.9.337~2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7a35320c3c483c642c79e661f29a21dc60c56b9e;p=thirdparty%2Fkernel%2Fstable-queue.git 6.0-stable patches added patches: arm-renumber-bits-related-to-_tif_work_mask.patch series --- diff --git a/queue-6.0/arm-renumber-bits-related-to-_tif_work_mask.patch b/queue-6.0/arm-renumber-bits-related-to-_tif_work_mask.patch new file mode 100644 index 00000000000..c0e9ea2b849 --- /dev/null +++ b/queue-6.0/arm-renumber-bits-related-to-_tif_work_mask.patch @@ -0,0 +1,50 @@ +From 191f8453fc99a537ea78b727acea739782378b0d Mon Sep 17 00:00:00 2001 +From: Jens Axboe +Date: Wed, 4 Jan 2023 07:48:37 -0700 +Subject: ARM: renumber bits related to _TIF_WORK_MASK + +From: Jens Axboe + +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 +Suggested-by: Russell King (Oracle) +Link: https://lore.kernel.org/lkml/7ecb8f3c-2aeb-a905-0d4a-aa768b9649b5@huawei.com/ +Signed-off-by: Jens Axboe +Signed-off-by: Greg Kroah-Hartman +--- + 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 +@@ -128,15 +128,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) diff --git a/queue-6.0/series b/queue-6.0/series new file mode 100644 index 00000000000..086018b5b1f --- /dev/null +++ b/queue-6.0/series @@ -0,0 +1 @@ +arm-renumber-bits-related-to-_tif_work_mask.patch