linux-next: build failure after merge of the mm-hotfixes tree

linux-next: build failure after merge of the mm-hotfixes tree

[Stephen Rothwell]

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

Hi all,

After merging the mm-hotfixes tree, today's linux-next build (arm
allmodconfig) failed like this:

mm/vmscan.c:4090:9: error: implicit declaration of function ‘pmd_young’; did you mean ‘pte_young’? [-Werror=implicit-function-declaration]

Caused by commit

  3f85e711d5af ("mm: introduce arch_has_hw_nonleaf_pmd_young()")

This error was found by the kernel.ci bot and so is still int today's
tree.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the mm-hotfixes tree

[Juergen Gross]

[-- Attachment #1.1.1: Type: text/plain, Size: 492 bytes --]

On 25.11.22 02:10, Stephen Rothwell wrote:
> Hi all,
> 
> After merging the mm-hotfixes tree, today's linux-next build (arm
> allmodconfig) failed like this:
> 
> mm/vmscan.c:4090:9: error: implicit declaration of function ‘pmd_young’; did you mean ‘pte_young’? [-Werror=implicit-function-declaration]
> 
> Caused by commit
> 
>    3f85e711d5af ("mm: introduce arch_has_hw_nonleaf_pmd_young()")

A patch fixing this is available already (see attached mail).


Juergen

[-- Attachment #1.1.2: + mm-add-dummy-pmd_young-for-architectures-not-having-it.patch added to mm-hotfixes-unstable branch.eml --]
[-- Type: message/rfc822, Size: 14689 bytes --]

From: Andrew Morton <akpm@linux-foundation.org>
To: mm-commits@vger.kernel.org,yuzhao@google.com,tglx@linutronix.de,mingo@redhat.com,linux@eikelenboom.it,hpa@zytor.com,geert@linux-m68k.org,dave.hansen@linux.intel.com,bp@alien8.de,jgross@suse.com,akpm@linux-foundation.org
Subject: + mm-add-dummy-pmd_young-for-architectures-not-having-it.patch added to mm-hotfixes-unstable branch
Date: Thu, 24 Nov 2022 13:35:01 -0800
Message-ID: <20221124213502.78CF4C433D6@smtp.kernel.org>


The patch titled
     Subject: mm: add dummy pmd_young() for architectures not having it
has been added to the -mm mm-hotfixes-unstable branch.  Its filename is
     mm-add-dummy-pmd_young-for-architectures-not-having-it.patch

This patch will shortly appear at
     https://git.kernel.org/pub/scm/linux/kernel/git/akpm/25-new.git/tree/patches/mm-add-dummy-pmd_young-for-architectures-not-having-it.patch

This patch will later appear in the mm-hotfixes-unstable branch at
    git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

Before you just go and hit "reply", please:
   a) Consider who else should be cc'ed
   b) Prefer to cc a suitable mailing list as well
   c) Ideally: find the original patch on the mailing list and do a
      reply-to-all to that, adding suitable additional cc's

*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***

The -mm tree is included into linux-next via the mm-everything
branch at git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
and is updated there every 2-3 working days

------------------------------------------------------
From: Juergen Gross <jgross@suse.com>
Subject: mm: add dummy pmd_young() for architectures not having it

In order to avoid #ifdeffery add a dummy pmd_young() implementation as a
fallback.  This is required for the later patch "mm: introduce
arch_has_hw_nonleaf_pmd_young()".

Link: https://lkml.kernel.org/r/fd3ac3cd-7349-6bbd-890a-71a9454ca0b3@suse.com
Signed-off-by: Juergen Gross <jgross@suse.com>
Acked-by: Yu Zhao <yuzhao@google.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Sander Eikelenboom <linux@eikelenboom.it>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---

 arch/loongarch/include/asm/pgtable.h |    1 +
 arch/mips/include/asm/pgtable.h      |    1 +
 arch/riscv/include/asm/pgtable.h     |    1 +
 arch/s390/include/asm/pgtable.h      |    1 +
 arch/sparc/include/asm/pgtable_64.h  |    1 +
 arch/x86/include/asm/pgtable.h       |    1 +
 include/linux/pgtable.h              |    7 +++++++
 7 files changed, 13 insertions(+)

