diff options
| author | Will Deacon <will.deacon@arm.com> | 2018-12-11 13:41:32 +0000 |
|---|---|---|
| committer | Will Deacon <will.deacon@arm.com> | 2018-12-11 20:07:03 +0000 |
| commit | 7faa313f05cad184e8b17750f0cbe5216ac6debb (patch) | |
| tree | c876a0fc11afaf73fb876d4756cc34a338bf5fa9 /arch/arm64/kernel | |
| parent | 732291c4fab8b790847aa572703c01ad483b14d0 (diff) | |
| download | linux-0-day-7faa313f05cad184e8b17750f0cbe5216ac6debb.tar.gz linux-0-day-7faa313f05cad184e8b17750f0cbe5216ac6debb.tar.xz | |
arm64: preempt: Fix big-endian when checking preempt count in assembly
Commit 396244692232 ("arm64: preempt: Provide our own implementation of
asm/preempt.h") extended the preempt count field in struct thread_info
to 64 bits, so that it consists of a 32-bit count plus a 32-bit flag
indicating whether or not the current task needs rescheduling.
Whilst the asm-offsets definition of TSK_TI_PREEMPT was updated to point
to this new field, the assembly usage was left untouched meaning that a
32-bit load from TSK_TI_PREEMPT on a big-endian machine actually returns
the reschedule flag instead of the count.
Whilst we could fix this by pointing TSK_TI_PREEMPT at the count field,
we're actually better off reworking the two assembly users so that they
operate on the whole 64-bit value in favour of inspecting the thread
flags separately in order to determine whether a reschedule is needed.
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reported-by: "kernelci.org bot" <bot@kernelci.org>
Tested-by: Kevin Hilman <khilman@baylibre.com>
Signed-off-by: Will Deacon <will.deacon@arm.com>
Diffstat (limited to 'arch/arm64/kernel')
| -rw-r--r-- | arch/arm64/kernel/entry.S | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index c7d050207e538..763f03dc4d9e7 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -619,10 +619,8 @@ el1_irq: irq_handler #ifdef CONFIG_PREEMPT - 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? + ldr x24, [tsk, #TSK_TI_PREEMPT] // get preempt count + cbnz x24, 1f // preempt count != 0 bl el1_preempt 1: #endif |