This is a note to let you know that I've just added the patch titled
Revert "arm64: preempt: Fix big-endian when checking preempt count in assembly"
to the 4.19-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
revert-arm64-preempt-fix-big-endian-when-checking-preempt-count-in-assembly.patch
and it can be found in the queue-4.19 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 3568eed989372764896b5a5f1cdb906bdad1854a Mon Sep 17 00:00:00 2001
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Date: Wed, 18 Dec 2019 21:09:37 +0100
Subject: Revert "arm64: preempt: Fix big-endian when checking preempt count in assembly"
From: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
This reverts commit 64694b276d74c653051637caa4bfa5e8c27b30ad which is
commit 7faa313f05cad184e8b17750f0cbe5216ac6debb upstream.
Turns out one of the pre-requsite patches wasn't in 4.19.y, so this
patch didn't make sense. So let's revert it.
Reported-by: Steven Rostedt <rostedt@xxxxxxxxxxx>
Reported-by: Will Deacon <will@xxxxxxxxxx>
Cc: Ard Biesheuvel <ard.biesheuvel@xxxxxxxxxx>
Cc: Kevin Hilman <khilman@xxxxxxxxxxxx>
Cc: Sasha Levin <sashal@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/arm64/include/asm/assembler.h | 8 +++++---
arch/arm64/kernel/entry.S | 6 ++++--
2 files changed, 9 insertions(+), 5 deletions(-)
--- a/arch/arm64/include/asm/assembler.h
+++ b/arch/arm64/include/asm/assembler.h
@@ -683,9 +683,11 @@ USER(\label, ic ivau, \tmp2) // invali
.macro if_will_cond_yield_neon
#ifdef CONFIG_PREEMPT
get_thread_info x0
- ldr x0, [x0, #TSK_TI_PREEMPT]
- sub x0, x0, #PREEMPT_DISABLE_OFFSET
- cbz x0, .Lyield_\@
+ ldr w1, [x0, #TSK_TI_PREEMPT]
+ ldr x0, [x0, #TSK_TI_FLAGS]
+ cmp w1, #PREEMPT_DISABLE_OFFSET
+ csel x0, x0, xzr, eq
+ tbnz x0, #TIF_NEED_RESCHED, .Lyield_\@ // needs rescheduling?
/* fall through to endif_yield_neon */
.subsection 1
.Lyield_\@ :
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -622,8 +622,10 @@ el1_irq:
irq_handler
#ifdef CONFIG_PREEMPT
- ldr x24, [tsk, #TSK_TI_PREEMPT] // get preempt count
- cbnz x24, 1f // preempt count != 0
+ ldr w24, [tsk, #TSK_TI_PREEMPT] // get preempt count
+ cbnz w24, 1f // preempt count != 0
+ ldr x0, [tsk, #TSK_TI_FLAGS] // get flags
+ tbz x0, #TIF_NEED_RESCHED, 1f // needs rescheduling?
bl el1_preempt
1:
#endif
Patches currently in stable-queue which might be from gregkh@xxxxxxxxxxxxxxxxxxx are
queue-4.19/tcp-md5-fix-potential-overestimation-of-tcp-option-space.patch
queue-4.19/net-bridge-deny-dev_set_mac_address-when-unregistering.patch
queue-4.19/net-mlx5e-query-global-pause-state-before-setting-prio2buffer.patch
queue-4.19/tcp-protect-accesses-to-.ts_recent_stamp-with-read-write-_once.patch
queue-4.19/tcp-fix-rejected-syncookies-due-to-stale-timestamps.patch
queue-4.19/net-dsa-fix-flow-dissection-on-tx-path.patch
queue-4.19/revert-arm64-preempt-fix-big-endian-when-checking-preempt-count-in-assembly.patch
queue-4.19/tcp-tighten-acceptance-of-acks-not-matching-a-child-socket.patch
queue-4.19/openvswitch-support-asymmetric-conntrack.patch
queue-4.19/net-ethernet-ti-cpsw-fix-extra-rx-interrupt.patch
queue-4.19/tipc-fix-ordering-of-tipc-module-init-and-exit-routine.patch
queue-4.19/inet-protect-against-too-small-mtu-values.patch
queue-4.19/net-thunderx-start-phy-before-starting-autonegotiation.patch
queue-4.19/net-sched-fix-dump-qlen-for-sch_mq-sch_mqprio-with-nolock-subqueues.patch
queue-4.19/mqprio-fix-out-of-bounds-access-in-mqprio_dump.patch
