Hi all,
On Mon, 28 Oct 2024 11:16:06 +1100 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the s390 tree got conflicts in:
>
> arch/s390/include/asm/set_memory.h
> arch/s390/mm/pageattr.c
>
> between commit:
>
> 4c5768ef0fd7 ("arch: introduce set_direct_map_valid_noflush()")
>
> from the mm-unstable branch of the mm tree and commit:
>
> 2835f8bf5530 ("s390/pageattr: Implement missing kernel_page_present()")
>
> from the s390 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.
>
>
> diff --cc arch/s390/include/asm/set_memory.h
> index 240bcfbdcdce,cb4cc0f59012..000000000000
> --- a/arch/s390/include/asm/set_memory.h
> +++ b/arch/s390/include/asm/set_memory.h
> @@@ -62,6 -62,6 +62,7 @@@ __SET_MEMORY_FUNC(set_memory_4k, SET_ME
>
> int set_direct_map_invalid_noflush(struct page *page);
> int set_direct_map_default_noflush(struct page *page);
> +int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid);
> + bool kernel_page_present(struct page *page);
>
> #endif
> diff --cc arch/s390/mm/pageattr.c
> index 4c7ee74aa130,aec9eb16b6f7..000000000000
> --- a/arch/s390/mm/pageattr.c
> +++ b/arch/s390/mm/pageattr.c
> @@@ -406,17 -406,21 +406,33 @@@ int set_direct_map_default_noflush(stru
> return __set_memory((unsigned long)page_to_virt(page), 1, SET_MEMORY_DEF);
> }
>
> +int set_direct_map_valid_noflush(struct page *page, unsigned nr, bool valid)
> +{
> + unsigned long flags;
> +
> + if (valid)
> + flags = SET_MEMORY_DEF;
> + else
> + flags = SET_MEMORY_INV;
> +
> + return __set_memory((unsigned long)page_to_virt(page), nr, flags);
> +}
> ++
> + bool kernel_page_present(struct page *page)
> + {
> + unsigned long addr;
> + unsigned int cc;
> +
> + addr = (unsigned long)page_address(page);
> + asm volatile(
> + " lra %[addr],0(%[addr])\n"
> + " ipm %[cc]\n"
> + : [cc] "=d" (cc), [addr] "+a" (addr)
> + :
> + : "cc");
> + return (cc >> 28) == 0;
> + }
> +
> #if defined(CONFIG_DEBUG_PAGEALLOC) || defined(CONFIG_KFENCE)
>
> static void ipte_range(pte_t *pte, unsigned long address, int nr)
This is now a conflict between the mm-stable tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpoT7pGpswKR.pgp
Description: OpenPGP digital signature
