* [folded-merged] hugetlb-userfaultfd-forbid-huge-pmd-sharing-when-uffd-enabled-fix.patch removed from -mm tree
@ 2021-05-05 0:54 akpm
0 siblings, 0 replies; only message in thread
From: akpm @ 2021-05-05 0:54 UTC (permalink / raw)
To: axelrasmussen, mike.kravetz, mm-commits, naresh.kamboju, peterx
The patch titled
Subject: mm/hugetlb: fix build with !ARCH_WANT_HUGE_PMD_SHARE
has been removed from the -mm tree. Its filename was
hugetlb-userfaultfd-forbid-huge-pmd-sharing-when-uffd-enabled-fix.patch
This patch was dropped because it was folded into hugetlb-userfaultfd-forbid-huge-pmd-sharing-when-uffd-enabled.patch
------------------------------------------------------
From: Peter Xu <peterx@redhat.com>
Subject: mm/hugetlb: fix build with !ARCH_WANT_HUGE_PMD_SHARE
want_pmd_share() is undefined with !ARCH_WANT_HUGE_PMD_SHARE since it's
put by accident into a "#ifdef ARCH_WANT_HUGE_PMD_SHARE" block. Moving it
out won't work either since vma_shareable() is only defined within the
block. Define it for !ARCH_WANT_HUGE_PMD_SHARE instead.
Link: https://lkml.kernel.org/r/20210310185359.88297-1-peterx@redhat.com
Fixes: 5b109cc1cdcc ("hugetlb/userfaultfd: forbid huge pmd sharing when uffd enabled")
Signed-off-by: Peter Xu <peterx@redhat.com>
Reported-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Tested-by: Naresh Kamboju <naresh.kamboju@linaro.org>
Reviewed-by: Mike Kravetz <mike.kravetz@oracle.com>
Cc: Axel Rasmussen <axelrasmussen@google.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
mm/hugetlb.c | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
--- a/mm/hugetlb.c~hugetlb-userfaultfd-forbid-huge-pmd-sharing-when-uffd-enabled-fix
+++ a/mm/hugetlb.c
@@ -5328,9 +5328,6 @@ static bool vma_shareable(struct vm_area
bool want_pmd_share(struct vm_area_struct *vma, unsigned long addr)
{
-#ifndef CONFIG_ARCH_WANT_HUGE_PMD_SHARE
- return false;
-#endif
#ifdef CONFIG_USERFAULTFD
if (uffd_disable_huge_pmd_share(vma))
return false;
@@ -5475,6 +5472,11 @@ void adjust_range_if_pmd_sharing_possibl
unsigned long *start, unsigned long *end)
{
}
+
+bool want_pmd_share(struct vm_area_struct *vma, unsigned long addr)
+{
+ return false;
+}
#endif /* CONFIG_ARCH_WANT_HUGE_PMD_SHARE */
#ifdef CONFIG_ARCH_WANT_GENERAL_HUGETLB
_
Patches currently in -mm which might be from peterx@redhat.com are
hugetlb-pass-vma-into-huge_pte_alloc-and-huge_pmd_share.patch
hugetlb-userfaultfd-forbid-huge-pmd-sharing-when-uffd-enabled.patch
mm-hugetlb-move-flush_hugetlb_tlb_range-into-hugetlbh.patch
hugetlb-userfaultfd-unshare-all-pmds-for-hugetlbfs-when-register-wp.patch
userfaultfd-add-minor-fault-registration-mode-fix.patch
mm-hugetlb-fix-f_seal_future_write.patch
mm-hugetlb-fix-cow-where-page-writtable-in-child.patch
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2021-05-05 0:54 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-05-05 0:54 [folded-merged] hugetlb-userfaultfd-forbid-huge-pmd-sharing-when-uffd-enabled-fix.patch removed from -mm tree akpm
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.