From ebbd0d31b97f03ff71e1181ea47355a2b1d73bb3 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Tue, 4 Oct 2022 19:49:10 +0200 Subject: [PATCH] drop powerpc-64s-radix-don-t-need-to-broadcast-ipi-for-radix-pmd-collapse-flush.patch from 5.15 and 5.10 as it needs another change at the same time. --- ...ast-ipi-for-radix-pmd-collapse-flush.patch | 55 ------------------- queue-5.10/series | 1 - ...ast-ipi-for-radix-pmd-collapse-flush.patch | 55 ------------------- queue-5.15/series | 1 - 4 files changed, 112 deletions(-) delete mode 100644 queue-5.10/powerpc-64s-radix-don-t-need-to-broadcast-ipi-for-radix-pmd-collapse-flush.patch delete mode 100644 queue-5.15/powerpc-64s-radix-don-t-need-to-broadcast-ipi-for-radix-pmd-collapse-flush.patch diff --git a/queue-5.10/powerpc-64s-radix-don-t-need-to-broadcast-ipi-for-radix-pmd-collapse-flush.patch b/queue-5.10/powerpc-64s-radix-don-t-need-to-broadcast-ipi-for-radix-pmd-collapse-flush.patch deleted file mode 100644 index a439f4c3380..00000000000 --- a/queue-5.10/powerpc-64s-radix-don-t-need-to-broadcast-ipi-for-radix-pmd-collapse-flush.patch +++ /dev/null @@ -1,55 +0,0 @@ -From bedf03416913d88c796288f9dca109a53608c745 Mon Sep 17 00:00:00 2001 -From: Yang Shi -Date: Wed, 7 Sep 2022 11:01:44 -0700 -Subject: powerpc/64s/radix: don't need to broadcast IPI for radix pmd collapse flush - -From: Yang Shi - -commit bedf03416913d88c796288f9dca109a53608c745 upstream. - -The IPI broadcast is used to serialize against fast-GUP, but fast-GUP will -move to use RCU instead of disabling local interrupts in fast-GUP. Using -an IPI is the old-styled way of serializing against fast-GUP although it -still works as expected now. - -And fast-GUP now fixed the potential race with THP collapse by checking -whether PMD is changed or not. So IPI broadcast in radix pmd collapse -flush is not necessary anymore. But it is still needed for hash TLB. - -Link: https://lkml.kernel.org/r/20220907180144.555485-2-shy828301@gmail.com -Suggested-by: Aneesh Kumar K.V -Signed-off-by: Yang Shi -Acked-by: David Hildenbrand -Acked-by: Peter Xu -Cc: Christophe Leroy -Cc: Hugh Dickins -Cc: Jason Gunthorpe -Cc: John Hubbard -Cc: "Kirill A. Shutemov" -Cc: Michael Ellerman -Cc: Nicholas Piggin -Cc: -Signed-off-by: Andrew Morton -Signed-off-by: Greg Kroah-Hartman ---- - arch/powerpc/mm/book3s64/radix_pgtable.c | 9 --------- - 1 file changed, 9 deletions(-) - ---- a/arch/powerpc/mm/book3s64/radix_pgtable.c -+++ b/arch/powerpc/mm/book3s64/radix_pgtable.c -@@ -997,15 +997,6 @@ pmd_t radix__pmdp_collapse_flush(struct - pmd = *pmdp; - pmd_clear(pmdp); - -- /* -- * pmdp collapse_flush need to ensure that there are no parallel gup -- * walk after this call. This is needed so that we can have stable -- * page ref count when collapsing a page. We don't allow a collapse page -- * if we have gup taken on the page. We can ensure that by sending IPI -- * because gup walk happens with IRQ disabled. -- */ -- serialize_against_pte_lookup(vma->vm_mm); -- - radix__flush_tlb_collapsed_pmd(vma->vm_mm, address); - - return pmd; diff --git a/queue-5.10/series b/queue-5.10/series index d47d881da19..d780e6f15a3 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -16,7 +16,6 @@ clk-ingenic-tcu-properly-enable-registers-before-accessing-timers.patch arm-dts-integrator-tag-pci-host-with-device_type.patch ntfs-fix-bug_on-in-ntfs_lookup_inode_by_name.patch net-mt7531-only-do-pll-once-after-the-reset.patch -powerpc-64s-radix-don-t-need-to-broadcast-ipi-for-radix-pmd-collapse-flush.patch libata-add-ata_horkage_nolpm-for-pioneer-bdr-207m-and-bdr-205.patch mmc-moxart-fix-4-bit-bus-width-and-remove-8-bit-bus-width.patch mmc-hsq-fix-data-stomping-during-mmc-recovery.patch diff --git a/queue-5.15/powerpc-64s-radix-don-t-need-to-broadcast-ipi-for-radix-pmd-collapse-flush.patch b/queue-5.15/powerpc-64s-radix-don-t-need-to-broadcast-ipi-for-radix-pmd-collapse-flush.patch deleted file mode 100644 index 79715363499..00000000000 --- a/queue-5.15/powerpc-64s-radix-don-t-need-to-broadcast-ipi-for-radix-pmd-collapse-flush.patch +++ /dev/null @@ -1,55 +0,0 @@ -From bedf03416913d88c796288f9dca109a53608c745 Mon Sep 17 00:00:00 2001 -From: Yang Shi -Date: Wed, 7 Sep 2022 11:01:44 -0700 -Subject: powerpc/64s/radix: don't need to broadcast IPI for radix pmd collapse flush - -From: Yang Shi - -commit bedf03416913d88c796288f9dca109a53608c745 upstream. - -The IPI broadcast is used to serialize against fast-GUP, but fast-GUP will -move to use RCU instead of disabling local interrupts in fast-GUP. Using -an IPI is the old-styled way of serializing against fast-GUP although it -still works as expected now. - -And fast-GUP now fixed the potential race with THP collapse by checking -whether PMD is changed or not. So IPI broadcast in radix pmd collapse -flush is not necessary anymore. But it is still needed for hash TLB. - -Link: https://lkml.kernel.org/r/20220907180144.555485-2-shy828301@gmail.com -Suggested-by: Aneesh Kumar K.V -Signed-off-by: Yang Shi -Acked-by: David Hildenbrand -Acked-by: Peter Xu -Cc: Christophe Leroy -Cc: Hugh Dickins -Cc: Jason Gunthorpe -Cc: John Hubbard -Cc: "Kirill A. Shutemov" -Cc: Michael Ellerman -Cc: Nicholas Piggin -Cc: -Signed-off-by: Andrew Morton -Signed-off-by: Greg Kroah-Hartman ---- - arch/powerpc/mm/book3s64/radix_pgtable.c | 9 --------- - 1 file changed, 9 deletions(-) - ---- a/arch/powerpc/mm/book3s64/radix_pgtable.c -+++ b/arch/powerpc/mm/book3s64/radix_pgtable.c -@@ -954,15 +954,6 @@ pmd_t radix__pmdp_collapse_flush(struct - pmd = *pmdp; - pmd_clear(pmdp); - -- /* -- * pmdp collapse_flush need to ensure that there are no parallel gup -- * walk after this call. This is needed so that we can have stable -- * page ref count when collapsing a page. We don't allow a collapse page -- * if we have gup taken on the page. We can ensure that by sending IPI -- * because gup walk happens with IRQ disabled. -- */ -- serialize_against_pte_lookup(vma->vm_mm); -- - radix__flush_tlb_collapsed_pmd(vma->vm_mm, address); - - return pmd; diff --git a/queue-5.15/series b/queue-5.15/series index 7df3ddae231..7b969258092 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -19,7 +19,6 @@ ntfs-fix-bug_on-in-ntfs_lookup_inode_by_name.patch mm-damon-dbgfs-fix-memory-leak-when-using-debugfs_lookup.patch net-mt7531-only-do-pll-once-after-the-reset.patch revert-firmware-arm_scmi-add-clock-management-to-the-scmi-power-domain.patch -powerpc-64s-radix-don-t-need-to-broadcast-ipi-for-radix-pmd-collapse-flush.patch drm-i915-gt-restrict-forced-preemption-to-the-active-context.patch drm-amdgpu-add-amdgpu-suspend-resume-code-path-under-sriov.patch vduse-prevent-uninitialized-memory-accesses.patch -- 2.47.3