x86-32: Clean up GS segment handling
Subsystems (5)
cover x86-32: Clean up GS segment handling
Since commit 3fb0fdb3bbe ("Make the canary into a regular percpu variable"), the GS segment is no longer switched on kernel entry for 32-bit kernels. Clean up the remaining code that handled lazy GS switching.
Brian Gerst (4):
x86-32: Simplify ELF_CORE_COPY_REGS
ELF: Remove elf_core_copy_kernel_regs()
x86-32: Remove lazy GS macros
x86: Merge load_gs_index()
arch/powerpc/kernel/fadump.c | 2 +- arch/powerpc/platforms/powernv/opal-core.c | 2 +- arch/x86/include/asm/elf.h | 15 ++------------- arch/x86/include/asm/mmu_context.h | 2 +- arch/x86/include/asm/segment.h | 12 ------------ arch/x86/include/asm/special_insns.h | 7 ++++--- arch/x86/kernel/process.c | 5 +---- arch/x86/kernel/process_32.c | 11 ++++------- arch/x86/kernel/ptrace.c | 6 +++--- arch/x86/kernel/signal.c | 8 +++++--- arch/x86/kernel/vm86_32.c | 4 ++-- arch/x86/lib/insn-eval.c | 5 +++-- arch/x86/math-emu/get_address.c | 2 +- include/linux/elfcore.h | 9 --------- kernel/kexec_core.c | 2 +- 15 files changed, 29 insertions(+), 63 deletions(-)
Signature · 1 line
2.35.1
PATCH 1/4 x86-32: Simplify ELF_CORE_COPY_REGS
GS is now always a user segment, so there is no difference between user and kernel registers.
--- arch/x86/include/asm/elf.h | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
arch/x86/include/asm/elf.h +2 -13
@@ -116,7 +116,7 @@ extern unsigned int vdso32_enabled;* now struct_user_regs, they are different) */ -#define ELF_CORE_COPY_REGS_COMMON (pr_reg, regs) \ +#define ELF_CORE_COPY_REGS (pr_reg, regs) \ do { \ pr_reg[0] = regs->bx; \ pr_reg[1] = regs->cx; \
@@ -128,6 +128,7 @@ do { \ pr_reg[7 ] = regs->ds; \ pr_reg[8 ] = regs->es; \ pr_reg[9 ] = regs->fs; \ +savesegment (gs, pr_reg[10 ]); \ pr_reg[11 ] = regs->orig_ax; \ pr_reg[12 ] = regs->ip; \ pr_reg[13 ] = regs->cs; \
@@ -136,18 +137,6 @@ do { \ pr_reg[16 ] = regs->ss; \ }while (0 ); -#define ELF_CORE_COPY_REGS (pr_reg, regs) \ -do { \ - ELF_CORE_COPY_REGS_COMMON(pr_reg, regs);\ - pr_reg[10] = get_user_gs(regs); \ -} while (0); - -#define ELF_CORE_COPY_KERNEL_REGS (pr_reg, regs) \ -do { \ - ELF_CORE_COPY_REGS_COMMON(pr_reg, regs);\ - savesegment(gs, pr_reg[10]); \ -} while (0); -#define ELF_PLATFORM (utsname()->machine)#define set_personality_64bit () do { } while (0)
Signature · 1 line
2.35.1
[tip: x86/core] x86/32: Simplify ELF_CORE_COPY_REGS
The following commit has been merged into the x86/core branch of tip:
The following commit has been merged into the x86/core branch of tip:
Commit-ID: f5d9283ecb33329073033029fe427155aa0abfb1 Gitweb: https://git.kernel.org/tip/f5d9283ecb33329073033029fe427155aa0abfb1 Author: Brian Gerst <[email protected]> AuthorDate: Fri, 25 Mar 2022 11:39:50 -04:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Tue, 12 Apr 2022 15:42:59 +02:00
x86/32: Simplify ELF_CORE_COPY_REGS
GS is now always a user segment, so there is no difference between user and kernel registers.
--- arch/x86/include/asm/elf.h | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-)
arch/x86/include/asm/elf.h +2 -13
@@ -116,7 +116,7 @@ extern unsigned int vdso32_enabled;* now struct_user_regs, they are different) */ -#define ELF_CORE_COPY_REGS_COMMON (pr_reg, regs) \ +#define ELF_CORE_COPY_REGS (pr_reg, regs) \ do { \ pr_reg[0] = regs->bx; \ pr_reg[1] = regs->cx; \
@@ -128,6 +128,7 @@ do { \ pr_reg[7 ] = regs->ds; \ pr_reg[8 ] = regs->es; \ pr_reg[9 ] = regs->fs; \ +savesegment (gs, pr_reg[10 ]); \ pr_reg[11 ] = regs->orig_ax; \ pr_reg[12 ] = regs->ip; \ pr_reg[13 ] = regs->cs; \
@@ -136,18 +137,6 @@ do { \ pr_reg[16 ] = regs->ss; \ }while (0 ); -#define ELF_CORE_COPY_REGS (pr_reg, regs) \ -do { \ - ELF_CORE_COPY_REGS_COMMON(pr_reg, regs);\ - pr_reg[10] = get_user_gs(regs); \ -} while (0); - -#define ELF_CORE_COPY_KERNEL_REGS (pr_reg, regs) \ -do { \ - ELF_CORE_COPY_REGS_COMMON(pr_reg, regs);\ - savesegment(gs, pr_reg[10]); \ -} while (0); -#define ELF_PLATFORM (utsname()->machine)#define set_personality_64bit () do { } while (0)
PATCH 2/4 ELF: Remove elf_core_copy_kernel_regs()
In reply to Brian Gerstx86-32 was the last architecture that implemented separate user and kernel registers.
--- arch/powerpc/kernel/fadump.c | 2 +- arch/powerpc/platforms/powernv/opal-core.c | 2 +- include/linux/elfcore.h | 9 --------- kernel/kexec_core.c | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-)
arch/powerpc/kernel/fadump.c +1 -1
@@ -752,7 +752,7 @@ u32 *__init fadump_regs_to_elf_notes(u32 *buf, struct pt_regs *regs)* FIXME: How do i get PID? Do I really need it? * prstatus.pr_pid = ???? */ -elf_core_copy_kernel_regs (&prstatus.pr_reg, regs); +elf_core_copy_regs (&prstatus.pr_reg, regs); buf =append_elf_note (buf,CRASH_CORE_NOTE_NAME ,NT_PRSTATUS , &prstatus,sizeof (prstatus));return buf;
arch/powerpc/platforms/powernv/opal-core.c +1 -1
@@ -112,7 +112,7 @@ static void __init fill_prstatus(struct elf_prstatus *prstatus, int pir, struct pt_regs *regs) {memset (prstatus,0 ,sizeof (struct elf_prstatus )); -elf_core_copy_kernel_regs (&(prstatus->pr_reg), regs); +elf_core_copy_regs (&(prstatus->pr_reg), regs);/* * Overload PID with PIR value.
include/linux/elfcore.h +0 -9
@@ -84,15 +84,6 @@ static inline void elf_core_copy_regs(elf_gregset_t *elfregs, struct pt_regs *re#endif } -static inline void elf_core_copy_kernel_regs (elf_gregset_t *elfregs,struct pt_regs *regs) -{ -#ifdef ELF_CORE_COPY_KERNEL_REGS -ELF_CORE_COPY_KERNEL_REGS ((*elfregs), regs); -#else -elf_core_copy_regs (elfregs, regs); -#endif -} -static inline int elf_core_copy_task_regs (struct task_struct *t,elf_gregset_t * elfregs) {#if defined (ELF_CORE_COPY_TASK_REGS )
kernel/kexec_core.c +1 -1
@@ -1078,7 +1078,7 @@ void crash_save_cpu(struct pt_regs *regs, int cpu)return ;memset (&prstatus,0 ,sizeof (prstatus)); prstatus.common.pr_pid = current->pid; -elf_core_copy_kernel_regs (&prstatus.pr_reg, regs); +elf_core_copy_regs (&prstatus.pr_reg, regs); buf =append_elf_note (buf,KEXEC_CORE_NOTE_NAME ,NT_PRSTATUS , &prstatus,sizeof (prstatus));final_note (buf);
Signature · 1 line
2.35.1
Borislav Petkov
maintainerRe: [PATCH 2/4] ELF: Remove elf_core_copy_kernel_regs()
+ PPC ML as an FYI that this change will come through tip.
Quoted 73 lines · Brian Gerst
x86-32 was the last architecture that implemented separate user and kernel registers.
Signed-off-by Brian Gerst <[email protected]>--- arch/powerpc/kernel/fadump.c | 2 +- arch/powerpc/platforms/powernv/opal-core.c | 2 +- include/linux/elfcore.h | 9 --------- kernel/kexec_core.c | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-)arch/powerpc/kernel/fadump.c +1
-1@@ -752,7 +752,7 @@ u32 *__init fadump_regs_to_elf_notes(u32 *buf, struct pt_regs *regs)* FIXME: How do i get PID? Do I really need it? * prstatus.pr_pid = ???? */ -elf_core_copy_kernel_regs (&prstatus.pr_reg, regs); +elf_core_copy_regs (&prstatus.pr_reg, regs); buf =append_elf_note (buf,CRASH_CORE_NOTE_NAME ,NT_PRSTATUS , &prstatus,sizeof (prstatus));return buf;arch/powerpc/platforms/powernv/opal-core.c +1
-1@@ -112,7 +112,7 @@ static void __init fill_prstatus(struct elf_prstatus *prstatus, int pir, struct pt_regs *regs) {memset (prstatus,0 ,sizeof (struct elf_prstatus )); -elf_core_copy_kernel_regs (&(prstatus->pr_reg), regs); +elf_core_copy_regs (&(prstatus->pr_reg), regs);/* * Overload PID with PIR value. include/linux/elfcore.h +0
-9@@ -84,15 +84,6 @@ static inline void elf_core_copy_regs(elf_gregset_t *elfregs, struct pt_regs *re#endif } -static inline void elf_core_copy_kernel_regs (elf_gregset_t *elfregs,struct pt_regs *regs) -{ -#ifdef ELF_CORE_COPY_KERNEL_REGS -ELF_CORE_COPY_KERNEL_REGS ((*elfregs), regs); -#else -elf_core_copy_regs (elfregs, regs); -#endif -} -static inline int elf_core_copy_task_regs (struct task_struct *t,elf_gregset_t * elfregs) {#if defined (ELF_CORE_COPY_TASK_REGS )kernel/kexec_core.c +1
-1@@ -1078,7 +1078,7 @@ void crash_save_cpu(struct pt_regs *regs, int cpu)return ;memset (&prstatus,0 ,sizeof (prstatus)); prstatus.common.pr_pid = current->pid; -elf_core_copy_kernel_regs (&prstatus.pr_reg, regs); +elf_core_copy_regs (&prstatus.pr_reg, regs); buf =append_elf_note (buf,KEXEC_CORE_NOTE_NAME ,NT_PRSTATUS , &prstatus,sizeof (prstatus));final_note (buf);Signature · 1 line
2.35.1
Signature · 4 lines
Regards/Gruss,
Boris.
https://people.kernel.org/tglx/notes-about-netiquetteMichael Ellerman
reviewerRe: [PATCH 2/4] ELF: Remove elf_core_copy_kernel_regs()
Quoted 1 line · Borislav Petkov
+ PPC ML as an FYI that this change will come through tip.
Ack.
cheers
Quoted 80 lines · Brian Gerst
Quoted 73 lines
x86-32 was the last architecture that implemented separate user and kernel registers.
Signed-off-by Brian Gerst <[email protected]>--- arch/powerpc/kernel/fadump.c | 2 +- arch/powerpc/platforms/powernv/opal-core.c | 2 +- include/linux/elfcore.h | 9 --------- kernel/kexec_core.c | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-)arch/powerpc/kernel/fadump.c +1
-1@@ -752,7 +752,7 @@ u32 *__init fadump_regs_to_elf_notes(u32 *buf, struct pt_regs *regs)* FIXME: How do i get PID? Do I really need it? * prstatus.pr_pid = ???? */ -elf_core_copy_kernel_regs (&prstatus.pr_reg, regs); +elf_core_copy_regs (&prstatus.pr_reg, regs); buf =append_elf_note (buf,CRASH_CORE_NOTE_NAME ,NT_PRSTATUS , &prstatus,sizeof (prstatus));return buf;arch/powerpc/platforms/powernv/opal-core.c +1
-1@@ -112,7 +112,7 @@ static void __init fill_prstatus(struct elf_prstatus *prstatus, int pir, struct pt_regs *regs) {memset (prstatus,0 ,sizeof (struct elf_prstatus )); -elf_core_copy_kernel_regs (&(prstatus->pr_reg), regs); +elf_core_copy_regs (&(prstatus->pr_reg), regs);/* * Overload PID with PIR value. include/linux/elfcore.h +0
-9@@ -84,15 +84,6 @@ static inline void elf_core_copy_regs(elf_gregset_t *elfregs, struct pt_regs *re#endif } -static inline void elf_core_copy_kernel_regs (elf_gregset_t *elfregs,struct pt_regs *regs) -{ -#ifdef ELF_CORE_COPY_KERNEL_REGS -ELF_CORE_COPY_KERNEL_REGS ((*elfregs), regs); -#else -elf_core_copy_regs (elfregs, regs); -#endif -} -static inline int elf_core_copy_task_regs (struct task_struct *t,elf_gregset_t * elfregs) {#if defined (ELF_CORE_COPY_TASK_REGS )kernel/kexec_core.c +1
-1@@ -1078,7 +1078,7 @@ void crash_save_cpu(struct pt_regs *regs, int cpu)return ;memset (&prstatus,0 ,sizeof (prstatus)); prstatus.common.pr_pid = current->pid; -elf_core_copy_kernel_regs (&prstatus.pr_reg, regs); +elf_core_copy_regs (&prstatus.pr_reg, regs); buf =append_elf_note (buf,KEXEC_CORE_NOTE_NAME ,NT_PRSTATUS , &prstatus,sizeof (prstatus));final_note (buf);Signature · 1 line
2.35.1Signature · 4 lines
Regards/Gruss, Boris. https://people.kernel.org/tglx/notes-about-netiquette
[tip: x86/core] ELF: Remove elf_core_copy_kernel_regs()
In reply to Brian GerstThe following commit has been merged into the x86/core branch of tip:
The following commit has been merged into the x86/core branch of tip:
Commit-ID: 9554e908fb5d02e48a681d1eca180225bf109e83 Gitweb: https://git.kernel.org/tip/9554e908fb5d02e48a681d1eca180225bf109e83 Author: Brian Gerst <[email protected]> AuthorDate: Fri, 25 Mar 2022 11:39:51 -04:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Thu, 14 Apr 2022 14:08:26 +02:00
ELF: Remove elf_core_copy_kernel_regs()
x86-32 was the last architecture that implemented separate user and kernel registers.
--- arch/powerpc/kernel/fadump.c | 2 +- arch/powerpc/platforms/powernv/opal-core.c | 2 +- include/linux/elfcore.h | 9 --------- kernel/kexec_core.c | 2 +- 4 files changed, 3 insertions(+), 12 deletions(-)
arch/powerpc/kernel/fadump.c +1 -1
@@ -752,7 +752,7 @@ u32 *__init fadump_regs_to_elf_notes(u32 *buf, struct pt_regs *regs)* FIXME: How do i get PID? Do I really need it? * prstatus.pr_pid = ???? */ -elf_core_copy_kernel_regs (&prstatus.pr_reg, regs); +elf_core_copy_regs (&prstatus.pr_reg, regs); buf =append_elf_note (buf,CRASH_CORE_NOTE_NAME ,NT_PRSTATUS , &prstatus,sizeof (prstatus));return buf;
arch/powerpc/platforms/powernv/opal-core.c +1 -1
@@ -112,7 +112,7 @@ static void __init fill_prstatus(struct elf_prstatus *prstatus, int pir, struct pt_regs *regs) {memset (prstatus,0 ,sizeof (struct elf_prstatus )); -elf_core_copy_kernel_regs (&(prstatus->pr_reg), regs); +elf_core_copy_regs (&(prstatus->pr_reg), regs);/* * Overload PID with PIR value.
include/linux/elfcore.h +0 -9
@@ -84,15 +84,6 @@ static inline void elf_core_copy_regs(elf_gregset_t *elfregs, struct pt_regs *re#endif } -static inline void elf_core_copy_kernel_regs (elf_gregset_t *elfregs,struct pt_regs *regs) -{ -#ifdef ELF_CORE_COPY_KERNEL_REGS -ELF_CORE_COPY_KERNEL_REGS ((*elfregs), regs); -#else -elf_core_copy_regs (elfregs, regs); -#endif -} -static inline int elf_core_copy_task_regs (struct task_struct *t,elf_gregset_t * elfregs) {#if defined (ELF_CORE_COPY_TASK_REGS )
kernel/kexec_core.c +1 -1
@@ -1078,7 +1078,7 @@ void crash_save_cpu(struct pt_regs *regs, int cpu)return ;memset (&prstatus,0 ,sizeof (prstatus)); prstatus.common.pr_pid = current->pid; -elf_core_copy_kernel_regs (&prstatus.pr_reg, regs); +elf_core_copy_regs (&prstatus.pr_reg, regs); buf =append_elf_note (buf,KEXEC_CORE_NOTE_NAME ,NT_PRSTATUS , &prstatus,sizeof (prstatus));final_note (buf);
PATCH 3/4 x86-32: Remove lazy GS macros
In reply to Brian GerstGS is always a user segment now.
--- arch/x86/include/asm/mmu_context.h | 2 +- arch/x86/include/asm/segment.h | 5 ----- arch/x86/kernel/process.c | 5 +---- arch/x86/kernel/process_32.c | 11 ++++------- arch/x86/kernel/ptrace.c | 6 +++--- arch/x86/kernel/signal.c | 8 +++++--- arch/x86/kernel/vm86_32.c | 4 ++-- arch/x86/lib/insn-eval.c | 5 +++-- arch/x86/math-emu/get_address.c | 2 +- 9 files changed, 20 insertions(+), 28 deletions(-)
arch/x86/include/asm/mmu_context.h +1 -1
@@ -141,7 +141,7 @@ do { \#ifdef CONFIG_X86_32 #define deactivate_mm (tsk, mm) \ do { \ - lazy_load_gs(0); \ + loadsegment(gs, 0); \ } while (0)#else #define deactivate_mm (tsk, mm) \
arch/x86/include/asm/segment.h +0 -5
@@ -354,11 +354,6 @@ static inline void __loadsegment_fs(unsigned short value)* x86-32 user GS accessors. This is ugly and could do with some cleaning up. */ #ifdef CONFIG_X86_32 -# define get_user_gs (regs) (u16)({ unsigned long v; savesegment(gs, v); v; }) -# define set_user_gs (regs, v) loadsegment(gs, (unsigned long)(v)) -# define task_user_gs (tsk) ((tsk)->thread.gs) -# define lazy_save_gs (v) savesegment(gs, (v)) -# define lazy_load_gs (v) loadsegment(gs, (v))# define load_gs_index (v) loadsegment(gs, (v))#endif /* X86_32 */
arch/x86/kernel/process.c +1 -4
@@ -160,6 +160,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, unsigned long arg,savesegment (ds, p->thread.ds);#else p->thread.sp0 = (unsigned long ) (childregs +1 ); +savesegment (gs, p->thread.gs);/* * Clear all status flags including IF and set fixed bit. 64bit * does not have this initialization as the frame does not contain
@@ -191,10 +192,6 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, unsigned long arg,if (sp) childregs->sp = sp; -#ifdef CONFIG_X86_32 -task_user_gs (p) =get_user_gs (current_pt_regs ()); -#endif -if (unlikely (p->flags &PF_IO_WORKER )) {/* * An IO thread is a user space thread, but it doesn't
arch/x86/kernel/process_32.c +4 -7
@@ -63,10 +63,7 @@ void __show_regs(struct pt_regs *regs, enum show_regs_mode mode,unsigned long d0, d1, d2, d3, d6, d7;unsigned short gs; -if (user_mode (regs)) - gs =get_user_gs (regs); -else -savesegment (gs, gs); +savesegment (gs, gs);show_ip (regs, log_lvl);
@@ -114,7 +111,7 @@ void release_thread(struct task_struct *dead_task)void start_thread (struct pt_regs *regs,unsigned long new_ip,unsigned long new_sp) { -set_user_gs (regs,0 ); +loadsegment (gs,0 ); regs->fs =0 ; regs->ds = __USER_DS; regs->es = __USER_DS;
@@ -177,7 +174,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)* used %fs or %gs (it does not today), or if the kernel is * running inside of a hypervisor layer. */ -lazy_save_gs (prev->gs); +savesegment (gs, prev->gs);/* * Load the per-thread Thread-Local Storage descriptor.
@@ -208,7 +205,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)* Restore %gs if needed (which is common) */ if (prev->gs | next->gs) -lazy_load_gs (next->gs); +loadsegment (gs, next->gs);this_cpu_write (current_task, next_p);
arch/x86/kernel/ptrace.c +3 -3
@@ -171,9 +171,9 @@ static u16 get_segment_reg(struct task_struct *task, unsigned long offset) retval = *pt_regs_access (task_pt_regs (task), offset); else {if (task == current) - retval =get_user_gs (task_pt_regs (task)); +savesegment (gs, retval);else - retval =task_user_gs (task); + retval = task->thread.gs; }return retval; }
@@ -211,7 +211,7 @@ static int set_segment_reg(struct task_struct *task,break ;case offsetof(struct user_regs_struct , gs): -task_user_gs (task) = value; + task->thread.gs = value; }return 0 ;
arch/x86/kernel/signal.c +5 -3
@@ -94,7 +94,7 @@ static bool restore_sigcontext(struct pt_regs *regs,return false;#ifdef CONFIG_X86_32 -set_user_gs (regs, sc.gs); +loadsegment (gs, sc.gs); regs->fs = sc.fs; regs->es = sc.es; regs->ds = sc.ds;
@@ -147,8 +147,10 @@ __unsafe_setup_sigcontext(struct sigcontext __user *sc, void __user *fpstate, struct pt_regs *regs, unsigned long mask) {#ifdef CONFIG_X86_32 -unsafe_put_user (get_user_gs (regs), - (unsigned int __user *)&sc->gs, Efault); +unsigned int gs; +savesegment (gs, gs); + +unsafe_put_user (gs, (unsigned int __user *)&sc->gs, Efault);unsafe_put_user (regs->fs, (unsigned int __user *)&sc->fs, Efault);unsafe_put_user (regs->es, (unsigned int __user *)&sc->es, Efault);unsafe_put_user (regs->ds, (unsigned int __user *)&sc->ds, Efault);
arch/x86/kernel/vm86_32.c +2 -2
@@ -151,7 +151,7 @@ void save_v86_state(struct kernel_vm86_regs *regs, int retval)memcpy (®s->pt, &vm86->regs32,sizeof (struct pt_regs )); -lazy_load_gs (vm86->regs32.gs); +loadsegment (gs, vm86->regs32.gs); regs->pt.ax = retval;return ;
@@ -325,7 +325,7 @@ static long do_sys_vm86(struct vm86plus_struct __user *user_vm86, bool plus)* Save old state */ vm86->saved_sp0 = tsk->thread.sp0; -lazy_save_gs (vm86->regs32.gs); +savesegment (gs, vm86->regs32.gs);/* make room for real-mode segments */ preempt_disable ();
arch/x86/lib/insn-eval.c +3 -2
@@ -342,9 +342,9 @@ static int resolve_seg_reg(struct insn *insn, struct pt_regs *regs, int regoff)*/ static short get_segment_selector (struct pt_regs *regs,int seg_reg_idx) { -#ifdef CONFIG_X86_64 unsigned short sel; +#ifdef CONFIG_X86_64 switch (seg_reg_idx) {case INAT_SEG_REG_IGNORE :return 0 ;
@@ -402,7 +402,8 @@ static short get_segment_selector(struct pt_regs *regs, int seg_reg_idx)case INAT_SEG_REG_FS :return (unsigned short )(regs->fs &0xffff );case INAT_SEG_REG_GS : -return get_user_gs (regs); +savesegment (gs, sel); +return sel;case INAT_SEG_REG_IGNORE :default :return -EINVAL ;
arch/x86/math-emu/get_address.c +1 -1
@@ -153,7 +153,7 @@ static long pm_address(u_char FPU_modrm, u_char segment,switch (segment) {case PREFIX_GS_ -1 :/* user gs handling can be lazy, use special accessors */ - addr->selector =get_user_gs (FPU_info->regs); +savesegment (gs, addr->selector);break ;default : addr->selector =PM_REG_ (segment);
Signature · 1 line
2.35.1
[tip: x86/core] x86/32: Remove lazy GS macros
The following commit has been merged into the x86/core branch of tip:
The following commit has been merged into the x86/core branch of tip:
Commit-ID: 3a24a60854d2ef19e0edcd11cdbbb4fabc655dde Gitweb: https://git.kernel.org/tip/3a24a60854d2ef19e0edcd11cdbbb4fabc655dde Author: Brian Gerst <[email protected]> AuthorDate: Fri, 25 Mar 2022 11:39:52 -04:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Thu, 14 Apr 2022 14:09:43 +02:00
x86/32: Remove lazy GS macros
GS is always a user segment now.
--- arch/x86/include/asm/mmu_context.h | 2 +- arch/x86/include/asm/segment.h | 5 ----- arch/x86/kernel/process.c | 5 +---- arch/x86/kernel/process_32.c | 11 ++++------- arch/x86/kernel/ptrace.c | 6 +++--- arch/x86/kernel/signal.c | 8 +++++--- arch/x86/kernel/vm86_32.c | 4 ++-- arch/x86/lib/insn-eval.c | 5 +++-- arch/x86/math-emu/get_address.c | 2 +- 9 files changed, 20 insertions(+), 28 deletions(-)
arch/x86/include/asm/mmu_context.h +1 -1
@@ -141,7 +141,7 @@ do { \#ifdef CONFIG_X86_32 #define deactivate_mm (tsk, mm) \ do { \ - lazy_load_gs(0); \ + loadsegment(gs, 0); \ } while (0)#else #define deactivate_mm (tsk, mm) \
arch/x86/include/asm/segment.h +0 -5
@@ -354,11 +354,6 @@ static inline void __loadsegment_fs(unsigned short value)* x86-32 user GS accessors. This is ugly and could do with some cleaning up. */ #ifdef CONFIG_X86_32 -# define get_user_gs (regs) (u16)({ unsigned long v; savesegment(gs, v); v; }) -# define set_user_gs (regs, v) loadsegment(gs, (unsigned long)(v)) -# define task_user_gs (tsk) ((tsk)->thread.gs) -# define lazy_save_gs (v) savesegment(gs, (v)) -# define lazy_load_gs (v) loadsegment(gs, (v))# define load_gs_index (v) loadsegment(gs, (v))#endif /* X86_32 */
arch/x86/kernel/process.c +1 -4
@@ -160,6 +160,7 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, unsigned long arg,savesegment (ds, p->thread.ds);#else p->thread.sp0 = (unsigned long ) (childregs +1 ); +savesegment (gs, p->thread.gs);/* * Clear all status flags including IF and set fixed bit. 64bit * does not have this initialization as the frame does not contain
@@ -191,10 +192,6 @@ int copy_thread(unsigned long clone_flags, unsigned long sp, unsigned long arg,if (sp) childregs->sp = sp; -#ifdef CONFIG_X86_32 -task_user_gs (p) =get_user_gs (current_pt_regs ()); -#endif -if (unlikely (p->flags &PF_IO_WORKER )) {/* * An IO thread is a user space thread, but it doesn't
arch/x86/kernel/process_32.c +4 -7
@@ -63,10 +63,7 @@ void __show_regs(struct pt_regs *regs, enum show_regs_mode mode,unsigned long d0, d1, d2, d3, d6, d7;unsigned short gs; -if (user_mode (regs)) - gs =get_user_gs (regs); -else -savesegment (gs, gs); +savesegment (gs, gs);show_ip (regs, log_lvl);
@@ -114,7 +111,7 @@ void release_thread(struct task_struct *dead_task)void start_thread (struct pt_regs *regs,unsigned long new_ip,unsigned long new_sp) { -set_user_gs (regs,0 ); +loadsegment (gs,0 ); regs->fs =0 ; regs->ds = __USER_DS; regs->es = __USER_DS;
@@ -177,7 +174,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)* used %fs or %gs (it does not today), or if the kernel is * running inside of a hypervisor layer. */ -lazy_save_gs (prev->gs); +savesegment (gs, prev->gs);/* * Load the per-thread Thread-Local Storage descriptor.
@@ -208,7 +205,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p)* Restore %gs if needed (which is common) */ if (prev->gs | next->gs) -lazy_load_gs (next->gs); +loadsegment (gs, next->gs);this_cpu_write (current_task, next_p);
arch/x86/kernel/ptrace.c +3 -3
@@ -170,9 +170,9 @@ static u16 get_segment_reg(struct task_struct *task, unsigned long offset) retval = *pt_regs_access (task_pt_regs (task), offset); else {if (task == current) - retval =get_user_gs (task_pt_regs (task)); +savesegment (gs, retval);else - retval =task_user_gs (task); + retval = task->thread.gs; }return retval; }
@@ -210,7 +210,7 @@ static int set_segment_reg(struct task_struct *task,break ;case offsetof(struct user_regs_struct , gs): -task_user_gs (task) = value; + task->thread.gs = value; }return 0 ;
arch/x86/kernel/signal.c +5 -3
@@ -93,7 +93,7 @@ static bool restore_sigcontext(struct pt_regs *regs,return false;#ifdef CONFIG_X86_32 -set_user_gs (regs, sc.gs); +loadsegment (gs, sc.gs); regs->fs = sc.fs; regs->es = sc.es; regs->ds = sc.ds;
@@ -146,8 +146,10 @@ __unsafe_setup_sigcontext(struct sigcontext __user *sc, void __user *fpstate, struct pt_regs *regs, unsigned long mask) {#ifdef CONFIG_X86_32 -unsafe_put_user (get_user_gs (regs), - (unsigned int __user *)&sc->gs, Efault); +unsigned int gs; +savesegment (gs, gs); + +unsafe_put_user (gs, (unsigned int __user *)&sc->gs, Efault);unsafe_put_user (regs->fs, (unsigned int __user *)&sc->fs, Efault);unsafe_put_user (regs->es, (unsigned int __user *)&sc->es, Efault);unsafe_put_user (regs->ds, (unsigned int __user *)&sc->ds, Efault);
arch/x86/kernel/vm86_32.c +2 -2
@@ -151,7 +151,7 @@ exit_vm86:memcpy (®s->pt, &vm86->regs32,sizeof (struct pt_regs )); -lazy_load_gs (vm86->regs32.gs); +loadsegment (gs, vm86->regs32.gs); regs->pt.ax = retval;return ;
@@ -325,7 +325,7 @@ static long do_sys_vm86(struct vm86plus_struct __user *user_vm86, bool plus)* Save old state */ vm86->saved_sp0 = tsk->thread.sp0; -lazy_save_gs (vm86->regs32.gs); +savesegment (gs, vm86->regs32.gs);/* make room for real-mode segments */ preempt_disable ();
arch/x86/lib/insn-eval.c +3 -2
@@ -342,9 +342,9 @@ static int resolve_seg_reg(struct insn *insn, struct pt_regs *regs, int regoff)*/ static short get_segment_selector (struct pt_regs *regs,int seg_reg_idx) { -#ifdef CONFIG_X86_64 unsigned short sel; +#ifdef CONFIG_X86_64 switch (seg_reg_idx) {case INAT_SEG_REG_IGNORE :return 0 ;
@@ -402,7 +402,8 @@ static short get_segment_selector(struct pt_regs *regs, int seg_reg_idx)case INAT_SEG_REG_FS :return (unsigned short )(regs->fs &0xffff );case INAT_SEG_REG_GS : -return get_user_gs (regs); +savesegment (gs, sel); +return sel;case INAT_SEG_REG_IGNORE :default :return -EINVAL ;
arch/x86/math-emu/get_address.c +1 -1
@@ -153,7 +153,7 @@ static long pm_address(u_char FPU_modrm, u_char segment,switch (segment) {case PREFIX_GS_ -1 :/* user gs handling can be lazy, use special accessors */ - addr->selector =get_user_gs (FPU_info->regs); +savesegment (gs, addr->selector);break ;default : addr->selector =PM_REG_ (segment);
PATCH 4/4 x86: Merge load_gs_index()
In reply to Brian GerstMerge the 32- and 64-bit implementations of load_gs_index().
--- arch/x86/include/asm/segment.h | 7 ------- arch/x86/include/asm/special_insns.h | 7 ++++--- 2 files changed, 4 insertions(+), 10 deletions(-)
arch/x86/include/asm/segment.h +0 -7
@@ -350,13 +350,6 @@ static inline void __loadsegment_fs(unsigned short value)#define savesegment (seg, value) \ asm("mov %%" #seg ",%0":"=r" (value) : : "memory") -/* -* x86-32 user GS accessors. This is ugly and could do with some cleaning up. -*/ -#ifdef CONFIG_X86_32 -# define load_gs_index (v) loadsegment(gs, (v)) -#endif /* X86_32 */ -#endif /* !__ASSEMBLY__ */ #endif /* __KERNEL__ */
arch/x86/include/asm/special_insns.h +4 -3
@@ -184,14 +184,15 @@ static inline void wbinvd(void) native_wbinvd(); } -#ifdef CONFIG_X86_64 static inline void load_gs_index (unsigned int selector) { +#ifdef CONFIG_X86_64 native_load_gs_index (selector); -} - +#else +loadsegment (gs, selector);#endif +}#endif /* CONFIG_PARAVIRT_XXL */
Signature · 1 line
2.35.1
[tip: x86/core] x86/asm: Merge load_gs_index()
The following commit has been merged into the x86/core branch of tip:
The following commit has been merged into the x86/core branch of tip:
Commit-ID: 203d8919a9eda5d1bc68ac3cd7637588334c9dc1 Gitweb: https://git.kernel.org/tip/203d8919a9eda5d1bc68ac3cd7637588334c9dc1 Author: Brian Gerst <[email protected]> AuthorDate: Fri, 25 Mar 2022 11:39:53 -04:00 Committer: Borislav Petkov <[email protected]> CommitterDate: Thu, 14 Apr 2022 14:15:54 +02:00
x86/asm: Merge load_gs_index()
Merge the 32- and 64-bit implementations of load_gs_index().
--- arch/x86/include/asm/segment.h | 7 ------- arch/x86/include/asm/special_insns.h | 7 ++++--- 2 files changed, 4 insertions(+), 10 deletions(-)
arch/x86/include/asm/segment.h +0 -7
@@ -350,13 +350,6 @@ static inline void __loadsegment_fs(unsigned short value)#define savesegment (seg, value) \ asm("mov %%" #seg ",%0":"=r" (value) : : "memory") -/* -* x86-32 user GS accessors. This is ugly and could do with some cleaning up. -*/ -#ifdef CONFIG_X86_32 -# define load_gs_index (v) loadsegment(gs, (v)) -#endif /* X86_32 */ -#endif /* !__ASSEMBLY__ */ #endif /* __KERNEL__ */
arch/x86/include/asm/special_insns.h +4 -3
@@ -184,14 +184,15 @@ static inline void wbinvd(void) native_wbinvd(); } -#ifdef CONFIG_X86_64 static inline void load_gs_index (unsigned int selector) { +#ifdef CONFIG_X86_64 native_load_gs_index (selector); -} - +#else +loadsegment (gs, selector);#endif +}#endif /* CONFIG_PARAVIRT_XXL */
Quoted 5 lines · Brian Gerst
Since commit
3fb0fdb3bbe("Make the canary into a regular percpu variable"), the GS segment is no longer switched on kernel entry for 32-bit kernels. Clean up the remaining code that handled lazy GS switching.
Thanks!
Quoted 23 lines
Brian Gerst (4):
x86-32: SimplifyELF_CORE_COPY_REGS
ELF: Removeelf_core_copy_kernel_regs()
x86-32: Remove lazy GS macros
x86: Mergeload_gs_index()arch/powerpc/kernel/fadump.c | 2 +- arch/powerpc/platforms/powernv/opal-core.c | 2 +- arch/x86/include/asm/elf.h | 15 ++------------- arch/x86/include/asm/mmu_context.h | 2 +- arch/x86/include/asm/segment.h | 12 ------------ arch/x86/include/asm/special_insns.h | 7 ++++--- arch/x86/kernel/process.c | 5 +---- arch/x86/kernel/process_32.c | 11 ++++------- arch/x86/kernel/ptrace.c | 6 +++--- arch/x86/kernel/signal.c | 8 +++++--- arch/x86/kernel/vm86_32.c | 4 ++-- arch/x86/lib/insn-eval.c | 5 +++-- arch/x86/math-emu/get_address.c | 2 +- include/linux/elfcore.h | 9 --------- kernel/kexec_core.c | 2 +- 15 files changed, 29 insertions(+), 63 deletions(-)
Quoted 4 lines · Brian Gerst
Since commit
3fb0fdb3bbe("Make the canary into a regular percpu variable"), the GS segment is no longer switched on kernel entry for 32-bit kernels. Clean up the remaining code that handled lazy GS switching.