mm/page_vma_mapped: fix device-private PMD handling
Subsystems (3)
PATCH v5 1/1 mm/page_vma_mapped: fix device-private PMD handling
Commit 65edfda6f3f2 ("mm/rmap: extend rmap and migration support device-private entries") introduced the concept of device-private PMD entries, but did not correctly update the rmap walk code to account for them.
As a result, when page_vma_mapped_walk() encounters device-private PMD entries, it takes no action other than to acquire the PMD lock and exit.
However this is highly problematic for two reasons - firstly, device private entries possess a PFN so check_pmd() needs to be called to ensure an overlapping PFN range.
Secondly, and more importantly, if PVMW_MIGRATION is set the caller assumes the returned entry is a migration entry, resulting in memory corruption when the caller tries to interpret the device private entry as such.
In addition, commit 146287290023 ("mm/huge_memory: implement device-private THP splitting") allowed device private PMDs to be split like THP mappings, but again did not update this code path.
As a result, we might race a PMD split prior to acquiring the PMD lock.
This patch addresses all of these issues by invoking check_pmd(), ensuring PMVW_MIGRATION is not set and checks whether a split raced us we do for PMD THP and migration entries.
Instead of checking for a subset of the cases after taking the pmd_lock(), put device-private along with pmd_trans_huge() and pmd_is_migration_entry(). Also remove thp_migration_supported() as it is already guarded by pmd_is_migration_entry().
---
v5:
* put device-private pmd handling along with the other two cases
* remove thp_migration_supported()
v4: https://lore.kernel.org/all/[email protected]/T/#u
* refine subject and commit log based on Lorenzo's suggestion
* put pmd device-private entry handling in its own if branch, suggested by Lorenzo
v3:
* remove cleanup part, only fix the issue for device-private entry
* refine user effect description based on Lorenzo's suggestion
v2: https://lore.kernel.org/all/[email protected]/T/#u
* specify the possible error case of current code and user visible effect
* besides fix, cleanup the pmd entry handling based on David's suggestion
v1: https://lore.kernel.org/linux-mm/[email protected]/
--- mm/page_vma_mapped.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)
mm/page_vma_mapped.c +16 -14
@@ -243,21 +243,30 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)*/ pmde =pmdp_get_lockless (pvmw->pmd); -if (pmd_trans_huge (pmde) ||pmd_is_migration_entry (pmde)) { +if (pmd_trans_huge (pmde) ||pmd_is_migration_entry (pmde) || +pmd_is_device_private_entry (pmde)) { pvmw->ptl =pmd_lock (mm, pvmw->pmd); pmde = *pvmw->pmd; -if (!pmd_present (pmde)) { +if (pmd_is_migration_entry (pmde)) {softleaf_t entry; -if (!thp_migration_supported () || - !(pvmw->flags &PVMW_MIGRATION )) +if (!(pvmw->flags &PVMW_MIGRATION ))return not_found (pvmw); entry =softleaf_from_pmd (pmde); +if (!check_pmd (softleaf_to_pfn (entry), pvmw)) +return not_found (pvmw); +return true; + }else if (pmd_is_device_private_entry (pmde)) { +softleaf_t entry; -if (!softleaf_is_migration (entry) || - !check_pmd (softleaf_to_pfn (entry), pvmw)) +if (pvmw->flags &PVMW_MIGRATION ) +return not_found (pvmw); + entry =softleaf_from_pmd (pmde); +if (!check_pmd (softleaf_to_pfn (entry), pvmw))return not_found (pvmw);return true; + }else if (!pmd_present (pmde)) { +return not_found (pvmw); }if (likely (pmd_trans_huge (pmde))) {if (pvmw->flags &PVMW_MIGRATION )
@@ -266,17 +275,10 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)return not_found (pvmw);return true; } -/* THP pmd was split under us: handle on pte level */ +/* THP/device-private pmd was split under us: handle on pte level */ spin_unlock (pvmw->ptl); pvmw->ptl =NULL ; }else if (!pmd_present (pmde)) { -const softleaf_t entry =softleaf_from_pmd (pmde); - -if (softleaf_is_device_private (entry)) { - pvmw->ptl =pmd_lock (mm, pvmw->pmd); -return true; - } - if ((pvmw->flags & PVMW_SYNC) && thp_vma_suitable_order(vma, pvmw->address, PMD_ORDER) &&
Signature · 1 line
2.34.1
Quoted 45 lines · Wei Yang
Commit
65edfda6f3f2("mm/rmap: extend rmap and migration support device-private entries") introduced the concept of device-private PMD entries, but did not correctly update the rmap walk code to account for them.As a result, when
page_vma_mapped_walk()encounters device-private PMD entries, it takes no action other than to acquire the PMD lock and exit.However this is highly problematic for two reasons - firstly, device private entries possess a PFN so
check_pmd()needs to be called to ensure an overlapping PFN range.Secondly, and more importantly, if
PVMW_MIGRATIONis set the caller assumes the returned entry is a migration entry, resulting in memory corruption when the caller tries to interpret the device private entry as such.In addition, commit 146287290023 ("
mm/huge_memory: implement device-private THP splitting") allowed device private PMDs to be split like THP mappings, but again did not update this code path.As a result, we might race a PMD split prior to acquiring the PMD lock.
This patch addresses all of these issues by invoking
check_pmd(), ensuringPMVW_MIGRATIONis not set and checks whether a split raced us we do for PMD THP and migration entries.Instead of checking for a subset of the cases after taking the
pmd_lock(), put device-private along withpmd_trans_huge()andpmd_is_migration_entry(). Also removethp_migration_supported()as it is already guarded bypmd_is_migration_entry().Fixes 65edfda6f3f2 ("mm/rmap: extend rmap and migration support device-private entries")Cc <[email protected]>Signed-off-by Wei Yang <[email protected]>Suggested-by David Hildenbrand <[email protected]>Cc David Hildenbrand <[email protected]>Cc Balbir Singh <[email protected]>Cc SeongJae Park <[email protected]>Cc Zi Yan <[email protected]>Cc Lorenzo Stoakes <[email protected]>Cc Lance Yang <[email protected]>
Quoted 1 line
---
LGTM, thanks!
Quoted 118 lines · Wei Yang
Commit
65edfda6f3f2("mm/rmap: extend rmap and migration support device-private entries") introduced the concept of device-private PMD entries, but did not correctly update the rmap walk code to account for them.As a result, when
page_vma_mapped_walk()encounters device-private PMD entries, it takes no action other than to acquire the PMD lock and exit.However this is highly problematic for two reasons - firstly, device private entries possess a PFN so
check_pmd()needs to be called to ensure an overlapping PFN range.Secondly, and more importantly, if
PVMW_MIGRATIONis set the caller assumes the returned entry is a migration entry, resulting in memory corruption when the caller tries to interpret the device private entry as such.In addition, commit 146287290023 ("
mm/huge_memory: implement device-private THP splitting") allowed device private PMDs to be split like THP mappings, but again did not update this code path.As a result, we might race a PMD split prior to acquiring the PMD lock.
This patch addresses all of these issues by invoking
check_pmd(), ensuringPMVW_MIGRATIONis not set and checks whether a split raced us we do for PMD THP and migration entries.Instead of checking for a subset of the cases after taking the
pmd_lock(), put device-private along withpmd_trans_huge()andpmd_is_migration_entry(). Also removethp_migration_supported()as it is already guarded bypmd_is_migration_entry().Fixes 65edfda6f3f2 ("mm/rmap: extend rmap and migration support device-private entries")Cc <[email protected]>Signed-off-by Wei Yang <[email protected]>Suggested-by David Hildenbrand <[email protected]>Cc David Hildenbrand <[email protected]>Cc Balbir Singh <[email protected]>Cc SeongJae Park <[email protected]>Cc Zi Yan <[email protected]>Cc Lorenzo Stoakes <[email protected]>Cc Lance Yang <[email protected]>---
v5:
* put device-private pmd handling along with the other two cases
* removethp_migration_supported()
v4: https://lore.kernel.org/all/[email protected]/T/#u
* refine subject and commit log based on Lorenzo's suggestion
* put pmd device-private entry handling in its own if branch, suggested by Lorenzov3:
* remove cleanup part, only fix the issue for device-private entry
* refine user effect description based on Lorenzo's suggestionv2: https://lore.kernel.org/all/[email protected]/T/#u
* specify the possible error case of current code and user visible effect
* besides fix, cleanup the pmd entry handling based on David's suggestionv1: https://lore.kernel.org/linux-mm/[email protected]/
--- mm/page_vma_mapped.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)mm/page_vma_mapped.c +16
-8@@ -243,21 +243,30 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)*/ pmde =pmdp_get_lockless (pvmw->pmd); -if (pmd_trans_huge (pmde) ||pmd_is_migration_entry (pmde)) { +if (pmd_trans_huge (pmde) ||pmd_is_migration_entry (pmde) || +pmd_is_device_private_entry (pmde)) { pvmw->ptl =pmd_lock (mm, pvmw->pmd); pmde = *pvmw->pmd; -if (!pmd_present (pmde)) { +if (pmd_is_migration_entry (pmde)) {softleaf_t entry; -if (!thp_migration_supported () || - !(pvmw->flags &PVMW_MIGRATION )) +if (!(pvmw->flags &PVMW_MIGRATION ))return not_found (pvmw); entry =softleaf_from_pmd (pmde); +if (!check_pmd (softleaf_to_pfn (entry), pvmw)) +return not_found (pvmw); +return true; + }else if (pmd_is_device_private_entry (pmde)) { +softleaf_t entry; -if (!softleaf_is_migration (entry) || - !check_pmd (softleaf_to_pfn (entry), pvmw)) +if (pvmw->flags &PVMW_MIGRATION ) +return not_found (pvmw); + entry =softleaf_from_pmd (pmde); +if (!check_pmd (softleaf_to_pfn (entry), pvmw))return not_found (pvmw);return true; + }else if (!pmd_present (pmde)) { +return not_found (pvmw); }if (likely (pmd_trans_huge (pmde))) {if (pvmw->flags &PVMW_MIGRATION )@@ -266,17 +275,10 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)return not_found (pvmw);return true; } -/* THP pmd was split under us: handle on pte level */ +/* THP/device-private pmd was split under us: handle on pte level */ spin_unlock (pvmw->ptl); pvmw->ptl =NULL ; }else if (!pmd_present (pmde)) { -const softleaf_t entry =softleaf_from_pmd (pmde);
mm/page_vma_mapped.c bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)
Quoted 10 lines
mm/page_vma_mapped.c +0
-7- -if (softleaf_is_device_private (entry)) { - pvmw->ptl =pmd_lock (mm, pvmw->pmd); -return true; - } - if ((pvmw->flags & PVMW_SYNC) && thp_vma_suitable_order(vma, pvmw->address, PMD_ORDER) && --
Thanks!
Hi,
Quoted 25 lines · Wei Yang
Commit
65edfda6f3f2("mm/rmap: extend rmap and migration support device-private entries") introduced the concept of device-private PMD entries, but did not correctly update the rmap walk code to account for them.As a result, when
page_vma_mapped_walk()encounters device-private PMD entries, it takes no action other than to acquire the PMD lock and exit.However this is highly problematic for two reasons - firstly, device private entries possess a PFN so
check_pmd()needs to be called to ensure an overlapping PFN range.Secondly, and more importantly, if
PVMW_MIGRATIONis set the caller assumes the returned entry is a migration entry, resulting in memory corruption when the caller tries to interpret the device private entry as such.In addition, commit 146287290023 ("
mm/huge_memory: implement device-private THP splitting") allowed device private PMDs to be split like THP mappings, but again did not update this code path.As a result, we might race a PMD split prior to acquiring the PMD lock.
Quoted 8 lines
This patch addresses all of these issues by invoking
check_pmd(), ensuringPMVW_MIGRATIONis not set and checks whether a split raced us we do for PMD THP and migration entries.Instead of checking for a subset of the cases after taking the
pmd_lock(), put device-private along withpmd_trans_huge()andpmd_is_migration_entry(). Also removethp_migration_supported()as it is already guarded bypmd_is_migration_entry().
This results in a build bug for my Raspberry Pi 1:
In file included from <command-line>:
In function ‘check_pmd’,
inlined from ‘page_vma_mapped_walk’ at /home/klara/git/linux/trees/bisect/mm/page_vma_mapped.c:256:10:
/home/klara/git/linux/trees/bisect/include/linux/compiler_types.h:702:45: error: call to ‘__compiletime_assert_433’ declared with attribute error: BUILD_BUG failed
702 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
| ^
/home/klara/git/linux/trees/bisect/include/linux/compiler_types.h:683:25: note: in definition of macro ‘__compiletime_assert’
683 | prefix ## suffix(); \
| ^~~~~~
/home/klara/git/linux/trees/bisect/include/linux/compiler_types.h:702:9: note: in expansion of macro ‘_compiletime_assert’
702 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
| ^~~~~~~~~~~~~~~~~~~
/home/klara/git/linux/trees/bisect/include/linux/build_bug.h:40:37: note: in expansion of macro ‘compiletime_assert’
40 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg)
| ^~~~~~~~~~~~~~~~~~
/home/klara/git/linux/trees/bisect/include/linux/build_bug.h:60:21: note: in expansion of macro ‘BUILD_BUG_ON_MSG’
60 | #define BUILD_BUG() BUILD_BUG_ON_MSG(1, "BUILD_BUG failed")
| ^~~~~~~~~~~~~~~~
/home/klara/git/linux/trees/bisect/include/linux/huge_mm.h:113:28: note: in expansion of macro ‘BUILD_BUG’
113 | #define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; })
| ^~~~~~~~~
/home/klara/git/linux/trees/bisect/include/linux/huge_mm.h:117:26: note: in expansion of macro ‘HPAGE_PMD_SHIFT’
117 | #define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT)
| ^~~~~~~~~~~~~~~
/home/klara/git/linux/trees/bisect/include/linux/huge_mm.h:118:26: note: in expansion of macro ‘HPAGE_PMD_ORDER’
118 | #define HPAGE_PMD_NR (1<<HPAGE_PMD_ORDER)
| ^~~~~~~~~~~~~~~
/home/klara/git/linux/trees/bisect/mm/page_vma_mapped.c:142:20: note: in expansion of macro ‘HPAGE_PMD_NR’
142 | if ((pfn + HPAGE_PMD_NR - 1) < pvmw->pfn)
| ^~~~~~~~~~~~bisect log:
# bad: [be5c93fa674f0fc3c8f359c2143abce6bbb422e6] Add linux-next specific files for 20260630
git bisect start 'HEAD'
# status: waiting for 'good' commit(s), 'bad' commit known
# good: [dc59e4fea9d83f03bad6bddf3fa2e52491777482] Linux 7.2-rc1
git bisect good dc59e4fea9d83f03bad6bddf3fa2e52491777482
# bad: [6148219e90732fd06f5d7a498bda974e6a43ab4b] Merge branch 'nand/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
git bisect bad 6148219e90732fd06f5d7a498bda974e6a43ab4b
# bad: [e0326ebe10191447ab8fa2e904080df7b743765e] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
git bisect bad e0326ebe10191447ab8fa2e904080df7b743765e
# bad: [fbc9c5ac47cef5a2b04aef30c8e990b32dcf2548] Merge branch 'hwmon' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
git bisect bad fbc9c5ac47cef5a2b04aef30c8e990b32dcf2548
# bad: [e488171f6f6df6fc899a355079665fdb3c50b0e3] Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
git bisect bad e488171f6f6df6fc899a355079665fdb3c50b0e3
# bad: [60db0fcb8fc9d80ac0b63041c632b41a311a45f1] Merge branch 'fs-current' of linux-next
git bisect bad 60db0fcb8fc9d80ac0b63041c632b41a311a45f1
# good: [51021d260d682aa17b3533848a99160ab83e0c93] Merge branch 'vfs.fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
git bisect good 51021d260d682aa17b3533848a99160ab83e0c93
# good: [ded56474db6552260786a65898322464b72c7540] mm: a second pagecache maintainer
git bisect good ded56474db6552260786a65898322464b72c7540
# good: [6c893b948351d42cfc3761cc746ab5b3d03ee7f3] Merge branch 'misc-7.2' into next-fixes
git bisect good 6c893b948351d42cfc3761cc746ab5b3d03ee7f3
# good: [bfcc55a14179495b0c41408908fd7b9d7785c694] lib: test_hmm: use device devt for coherent device range selection
git bisect good bfcc55a14179495b0c41408908fd7b9d7785c694
# good: [a27318567c92ba5482906d047e71a7aa4fd01889] Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git
git bisect good a27318567c92ba5482906d047e71a7aa4fd01889
# bad: [6887a39652cdfd4cfd3b0962662c9cbc26ce5252] mm/page_vma_mapped: fix device-private PMD handling
git bisect bad 6887a39652cdfd4cfd3b0962662c9cbc26ce5252
# good: [2cc6bd0efc264b9ac760c2bc74dff4f521a680a1] MAINTAINERS: s/SeongJae/SJ/
git bisect good 2cc6bd0efc264b9ac760c2bc74dff4f521a680a1
# first 'bad' commit: [6887a39652cdfd4cfd3b0962662c9cbc26ce5252] mm/page_vma_mapped: fix device-private PMD handling
Quoted 55 lines
Fixes 65edfda6f3f2 ("mm/rmap: extend rmap and migration support device-private entries")Cc <[email protected]>Signed-off-by Wei Yang <[email protected]>Suggested-by David Hildenbrand <[email protected]>Cc David Hildenbrand <[email protected]>Cc Balbir Singh <[email protected]>Cc SeongJae Park <[email protected]>Cc Zi Yan <[email protected]>Cc Lorenzo Stoakes <[email protected]>Cc Lance Yang <[email protected]>---
v5:
* put device-private pmd handling along with the other two cases
* removethp_migration_supported()
v4: https://lore.kernel.org/all/[email protected]/T/#u
* refine subject and commit log based on Lorenzo's suggestion
* put pmd device-private entry handling in its own if branch, suggested by Lorenzov3:
* remove cleanup part, only fix the issue for device-private entry
* refine user effect description based on Lorenzo's suggestionv2: https://lore.kernel.org/all/[email protected]/T/#u
* specify the possible error case of current code and user visible effect
* besides fix, cleanup the pmd entry handling based on David's suggestionv1: https://lore.kernel.org/linux-mm/[email protected]/
--- mm/page_vma_mapped.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)mm/page_vma_mapped.c +4
-4@@ -243,21 +243,30 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)*/ pmde =pmdp_get_lockless (pvmw->pmd); -if (pmd_trans_huge (pmde) ||pmd_is_migration_entry (pmde)) { +if (pmd_trans_huge (pmde) ||pmd_is_migration_entry (pmde) || +pmd_is_device_private_entry (pmde)) { pvmw->ptl =pmd_lock (mm, pvmw->pmd); pmde = *pvmw->pmd; -if (!pmd_present (pmde)) { +if (pmd_is_migration_entry (pmde)) {softleaf_t entry; -if (!thp_migration_supported () || - !(pvmw->flags &PVMW_MIGRATION )) +if (!(pvmw->flags &PVMW_MIGRATION ))return not_found (pvmw);
mm/page_vma_mapped.c bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) · line 259
Quoted 10 lines
mm/page_vma_mapped.c +5
-2entry =softleaf_from_pmd (pmde); +if (!check_pmd (softleaf_to_pfn (entry), pvmw)) +return not_found (pvmw); +return true; + }else if (pmd_is_device_private_entry (pmde)) { +softleaf_t entry; -if (!softleaf_is_migration (entry) || - !check_pmd (softleaf_to_pfn (entry), pvmw))
My only guess here would be that the compiler evaluates !softleaf_is_migration(entry) to always be true and optimises away the !check_pmd(softleaf_to_pfn(entry), pvmw) which is why this worked before?
Quoted 33 lines
mm/page_vma_mapped.c +6
-0+if (pvmw->flags &PVMW_MIGRATION ) +return not_found (pvmw); + entry =softleaf_from_pmd (pmde); +if (!check_pmd (softleaf_to_pfn (entry), pvmw))return not_found (pvmw);return true; + }else if (!pmd_present (pmde)) { +return not_found (pvmw); }if (likely (pmd_trans_huge (pmde))) {mm/page_vma_mapped.c +1
-8if (pvmw->flags &PVMW_MIGRATION )@@ -266,17 +275,10 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)return not_found (pvmw);return true; } -/* THP pmd was split under us: handle on pte level */ +/* THP/device-private pmd was split under us: handle on pte level */ spin_unlock (pvmw->ptl); pvmw->ptl =NULL ; }else if (!pmd_present (pmde)) { -const softleaf_t entry =softleaf_from_pmd (pmde); - -if (softleaf_is_device_private (entry)) { - pvmw->ptl =pmd_lock (mm, pvmw->pmd); -return true; - } - if ((pvmw->flags & PVMW_SYNC) && thp_vma_suitable_order(vma, pvmw->address, PMD_ORDER) &&Signature · 1 line
2.34.1
Regards,
Klara Modin
David Hildenbrand (Arm)
maintainerQuoted 166 lines · Klara Modin
Hi,
Quoted 25 lines · Wei Yang
Commit
65edfda6f3f2("mm/rmap: extend rmap and migration support device-private entries") introduced the concept of device-private PMD entries, but did not correctly update the rmap walk code to account for them.As a result, when
page_vma_mapped_walk()encounters device-private PMD entries, it takes no action other than to acquire the PMD lock and exit.However this is highly problematic for two reasons - firstly, device private entries possess a PFN so
check_pmd()needs to be called to ensure an overlapping PFN range.Secondly, and more importantly, if
PVMW_MIGRATIONis set the caller assumes the returned entry is a migration entry, resulting in memory corruption when the caller tries to interpret the device private entry as such.In addition, commit 146287290023 ("
mm/huge_memory: implement device-private THP splitting") allowed device private PMDs to be split like THP mappings, but again did not update this code path.As a result, we might race a PMD split prior to acquiring the PMD lock.
Quoted 8 lines
This patch addresses all of these issues by invoking
check_pmd(), ensuringPMVW_MIGRATIONis not set and checks whether a split raced us we do for PMD THP and migration entries.Instead of checking for a subset of the cases after taking the
pmd_lock(), put device-private along withpmd_trans_huge()andpmd_is_migration_entry(). Also removethp_migration_supported()as it is already guarded bypmd_is_migration_entry().This results in a build bug for my Raspberry Pi 1:
In file included from <command-line>:
In function ‘check_pmd’,
inlined from ‘page_vma_mapped_walk’ at/home/klara/git/linux/trees/bisect/mm/page_vma_mapped.c:256:10:
/home/klara/git/linux/trees/bisect/include/linux/compiler_types.h:702:45: error: call to ‘__compiletime_assert_433’ declared with attribute error:BUILD_BUGfailed
702 |_compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
| ^
/home/klara/git/linux/trees/bisect/include/linux/compiler_types.h:683:25: note: in definition of macro ‘__compiletime_assert’683 | prefix ## suffix(); \ | ^~~~~~ /home/klara/git/linux/trees/bisect/include/linux/compiler_types.h:702:9: note: in expansion of macro ‘_compiletime_assert’ 702 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /home/klara/git/linux/trees/bisect/include/linux/build_bug.h:40:37: note: in expansion of macro ‘compiletime_assert’ 40 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /home/klara/git/linux/trees/bisect/include/linux/build_bug.h:60:21: note: in expansion of macro ‘BUILD_BUG_ON_MSG’ 60 | #define BUILD_BUG() BUILD_BUG_ON_MSG(1, "BUILD_BUG failed") | ^~~~~~~~~~~~~~~~ /home/klara/git/linux/trees/bisect/include/linux/huge_mm.h:113:28: note: in expansion of macro ‘BUILD_BUG’ 113 | #define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; }) | ^~~~~~~~~ /home/klara/git/linux/trees/bisect/include/linux/huge_mm.h:117:26: note: in expansion of macro ‘HPAGE_PMD_SHIFT’ 117 | #define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT) | ^~~~~~~~~~~~~~~ /home/klara/git/linux/trees/bisect/include/linux/huge_mm.h:118:26: note: in expansion of macro ‘HPAGE_PMD_ORDER’ 118 | #define HPAGE_PMD_NR (1<<HPAGE_PMD_ORDER) | ^~~~~~~~~~~~~~~ /home/klara/git/linux/trees/bisect/mm/page_vma_mapped.c:142:20: note: in expansion of macro ‘HPAGE_PMD_NR’ 142 | if ((pfn + HPAGE_PMD_NR - 1) < pvmw->pfn) | ^~~~~~~~~~~~bisect log:
# bad: [
be5c93fa674f0fc3c8f359c2143abce6bbb422e6] Add linux-next specific files for 20260630
git bisect start 'HEAD'
# status: waiting for 'good' commit(s), 'bad' commit known
# good: [dc59e4fea9d83f03bad6bddf3fa2e52491777482] Linux 7.2-rc1
git bisect gooddc59e4fea9d83f03bad6bddf3fa2e52491777482
# bad: [6148219e90732fd06f5d7a498bda974e6a43ab4b] Merge branch 'nand/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
git bisect bad6148219e90732fd06f5d7a498bda974e6a43ab4b
# bad: [e0326ebe10191447ab8fa2e904080df7b743765e] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
git bisect bade0326ebe10191447ab8fa2e904080df7b743765e
# bad: [fbc9c5ac47cef5a2b04aef30c8e990b32dcf2548] Merge branch 'hwmon' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
git bisect badfbc9c5ac47cef5a2b04aef30c8e990b32dcf2548
# bad: [e488171f6f6df6fc899a355079665fdb3c50b0e3] Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
git bisect bade488171f6f6df6fc899a355079665fdb3c50b0e3
# bad: [60db0fcb8fc9d80ac0b63041c632b41a311a45f1] Merge branch 'fs-current' of linux-next
git bisect bad60db0fcb8fc9d80ac0b63041c632b41a311a45f1
# good: [51021d260d682aa17b3533848a99160ab83e0c93] Merge branch 'vfs.fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
git bisect good51021d260d682aa17b3533848a99160ab83e0c93
# good: [ded56474db6552260786a65898322464b72c7540] mm: a second pagecache maintainer
git bisect goodded56474db6552260786a65898322464b72c7540
# good: [6c893b948351d42cfc3761cc746ab5b3d03ee7f3] Merge branch 'misc-7.2' into next-fixes
git bisect good6c893b948351d42cfc3761cc746ab5b3d03ee7f3
# good: [bfcc55a14179495b0c41408908fd7b9d7785c694] lib:test_hmm: use device devt for coherent device range selection
git bisect goodbfcc55a14179495b0c41408908fd7b9d7785c694
# good: [a27318567c92ba5482906d047e71a7aa4fd01889] Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git
git bisect gooda27318567c92ba5482906d047e71a7aa4fd01889
# bad: [6887a39652cdfd4cfd3b0962662c9cbc26ce5252]mm/page_vma_mapped: fix device-private PMD handling
git bisect bad6887a39652cdfd4cfd3b0962662c9cbc26ce5252
# good: [2cc6bd0efc264b9ac760c2bc74dff4f521a680a1]MAINTAINERS: s/SeongJae/SJ/
git bisect good2cc6bd0efc264b9ac760c2bc74dff4f521a680a1# first 'bad' commit: [6887a39652cdfd4cfd3b0962662c9cbc26ce5252] mm/page_vma_mapped: fix device-private PMD handlingQuoted 62 lines
Fixes 65edfda6f3f2 ("mm/rmap: extend rmap and migration support device-private entries")Cc <[email protected]>Signed-off-by Wei Yang <[email protected]>Suggested-by David Hildenbrand <[email protected]>Cc David Hildenbrand <[email protected]>Cc Balbir Singh <[email protected]>Cc SeongJae Park <[email protected]>Cc Zi Yan <[email protected]>Cc Lorenzo Stoakes <[email protected]>Cc Lance Yang <[email protected]>---
v5:
* put device-private pmd handling along with the other two cases
* removethp_migration_supported()
v4: https://lore.kernel.org/all/[email protected]/T/#u
* refine subject and commit log based on Lorenzo's suggestion
* put pmd device-private entry handling in its own if branch, suggested by Lorenzov3:
* remove cleanup part, only fix the issue for device-private entry
* refine user effect description based on Lorenzo's suggestionv2: https://lore.kernel.org/all/[email protected]/T/#u
* specify the possible error case of current code and user visible effect
* besides fix, cleanup the pmd entry handling based on David's suggestionv1: https://lore.kernel.org/linux-mm/[email protected]/
--- mm/page_vma_mapped.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)mm/page_vma_mapped.c +9
-4@@ -243,21 +243,30 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)*/ pmde =pmdp_get_lockless (pvmw->pmd); -if (pmd_trans_huge (pmde) ||pmd_is_migration_entry (pmde)) { +if (pmd_trans_huge (pmde) ||pmd_is_migration_entry (pmde) || +pmd_is_device_private_entry (pmde)) { pvmw->ptl =pmd_lock (mm, pvmw->pmd); pmde = *pvmw->pmd; -if (!pmd_present (pmde)) { +if (pmd_is_migration_entry (pmde)) {softleaf_t entry; -if (!thp_migration_supported () || - !(pvmw->flags &PVMW_MIGRATION )) +if (!(pvmw->flags &PVMW_MIGRATION ))return not_found (pvmw); entry =softleaf_from_pmd (pmde); +if (!check_pmd (softleaf_to_pfn (entry), pvmw)) +return not_found (pvmw); +return true; + }else if (pmd_is_device_private_entry (pmde)) { +softleaf_t entry;
Quoted 7 lines
mm/page_vma_mapped.c bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) · line 258
Quoted 2 lines
mm/page_vma_mapped.c +0
-2-if (!softleaf_is_migration (entry) || - !check_pmd (softleaf_to_pfn (entry), pvmw))My only guess here would be that the compiler evaluates !softleaf_is_migration(entry) to always be true and optimises away the !check_pmd(softleaf_to_pfn(entry), pvmw) which is why this worked before?
Weird, we enter this path only with
pmd_trans_huge(pmde) || pmd_is_migration_entry(pmde) || pmd_is_device_private_entry(pmde)
If any one of these would compile for !CONFIG_TRANSPARENT_HUGEPAGE that would be odd.
pmd_is_device_private_entry() is hard-coded to false unless CONFIG_ARCH_ENABLE_THP_MIGRATION. Which is only selected with ARCH_ENABLE_THP_MIGRATION.
pmd_trans_huge() as well.
Maybe it's struggling with pmd_is_migration_entry() on some (older) compilers? (not innlining stuff and not properly optimizing it out).
The whole conditional must be optimized out.
We could check for IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) right at the start to make it easier for the compiler:
if (IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) &&
(pmd_trans_huge(pmde) || pmd_is_migration_entry(pmde) ||
pmd_is_device_private_entry(pmde))) {Signature · 3 lines
Cheers, David
Lance Yang
reviewerQuoted 2 lines · David Hildenbrand (Arm)
Quoted 1 line · Klara Modin
Hi,
Hi,
[...]
Quoted 2 lines
Quoted 2 lines
This results in a build bug for my Raspberry Pi 1:
Thanks for reporting this!
Quoted 147 lines
Quoted 127 lines
In file included from <command-line>:
In function ‘check_pmd’,
inlined from ‘page_vma_mapped_walk’ at/home/klara/git/linux/trees/bisect/mm/page_vma_mapped.c:256:10:
/home/klara/git/linux/trees/bisect/include/linux/compiler_types.h:702:45: error: call to ‘__compiletime_assert_433’ declared with attribute error:BUILD_BUGfailed
702 |_compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
| ^
/home/klara/git/linux/trees/bisect/include/linux/compiler_types.h:683:25: note: in definition of macro ‘__compiletime_assert’683 | prefix ## suffix(); \ | ^~~~~~ /home/klara/git/linux/trees/bisect/include/linux/compiler_types.h:702:9: note: in expansion of macro ‘_compiletime_assert’ 702 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /home/klara/git/linux/trees/bisect/include/linux/build_bug.h:40:37: note: in expansion of macro ‘compiletime_assert’ 40 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /home/klara/git/linux/trees/bisect/include/linux/build_bug.h:60:21: note: in expansion of macro ‘BUILD_BUG_ON_MSG’ 60 | #define BUILD_BUG() BUILD_BUG_ON_MSG(1, "BUILD_BUG failed") | ^~~~~~~~~~~~~~~~ /home/klara/git/linux/trees/bisect/include/linux/huge_mm.h:113:28: note: in expansion of macro ‘BUILD_BUG’ 113 | #define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; }) | ^~~~~~~~~ /home/klara/git/linux/trees/bisect/include/linux/huge_mm.h:117:26: note: in expansion of macro ‘HPAGE_PMD_SHIFT’ 117 | #define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT) | ^~~~~~~~~~~~~~~ /home/klara/git/linux/trees/bisect/include/linux/huge_mm.h:118:26: note: in expansion of macro ‘HPAGE_PMD_ORDER’ 118 | #define HPAGE_PMD_NR (1<<HPAGE_PMD_ORDER) | ^~~~~~~~~~~~~~~ /home/klara/git/linux/trees/bisect/mm/page_vma_mapped.c:142:20: note: in expansion of macro ‘HPAGE_PMD_NR’ 142 | if ((pfn + HPAGE_PMD_NR - 1) < pvmw->pfn) | ^~~~~~~~~~~~bisect log:
# bad: [
be5c93fa674f0fc3c8f359c2143abce6bbb422e6] Add linux-next specific files for 20260630
git bisect start 'HEAD'
# status: waiting for 'good' commit(s), 'bad' commit known
# good: [dc59e4fea9d83f03bad6bddf3fa2e52491777482] Linux 7.2-rc1
git bisect gooddc59e4fea9d83f03bad6bddf3fa2e52491777482
# bad: [6148219e90732fd06f5d7a498bda974e6a43ab4b] Merge branch 'nand/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
git bisect bad6148219e90732fd06f5d7a498bda974e6a43ab4b
# bad: [e0326ebe10191447ab8fa2e904080df7b743765e] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
git bisect bade0326ebe10191447ab8fa2e904080df7b743765e
# bad: [fbc9c5ac47cef5a2b04aef30c8e990b32dcf2548] Merge branch 'hwmon' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
git bisect badfbc9c5ac47cef5a2b04aef30c8e990b32dcf2548
# bad: [e488171f6f6df6fc899a355079665fdb3c50b0e3] Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
git bisect bade488171f6f6df6fc899a355079665fdb3c50b0e3
# bad: [60db0fcb8fc9d80ac0b63041c632b41a311a45f1] Merge branch 'fs-current' of linux-next
git bisect bad60db0fcb8fc9d80ac0b63041c632b41a311a45f1
# good: [51021d260d682aa17b3533848a99160ab83e0c93] Merge branch 'vfs.fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
git bisect good51021d260d682aa17b3533848a99160ab83e0c93
# good: [ded56474db6552260786a65898322464b72c7540] mm: a second pagecache maintainer
git bisect goodded56474db6552260786a65898322464b72c7540
# good: [6c893b948351d42cfc3761cc746ab5b3d03ee7f3] Merge branch 'misc-7.2' into next-fixes
git bisect good6c893b948351d42cfc3761cc746ab5b3d03ee7f3
# good: [bfcc55a14179495b0c41408908fd7b9d7785c694] lib:test_hmm: use device devt for coherent device range selection
git bisect goodbfcc55a14179495b0c41408908fd7b9d7785c694
# good: [a27318567c92ba5482906d047e71a7aa4fd01889] Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git
git bisect gooda27318567c92ba5482906d047e71a7aa4fd01889
# bad: [6887a39652cdfd4cfd3b0962662c9cbc26ce5252]mm/page_vma_mapped: fix device-private PMD handling
git bisect bad6887a39652cdfd4cfd3b0962662c9cbc26ce5252
# good: [2cc6bd0efc264b9ac760c2bc74dff4f521a680a1]MAINTAINERS: s/SeongJae/SJ/
git bisect good2cc6bd0efc264b9ac760c2bc74dff4f521a680a1# first 'bad' commit: [6887a39652cdfd4cfd3b0962662c9cbc26ce5252] mm/page_vma_mapped: fix device-private PMD handlingQuoted 62 lines
Fixes 65edfda6f3f2 ("mm/rmap: extend rmap and migration support device-private entries")Cc <[email protected]>Signed-off-by Wei Yang <[email protected]>Suggested-by David Hildenbrand <[email protected]>Cc David Hildenbrand <[email protected]>Cc Balbir Singh <[email protected]>Cc SeongJae Park <[email protected]>Cc Zi Yan <[email protected]>Cc Lorenzo Stoakes <[email protected]>Cc Lance Yang <[email protected]>---
v5:
* put device-private pmd handling along with the other two cases
* removethp_migration_supported()
v4: https://lore.kernel.org/all/[email protected]/T/#u
* refine subject and commit log based on Lorenzo's suggestion
* put pmd device-private entry handling in its own if branch, suggested by Lorenzov3:
* remove cleanup part, only fix the issue for device-private entry
* refine user effect description based on Lorenzo's suggestionv2: https://lore.kernel.org/all/[email protected]/T/#u
* specify the possible error case of current code and user visible effect
* besides fix, cleanup the pmd entry handling based on David's suggestionv1: https://lore.kernel.org/linux-mm/[email protected]/
--- mm/page_vma_mapped.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)mm/page_vma_mapped.c +9
-4@@ -243,21 +243,30 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)*/ pmde =pmdp_get_lockless (pvmw->pmd); -if (pmd_trans_huge (pmde) ||pmd_is_migration_entry (pmde)) { +if (pmd_trans_huge (pmde) ||pmd_is_migration_entry (pmde) || +pmd_is_device_private_entry (pmde)) { pvmw->ptl =pmd_lock (mm, pvmw->pmd); pmde = *pvmw->pmd; -if (!pmd_present (pmde)) { +if (pmd_is_migration_entry (pmde)) {softleaf_t entry; -if (!thp_migration_supported () || - !(pvmw->flags &PVMW_MIGRATION )) +if (!(pvmw->flags &PVMW_MIGRATION ))return not_found (pvmw); entry =softleaf_from_pmd (pmde); +if (!check_pmd (softleaf_to_pfn (entry), pvmw)) +return not_found (pvmw); +return true; + }else if (pmd_is_device_private_entry (pmde)) { +softleaf_t entry;Quoted 7 lines
mm/page_vma_mapped.c bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) · line 258
Quoted 2 lines
mm/page_vma_mapped.c +0
-2-if (!softleaf_is_migration (entry) || - !check_pmd (softleaf_to_pfn (entry), pvmw))My only guess here would be that the compiler evaluates !softleaf_is_migration(entry) to always be true and optimises away the !check_pmd(softleaf_to_pfn(entry), pvmw) which is why this worked before?
Weird, we enter this path only with
pmd_trans_huge(pmde)||pmd_is_migration_entry(pmde)||pmd_is_device_private_entry(pmde)If any one of these would compile for !CONFIG_TRANSPARENT_HUGEPAGE that would be odd.
pmd_is_device_private_entry()is hard-coded to false unlessCONFIG_ARCH_ENABLE_THP_MIGRATION. Which is only selected withARCH_ENABLE_THP_MIGRATION.
Quoted 6 lines
pmd_trans_huge()as well.Maybe it's struggling with
pmd_is_migration_entry()on some (older) compilers? (not innlining stuff and not properly optimizing it out).The whole conditional must be optimized out.
Right. Kinda weird if compiler didn't fold
pmd_trans_huge(pmde) || pmd_is_migration_entry(pmde) || pmd_is_device_private_entry(pmde)
away here ...
Quoted 2 lines
We could check for
IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) right at the start to make it easier for the compiler:
+1, explicit THP guard should do the trick :)
Quoted 5 lines
if (
IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) &&
(pmd_trans_huge(pmde)||pmd_is_migration_entry(pmde)||pmd_is_device_private_entry(pmde))) {
Klara, could you try with this change and see if it fixes the build?
Thanks, Lance
Quoted 5 lines · Lance Yang
Quoted 2 lines · David Hildenbrand (Arm)
Quoted 1 line · Klara Modin
Hi,
Quoted 159 lines
Hi,
[...]
Quoted 2 lines
Quoted 2 lines
This results in a build bug for my Raspberry Pi 1:
Thanks for reporting this!
Quoted 151 lines
Quoted 127 lines
In file included from <command-line>:
In function ‘check_pmd’,
inlined from ‘page_vma_mapped_walk’ at/home/klara/git/linux/trees/bisect/mm/page_vma_mapped.c:256:10:
/home/klara/git/linux/trees/bisect/include/linux/compiler_types.h:702:45: error: call to ‘__compiletime_assert_433’ declared with attribute error:BUILD_BUGfailed
702 |_compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
| ^
/home/klara/git/linux/trees/bisect/include/linux/compiler_types.h:683:25: note: in definition of macro ‘__compiletime_assert’683 | prefix ## suffix(); \ | ^~~~~~ /home/klara/git/linux/trees/bisect/include/linux/compiler_types.h:702:9: note: in expansion of macro ‘_compiletime_assert’ 702 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /home/klara/git/linux/trees/bisect/include/linux/build_bug.h:40:37: note: in expansion of macro ‘compiletime_assert’ 40 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /home/klara/git/linux/trees/bisect/include/linux/build_bug.h:60:21: note: in expansion of macro ‘BUILD_BUG_ON_MSG’ 60 | #define BUILD_BUG() BUILD_BUG_ON_MSG(1, "BUILD_BUG failed") | ^~~~~~~~~~~~~~~~ /home/klara/git/linux/trees/bisect/include/linux/huge_mm.h:113:28: note: in expansion of macro ‘BUILD_BUG’ 113 | #define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; }) | ^~~~~~~~~ /home/klara/git/linux/trees/bisect/include/linux/huge_mm.h:117:26: note: in expansion of macro ‘HPAGE_PMD_SHIFT’ 117 | #define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT) | ^~~~~~~~~~~~~~~ /home/klara/git/linux/trees/bisect/include/linux/huge_mm.h:118:26: note: in expansion of macro ‘HPAGE_PMD_ORDER’ 118 | #define HPAGE_PMD_NR (1<<HPAGE_PMD_ORDER) | ^~~~~~~~~~~~~~~ /home/klara/git/linux/trees/bisect/mm/page_vma_mapped.c:142:20: note: in expansion of macro ‘HPAGE_PMD_NR’ 142 | if ((pfn + HPAGE_PMD_NR - 1) < pvmw->pfn) | ^~~~~~~~~~~~bisect log:
# bad: [
be5c93fa674f0fc3c8f359c2143abce6bbb422e6] Add linux-next specific files for 20260630
git bisect start 'HEAD'
# status: waiting for 'good' commit(s), 'bad' commit known
# good: [dc59e4fea9d83f03bad6bddf3fa2e52491777482] Linux 7.2-rc1
git bisect gooddc59e4fea9d83f03bad6bddf3fa2e52491777482
# bad: [6148219e90732fd06f5d7a498bda974e6a43ab4b] Merge branch 'nand/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
git bisect bad6148219e90732fd06f5d7a498bda974e6a43ab4b
# bad: [e0326ebe10191447ab8fa2e904080df7b743765e] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
git bisect bade0326ebe10191447ab8fa2e904080df7b743765e
# bad: [fbc9c5ac47cef5a2b04aef30c8e990b32dcf2548] Merge branch 'hwmon' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
git bisect badfbc9c5ac47cef5a2b04aef30c8e990b32dcf2548
# bad: [e488171f6f6df6fc899a355079665fdb3c50b0e3] Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
git bisect bade488171f6f6df6fc899a355079665fdb3c50b0e3
# bad: [60db0fcb8fc9d80ac0b63041c632b41a311a45f1] Merge branch 'fs-current' of linux-next
git bisect bad60db0fcb8fc9d80ac0b63041c632b41a311a45f1
# good: [51021d260d682aa17b3533848a99160ab83e0c93] Merge branch 'vfs.fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
git bisect good51021d260d682aa17b3533848a99160ab83e0c93
# good: [ded56474db6552260786a65898322464b72c7540] mm: a second pagecache maintainer
git bisect goodded56474db6552260786a65898322464b72c7540
# good: [6c893b948351d42cfc3761cc746ab5b3d03ee7f3] Merge branch 'misc-7.2' into next-fixes
git bisect good6c893b948351d42cfc3761cc746ab5b3d03ee7f3
# good: [bfcc55a14179495b0c41408908fd7b9d7785c694] lib:test_hmm: use device devt for coherent device range selection
git bisect goodbfcc55a14179495b0c41408908fd7b9d7785c694
# good: [a27318567c92ba5482906d047e71a7aa4fd01889] Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git
git bisect gooda27318567c92ba5482906d047e71a7aa4fd01889
# bad: [6887a39652cdfd4cfd3b0962662c9cbc26ce5252]mm/page_vma_mapped: fix device-private PMD handling
git bisect bad6887a39652cdfd4cfd3b0962662c9cbc26ce5252
# good: [2cc6bd0efc264b9ac760c2bc74dff4f521a680a1]MAINTAINERS: s/SeongJae/SJ/
git bisect good2cc6bd0efc264b9ac760c2bc74dff4f521a680a1# first 'bad' commit: [6887a39652cdfd4cfd3b0962662c9cbc26ce5252] mm/page_vma_mapped: fix device-private PMD handlingQuoted 62 lines
Fixes 65edfda6f3f2 ("mm/rmap: extend rmap and migration support device-private entries")Cc <[email protected]>Signed-off-by Wei Yang <[email protected]>Suggested-by David Hildenbrand <[email protected]>Cc David Hildenbrand <[email protected]>Cc Balbir Singh <[email protected]>Cc SeongJae Park <[email protected]>Cc Zi Yan <[email protected]>Cc Lorenzo Stoakes <[email protected]>Cc Lance Yang <[email protected]>---
v5:
* put device-private pmd handling along with the other two cases
* removethp_migration_supported()
v4: https://lore.kernel.org/all/[email protected]/T/#u
* refine subject and commit log based on Lorenzo's suggestion
* put pmd device-private entry handling in its own if branch, suggested by Lorenzov3:
* remove cleanup part, only fix the issue for device-private entry
* refine user effect description based on Lorenzo's suggestionv2: https://lore.kernel.org/all/[email protected]/T/#u
* specify the possible error case of current code and user visible effect
* besides fix, cleanup the pmd entry handling based on David's suggestionv1: https://lore.kernel.org/linux-mm/[email protected]/
--- mm/page_vma_mapped.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)mm/page_vma_mapped.c +9
-4@@ -243,21 +243,30 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)*/ pmde =pmdp_get_lockless (pvmw->pmd); -if (pmd_trans_huge (pmde) ||pmd_is_migration_entry (pmde)) { +if (pmd_trans_huge (pmde) ||pmd_is_migration_entry (pmde) || +pmd_is_device_private_entry (pmde)) { pvmw->ptl =pmd_lock (mm, pvmw->pmd); pmde = *pvmw->pmd; -if (!pmd_present (pmde)) { +if (pmd_is_migration_entry (pmde)) {softleaf_t entry; -if (!thp_migration_supported () || - !(pvmw->flags &PVMW_MIGRATION )) +if (!(pvmw->flags &PVMW_MIGRATION ))return not_found (pvmw); entry =softleaf_from_pmd (pmde); +if (!check_pmd (softleaf_to_pfn (entry), pvmw)) +return not_found (pvmw); +return true; + }else if (pmd_is_device_private_entry (pmde)) { +softleaf_t entry;Quoted 7 lines
mm/page_vma_mapped.c bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) · line 258
Quoted 2 lines
mm/page_vma_mapped.c +0
-2-if (!softleaf_is_migration (entry) || - !check_pmd (softleaf_to_pfn (entry), pvmw))My only guess here would be that the compiler evaluates !softleaf_is_migration(entry) to always be true and optimises away the !check_pmd(softleaf_to_pfn(entry), pvmw) which is why this worked before?
Weird, we enter this path only with
pmd_trans_huge(pmde)||pmd_is_migration_entry(pmde)||pmd_is_device_private_entry(pmde)If any one of these would compile for !CONFIG_TRANSPARENT_HUGEPAGE that would be odd.
pmd_is_device_private_entry()is hard-coded to false unlessCONFIG_ARCH_ENABLE_THP_MIGRATION. Which is only selected withARCH_ENABLE_THP_MIGRATION.
pmd_trans_huge()as well.Maybe it's struggling with
pmd_is_migration_entry()on some (older) compilers? (not innlining stuff and not properly optimizing it out).
It's a GCC 16 cross-compiler for armv6 so I wouldn't call it old :)
Quoted 21 lines
Quoted 2 lines
The whole conditional must be optimized out.
Right. Kinda weird if compiler didn't fold
pmd_trans_huge(pmde)||pmd_is_migration_entry(pmde)||pmd_is_device_private_entry(pmde)away here ...
Quoted 2 lines
We could check for
IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) right at the start to make it easier for the compiler:+1, explicit THP guard should do the trick :)
Quoted 5 lines
if (
IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) &&
(pmd_trans_huge(pmde)||pmd_is_migration_entry(pmde)||pmd_is_device_private_entry(pmde))) {
Quoted 3 lines
Klara, could you try with this change and see if it fixes the build?
Thanks, Lance
This does indeed make it build.
Thanks,
Klara Modin
Lance Yang
reviewerOn 2026/7/2 00:46, Klara Modin wrote:
[...]
Quoted 46 lines
Quoted 14 lines
Quoted 14 lines
Quoted 5 lines
My only guess here would be that the compiler evaluates !softleaf_is_migration(entry) to always be true and optimises away the !check_pmd(softleaf_to_pfn(entry), pvmw) which is why this worked before?
Weird, we enter this path only with
pmd_trans_huge(pmde)||pmd_is_migration_entry(pmde)||pmd_is_device_private_entry(pmde)If any one of these would compile for !CONFIG_TRANSPARENT_HUGEPAGE that would be odd.
Quoted 8 lines
Quoted 8 lines
pmd_is_device_private_entry()is hard-coded to false unlessCONFIG_ARCH_ENABLE_THP_MIGRATION. Which is only selected withARCH_ENABLE_THP_MIGRATION.
pmd_trans_huge()as well.Maybe it's struggling with
pmd_is_migration_entry()on some (older) compilers? (not innlining stuff and not properly optimizing it out).It's a GCC 16 cross-compiler for armv6 so I wouldn't call it old :)
Quoted 21 lines
Quoted 2 lines
The whole conditional must be optimized out.
Right. Kinda weird if compiler didn't fold
pmd_trans_huge(pmde)||pmd_is_migration_entry(pmde)||pmd_is_device_private_entry(pmde)away here ...
Quoted 2 lines
We could check for
IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) right at the start to make it easier for the compiler:+1, explicit THP guard should do the trick :)
Quoted 5 lines
if (
IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) &&(pmd_trans_huge(pmde) || pmd_is_migration_entry(pmde) || pmd_is_device_private_entry(pmde))) {
Quoted 5 lines
Quoted 3 lines
Klara, could you try with this change and see if it fixes the build?
Thanks, Lance
This does indeed make it build.
Good to know, thanks for testing!
Lorenzo Stoakes
maintainerQuoted 189 lines · Klara Modin
Quoted 5 lines · Lance Yang
Quoted 2 lines · David Hildenbrand (Arm)
Quoted 1 line · Klara Modin
Hi,
Quoted 159 lines
Hi,
[...]
Quoted 2 lines
Quoted 2 lines
This results in a build bug for my Raspberry Pi 1:
Thanks for reporting this!
Quoted 151 lines
Quoted 127 lines
In file included from <command-line>:
In function ‘check_pmd’,
inlined from ‘page_vma_mapped_walk’ at/home/klara/git/linux/trees/bisect/mm/page_vma_mapped.c:256:10:
/home/klara/git/linux/trees/bisect/include/linux/compiler_types.h:702:45: error: call to ‘__compiletime_assert_433’ declared with attribute error:BUILD_BUGfailed
702 |_compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__)
| ^
/home/klara/git/linux/trees/bisect/include/linux/compiler_types.h:683:25: note: in definition of macro ‘__compiletime_assert’683 | prefix ## suffix(); \ | ^~~~~~ /home/klara/git/linux/trees/bisect/include/linux/compiler_types.h:702:9: note: in expansion of macro ‘_compiletime_assert’ 702 | _compiletime_assert(condition, msg, __compiletime_assert_, __COUNTER__) | ^~~~~~~~~~~~~~~~~~~ /home/klara/git/linux/trees/bisect/include/linux/build_bug.h:40:37: note: in expansion of macro ‘compiletime_assert’ 40 | #define BUILD_BUG_ON_MSG(cond, msg) compiletime_assert(!(cond), msg) | ^~~~~~~~~~~~~~~~~~ /home/klara/git/linux/trees/bisect/include/linux/build_bug.h:60:21: note: in expansion of macro ‘BUILD_BUG_ON_MSG’ 60 | #define BUILD_BUG() BUILD_BUG_ON_MSG(1, "BUILD_BUG failed") | ^~~~~~~~~~~~~~~~ /home/klara/git/linux/trees/bisect/include/linux/huge_mm.h:113:28: note: in expansion of macro ‘BUILD_BUG’ 113 | #define HPAGE_PMD_SHIFT ({ BUILD_BUG(); 0; }) | ^~~~~~~~~ /home/klara/git/linux/trees/bisect/include/linux/huge_mm.h:117:26: note: in expansion of macro ‘HPAGE_PMD_SHIFT’ 117 | #define HPAGE_PMD_ORDER (HPAGE_PMD_SHIFT-PAGE_SHIFT) | ^~~~~~~~~~~~~~~ /home/klara/git/linux/trees/bisect/include/linux/huge_mm.h:118:26: note: in expansion of macro ‘HPAGE_PMD_ORDER’ 118 | #define HPAGE_PMD_NR (1<<HPAGE_PMD_ORDER) | ^~~~~~~~~~~~~~~ /home/klara/git/linux/trees/bisect/mm/page_vma_mapped.c:142:20: note: in expansion of macro ‘HPAGE_PMD_NR’ 142 | if ((pfn + HPAGE_PMD_NR - 1) < pvmw->pfn) | ^~~~~~~~~~~~bisect log:
# bad: [
be5c93fa674f0fc3c8f359c2143abce6bbb422e6] Add linux-next specific files for 20260630
git bisect start 'HEAD'
# status: waiting for 'good' commit(s), 'bad' commit known
# good: [dc59e4fea9d83f03bad6bddf3fa2e52491777482] Linux 7.2-rc1
git bisect gooddc59e4fea9d83f03bad6bddf3fa2e52491777482
# bad: [6148219e90732fd06f5d7a498bda974e6a43ab4b] Merge branch 'nand/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git
git bisect bad6148219e90732fd06f5d7a498bda974e6a43ab4b
# bad: [e0326ebe10191447ab8fa2e904080df7b743765e] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git
git bisect bade0326ebe10191447ab8fa2e904080df7b743765e
# bad: [fbc9c5ac47cef5a2b04aef30c8e990b32dcf2548] Merge branch 'hwmon' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git
git bisect badfbc9c5ac47cef5a2b04aef30c8e990b32dcf2548
# bad: [e488171f6f6df6fc899a355079665fdb3c50b0e3] Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git
git bisect bade488171f6f6df6fc899a355079665fdb3c50b0e3
# bad: [60db0fcb8fc9d80ac0b63041c632b41a311a45f1] Merge branch 'fs-current' of linux-next
git bisect bad60db0fcb8fc9d80ac0b63041c632b41a311a45f1
# good: [51021d260d682aa17b3533848a99160ab83e0c93] Merge branch 'vfs.fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git
git bisect good51021d260d682aa17b3533848a99160ab83e0c93
# good: [ded56474db6552260786a65898322464b72c7540] mm: a second pagecache maintainer
git bisect goodded56474db6552260786a65898322464b72c7540
# good: [6c893b948351d42cfc3761cc746ab5b3d03ee7f3] Merge branch 'misc-7.2' into next-fixes
git bisect good6c893b948351d42cfc3761cc746ab5b3d03ee7f3
# good: [bfcc55a14179495b0c41408908fd7b9d7785c694] lib:test_hmm: use device devt for coherent device range selection
git bisect goodbfcc55a14179495b0c41408908fd7b9d7785c694
# good: [a27318567c92ba5482906d047e71a7aa4fd01889] Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git
git bisect gooda27318567c92ba5482906d047e71a7aa4fd01889
# bad: [6887a39652cdfd4cfd3b0962662c9cbc26ce5252]mm/page_vma_mapped: fix device-private PMD handling
git bisect bad6887a39652cdfd4cfd3b0962662c9cbc26ce5252
# good: [2cc6bd0efc264b9ac760c2bc74dff4f521a680a1]MAINTAINERS: s/SeongJae/SJ/
git bisect good2cc6bd0efc264b9ac760c2bc74dff4f521a680a1# first 'bad' commit: [6887a39652cdfd4cfd3b0962662c9cbc26ce5252] mm/page_vma_mapped: fix device-private PMD handlingQuoted 62 lines
Fixes 65edfda6f3f2 ("mm/rmap: extend rmap and migration support device-private entries")Cc <[email protected]>Signed-off-by Wei Yang <[email protected]>Suggested-by David Hildenbrand <[email protected]>Cc David Hildenbrand <[email protected]>Cc Balbir Singh <[email protected]>Cc SeongJae Park <[email protected]>Cc Zi Yan <[email protected]>Cc Lorenzo Stoakes <[email protected]>Cc Lance Yang <[email protected]>---
v5:
* put device-private pmd handling along with the other two cases
* removethp_migration_supported()
v4: https://lore.kernel.org/all/[email protected]/T/#u
* refine subject and commit log based on Lorenzo's suggestion
* put pmd device-private entry handling in its own if branch, suggested by Lorenzov3:
* remove cleanup part, only fix the issue for device-private entry
* refine user effect description based on Lorenzo's suggestionv2: https://lore.kernel.org/all/[email protected]/T/#u
* specify the possible error case of current code and user visible effect
* besides fix, cleanup the pmd entry handling based on David's suggestionv1: https://lore.kernel.org/linux-mm/[email protected]/
--- mm/page_vma_mapped.c | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-)mm/page_vma_mapped.c +9
-4@@ -243,21 +243,30 @@ bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw)*/ pmde =pmdp_get_lockless (pvmw->pmd); -if (pmd_trans_huge (pmde) ||pmd_is_migration_entry (pmde)) { +if (pmd_trans_huge (pmde) ||pmd_is_migration_entry (pmde) || +pmd_is_device_private_entry (pmde)) { pvmw->ptl =pmd_lock (mm, pvmw->pmd); pmde = *pvmw->pmd; -if (!pmd_present (pmde)) { +if (pmd_is_migration_entry (pmde)) {softleaf_t entry; -if (!thp_migration_supported () || - !(pvmw->flags &PVMW_MIGRATION )) +if (!(pvmw->flags &PVMW_MIGRATION ))return not_found (pvmw); entry =softleaf_from_pmd (pmde); +if (!check_pmd (softleaf_to_pfn (entry), pvmw)) +return not_found (pvmw); +return true; + }else if (pmd_is_device_private_entry (pmde)) { +softleaf_t entry;Quoted 7 lines
mm/page_vma_mapped.c bool page_vma_mapped_walk(struct page_vma_mapped_walk *pvmw) · line 258
Quoted 2 lines
mm/page_vma_mapped.c +0
-2-if (!softleaf_is_migration (entry) || - !check_pmd (softleaf_to_pfn (entry), pvmw))My only guess here would be that the compiler evaluates !softleaf_is_migration(entry) to always be true and optimises away the !check_pmd(softleaf_to_pfn(entry), pvmw) which is why this worked before?
Weird, we enter this path only with
pmd_trans_huge(pmde)||pmd_is_migration_entry(pmde)||pmd_is_device_private_entry(pmde)If any one of these would compile for !CONFIG_TRANSPARENT_HUGEPAGE that would be odd.
pmd_is_device_private_entry()is hard-coded to false unlessCONFIG_ARCH_ENABLE_THP_MIGRATION. Which is only selected withARCH_ENABLE_THP_MIGRATION.
pmd_trans_huge()as well.Maybe it's struggling with
pmd_is_migration_entry()on some (older) compilers? (not innlining stuff and not properly optimizing it out).It's a GCC 16 cross-compiler for armv6 so I wouldn't call it old :)
Quoted 21 lines
Quoted 2 lines
The whole conditional must be optimized out.
Right. Kinda weird if compiler didn't fold
pmd_trans_huge(pmde)||pmd_is_migration_entry(pmde)||pmd_is_device_private_entry(pmde)away here ...
Quoted 2 lines
We could check for
IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) right at the start to make it easier for the compiler:+1, explicit THP guard should do the trick :)
Quoted 5 lines
if (
IS_ENABLED(CONFIG_TRANSPARENT_HUGEPAGE)) &&
(pmd_trans_huge(pmde)||pmd_is_migration_entry(pmde)||pmd_is_device_private_entry(pmde))) {
Quoted 5 lines
Quoted 3 lines
Klara, could you try with this change and see if it fixes the build?
Thanks, Lance
This does indeed make it build.
Hmm this is pretty ugly though.
softleaf_is_migration() is a bit-test so I don't think that's the issue.
I think the issue here is thp_migration_supported() that's what's needed here.
So maybe
- if (!thp_migration_supported() ||
- !(pvmw->flags & PVMW_MIGRATION))
+ if (!(pvmw->flags & PVMW_MIGRATION))
Should just be kept as it is or:
+#ifdef CONFIG_ARCH_ENABLE_THP_MIGRATION
static inline bool pmd_is_migration_entry(pmd_t pmd)
{
return softleaf_is_migration(softleaf_from_pmd(pmd)); }
+#else
+static inline bool pmd_is_migration_entry(pmd_t pmd) +{
+ return false;
+}
+#endif
And I think the CONFIG_TRANSPARENT_HUGEPAGE is just conflating the CONFIG_ARCH_ENABLE_THP_MIGRATION.
Quoted 3 lines
Thanks,
Klara Modin
Thanks, Lorenzo