x86/ptrace: Use savesegment() in get_segment_reg() instead of inline asm
Subsystems (2)
PATCH 1/1 x86/ptrace: Use savesegment() in get_segment_reg() instead of inline asm
Replace direct 'movl' instructions for DS, ES, FS, and GS read in get_segment_reg() with the savesegment() helper. This improves readability, consistency, and ensures proper handling of segment registers on x86_64.
No functional change intended.
--- arch/x86/kernel/ptrace.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-)
arch/x86/kernel/ptrace.c +9 -10
@@ -251,32 +251,31 @@ static u16 get_segment_reg(struct task_struct *task, unsigned long offset)/* * Returning the value truncates it to 16 bits. */ -unsigned int seg; +unsigned int retval;switch (offset) {case offsetof(struct user_regs_struct , fs):if (task == current) { -/* Older gas can't assemble movq %?s,%r?? */ - asm("movl %%fs,%0" :"=r" (seg)); -return seg; +savesegment (fs, retval); +return retval; }return task->thread.fsindex;case offsetof(struct user_regs_struct , gs):if (task == current) { - asm("movl %%gs,%0" :"=r" (seg)); -return seg; +savesegment (gs, retval); +return retval; }return task->thread.gsindex;case offsetof(struct user_regs_struct , ds):if (task == current) { - asm("movl %%ds,%0" :"=r" (seg)); -return seg; +savesegment (ds, retval); +return retval; }return task->thread.ds;case offsetof(struct user_regs_struct , es):if (task == current) { - asm("movl %%es,%0" :"=r" (seg)); -return seg; +savesegment (es, retval); +return retval; }return task->thread.es;
Signature · 1 line
2.53.0
Oleg Nesterov
maintainerarch/x86/kernel/ptrace.c static u16 get_segment_reg(struct task_struct *task, unsigned long offset) · line 254
Quoted 7 lines · Uros Bizjak
arch/x86/kernel/ptrace.c +1
-1@@ -251,32 +251,31 @@ static u16 get_segment_reg(struct task_struct *task, unsigned long offset)/* * Returning the value truncates it to 16 bits. */ -unsigned int seg; +unsigned int retval;
LGTM, but perhaps it would be better to use "u16 retval" ? and remove the comment.
Oleg.
Quoted 39 lines
arch/x86/kernel/ptrace.c +8
-9switch (offset) {case offsetof(struct user_regs_struct , fs):if (task == current) { -/* Older gas can't assemble movq %?s,%r?? */ - asm("movl %%fs,%0" :"=r" (seg)); -return seg; +savesegment (fs, retval); +return retval; }return task->thread.fsindex;case offsetof(struct user_regs_struct , gs):if (task == current) { - asm("movl %%gs,%0" :"=r" (seg)); -return seg; +savesegment (gs, retval); +return retval; }return task->thread.gsindex;case offsetof(struct user_regs_struct , ds):if (task == current) { - asm("movl %%ds,%0" :"=r" (seg)); -return seg; +savesegment (ds, retval); +return retval; }return task->thread.ds;case offsetof(struct user_regs_struct , es):if (task == current) { - asm("movl %%es,%0" :"=r" (seg)); -return seg; +savesegment (es, retval); +return retval; }return task->thread.es;Signature · 1 line
2.53.0
Quoted 12 lines · Oleg Nesterov
arch/x86/kernel/ptrace.c static u16 get_segment_reg(struct task_struct *task, unsigned long offset) · line 254
Quoted 7 lines · Uros Bizjak
arch/x86/kernel/ptrace.c +1
-1@@ -251,32 +251,31 @@ static u16 get_segment_reg(struct task_struct *task, unsigned long offset)/* * Returning the value truncates it to 16 bits. */ -unsigned int seg; +unsigned int retval;LGTM, but perhaps it would be better to use "u16 retval" ? and remove the comment.
With the new definition of savesegment(), this is actually NOP from the compiler PoV.
There is a corresponding x86_32 get_segment_reg() function that has the same definition of retval, I can prepare a follow-up patch that changes both.
Thanks,
Uros.
Quoted 15 lines · Uros Bizjak
Quoted 12 lines · Oleg Nesterov
Review static u16 get_segment_reg(struct task_struct *task, unsigned long offset) · line 254
Quoted 7 lines · Uros Bizjak
(quoted diff) +1
-1@@ -251,32 +251,31 @@ static u16 get_segment_reg(struct task_struct *task, unsigned long offset) /* * Returning the value truncates it to 16 bits. */ - unsigned int seg; + unsigned int retval;LGTM, but perhaps it would be better to use "u16 retval" ? and remove the comment.
Quoted 6 lines
With the new definition of
savesegment(), this is actually NOP from the compiler PoV.There is a corresponding
x86_32get_segment_reg()function that has the same definition of retval, I can prepare a follow-up patch that changes both.
Something like the attached patch that also slightly unifies x86_32 with x86_64.
Uros.
arch/x86/kernel/ptrace.c +9 -15
@@ -182,19 +182,16 @@ static unsigned long *pt_regs_access(struct pt_regs *regs, unsigned long regno)static u16 get_segment_reg (struct task_struct *task,unsigned long offset) { -/* -* Returning the value truncates it to 16 bits. -*/ -unsigned int retval; -if (offset != offsetof(struct user_regs_struct , gs)) - retval = *pt_regs_access (task_pt_regs (task), offset); -else { -if (task == current) +unsigned short retval; + +if (offset == offsetof(struct user_regs_struct , gs)) { +if (task == current) {savesegment (gs, retval); -else - retval = task->thread.gs; +return retval; + } +return task->thread.gs; } -return retval; +return *pt_regs_access (task_pt_regs (task), offset); } static int set_segment_reg(struct task_struct *task,
@@ -248,10 +245,7 @@ static unsigned long *pt_regs_access(struct pt_regs *regs, unsigned long offset)static u16 get_segment_reg (struct task_struct *task,unsigned long offset) { -/* -* Returning the value truncates it to 16 bits. -*/ -unsigned int retval; +unsigned short retval;switch (offset) {case offsetof(struct user_regs_struct , fs):
Oleg Nesterov
maintainerQuoted 8 lines · Uros Bizjak
Quoted 4 lines · Uros Bizjak
There is a corresponding
x86_32get_segment_reg()function that has the same definition of retval, I can prepare a follow-up patch that changes both.Something like the attached patch that also slightly unifies
x86_32withx86_64.
OK, agreed. And this cleanup looks good to me as well.
Oleg.