UPSTREAM: arm64: assembler: introduce ldr_this_cpu

Shortly we will want to load a percpu variable in the return from
userspace path. We can save an instruction by folding the addition of
the percpu offset into the load instruction, and this patch adds a new
helper to do so.

At the same time, we clean up this_cpu_ptr for consistency. As with
{adr,ldr,str}_l, we change the template to take the destination register
first, and name this dst. Secondly, we rename the macro to adr_this_cpu,
following the scheme of adr_l, and matching the newly added
ldr_this_cpu.

Signed-off-by: Mark Rutland <mark.rutland@arm.com>
Tested-by: Laura Abbott <labbott@redhat.com>
Cc: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Cc: James Morse <james.morse@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
Bug: 38331309
Change-Id: Iaaf4ea9674ab89289badee216b5305204172895e
(cherry picked from commit 1b7e2296a822dfd2349960addc42a139360ce769)
Signed-off-by: Zubin Mithra <zsm@google.com>

diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h
index d8855ca..e450bb6 100644 (file)
--- a/arch/arm64/include/asm/assembler.h
+++ b/arch/arm64/include/asm/assembler.h
@@ -223,14 +223,25 @@ lr        .req    x30             // link register
        .endm
 
        /*
+        * @dst: Result of per_cpu(sym, smp_processor_id())
         * @sym: The name of the per-cpu variable
-        * @reg: Result of per_cpu(sym, smp_processor_id())
         * @tmp: scratch register
         */
-       .macro this_cpu_ptr, sym, reg, tmp
-       adr_l   \reg, \sym
+       .macro adr_this_cpu, dst, sym, tmp
+       adr_l   \dst, \sym
        mrs     \tmp, tpidr_el1
-       add     \reg, \reg, \tmp
+       add     \dst, \dst, \tmp
+       .endm
+
+       /*
+        * @dst: Result of READ_ONCE(per_cpu(sym, smp_processor_id()))
+        * @sym: The name of the per-cpu variable
+        * @tmp: scratch register
+        */
+       .macro ldr_this_cpu dst, sym, tmp
+       adr_l   \dst, \sym
+       mrs     \tmp, tpidr_el1
+       ldr     \dst, [\dst, \tmp]
        .endm
 
 /*

diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S
index 3f9d786..ed2df05 100644 (file)
--- a/arch/arm64/kernel/entry.S
+++ b/arch/arm64/kernel/entry.S
@@ -266,7 +266,7 @@ alternative_endif
        cmp     x25, tsk
        b.ne    9998f
 
-       this_cpu_ptr irq_stack, x25, x26
+       adr_this_cpu x25, irq_stack, x26
        mov     x26, #IRQ_STACK_START_SP
        add     x26, x25, x26