Re: [PATCHv3 2/2] x86: rename is_{ia32,x32}_task to in_{ia32,x32}_syscall

[Andy Lutomirski]

On Fri, Apr 15, 2016 at 6:20 AM, Dmitry Safonov <dsafonov@xxxxxxxxxxxxx> wrote:
> Impact: clearify meaning
>
> Suggested-by: Andy Lutomirski <luto@xxxxxxxxxxxxxx>
> Suggested-by: Ingo Molnar <mingo@xxxxxxxxxx>
> Signed-off-by: Dmitry Safonov <dsafonov@xxxxxxxxxxxxx>

Acked-by: Andy Lutomirski <luto@xxxxxxxxxx>

But if you resubmit, please consider making this patch 1 so Ingo can
apply it directly.

--Andy

> ---
> v3: initial patch
>
>  arch/x86/entry/common.c            | 2 +-
>  arch/x86/entry/vdso/vma.c          | 2 +-
>  arch/x86/include/asm/compat.h      | 4 ++--
>  arch/x86/include/asm/thread_info.h | 2 +-
>  arch/x86/kernel/process_64.c       | 2 +-
>  arch/x86/kernel/ptrace.c           | 2 +-
>  arch/x86/kernel/signal.c           | 2 +-
>  arch/x86/kernel/uprobes.c          | 2 +-
>  8 files changed, 9 insertions(+), 9 deletions(-)
>
> diff --git a/arch/x86/entry/common.c b/arch/x86/entry/common.c
> index e79d93d44ecd..ec138e538c44 100644
> --- a/arch/x86/entry/common.c
> +++ b/arch/x86/entry/common.c
> @@ -191,7 +191,7 @@ long syscall_trace_enter_phase2(struct pt_regs *regs, u32 arch,
>
>  long syscall_trace_enter(struct pt_regs *regs)
>  {
> -       u32 arch = is_ia32_task() ? AUDIT_ARCH_I386 : AUDIT_ARCH_X86_64;
> +       u32 arch = in_ia32_syscall() ? AUDIT_ARCH_I386 : AUDIT_ARCH_X86_64;
>         unsigned long phase1_result = syscall_trace_enter_phase1(regs, arch);
>
>         if (phase1_result == 0)
> diff --git a/arch/x86/entry/vdso/vma.c b/arch/x86/entry/vdso/vma.c
> index 8510b1b55b21..0b861fc274b6 100644
> --- a/arch/x86/entry/vdso/vma.c
> +++ b/arch/x86/entry/vdso/vma.c
> @@ -109,7 +109,7 @@ static int vdso_mremap(const struct vm_special_mapping *sm,
>         if (image->size != new_size)
>                 return -EINVAL;
>
> -       if (is_ia32_task()) {
> +       if (in_ia32_syscall()) {
>                 unsigned long vdso_land = vdso_image_32.sym_int80_landing_pad;
>                 unsigned long old_land_addr = vdso_land +
>                         (unsigned long)current->mm->context.vdso;
> diff --git a/arch/x86/include/asm/compat.h b/arch/x86/include/asm/compat.h
> index ebb102e1bbc7..5a3b2c119ed0 100644
> --- a/arch/x86/include/asm/compat.h
> +++ b/arch/x86/include/asm/compat.h
> @@ -307,7 +307,7 @@ static inline void __user *arch_compat_alloc_user_space(long len)
>         return (void __user *)round_down(sp - len, 16);
>  }
>
> -static inline bool is_x32_task(void)
> +static inline bool in_x32_syscall(void)
>  {
>  #ifdef CONFIG_X86_X32_ABI
>         if (task_pt_regs(current)->orig_ax & __X32_SYSCALL_BIT)
> @@ -318,7 +318,7 @@ static inline bool is_x32_task(void)
>
>  static inline bool in_compat_syscall(void)
>  {
> -       return is_ia32_task() || is_x32_task();
> +       return in_ia32_syscall() || in_x32_syscall();
>  }
>  #define in_compat_syscall in_compat_syscall    /* override the generic impl */
>
> diff --git a/arch/x86/include/asm/thread_info.h b/arch/x86/include/asm/thread_info.h
> index ffae84df8a93..30c133ac05cd 100644
> --- a/arch/x86/include/asm/thread_info.h
> +++ b/arch/x86/include/asm/thread_info.h
> @@ -255,7 +255,7 @@ static inline bool test_and_clear_restore_sigmask(void)
>         return true;
>  }
>
> -static inline bool is_ia32_task(void)
> +static inline bool in_ia32_syscall(void)
>  {
>  #ifdef CONFIG_X86_32
>         return true;
> diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c
> index 6cbab31ac23a..4a62ec457b56 100644
> --- a/arch/x86/kernel/process_64.c
> +++ b/arch/x86/kernel/process_64.c
> @@ -210,7 +210,7 @@ int copy_thread_tls(unsigned long clone_flags, unsigned long sp,
>          */
>         if (clone_flags & CLONE_SETTLS) {
>  #ifdef CONFIG_IA32_EMULATION
> -               if (is_ia32_task())
> +               if (in_ia32_syscall())
>                         err = do_set_thread_area(p, -1,
>                                 (struct user_desc __user *)tls, 0);
>                 else
> diff --git a/arch/x86/kernel/ptrace.c b/arch/x86/kernel/ptrace.c
> index 32e9d9cbb884..0f4d2a5df2dc 100644
> --- a/arch/x86/kernel/ptrace.c
> +++ b/arch/x86/kernel/ptrace.c
> @@ -1266,7 +1266,7 @@ long compat_arch_ptrace(struct task_struct *child, compat_long_t request,
>                         compat_ulong_t caddr, compat_ulong_t cdata)
>  {
>  #ifdef CONFIG_X86_X32_ABI
> -       if (!is_ia32_task())
> +       if (!in_ia32_syscall())
>                 return x32_arch_ptrace(child, request, caddr, cdata);
>  #endif
>  #ifdef CONFIG_IA32_EMULATION
> diff --git a/arch/x86/kernel/signal.c b/arch/x86/kernel/signal.c
> index 548ddf7d6fd2..aa31265aa61d 100644
> --- a/arch/x86/kernel/signal.c
> +++ b/arch/x86/kernel/signal.c
> @@ -762,7 +762,7 @@ handle_signal(struct ksignal *ksig, struct pt_regs *regs)
>  static inline unsigned long get_nr_restart_syscall(const struct pt_regs *regs)
>  {
>  #ifdef CONFIG_X86_64
> -       if (is_ia32_task())
> +       if (in_ia32_syscall())
>                 return __NR_ia32_restart_syscall;
>  #endif
>  #ifdef CONFIG_X86_X32_ABI
> diff --git a/arch/x86/kernel/uprobes.c b/arch/x86/kernel/uprobes.c
> index bf4db6eaec8f..98b4dc87628b 100644
> --- a/arch/x86/kernel/uprobes.c
> +++ b/arch/x86/kernel/uprobes.c
> @@ -516,7 +516,7 @@ struct uprobe_xol_ops {
>
>  static inline int sizeof_long(void)
>  {
> -       return is_ia32_task() ? 4 : 8;
> +       return in_ia32_syscall() ? 4 : 8;
>  }
>
>  static int default_pre_xol_op(struct arch_uprobe *auprobe, struct pt_regs *regs)
> --
> 2.8.0
>



-- 
Andy Lutomirski
AMA Capital Management, LLC