Skip to content

Fix CONT-PTE/PMD size hugetlb issue when unmapping or migrating

Baolin Wang linux-arch linux-arm-kernel linux-ia64 linux-mips linux-mm linux-parisc linux-s390 linux-sh linuxppc-dev lkml sparclinux 4 versions – Applied

Status from this message: [merged mm-stable] mm-change-huge_ptep_clear_flush-to-return-the-original-pte.patch removed from -mm tree

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v4 Latest3 patches 2 repliesApplied 3/3
  2. v33 patches 6 repliesSuperseded
  3. v23 patches 12 repliesSuperseded
Earlier versions · 1
VersionPostedPatchesRepliesStatus
v13 patches18 repliesSuperseded

Changes in v4 from the cover letter

- Fix building errors for !CONFIG_MMU.

Patches in v4 All 3 applied

#Subject and filesSizeRepliesApplied
1/3mm: change huge_ptep_clear_flush() to return the original ptearch/arm64/include/asm/hugetlb.h arch/arm64/mm/hugetlbpage.c arch/ia64/include/asm/hugetlb.h +7 more+36 -280 repliesApplied
2/3mm: rmap: Fix CONT-PTE/PMD size hugetlb issue when migrationinclude/linux/hugetlb.h mm/rmap.c+29 -61 replyApplied
3/3mm: rmap: Fix CONT-PTE/PMD size hugetlb issue when unmappingmm/rmap.c+22 -171 replyApplied

Reviews trailers per patch

All 3 patches have a Reviewed-by or Acked-by.

PatchMike KravetzMuchun SongDavid Hildenbrand
1/3A-b R-b
2/3R-b R-b A-b
3/3R-b R-b A-b

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes. Scroll the table sideways for all 3 reviewers.

Read the v4 thread

Cover letter [PATCH v4 0/3] Fix CONT-PTE/PMD size hugetlb issue when unmapping or migrating

Hi,

Now migrating a hugetlb page or unmapping a poisoned hugetlb page, we'll use ptep_clear_flush() and set_pte_at() to nuke the page table entry and remap it, and this is incorrect for CONT-PTE or CONT-PMD size hugetlb page, which will cause potential data consistent issue. This patch set will change to use hugetlb related APIs to fix this issue, please find details in each patch. Thanks.

Note: Mike pointed out the huge_ptep_get() will only return the one specific value, and it would not take into account the dirty or young bits of CONT-PTE/PMDs like the huge_ptep_get_and_clear() [1]. This inconsistent issue is not introduced by this patch set, and will address this issue in another thread [2]. Meanwhile the uffd for hugetlb case [3] pointed by Gerald also need another patch to address.

[1] https://lore.kernel.org/linux-mm/[email protected]/
[2] https://lore.kernel.org/all/[email protected]/
[3] https://lore.kernel.org/linux-mm/20220503120343.6264e126@thinkpad/

Changes from v3:
- Fix building errors for !CONFIG_MMU.

Changes from v2:
- Collect reviewed tags from Muchun and Mike.
- Drop the unnecessary casting in hugetlb.c.
- Fix building errors with adding dummy functions for !CONFIG_HUGETLB_PAGE.

Changes from v1:
- Add acked tag from Mike.
- Update some commit message.
- Add VM_BUG_ON in try_to_unmap() for hugetlb case.
- Add an explict void casting for huge_ptep_clear_flush() in hugetlb.c.

Baolin Wang (3):
mm: change huge_ptep_clear_flush() to return the original pte
mm: rmap: Fix CONT-PTE/PMD size hugetlb issue when migration
mm: rmap: Fix CONT-PTE/PMD size hugetlb issue when unmapping

 arch/arm64/include/asm/hugetlb.h   |  4 +--
 arch/arm64/mm/hugetlbpage.c        | 12 +++-----
 arch/ia64/include/asm/hugetlb.h    |  5 +--
 arch/mips/include/asm/hugetlb.h    |  9 ++++--
 arch/parisc/include/asm/hugetlb.h  |  5 +--
 arch/powerpc/include/asm/hugetlb.h |  9 ++++--
 arch/s390/include/asm/hugetlb.h    |  6 ++--
 arch/sh/include/asm/hugetlb.h      |  5 +--
 arch/sparc/include/asm/hugetlb.h   |  5 +--
 include/asm-generic/hugetlb.h      |  4 +--
 include/linux/hugetlb.h            | 11 +++++++
 mm/rmap.c                          | 63 ++++++++++++++++++++++++--------------
 12 files changed, 87 insertions(+), 51 deletions(-)
Signature · 1 line
1.8.3.1