linux-next: manual merge of the uprobes tree with the tip tree

linux-next: manual merge of the uprobes tree with the tip tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 993 bytes --]

Hi Srikar,

The linux-next merge of the uprobes tree gets several conflicts against
the tip tree because the same patches appear in both threes and there are
further changes to some files in the uprobes tree.

Merging uprobes/for-next (1fe509b uprobes/core: Handle breakpoint and singlestep exception.)
CONFLICT (add/add): Merge conflict in kernel/events/uprobes.c
CONFLICT (content): Merge conflict in kernel/events/Makefile
CONFLICT (add/add): Merge conflict in include/linux/uprobes.h
CONFLICT (add/add): Merge conflict in arch/x86/kernel/uprobes.c
CONFLICT (add/add): Merge conflict in arch/x86/include/asm/uprobes.h

The easiest way to remove these conflicts would be for you to rebase the
uprobes tree onto the perl/uprobes branch of the tip tree (I assume that
all the uprobes code will eventually be merged to Linus via the tip tree)
or a subset of that branch that is the common set of patches.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

Re: linux-next: manual merge of the uprobes tree with the tip tree

[Srikar Dronamraju]

> The linux-next merge of the uprobes tree gets several conflicts against
> the tip tree because the same patches appear in both threes and there are
> further changes to some files in the uprobes tree.
> 
> Merging uprobes/for-next (1fe509b uprobes/core: Handle breakpoint and singlestep exception.)
> CONFLICT (add/add): Merge conflict in kernel/events/uprobes.c
> CONFLICT (content): Merge conflict in kernel/events/Makefile
> CONFLICT (add/add): Merge conflict in include/linux/uprobes.h
> CONFLICT (add/add): Merge conflict in arch/x86/kernel/uprobes.c
> CONFLICT (add/add): Merge conflict in arch/x86/include/asm/uprobes.h
> 
> The easiest way to remove these conflicts would be for you to rebase the
> uprobes tree onto the perl/uprobes branch of the tip tree (I assume that
> all the uprobes code will eventually be merged to Linus via the tip tree)
> or a subset of that branch that is the common set of patches.


Okay, I will go with this suggestion. Infact this is actually easier for
me.

-- 
Thanks and Regards
Srikar

linux-next: manual merge of the uprobes tree with the tip tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1828 bytes --]

Hi Srikar,

Today's linux-next merge of the uprobes tree got a conflict in
arch/x86/kernel/signal.c between commit c5a373942bbc ("x32:
Signal-related system calls") from the tip tree and commit 1e1e2cddc33d
("x86/trivial: use is_ia32_compat_task") from the uprobes tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/x86/kernel/signal.c
index 5134e17,907d483..0000000
--- a/arch/x86/kernel/signal.c
+++ b/arch/x86/kernel/signal.c
@@@ -37,7 -37,15 +38,8 @@@
  #include <asm/syscalls.h>
  
  #include <asm/sigframe.h>
+ #include <asm/compat.h>
  
 -#define _BLOCKABLE (~(sigmask(SIGKILL) | sigmask(SIGSTOP)))
 -
 -#define __FIX_EFLAGS	(X86_EFLAGS_AC | X86_EFLAGS_OF | \
 -			 X86_EFLAGS_DF | X86_EFLAGS_TF | X86_EFLAGS_SF | \
 -			 X86_EFLAGS_ZF | X86_EFLAGS_AF | X86_EFLAGS_PF | \
 -			 X86_EFLAGS_CF)
 -
  #ifdef CONFIG_X86_32
  # define FIX_EFLAGS	(__FIX_EFLAGS | X86_EFLAGS_RF)
  #else
@@@ -628,22 -637,6 +629,16 @@@ static int signr_convert(int sig
  
  #else /* !CONFIG_X86_32 */
  
- #ifdef CONFIG_IA32_EMULATION
- #define is_ia32	test_thread_flag(TIF_IA32)
- #else /* !CONFIG_IA32_EMULATION */
- #define is_ia32	0
- #endif /* CONFIG_IA32_EMULATION */
- 
 +#ifdef CONFIG_X86_X32_ABI
 +#define is_x32	test_thread_flag(TIF_X32)
 +
 +static int x32_setup_rt_frame(int sig, struct k_sigaction *ka,
 +			      siginfo_t *info, compat_sigset_t *set,
 +			      struct pt_regs *regs);
 +#else /* !CONFIG_X86_X32_ABI */
 +#define is_x32	0
 +#endif /* CONFIG_X86_X32_ABI */
 +
  int ia32_setup_rt_frame(int sig, struct k_sigaction *ka, siginfo_t *info,
  		sigset_t *set, struct pt_regs *regs);
  int ia32_setup_frame(int sig, struct k_sigaction *ka,

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the uprobes tree with the tip tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1801 bytes --]

Hi Srikar,

Today's linux-next merge of the uprobes tree got a conflict in
arch/x86/include/asm/compat.h between commits fca460f95e92 ("x32: Handle
the x32 system call flag") and a628b684d27d ("x32: Provide separate
is_ia32_task() and is_x32_task() predicates") from the tip tree and
commit 1e1e2cddc33d ("x86/trivial: use is_ia32_compat_task") from the
uprobes tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/x86/include/asm/compat.h
index 355edc0,a6ba59d..0000000
--- a/arch/x86/include/asm/compat.h
+++ b/arch/x86/include/asm/compat.h
@@@ -223,39 -214,15 +229,41 @@@ static inline compat_uptr_t ptr_to_comp
  
  static inline void __user *arch_compat_alloc_user_space(long len)
  {
 -	struct pt_regs *regs = task_pt_regs(current);
 -	return (void __user *)regs->sp - len;
 +	compat_uptr_t sp;
 +
 +	if (test_thread_flag(TIF_IA32)) {
 +		sp = task_pt_regs(current)->sp;
 +	} else {
 +		/* -128 for the x32 ABI redzone */
 +		sp = percpu_read(old_rsp) - 128;
 +	}
 +
 +	return (void __user *)round_down(sp - len, 16);
 +}
 +
 +static inline bool is_ia32_task(void)
 +{
 +#ifdef CONFIG_IA32_EMULATION
 +	if (current_thread_info()->status & TS_COMPAT)
 +		return true;
 +#endif
 +	return false;
 +}
 +
 +static inline bool is_x32_task(void)
 +{
 +#ifdef CONFIG_X86_X32_ABI
 +	if (task_pt_regs(current)->orig_ax & __X32_SYSCALL_BIT)
 +		return true;
 +#endif
 +	return false;
  }
  
+ #undef is_compat_task
+ 
 -static inline int is_compat_task(void)
 +static inline bool is_compat_task(void)
  {
 -	return current_thread_info()->status & TS_COMPAT;
 +	return is_ia32_task() || is_x32_task();
  }
  
  #endif /* _ASM_X86_COMPAT_H */

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the uprobes tree with the tip tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1986 bytes --]

Hi Srikar,

Today's linux-next merge of the uprobes tree got a conflict in
arch/x86/kernel/traps.c between commit c94082656dac ("x86: Use enum
instead of literals for trap values") from the tip tree and commit
b6d8245ec899 ("x86/trivial: rename trap_no to trap_nr in thread struct")
from the uprobes tree.

I fixed it up (see below) and can carry the fix as necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/x86/kernel/traps.c
index 4310189,993f52f..0000000
--- a/arch/x86/kernel/traps.c
+++ b/arch/x86/kernel/traps.c
@@@ -238,10 -233,10 +238,10 @@@ dotraplinkage void do_double_fault(stru
  	struct task_struct *tsk = current;
  
  	/* Return not checked because double check cannot be ignored */
 -	notify_die(DIE_TRAP, str, regs, error_code, 8, SIGSEGV);
 +	notify_die(DIE_TRAP, str, regs, error_code, X86_TRAP_DF, SIGSEGV);
  
  	tsk->thread.error_code = error_code;
- 	tsk->thread.trap_no = X86_TRAP_DF;
 -	tsk->thread.trap_nr = 8;
++	tsk->thread.trap_nr = X86_TRAP_DF;
  
  	/*
  	 * This is always a kernel trap and never fixable (and thus must
@@@ -269,7 -264,7 +269,7 @@@ do_general_protection(struct pt_regs *r
  		goto gp_in_kernel;
  
  	tsk->thread.error_code = error_code;
- 	tsk->thread.trap_no = X86_TRAP_GP;
 -	tsk->thread.trap_nr = 13;
++	tsk->thread.trap_nr = X86_TRAP_GP;
  
  	if (show_unhandled_signals && unhandled_signal(tsk, SIGSEGV) &&
  			printk_ratelimit()) {
@@@ -296,9 -291,9 +296,9 @@@ gp_in_kernel
  		return;
  
  	tsk->thread.error_code = error_code;
- 	tsk->thread.trap_no = X86_TRAP_GP;
 -	tsk->thread.trap_nr = 13;
 -	if (notify_die(DIE_GPF, "general protection fault", regs,
 -				error_code, 13, SIGSEGV) == NOTIFY_STOP)
++	tsk->thread.trap_nr = X86_TRAP_GP;
 +	if (notify_die(DIE_GPF, "general protection fault", regs, error_code,
 +			X86_TRAP_GP, SIGSEGV) == NOTIFY_STOP)
  		return;
  	die("general protection fault", regs, error_code);
  }

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the uprobes tree with the tip tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 839 bytes --]

Hi Srikar,

Today's linux-next merge of the uprobes tree got a conflict in
arch/x86/kernel/cpu/perf_event_intel_ds.c between commit 3e702ff6d1ea
("perf/x86: Add LBR software filter support for Intel CPUs") from the tip
tree and commit 1e1e2cddc33d ("x86/trivial: use is_ia32_compat_task")
from the uprobes tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc arch/x86/kernel/cpu/perf_event_intel_ds.c
index 7f64df1,92e7dee4..0000000
--- a/arch/x86/kernel/cpu/perf_event_intel_ds.c
+++ b/arch/x86/kernel/cpu/perf_event_intel_ds.c
@@@ -3,7 -3,7 +3,8 @@@
  #include <linux/slab.h>
  
  #include <asm/perf_event.h>
 +#include <asm/insn.h>
+ #include <asm/compat.h>
  
  #include "perf_event.h"
  

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

linux-next: manual merge of the uprobes tree with the tip tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 436 bytes --]

Hi Srikar,

Today's linux-next merge of the uprobes tree got a conflicts in various
files between commits from the tip tree and commits from the uprobes tree.

It looks like a later (and different) version of the uprobes patch set has
been merged into the tip tree.  So I have dropped the uprobes tree
changes for today.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]