2023-07-19 05:15:02

by Stephen Rothwell

[permalink] [raw]

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

---

Hi all,

After merging the mm tree, today's linux-next build (arm64 defconfig)
failed like this:

In file included from arch/arm64/include/asm/pgtable.h:15,
from include/linux/pgtable.h:6,
from arch/arm64/include/asm/io.h:12,
from include/linux/io.h:13,
from include/acpi/acpi_io.h:5,
from include/linux/acpi.h:37,
from include/acpi/apei.h:9,
from include/acpi/ghes.h:5,
from include/linux/arm_sdei.h:8,
from arch/arm64/kernel/asm-offsets.c:10:
arch/arm64/include/asm/tlbflush.h: In function '__flush_tlb_page_nosync':
arch/arm64/include/asm/tlbflush.h:268:53: error: 'vma' undeclared (first use in this function); did you mean 'cma'?
268 | mmu_notifier_arch_invalidate_secondary_tlbs(vma->vm_mm, uaddr & PAGE_MASK,
| ^~~
| cma

Caused by commit

8c2be11e06f4 ("mmu_notifiers: call arch_invalidate_secondary_tlbs() when invalidating TLBs")

I have reverted that commit (and the following clear
one and the two
earlier ones - otherwise it would not buildfrom) for today.

--
Cheers,
Stephen Rothwell

---

Attachments:

(No filename) (499.00 B)
OpenPGP digital signature

2023-07-19 06:07:19

by Alistair Popple

[permalink] [raw]

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

---

Thanks Stephen.

Looks like a conflict with 9c47011d3302 ("arm64: support
batched/deferred tlb shootdown during page reclamation/migration") which
restructured that code slightly. I have to respin my series anyway so
will rebase on mm-unstable rather than v6.5-rc2.

- Alistair

Stephen Rothwell <[email protected]> writes:

> [[PGP Signed Part:Undecided]]
> Hi all,
>
> After merging the mm tree, today's linux-next build (arm64 defconfig)
> failed like this:
>
> In file included from arch/arm64/include/asm/pgtable.h:15,
> from include/linux/pgtable.h:6,
> from arch/arm64/include/asm/io.h:12,
> from include/linux/io.h:13,
> from include/acpi/acpi_io.h:5,
> from include/linux/acpi.h:37,
> from include/acpi/apei.h:9,
> from include/acpi/ghes.h:5,
> from include/linux/arm_sdei.h:8,
> from arch/arm64/kernel/asm-offsets.c:10:
> arch/arm64/include/asm/tlbflush.h: In function '__flush_tlb_page_nosync':
> arch/arm64/include/asm/tlbflush.h:268:53: error: 'vma' undeclared (first use in this function); did you mean 'cma'?
> 268 | mmu_notifier_arch_invalidate_secondary_tlbs(vma->vm_mm, uaddr & PAGE_MASK,
> | ^~~
> | cma
>
> Caused by commit
>
> 8c2be11e06f4 ("mmu_notifiers: call arch_invalidate_secondary_tlbs() when invalidating TLBs")
>
> I have reverted that commit (and the following clear
> one and the two
> earlier ones - otherwise it would not buildfrom) for today.