linux-next: manual merge of the efi tree with Linus' tree

linux-next: manual merge of the efi tree with Linus' tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the efi tree got a conflict in:

  arch/arm64/include/asm/efi.h

between commit:

  8a9a1a18731e ("arm64: efi: Avoid workqueue to check whether EFI runtime is live")

from Linus' tree and commit:

  0e68b5517d37 ("arm64: efi: Make efi_rt_lock a raw_spinlock")

from the efi tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm64/include/asm/efi.h
index acaa39f6381a,1b81dd5554cb..000000000000
--- a/arch/arm64/include/asm/efi.h
+++ b/arch/arm64/include/asm/efi.h
@@@ -47,18 -48,9 +48,18 @@@ int efi_set_mapping_permissions(struct 
  	efi_virtmap_unload();						\
  })
  
- extern spinlock_t efi_rt_lock;
+ extern raw_spinlock_t efi_rt_lock;
 +extern u64 *efi_rt_stack_top;
  efi_status_t __efi_rt_asm_wrapper(void *, const char *, ...);
  
 +/*
 + * efi_rt_stack_top[-1] contains the value the stack pointer had before
 + * switching to the EFI runtime stack.
 + */
 +#define current_in_efi()						\
 +	(!preemptible() && efi_rt_stack_top != NULL &&			\
 +	 on_task_stack(current, READ_ONCE(efi_rt_stack_top[-1]), 1))
 +
  #define ARCH_EFI_IRQ_FLAGS_MASK (PSR_D_BIT | PSR_A_BIT | PSR_I_BIT | PSR_F_BIT)
  
  /*

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the efi tree with Linus' tree

[Stephen Rothwell]

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

Hi all,

Today's linux-next merge of the efi tree got a conflict in:

  arch/arm64/kernel/stacktrace.c

between commit:

  0fbcd8abf337 ("arm64: Prohibit instrumentation on arch_stack_walk()")

from Linus' tree and commit:

  c2530a04a73e ("arm64: efi: Account for the EFI runtime stack in stack unwinder")

from the efi tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc arch/arm64/kernel/stacktrace.c
index 117e2c180f3c,ee9fd2018cd7..000000000000
--- a/arch/arm64/kernel/stacktrace.c
+++ b/arch/arm64/kernel/stacktrace.c
@@@ -186,7 -188,14 +188,14 @@@ void show_stack(struct task_struct *tsk
  			: stackinfo_get_unknown();		\
  	})
  
+ #define STACKINFO_EFI						\
+ 	({							\
+ 		((task == current) && current_in_efi())		\
+ 			? stackinfo_get_efi()			\
+ 			: stackinfo_get_unknown();		\
+ 	})
+ 
 -noinline notrace void arch_stack_walk(stack_trace_consume_fn consume_entry,
 +noinline noinstr void arch_stack_walk(stack_trace_consume_fn consume_entry,
  			      void *cookie, struct task_struct *task,
  			      struct pt_regs *regs)
  {

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]