From: Will Deacon <will.deacon@arm.com> To: "André Hentschel" <nerv@dawncrow.de> Cc: Russell King - ARM Linux <linux@arm.linux.org.uk>, "linux-arch@vger.kernel.org" <linux-arch@vger.kernel.org>, "linux-arm-kernel@lists.infradead.org" <linux-arm-kernel@lists.infradead.org>, "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>, Greg KH <gregkh@linuxfoundation.org> Subject: Re: [PATCH] arm: Preserve TPIDRURW on context switch Date: Fri, 8 Feb 2013 15:48:09 +0000 [thread overview] Message-ID: <20130208154809.GF3495@mudshark.cambridge.arm.com> (raw) In-Reply-To: <5112E0C3.1080706@dawncrow.de> On Wed, Feb 06, 2013 at 11:01:23PM +0000, André Hentschel wrote: > Am 06.02.2013 23:51, schrieb Russell King - ARM Linux: > > On Wed, Feb 06, 2013 at 11:43:10PM +0100, André Hentschel wrote: > >> There are more and more applications coming to WinRT, Wine could support them, > >> but mostly they expect to have the thread environment block (TEB) in TPIDRURW. > >> This register must be preserved per thread instead of being cleared. > > > > I'd prefer this was done a little more sensitively to those CPUs where > > loads/stores are expensive, namely: > > > >> + > >> + @ preserve TPIDRURW register state > >> + get_tls2 r3, r4, r5 > >> + str r3, [r1, #TI_TP2_VALUE] > >> + ldr r3, [r2, #TI_TP2_VALUE] > >> + set_tls2 r3, r4, r5 > > > > those two loads/stores get omitted from the thread switching if the CPU > > doesn't support it. Do you think that's something you could do? > > No, i'm not sure how to improve this. How does the process can continue, can you or someone else fix that and add his Signed-off-by? How about something like the (completely untested) diff below? Andre: if this works for you, I'm happy to write a commit message etc. Cheers, Will --->8 diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h index cddda1f..d90be6d 100644 --- a/arch/arm/include/asm/thread_info.h +++ b/arch/arm/include/asm/thread_info.h @@ -58,7 +58,7 @@ struct thread_info { struct cpu_context_save cpu_context; /* cpu context */ __u32 syscall; /* syscall number */ __u8 used_cp[16]; /* thread used copro */ - unsigned long tp_value; + unsigned long tp_value[2]; /* TLS registers */ #ifdef CONFIG_CRUNCH struct crunch_state crunchstate; #endif diff --git a/arch/arm/include/asm/tls.h b/arch/arm/include/asm/tls.h index 73409e6..e1b09d32 100644 --- a/arch/arm/include/asm/tls.h +++ b/arch/arm/include/asm/tls.h @@ -6,9 +6,9 @@ .endm .macro set_tls_v6k, tp, tmp1, tmp2 - mcr p15, 0, \tp, c13, c0, 3 @ set TLS register - mov \tmp1, #0 - mcr p15, 0, \tmp1, c13, c0, 2 @ clear user r/w TLS register + ldrd \tmp1, \tmp2, [\tp] + mcr p15, 0, \tmp1, c13, c0, 3 @ set user r/o TLS register + mcr p15, 0, \tmp2, c13, c0, 2 @ set user r/w TLS register .endm .macro set_tls_v6, tp, tmp1, tmp2 @@ -16,15 +16,17 @@ ldr \tmp1, [\tmp1, #0] mov \tmp2, #0xffff0fff tst \tmp1, #HWCAP_TLS @ hardware TLS available? - mcrne p15, 0, \tp, c13, c0, 3 @ yes, set TLS register - movne \tmp1, #0 - mcrne p15, 0, \tmp1, c13, c0, 2 @ clear user r/w TLS register - streq \tp, [\tmp2, #-15] @ set TLS value at 0xffff0ff0 + ldrdne \tmp1, \tmp2, [\tp] + ldreq \tmp1, [\tp] + mcrne p15, 0, \tmp1, c13, c0, 3 @ yes, set user r/o TLS register + mcrne p15, 0, \tmp2, c13, c0, 2 @ set user r/w TLS register + streq \tmp1, [\tmp2, #-15] @ set TLS value at 0xffff0ff0 .endm .macro set_tls_software, tp, tmp1, tmp2 - mov \tmp1, #0xffff0fff - str \tp, [\tmp1, #-15] @ set TLS value at 0xffff0ff0 + ldr \tmp1, [\tp] + mov \tmp2, #0xffff0fff + str \tmp1, [\tmp2, #-15] @ set TLS value at 0xffff0ff0 .endm #endif diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 0f82098..a0a8fe3 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -728,7 +728,7 @@ ENTRY(__switch_to) UNWIND(.fnstart ) UNWIND(.cantunwind ) add ip, r1, #TI_CPU_SAVE - ldr r3, [r2, #TI_TP_VALUE] + add r3, r2, #TI_TP_VALUE ARM( stmia ip!, {r4 - sl, fp, sp, lr} ) @ Store most regs on stack THUMB( stmia ip!, {r4 - sl, fp} ) @ Store most regs on stack THUMB( str sp, [ip], #4 ) diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index c6dec5f..ea298d2 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -400,7 +400,7 @@ copy_thread(unsigned long clone_flags, unsigned long stack_start, clear_ptrace_hw_breakpoint(p); if (clone_flags & CLONE_SETTLS) - thread->tp_value = childregs->ARM_r3; + thread->tp_value[0] = childregs->ARM_r3; thread_notify(THREAD_NOTIFY_COPY, thread); diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c index 03deeff..2bc1514 100644 --- a/arch/arm/kernel/ptrace.c +++ b/arch/arm/kernel/ptrace.c @@ -849,7 +849,7 @@ long arch_ptrace(struct task_struct *child, long request, #endif case PTRACE_GET_THREAD_AREA: - ret = put_user(task_thread_info(child)->tp_value, + ret = put_user(task_thread_info(child)->tp_value[0], datap); break; diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index b0179b8..08b0db9 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -588,7 +588,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs) return regs->ARM_r0; case NR(set_tls): - thread->tp_value = regs->ARM_r0; + thread->tp_value[0] = regs->ARM_r0; if (tls_emu) return 0; if (has_tls_reg) { @@ -706,7 +706,7 @@ static int get_tp_trap(struct pt_regs *regs, unsigned int instr) int reg = (instr >> 12) & 15; if (reg == 15) return 1; - regs->uregs[reg] = current_thread_info()->tp_value; + regs->uregs[reg] = current_thread_info()->tp_value[0]; regs->ARM_pc += 4; return 0; }
WARNING: multiple messages have this Message-ID (diff)
From: will.deacon@arm.com (Will Deacon) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH] arm: Preserve TPIDRURW on context switch Date: Fri, 8 Feb 2013 15:48:09 +0000 [thread overview] Message-ID: <20130208154809.GF3495@mudshark.cambridge.arm.com> (raw) In-Reply-To: <5112E0C3.1080706@dawncrow.de> On Wed, Feb 06, 2013 at 11:01:23PM +0000, Andr? Hentschel wrote: > Am 06.02.2013 23:51, schrieb Russell King - ARM Linux: > > On Wed, Feb 06, 2013 at 11:43:10PM +0100, Andr? Hentschel wrote: > >> There are more and more applications coming to WinRT, Wine could support them, > >> but mostly they expect to have the thread environment block (TEB) in TPIDRURW. > >> This register must be preserved per thread instead of being cleared. > > > > I'd prefer this was done a little more sensitively to those CPUs where > > loads/stores are expensive, namely: > > > >> + > >> + @ preserve TPIDRURW register state > >> + get_tls2 r3, r4, r5 > >> + str r3, [r1, #TI_TP2_VALUE] > >> + ldr r3, [r2, #TI_TP2_VALUE] > >> + set_tls2 r3, r4, r5 > > > > those two loads/stores get omitted from the thread switching if the CPU > > doesn't support it. Do you think that's something you could do? > > No, i'm not sure how to improve this. How does the process can continue, can you or someone else fix that and add his Signed-off-by? How about something like the (completely untested) diff below? Andre: if this works for you, I'm happy to write a commit message etc. Cheers, Will --->8 diff --git a/arch/arm/include/asm/thread_info.h b/arch/arm/include/asm/thread_info.h index cddda1f..d90be6d 100644 --- a/arch/arm/include/asm/thread_info.h +++ b/arch/arm/include/asm/thread_info.h @@ -58,7 +58,7 @@ struct thread_info { struct cpu_context_save cpu_context; /* cpu context */ __u32 syscall; /* syscall number */ __u8 used_cp[16]; /* thread used copro */ - unsigned long tp_value; + unsigned long tp_value[2]; /* TLS registers */ #ifdef CONFIG_CRUNCH struct crunch_state crunchstate; #endif diff --git a/arch/arm/include/asm/tls.h b/arch/arm/include/asm/tls.h index 73409e6..e1b09d32 100644 --- a/arch/arm/include/asm/tls.h +++ b/arch/arm/include/asm/tls.h @@ -6,9 +6,9 @@ .endm .macro set_tls_v6k, tp, tmp1, tmp2 - mcr p15, 0, \tp, c13, c0, 3 @ set TLS register - mov \tmp1, #0 - mcr p15, 0, \tmp1, c13, c0, 2 @ clear user r/w TLS register + ldrd \tmp1, \tmp2, [\tp] + mcr p15, 0, \tmp1, c13, c0, 3 @ set user r/o TLS register + mcr p15, 0, \tmp2, c13, c0, 2 @ set user r/w TLS register .endm .macro set_tls_v6, tp, tmp1, tmp2 @@ -16,15 +16,17 @@ ldr \tmp1, [\tmp1, #0] mov \tmp2, #0xffff0fff tst \tmp1, #HWCAP_TLS @ hardware TLS available? - mcrne p15, 0, \tp, c13, c0, 3 @ yes, set TLS register - movne \tmp1, #0 - mcrne p15, 0, \tmp1, c13, c0, 2 @ clear user r/w TLS register - streq \tp, [\tmp2, #-15] @ set TLS value at 0xffff0ff0 + ldrdne \tmp1, \tmp2, [\tp] + ldreq \tmp1, [\tp] + mcrne p15, 0, \tmp1, c13, c0, 3 @ yes, set user r/o TLS register + mcrne p15, 0, \tmp2, c13, c0, 2 @ set user r/w TLS register + streq \tmp1, [\tmp2, #-15] @ set TLS value at 0xffff0ff0 .endm .macro set_tls_software, tp, tmp1, tmp2 - mov \tmp1, #0xffff0fff - str \tp, [\tmp1, #-15] @ set TLS value at 0xffff0ff0 + ldr \tmp1, [\tp] + mov \tmp2, #0xffff0fff + str \tmp1, [\tmp2, #-15] @ set TLS value at 0xffff0ff0 .endm #endif diff --git a/arch/arm/kernel/entry-armv.S b/arch/arm/kernel/entry-armv.S index 0f82098..a0a8fe3 100644 --- a/arch/arm/kernel/entry-armv.S +++ b/arch/arm/kernel/entry-armv.S @@ -728,7 +728,7 @@ ENTRY(__switch_to) UNWIND(.fnstart ) UNWIND(.cantunwind ) add ip, r1, #TI_CPU_SAVE - ldr r3, [r2, #TI_TP_VALUE] + add r3, r2, #TI_TP_VALUE ARM( stmia ip!, {r4 - sl, fp, sp, lr} ) @ Store most regs on stack THUMB( stmia ip!, {r4 - sl, fp} ) @ Store most regs on stack THUMB( str sp, [ip], #4 ) diff --git a/arch/arm/kernel/process.c b/arch/arm/kernel/process.c index c6dec5f..ea298d2 100644 --- a/arch/arm/kernel/process.c +++ b/arch/arm/kernel/process.c @@ -400,7 +400,7 @@ copy_thread(unsigned long clone_flags, unsigned long stack_start, clear_ptrace_hw_breakpoint(p); if (clone_flags & CLONE_SETTLS) - thread->tp_value = childregs->ARM_r3; + thread->tp_value[0] = childregs->ARM_r3; thread_notify(THREAD_NOTIFY_COPY, thread); diff --git a/arch/arm/kernel/ptrace.c b/arch/arm/kernel/ptrace.c index 03deeff..2bc1514 100644 --- a/arch/arm/kernel/ptrace.c +++ b/arch/arm/kernel/ptrace.c @@ -849,7 +849,7 @@ long arch_ptrace(struct task_struct *child, long request, #endif case PTRACE_GET_THREAD_AREA: - ret = put_user(task_thread_info(child)->tp_value, + ret = put_user(task_thread_info(child)->tp_value[0], datap); break; diff --git a/arch/arm/kernel/traps.c b/arch/arm/kernel/traps.c index b0179b8..08b0db9 100644 --- a/arch/arm/kernel/traps.c +++ b/arch/arm/kernel/traps.c @@ -588,7 +588,7 @@ asmlinkage int arm_syscall(int no, struct pt_regs *regs) return regs->ARM_r0; case NR(set_tls): - thread->tp_value = regs->ARM_r0; + thread->tp_value[0] = regs->ARM_r0; if (tls_emu) return 0; if (has_tls_reg) { @@ -706,7 +706,7 @@ static int get_tp_trap(struct pt_regs *regs, unsigned int instr) int reg = (instr >> 12) & 15; if (reg == 15) return 1; - regs->uregs[reg] = current_thread_info()->tp_value; + regs->uregs[reg] = current_thread_info()->tp_value[0]; regs->ARM_pc += 4; return 0; }
next prev parent reply other threads:[~2013-02-08 15:48 UTC|newest] Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top 2013-02-06 22:43 [PATCH] arm: Preserve TPIDRURW on context switch André Hentschel 2013-02-06 22:43 ` André Hentschel 2013-02-06 22:51 ` Russell King - ARM Linux 2013-02-06 22:51 ` Russell King - ARM Linux 2013-02-06 23:01 ` André Hentschel 2013-02-06 23:01 ` André Hentschel 2013-02-08 15:48 ` Will Deacon [this message] 2013-02-08 15:48 ` Will Deacon 2013-02-08 15:48 ` Will Deacon 2013-02-09 16:44 ` André Hentschel 2013-02-09 16:44 ` André Hentschel 2013-02-09 16:44 ` André Hentschel 2013-02-12 14:02 ` André Hentschel 2013-02-12 14:02 ` André Hentschel 2013-02-12 14:02 ` André Hentschel 2013-02-12 14:09 ` Will Deacon 2013-02-12 14:09 ` Will Deacon 2013-02-12 14:09 ` Will Deacon 2013-02-12 14:14 ` André Hentschel 2013-02-12 14:14 ` André Hentschel 2013-02-12 14:14 ` André Hentschel 2013-02-12 15:02 ` Matthieu CASTET 2013-02-12 15:02 ` Matthieu CASTET 2013-02-20 19:34 ` André Hentschel 2013-02-20 19:34 ` André Hentschel 2013-02-20 19:34 ` André Hentschel 2013-02-21 10:33 ` Will Deacon 2013-02-21 10:33 ` Will Deacon 2013-02-21 10:33 ` Will Deacon
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20130208154809.GF3495@mudshark.cambridge.arm.com \ --to=will.deacon@arm.com \ --cc=gregkh@linuxfoundation.org \ --cc=linux-arch@vger.kernel.org \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux@arm.linux.org.uk \ --cc=nerv@dawncrow.de \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.