Commit 4caf8758 authored by Julien Thierry's avatar Julien Thierry Committed by Catalin Marinas

arm64: Rename get_thread_info()

The assembly macro get_thread_info() actually returns a task_struct and is
analogous to the current/get_current macro/function.

While it could be argued that thread_info sits at the start of
task_struct and the intention could have been to return a thread_info,
instances of loads from/stores to the address obtained from
get_thread_info() use offsets that are generated with
offsetof(struct task_struct, [...]).

Rename get_thread_info() to state it returns a task_struct.
Acked-by: default avatarMark Rutland <mark.rutland@arm.com>
Signed-off-by: default avatarJulien Thierry <julien.thierry@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Signed-off-by: default avatarCatalin Marinas <catalin.marinas@arm.com>
parent 47224e51
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
.endm .endm
.macro __uaccess_ttbr0_enable, tmp1, tmp2 .macro __uaccess_ttbr0_enable, tmp1, tmp2
get_thread_info \tmp1 get_current_task \tmp1
ldr \tmp1, [\tmp1, #TSK_TI_TTBR0] // load saved TTBR0_EL1 ldr \tmp1, [\tmp1, #TSK_TI_TTBR0] // load saved TTBR0_EL1
mrs \tmp2, ttbr1_el1 mrs \tmp2, ttbr1_el1
extr \tmp2, \tmp2, \tmp1, #48 extr \tmp2, \tmp2, \tmp1, #48
......
...@@ -528,9 +528,9 @@ USER(\label, ic ivau, \tmp2) // invalidate I line PoU ...@@ -528,9 +528,9 @@ USER(\label, ic ivau, \tmp2) // invalidate I line PoU
.endm .endm
/* /*
* Return the current thread_info. * Return the current task_struct.
*/ */
.macro get_thread_info, rd .macro get_current_task, rd
mrs \rd, sp_el0 mrs \rd, sp_el0
.endm .endm
...@@ -713,7 +713,7 @@ USER(\label, ic ivau, \tmp2) // invalidate I line PoU ...@@ -713,7 +713,7 @@ USER(\label, ic ivau, \tmp2) // invalidate I line PoU
.macro if_will_cond_yield_neon .macro if_will_cond_yield_neon
#ifdef CONFIG_PREEMPT #ifdef CONFIG_PREEMPT
get_thread_info x0 get_current_task x0
ldr x0, [x0, #TSK_TI_PREEMPT] ldr x0, [x0, #TSK_TI_PREEMPT]
sub x0, x0, #PREEMPT_DISABLE_OFFSET sub x0, x0, #PREEMPT_DISABLE_OFFSET
cbz x0, .Lyield_\@ cbz x0, .Lyield_\@
......
...@@ -185,7 +185,7 @@ alternative_cb_end ...@@ -185,7 +185,7 @@ alternative_cb_end
.else .else
add x21, sp, #S_FRAME_SIZE add x21, sp, #S_FRAME_SIZE
get_thread_info tsk get_current_task tsk
/* Save the task's original addr_limit and set USER_DS */ /* Save the task's original addr_limit and set USER_DS */
ldr x20, [tsk, #TSK_TI_ADDR_LIMIT] ldr x20, [tsk, #TSK_TI_ADDR_LIMIT]
str x20, [sp, #S_ORIG_ADDR_LIMIT] str x20, [sp, #S_ORIG_ADDR_LIMIT]
...@@ -1104,7 +1104,7 @@ ENTRY(ret_from_fork) ...@@ -1104,7 +1104,7 @@ ENTRY(ret_from_fork)
cbz x19, 1f // not a kernel thread cbz x19, 1f // not a kernel thread
mov x0, x20 mov x0, x20
blr x19 blr x19
1: get_thread_info tsk 1: get_current_task tsk
b ret_to_user b ret_to_user
ENDPROC(ret_from_fork) ENDPROC(ret_from_fork)
NOKPROBE(ret_from_fork) NOKPROBE(ret_from_fork)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment