public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
* linux-next: manual merge of the arm64 tree with the mm tree
@ 2024-10-28  0:10 Stephen Rothwell
  2024-10-28 17:25 ` Catalin Marinas
  2024-11-20  1:01 ` Stephen Rothwell
  0 siblings, 2 replies; 11+ messages in thread
From: Stephen Rothwell @ 2024-10-28  0:10 UTC (permalink / raw)
  To: Catalin Marinas, Will Deacon, Andrew Morton
  Cc: Linux Kernel Mailing List, Linux Next Mailing List, Mark Brown,
	Suren Baghdasaryan

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

Hi all,

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

  include/linux/mm.h

between commit:

  e87ec503cf2e ("mm/codetag: uninline and move pgalloc_tag_copy and pgalloc_tag_split")

from the mm-unstable branch of the mm tree and commit:

  91e102e79740 ("prctl: arch-agnostic prctl for shadow stack")

from the arm64 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 include/linux/mm.h
index 086ba524d3ba,8852c39c7695..000000000000
--- a/include/linux/mm.h
+++ b/include/linux/mm.h
@@@ -4166,4 -4174,65 +4178,8 @@@ static inline int do_mseal(unsigned lon
  }
  #endif
  
 -#ifdef CONFIG_MEM_ALLOC_PROFILING
 -static inline void pgalloc_tag_split(struct folio *folio, int old_order, int new_order)
 -{
 -	int i;
 -	struct alloc_tag *tag;
 -	unsigned int nr_pages = 1 << new_order;
 -
 -	if (!mem_alloc_profiling_enabled())
 -		return;
 -
 -	tag = pgalloc_tag_get(&folio->page);
 -	if (!tag)
 -		return;
 -
 -	for (i = nr_pages; i < (1 << old_order); i += nr_pages) {
 -		union codetag_ref *ref = get_page_tag_ref(folio_page(folio, i));
 -
 -		if (ref) {
 -			/* Set new reference to point to the original tag */
 -			alloc_tag_ref_set(ref, tag);
 -			put_page_tag_ref(ref);
 -		}
 -	}
 -}
 -
 -static inline void pgalloc_tag_copy(struct folio *new, struct folio *old)
 -{
 -	struct alloc_tag *tag;
 -	union codetag_ref *ref;
 -
 -	tag = pgalloc_tag_get(&old->page);
 -	if (!tag)
 -		return;
 -
 -	ref = get_page_tag_ref(&new->page);
 -	if (!ref)
 -		return;
 -
 -	/* Clear the old ref to the original allocation tag. */
 -	clear_page_tag_ref(&old->page);
 -	/* Decrement the counters of the tag on get_new_folio. */
 -	alloc_tag_sub(ref, folio_nr_pages(new));
 -
 -	__alloc_tag_ref_set(ref, tag);
 -
 -	put_page_tag_ref(ref);
 -}
 -#else /* !CONFIG_MEM_ALLOC_PROFILING */
 -static inline void pgalloc_tag_split(struct folio *folio, int old_order, int new_order)
 -{
 -}
 -
 -static inline void pgalloc_tag_copy(struct folio *new, struct folio *old)
 -{
 -}
 -#endif /* CONFIG_MEM_ALLOC_PROFILING */
 -
+ int arch_get_shadow_stack_status(struct task_struct *t, unsigned long __user *status);
+ int arch_set_shadow_stack_status(struct task_struct *t, unsigned long status);
+ int arch_lock_shadow_stack_status(struct task_struct *t, unsigned long status);
+ 
  #endif /* _LINUX_MM_H */

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

^ permalink raw reply	[flat|nested] 11+ messages in thread
* linux-next: manual merge of the arm64 tree with the mm tree
@ 2024-10-23 23:37 Stephen Rothwell
  2024-10-24  8:14 ` Catalin Marinas
  2024-11-20  0:58 ` Stephen Rothwell
  0 siblings, 2 replies; 11+ messages in thread
From: Stephen Rothwell @ 2024-10-23 23:37 UTC (permalink / raw)
  To: Catalin Marinas, Will Deacon, Andrew Morton
  Cc: Linux Kernel Mailing List, Linux Next Mailing List,
	Mike Rapoport (Microsoft), Steven Price, Suzuki K Poulose

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

Hi all,

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

  arch/arm64/mm/pageattr.c

between commit:

  040ee4186d6c ("arch: introduce set_direct_map_valid_noflush()")