--- a/arch/loongarch/include/asm/pgtable.h~mm-add-dummy-pmd_young-for-architectures-not-having-it
+++ a/arch/loongarch/include/asm/pgtable.h
@@ -482,6 +482,7 @@ static inline pmd_t pmd_mkdirty(pmd_t pm
 	return pmd;
 }
 
+#define pmd_young pmd_young
 static inline int pmd_young(pmd_t pmd)
 {
 	return !!(pmd_val(pmd) & _PAGE_ACCESSED);
--- a/arch/mips/include/asm/pgtable.h~mm-add-dummy-pmd_young-for-architectures-not-having-it
+++ a/arch/mips/include/asm/pgtable.h
@@ -622,6 +622,7 @@ static inline pmd_t pmd_mkdirty(pmd_t pm
 	return pmd;
 }
 
+#define pmd_young pmd_young
 static inline int pmd_young(pmd_t pmd)
 {
 	return !!(pmd_val(pmd) & _PAGE_ACCESSED);
--- a/arch/riscv/include/asm/pgtable.h~mm-add-dummy-pmd_young-for-architectures-not-having-it
+++ a/arch/riscv/include/asm/pgtable.h
@@ -600,6 +600,7 @@ static inline int pmd_dirty(pmd_t pmd)
 	return pte_dirty(pmd_pte(pmd));
 }
 
+#define pmd_young pmd_young
 static inline int pmd_young(pmd_t pmd)
 {
 	return pte_young(pmd_pte(pmd));
--- a/arch/s390/include/asm/pgtable.h~mm-add-dummy-pmd_young-for-architectures-not-having-it
+++ a/arch/s390/include/asm/pgtable.h
@@ -763,6 +763,7 @@ static inline int pmd_dirty(pmd_t pmd)
 	return (pmd_val(pmd) & _SEGMENT_ENTRY_DIRTY) != 0;
 }
 
+#define pmd_young pmd_young
 static inline int pmd_young(pmd_t pmd)
 {
 	return (pmd_val(pmd) & _SEGMENT_ENTRY_YOUNG) != 0;
--- a/arch/sparc/include/asm/pgtable_64.h~mm-add-dummy-pmd_young-for-architectures-not-having-it
+++ a/arch/sparc/include/asm/pgtable_64.h
@@ -693,6 +693,7 @@ static inline unsigned long pmd_dirty(pm
 	return pte_dirty(pte);
 }
 
+#define pmd_young pmd_young
 static inline unsigned long pmd_young(pmd_t pmd)
 {
 	pte_t pte = __pte(pmd_val(pmd));
--- a/arch/x86/include/asm/pgtable.h~mm-add-dummy-pmd_young-for-architectures-not-having-it
+++ a/arch/x86/include/asm/pgtable.h
@@ -139,6 +139,7 @@ static inline int pmd_dirty(pmd_t pmd)
 	return pmd_flags(pmd) & _PAGE_DIRTY;
 }
 
+#define pmd_young pmd_young
 static inline int pmd_young(pmd_t pmd)
 {
 	return pmd_flags(pmd) & _PAGE_ACCESSED;
--- a/include/linux/pgtable.h~mm-add-dummy-pmd_young-for-architectures-not-having-it
+++ a/include/linux/pgtable.h
@@ -165,6 +165,13 @@ static inline pte_t *virt_to_kpte(unsign
 	return pmd_none(*pmd) ? NULL : pte_offset_kernel(pmd, vaddr);
 }
 
+#ifndef pmd_young
+static inline int pmd_young(pmd_t pmd)
+{
+	return 0;
+}
+#endif
+
 #ifndef __HAVE_ARCH_PTEP_SET_ACCESS_FLAGS
 extern int ptep_set_access_flags(struct vm_area_struct *vma,
 				 unsigned long address, pte_t *ptep,
_

Patches currently in -mm which might be from jgross@suse.com are

mm-add-dummy-pmd_young-for-architectures-not-having-it.patch
mm-introduce-arch_has_hw_nonleaf_pmd_young.patch

[-- Attachment #1.1.3: OpenPGP public key --]
[-- Type: application/pgp-keys, Size: 3149 bytes --]

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

Re: linux-next: build failure after merge of the mm-hotfixes tree

[Andrew Morton]

On Fri, 25 Nov 2022 12:10:51 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:

> Hi all,
> 
> After merging the mm-hotfixes tree, today's linux-next build (arm
> allmodconfig) failed like this:
> 
> mm/vmscan.c:4090:9: error: implicit declaration of function ‘pmd_young’; did you mean ‘pte_young’? [-Werror=implicit-function-declaration]
> 
> Caused by commit
> 
>   3f85e711d5af ("mm: introduce arch_has_hw_nonleaf_pmd_young()")
> 
> This error was found by the kernel.ci bot and so is still int today's
> tree.

Thanks.  Did that tree include "mm: add dummy pmd_young() for
architectures not having it"?

Re: linux-next: build failure after merge of the mm-hotfixes tree

[Stephen Rothwell]

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

Hi Andrew,

On Thu, 24 Nov 2022 21:24:57 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Fri, 25 Nov 2022 12:10:51 +1100 Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> > Hi all,
> > 
> > After merging the mm-hotfixes tree, today's linux-next build (arm
> > allmodconfig) failed like this:
> > 
> > mm/vmscan.c:4090:9: error: implicit declaration of function ‘pmd_young’; did you mean ‘pte_young’? [-Werror=implicit-function-declaration]
> > 
> > Caused by commit
> > 
> >   3f85e711d5af ("mm: introduce arch_has_hw_nonleaf_pmd_young()")
> > 
> > This error was found by the kernel.ci bot and so is still int today's
> > tree.  
> 
> Thanks.  Did that tree include "mm: add dummy pmd_young() for
> architectures not having it"?

It did not when I merged the mm-hotfixes branch, but then I refetched
your trees during the day and so that patch appeared when I merged the
mm tree (which is now based on a later version of the mm-hotfixes
branch). So next-20221125 as a whole will not have the build failure.

After I merge all the "fixes" branches, I upload a "pending-updates"
branch that feeds into the various bots independently of the full next
tree.
-- 
Cheers,
Stephen Rothwell

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

linux-next: build failure after merge of the mm-hotfixes tree

[Stephen Rothwell]

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

Hi all,

After merging the mm-hotfixes tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

mm/ksm.c: In function 'ksm_might_need_to_copy':
mm/ksm.c:2605:21: error: implicit declaration of function 'copy_mc_user_highpage'; did you mean 'copy_user_highpage'? [-Werror=implicit-function-declaration]
 2605 |                 if (copy_mc_user_highpage(new_page, page, address, vma)) {
      |                     ^~~~~~~~~~~~~~~~~~~~~
      |                     copy_user_highpage

Caused by commit

  b7edf4b1cdb1 ("mm: hwpoison: support recovery from ksm_might_need_to_copy()")

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the mm-hotfixes tree

[Kefeng Wang]

Hi, this patch relays on Tony Luck's Patch series "Copy-on-write poison 
recovery".[1]
and tested ppc64_defconfig based on next-20221208, it's no build failure

I think it is not very hotfix, also will send v3 to address some comments
we could adjust the patch order in mm tree, thanks.

[1] 
https://lore.kernel.org/all/50506c8a-71c1-9c68-aa47-7e8dc68a3c52@huawei.com/ 



On 2022/12/13 6:30, Stephen Rothwell wrote:
> Hi all,
>
> After merging the mm-hotfixes tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> mm/ksm.c: In function 'ksm_might_need_to_copy':
> mm/ksm.c:2605:21: error: implicit declaration of function 'copy_mc_user_highpage'; did you mean 'copy_user_highpage'? [-Werror=implicit-function-declaration]
>   2605 |                 if (copy_mc_user_highpage(new_page, page, address, vma)) {
>        |                     ^~~~~~~~~~~~~~~~~~~~~
>        |                     copy_user_highpage
>
> Caused by commit
>
>    b7edf4b1cdb1 ("mm: hwpoison: support recovery from ksm_might_need_to_copy()")
>
> I have reverted that commit for today.
>

Re: linux-next: build failure after merge of the mm-hotfixes tree

[Andrew Morton]

On Tue, 13 Dec 2022 09:34:24 +0800 Kefeng Wang <wangkefeng.wang@huawei.com> wrote:

> Hi, this patch relays on Tony Luck's Patch series "Copy-on-write poison 
> recovery".[1]
> and tested ppc64_defconfig based on next-20221208, it's no build failure

I reordered these a couple of days ago, not sure how Stephen got a hold
of this tree - perhaps I wasn't pushy enough.

Stephen, quoting the mm-everything tag would be helpful, but rarely
useful so only if you're feeling bored ;)

> I think it is not very hotfix, also will send v3 to address some comments
> we could adjust the patch order in mm tree, thanks.

This patch is still in mm-unstable so updates won't be a problem. 
Soon, please.

Re: linux-next: build failure after merge of the mm-hotfixes tree

[Stephen Rothwell]

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

Hi Andrew,

On Mon, 12 Dec 2022 18:23:04 -0800 Andrew Morton <akpm@linux-foundation.org> wrote:
>
> On Tue, 13 Dec 2022 09:34:24 +0800 Kefeng Wang <wangkefeng.wang@huawei.com> wrote:
> 
> > Hi, this patch relays on Tony Luck's Patch series "Copy-on-write poison 
> > recovery".[1]
> > and tested ppc64_defconfig based on next-20221208, it's no build failure  
> 
> I reordered these a couple of days ago, not sure how Stephen got a hold
> of this tree - perhaps I wasn't pushy enough.

Probably, its just what I got when I fetched your branches this morning
(my time).

> Stephen, quoting the mm-everything tag would be helpful, but rarely
> useful so only if you're feeling bored ;)

OK, I will try to remember.

Part of the problem (for me) is that you sometimes update all your
branches in the middle of my day (I am not asking you to stop doing
that - I can cope), so the mm-hotifxes that I have merged early on does
not match the new mm-hotfixes-* branches that get merged as part of mm
(mm-everything) later in the day.  This occasionally causes conflicts,
but they are invariably trivial and fixed by using the versions of
files from the new branches.  I am wondering if maybe I should merge
mm-everything early (but after I have merged and tested all the -fixes
branches) to narrow the race condition :-)

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the mm-hotfixes tree

[Kefeng Wang]

On 2022/12/13 10:23, Andrew Morton wrote:
> On Tue, 13 Dec 2022 09:34:24 +0800 Kefeng Wang <wangkefeng.wang@huawei.com> wrote:
>
>> Hi, this patch relays on Tony Luck's Patch series "Copy-on-write poison
>> recovery".[1]
>> and tested ppc64_defconfig based on next-20221208, it's no build failure
...
>> I think it is not very hotfix, also will send v3 to address some comments
>> we could adjust the patch order in mm tree, thanks.
> This patch is still in mm-unstable so updates won't be a problem.
> Soon, please.
Done, thanks.
>

linux-next: build failure after merge of the mm-hotfixes tree

[Stephen Rothwell]

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

Hi all,

After merging the mm-hotfixes tree, today's linux-next build (powerpc
ppc64_defconfig) failed like this:

lib/maple_tree.c: In function 'mas_preallocate':
lib/maple_tree.c:5506:30: error: 'struct ma_state' has no member named 'end'
 5506 |         if ((node_size == mas->end) && ((!mt_in_rcu(mas->tree))
      |                              ^~

Caused by commit

  84bda0b24555 ("maple_tree: do not preallocate nodes for slot stores")

I have reverted that commit for today.

-- 
Cheers,
Stephen Rothwell

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

Re: linux-next: build failure after merge of the mm-hotfixes tree

[Liam R. Howlett]

* Stephen Rothwell <sfr@canb.auug.org.au> [231213 17:18]:
> Hi all,
> 
> After merging the mm-hotfixes tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
> 
> lib/maple_tree.c: In function 'mas_preallocate':
> lib/maple_tree.c:5506:30: error: 'struct ma_state' has no member named 'end'
>  5506 |         if ((node_size == mas->end) && ((!mt_in_rcu(mas->tree))
>       |                              ^~
> 
> Caused by commit
> 
>   84bda0b24555 ("maple_tree: do not preallocate nodes for slot stores")
> 
> I have reverted that commit for today.


No harm in leaving it, but akpm made a 'fixlet' for this [1].  The word
fixlet made my day.  I assume this will be fix(let)ed tomorrow.

Cheers,
Liam

[1] https://lore.kernel.org/linux-mm/20231213130923.cc00317b4ebab1b0864d8b42@linux-foundation.org/