mm-shmem-allows-file-back-mem-to-be-uffd-wr-protected-on-thps.patch removed from -mm tree
The quilt patch titled
Subject: mm/shmem: allows file-back mem to be uffd wr-protected on thps
has been removed from the -mm tree. Its filename was
mm-shmem-allows-file-back-mem-to-be-uffd-wr-protected-on-thps.patch
This patch was dropped because it was merged into the mm-stable branch\nof git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Peter Xu <[email protected]>
Subject: mm/shmem: allows file-back mem to be uffd wr-protected on thps
We don't have "huge" version of pte markers, instead when necessary we split the thp.
However split the thp is not enough, because file-backed thp is handled totally differently comparing to anonymous thps: rather than doing a real split, the thp pmd will simply got cleared in __split_huge_pmd_locked().
That is not enough if e.g. when there is a thp covers range [0, 2M) but we want to wr-protect small page resides in [4K, 8K) range, because after __split_huge_pmd() returns, there will be a none pmd, and change_pmd_range() will just skip it right after the split.
Here we leverage the previously introduced change_pmd_prepare() macro so that we'll populate the pmd with a pgtable page after the pmd split (in which process the pmd will be cleared for cases like shmem). Then change_pte_range() will do all the rest for us by installing the uffd-wp pte marker at any none pte that we'd like to wr-protect.
---
mm/mprotect.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
mm/mprotect.c renamed from mm/mprotect.c~mm-shmem-allows-file-back-mem-to-be-uffd-wr-protected-on-thps +8 -1
@@ -338,8 +338,15 @@ static inline unsigned long change_pmd_r }if (is_swap_pmd (*pmd) ||pmd_trans_huge (*pmd) ||pmd_devmap (*pmd)) { -if (next - addr !=HPAGE_PMD_SIZE ) { +if ((next - addr !=HPAGE_PMD_SIZE ) || +uffd_wp_protect_file (vma, cp_flags)) {__split_huge_pmd (vma, pmd, addr, false,NULL ); +/* +* For file-backed, the pmd could have been +* cleared; make sure pmd populated if +* necessary, then fall-through to pte level. +*/ +change_pmd_prepare (vma, pmd, cp_flags); }else {/* * change_huge_pmd() does not defer TLB flushes,
_
Patches currently in -mm which might be from [email protected] are