from the mm-unstable branch of the mm tree and commit:

  42be24a4178f ("arm64: Enable memory encrypt for Realms")

from the arm64 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/mm/pageattr.c
index 01225900293a,6ae6ae806454..000000000000
--- a/arch/arm64/mm/pageattr.c
+++ b/arch/arm64/mm/pageattr.c
@@@ -192,16 -202,86 +202,96 @@@ int set_direct_map_default_noflush(stru
  				   PAGE_SIZE, change_page_range, &data);
  }
  
 +int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid)
 +{
 +	unsigned long addr = (unsigned long)page_address(page);
 +
 +	if (!can_set_direct_map())
 +		return 0;
 +
 +	return set_memory_valid(addr, nr, valid);
 +}
 +
+ static int __set_memory_enc_dec(unsigned long addr,
+ 				int numpages,
+ 				bool encrypt)
+ {
+ 	unsigned long set_prot = 0, clear_prot = 0;
+ 	phys_addr_t start, end;
+ 	int ret;
+ 
+ 	if (!is_realm_world())
+ 		return 0;
+ 
+ 	if (!__is_lm_address(addr))
+ 		return -EINVAL;
+ 
+ 	start = __virt_to_phys(addr);
+ 	end = start + numpages * PAGE_SIZE;
+ 
+ 	if (encrypt)
+ 		clear_prot = PROT_NS_SHARED;
+ 	else
+ 		set_prot = PROT_NS_SHARED;
+ 
+ 	/*
+ 	 * Break the mapping before we make any changes to avoid stale TLB
+ 	 * entries or Synchronous External Aborts caused by RIPAS_EMPTY
+ 	 */
+ 	ret = __change_memory_common(addr, PAGE_SIZE * numpages,
+ 				     __pgprot(set_prot),
+ 				     __pgprot(clear_prot | PTE_VALID));
+ 
+ 	if (ret)
+ 		return ret;
+ 
+ 	if (encrypt)
+ 		ret = rsi_set_memory_range_protected(start, end);
+ 	else
+ 		ret = rsi_set_memory_range_shared(start, end);
+ 
+ 	if (ret)
+ 		return ret;
+ 
+ 	return __change_memory_common(addr, PAGE_SIZE * numpages,
+ 				      __pgprot(PTE_VALID),
+ 				      __pgprot(0));
+ }
+ 
+ static int realm_set_memory_encrypted(unsigned long addr, int numpages)
+ {
+ 	int ret = __set_memory_enc_dec(addr, numpages, true);
+ 
+ 	/*
+ 	 * If the request to change state fails, then the only sensible cause
+ 	 * of action for the caller is to leak the memory
+ 	 */
+ 	WARN(ret, "Failed to encrypt memory, %d pages will be leaked",
+ 	     numpages);
+ 
+ 	return ret;
+ }
+ 
+ static int realm_set_memory_decrypted(unsigned long addr, int numpages)
+ {
+ 	int ret = __set_memory_enc_dec(addr, numpages, false);
+ 
+ 	WARN(ret, "Failed to decrypt memory, %d pages will be leaked",
+ 	     numpages);
+ 
+ 	return ret;
+ }
+ 
+ static const struct arm64_mem_crypt_ops realm_crypt_ops = {
+ 	.encrypt = realm_set_memory_encrypted,
+ 	.decrypt = realm_set_memory_decrypted,
+ };
+ 
+ int realm_register_memory_enc_ops(void)
+ {
+ 	return arm64_mem_crypt_ops_register(&realm_crypt_ops);
+ }
+ 
  #ifdef CONFIG_DEBUG_PAGEALLOC
  void __kernel_map_pages(struct page *page, int numpages, int enable)
  {

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

^ permalink raw reply	[flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-11-20  3:18 UTC | newest]

Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-28  0:10 linux-next: manual merge of the arm64 tree with the mm tree Stephen Rothwell
2024-10-28 17:25 ` Catalin Marinas
2024-10-28 17:47   ` Suren Baghdasaryan
2024-11-20  1:01 ` Stephen Rothwell
2024-11-20  1:09   ` Suren Baghdasaryan
2024-11-20  1:43     ` Suren Baghdasaryan
2024-11-20  2:57     ` Stephen Rothwell
2024-11-20  3:18       ` Suren Baghdasaryan
  -- strict thread matches above, loose matches on Subject: below --
2024-10-23 23:37 Stephen Rothwell
2024-10-24  8:14 ` Catalin Marinas
2024-11-20  0:58 ` Stephen Rothwell

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox