fixup: mm/huge_memory.c: introduce folio_split_unmapped
Subsystems (3)
PATCH 1/1 fixup: mm/huge_memory.c: introduce folio_split_unmapped
Code refactoring of __folio_split() via helper __folio_freeze_and_split_unmapped() caused a regression with clang-20 with CONFIG_SHMEM=n, the compiler was not able to optimize away the call to shmem_uncharge() due to changes in nr_shmem_dropped. Fix this by checking for shmem_mapping() prior to calling shmem_uncharge(), shmem_mapping() returns false when CONFIG_SHMEM=n.
smatch also complained about parameter end being used without initialization, which is a false positive, but keep the tool happy by sending in initialized parameters. end is initialized to 0.
Add detailed documentation comments for folio_split_unmapped()
--- mm/huge_memory.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-)
mm/huge_memory.c +22 -10
@@ -3751,6 +3751,7 @@ static int __folio_freeze_and_split_unmapped(struct folio *folio, unsigned int nint ret =0 ;struct deferred_split *ds_queue; +VM_WARN_ON_ONCE (!mapping && end !=0 );/* Prevent deferred_split_scan() touching ->_refcount */ ds_queue =folio_split_queue_lock (folio);if (folio_ref_freeze (folio,1 + extra_pins)) {
@@ -3919,7 +3920,7 @@ static int __folio_split(struct folio *folio, unsigned int new_order,int nr_shmem_dropped =0 ;int remap_flags =0 ;int extra_pins, ret; -pgoff_t end; +pgoff_t end =0 ;bool is_hzp;VM_WARN_ON_ONCE_FOLIO (!folio_test_locked (folio), folio);
@@ -4049,7 +4050,7 @@ static int __folio_split(struct folio *folio, unsigned int new_order,local_irq_enable (); -if (nr_shmem_dropped) +if (mapping &&shmem_mapping (mapping) && nr_shmem_dropped)shmem_uncharge (mapping->host, nr_shmem_dropped);if (!ret && is_anon && !folio_is_device_private (folio))
@@ -4092,16 +4093,27 @@ static int __folio_split(struct folio *folio, unsigned int new_order,return ret; } -/* -* This function is a helper for splitting folios that have already been unmapped. -* The use case is that the device or the CPU can refuse to migrate THP pages in -* the middle of migration, due to allocation issues on either side +/** +* folio_split_unmapped() - split a large anon folio that is already unmapped +* @folio: folio to split +* @new_order: the order of folios after split +* +* This function is a helper for splitting folios that have already been +* unmapped. The use case is that the device or the CPU can refuse to migrate +* THP pages in the middle of migration, due to allocation issues on either +* side. +* +* anon_vma_lock is not required to be held, mmap_read_lock() or +* mmap_write_lock() should be held. @folio is expected to be locked by the +* caller. device-private and non device-private folios are supported along +* with folios that are in the swapcache. @folio should also be unmapped and +* isolated from LRU (if applicable) * -* The high level code is copied from __folio_split, since the pages are anonymous -* and are already isolated from the LRU, the code has been simplified to not -* burden __folio_split with unmapped sprinkled into the code. +* Upon return, the folio is not remapped, split folios are not added to LRU, +* free_folio_and_swap_cache() is not called, and new folios remain locked. * -* None of the split folios are unlocked +* Return: 0 on success, -EAGAIN if the folio cannot be split (e.g., due to +* insufficient reference count or extra pins). */ int folio_split_unmapped (struct folio *folio,unsigned int new_order) {
Signature · 1 line
2.51.1
David Hildenbrand (Red Hat)
maintainerQuoted 49 lines · Balbir Singh
Code refactoring of
__folio_split()via helper__folio_freeze_and_split_unmapped()caused a regression with clang-20 withCONFIG_SHMEM=n, the compiler was not able to optimize away the call toshmem_uncharge()due to changes innr_shmem_dropped. Fix this by checking forshmem_mapping()prior to callingshmem_uncharge(),shmem_mapping()returns false whenCONFIG_SHMEM=n.smatch also complained about parameter end being used without initialization, which is a false positive, but keep the tool happy by sending in initialized parameters. end is initialized to 0.
Add detailed documentation comments for
folio_split_unmapped()Cc Andrew Morton <[email protected]>Cc David Hildenbrand <[email protected]>Cc Zi Yan <[email protected]>Cc Joshua Hahn <[email protected]>Cc Rakie Kim <[email protected]>Cc Byungchul Park <[email protected]>Cc Gregory Price <[email protected]>Cc Ying Huang <[email protected]>Cc Alistair Popple <[email protected]>Cc Oscar Salvador <[email protected]>Cc Lorenzo Stoakes <[email protected]>Cc Baolin Wang <[email protected]>Cc "Liam R. Howlett" <[email protected]>Cc Nico Pache <[email protected]>Cc Ryan Roberts <[email protected]>Cc Dev Jain <[email protected]>Cc Barry Song <[email protected]>Cc Lyude Paul <[email protected]>Cc Danilo Krummrich <[email protected]>Cc David Airlie <[email protected]>Cc Simona Vetter <[email protected]>Cc Ralph Campbell <[email protected]>Cc Mika Penttilä <[email protected]>Cc Matthew Brost <[email protected]>Cc Francois Dugast <[email protected]>Signed-off-by Balbir Singh <[email protected]>--- mm/huge_memory.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-)mm/huge_memory.c +0
-0
mm/huge_memory.c static int __folio_freeze_and_split_unmapped(struct folio *folio, unsigned int n · line 3754
Quoted 4 lines
mm/huge_memory.c +1
-0@@ -3751,6 +3751,7 @@ static int __folio_freeze_and_split_unmapped(struct folio *folio, unsigned int nint ret =0 ;struct deferred_split *ds_queue; +VM_WARN_ON_ONCE (!mapping && end !=0 );
You could drop the "!= 0"
Quoted 13 lines
mm/huge_memory.c +1
-1/* Prevent deferred_split_scan() touching ->_refcount */ ds_queue =folio_split_queue_lock (folio);if (folio_ref_freeze (folio,1 + extra_pins)) {@@ -3919,7 +3920,7 @@ static int __folio_split(struct folio *folio, unsigned int new_order,int nr_shmem_dropped =0 ;int remap_flags =0 ;int extra_pins, ret; -pgoff_t end; +pgoff_t end =0 ;bool is_hzp;VM_WARN_ON_ONCE_FOLIO (!folio_test_locked (folio), folio);
mm/huge_memory.c static int __folio_split(struct folio *folio, unsigned int new_order, · line 4054
Quoted 6 lines
mm/huge_memory.c +1
-1@@ -4049,7 +4050,7 @@ static int __folio_split(struct folio *folio, unsigned int new_order,local_irq_enable (); -if (nr_shmem_dropped) +if (mapping &&shmem_mapping (mapping) && nr_shmem_dropped)shmem_uncharge (mapping->host, nr_shmem_dropped);
That looks questionable. We shouldn't add runtime check to handle buildtime things.
Likely what you want is instead
if (IS_ENABLED(CONFIG_SHMEM) && nr_shmem_dropped)
shmem_uncharge()
Quoted 25 lines
mm/huge_memory.c +15
-4if (!ret && is_anon && !folio_is_device_private (folio))@@ -4092,16 +4093,27 @@ static int __folio_split(struct folio *folio, unsigned int new_order,return ret; } -/* -* This function is a helper for splitting folios that have already been unmapped. -* The use case is that the device or the CPU can refuse to migrate THP pages in -* the middle of migration, due to allocation issues on either side +/** +* folio_split_unmapped() - split a large anon folio that is already unmapped +* @folio: folio to split +* @new_order: the order of folios after split +* +* This function is a helper for splitting folios that have already been +* unmapped. The use case is that the device or the CPU can refuse to migrate +* THP pages in the middle of migration, due to allocation issues on either +* side. +* +* anon_vma_lock is not required to be held, mmap_read_lock() or +* mmap_write_lock() should be held. @folio is expected to be locked by the +* caller. device-private and non device-private folios are supported along +* with folios that are in the swapcache. @folio should also be unmapped and +* isolated from LRU (if applicable)
mm/huge_memory.c static int __folio_split(struct folio *folio, unsigned int new_order, · line 4116
Quoted 10 lines
mm/huge_memory.c +4
-4* -* The high level code is copied from __folio_split, since the pages are anonymous -* and are already isolated from the LRU, the code has been simplified to not -* burden __folio_split with unmapped sprinkled into the code. +* Upon return, the folio is not remapped, split folios are not added to LRU, +* free_folio_and_swap_cache() is not called, and new folios remain locked. * -* None of the split folios are unlocked +* Return: 0 on success, -EAGAIN if the folio cannot be split (e.g., due to +* insufficient reference count or extra pins).
Sounds much better to me, thanks.
Signature · 3 lines
Cheers David
Quoted 45 lines · David Hildenbrand (Red Hat)
Quoted 44 lines · Balbir Singh
Code refactoring of
__folio_split()via helper__folio_freeze_and_split_unmapped()caused a regression with clang-20 withCONFIG_SHMEM=n, the compiler was not able to optimize away the call toshmem_uncharge()due to changes innr_shmem_dropped. Fix this by checking forshmem_mapping()prior to callingshmem_uncharge(),shmem_mapping()returns false whenCONFIG_SHMEM=n.smatch also complained about parameter end being used without initialization, which is a false positive, but keep the tool happy by sending in initialized parameters. end is initialized to 0.
Add detailed documentation comments for
folio_split_unmapped()Cc Andrew Morton <[email protected]>Cc David Hildenbrand <[email protected]>Cc Zi Yan <[email protected]>Cc Joshua Hahn <[email protected]>Cc Rakie Kim <[email protected]>Cc Byungchul Park <[email protected]>Cc Gregory Price <[email protected]>Cc Ying Huang <[email protected]>Cc Alistair Popple <[email protected]>Cc Oscar Salvador <[email protected]>Cc Lorenzo Stoakes <[email protected]>Cc Baolin Wang <[email protected]>Cc "Liam R. Howlett" <[email protected]>Cc Nico Pache <[email protected]>Cc Ryan Roberts <[email protected]>Cc Dev Jain <[email protected]>Cc Barry Song <[email protected]>Cc Lyude Paul <[email protected]>Cc Danilo Krummrich <[email protected]>Cc David Airlie <[email protected]>Cc Simona Vetter <[email protected]>Cc Ralph Campbell <[email protected]>Cc Mika Penttilä <[email protected]>Cc Matthew Brost <[email protected]>Cc Francois Dugast <[email protected]>Signed-off-by Balbir Singh <[email protected]>---
mm/huge_memory.c| 32 ++++++++++++++++++++++----------1 file changed, 22 insertions(+), 10 deletions(-)
Quoted 10 lines
mm/huge_memory.c static int __folio_freeze_and_split_unmapped(struct folio *folio, unsigned int n · line 3753
Quoted 8 lines
mm/huge_memory.c +0
-0@@ -3751,6 +3751,7 @@ static int __folio_freeze_and_split_unmapped(struct folio *folio, unsigned int n int ret = 0; struct deferred_split *ds_queue; + VM_WARN_ON_ONCE(!mapping && end != 0);You could drop the "!= 0"
Ack
VM_WARN_ONE(!mapping && end);
Quoted 20 lines
Quoted 13 lines
mm/huge_memory.c +1
-1/* Prevent deferred_split_scan() touching ->_refcount */ ds_queue = folio_split_queue_lock(folio); if (folio_ref_freeze(folio, 1 + extra_pins)) {@@ -3919,7 +3920,7 @@ static int __folio_split(struct folio *folio, unsigned int new_order, int nr_shmem_dropped = 0; int remap_flags = 0; int extra_pins, ret; - pgoff_t end; + pgoff_t end = 0; bool is_hzp; VM_WARN_ON_ONCE_FOLIO(!folio_test_locked(folio), folio);mm/huge_memory.c static int __folio_split(struct folio *folio, unsigned int new_order, · line 4053
Quoted 4 lines
mm/huge_memory.c +1
-0@@ -4049,7 +4050,7 @@ static int __folio_split(struct folio *folio, unsigned int new_order, local_irq_enable(); - if (nr_shmem_dropped) + if (mapping && shmem_mapping(mapping) && nr_shmem_dropped) shmem_uncharge(mapping->host, nr_shmem_dropped);That looks questionable. We shouldn't add runtime check to handle buildtime things.
Quoted 5 lines
Likely what you want is instead
if (
IS_ENABLED(CONFIG_SHMEM)&&nr_shmem_dropped)
shmem_uncharge()
shmem_mapping() returns false for CONFIG_SHMEM=n and shmem_mapping() checks that the mapping is indeed for shmem ops before uncharging. Happy to change it if you like, your version is more readable
Quoted 27 lines
Quoted 27 lines
mm/huge_memory.c +0
-0if (!ret && is_anon && !folio_is_device_private(folio))@@ -4092,16 +4093,27 @@ static int __folio_split(struct folio *folio, unsigned int new_order, return ret; }-/*
- * This function is a helper for splitting folios that have already been unmapped.
- * The use case is that the device or the CPU can refuse to migrate THP pages in
- * the middle of migration, due to allocation issues on either side +/**
+ *folio_split_unmapped()- split a large anon folio that is already unmapped
+ * @folio: folio to split
+ * @new_order: the order of folios after split
+ *
+ * This function is a helper for splitting folios that have already been
+ * unmapped. The use case is that the device or the CPU can refuse to migrate
+ * THP pages in the middle of migration, due to allocation issues on either
+ * side.
+ *
+ *anon_vma_lockis not required to be held,mmap_read_lock()or
+ *mmap_write_lock()should be held. @folio is expected to be locked by the
+ * caller. device-private and non device-private folios are supported along
+ * with folios that are in the swapcache. @folio should also be unmapped and
+ * isolated from LRU (if applicable)
*
- * The high level code is copied from__folio_split, since the pages are anonymous
- * and are already isolated from the LRU, the code has been simplified to not
- * burden__folio_splitwith unmapped sprinkled into the code.
Quoted 9 lines
Quoted 6 lines
+ * Upon return, the folio is not remapped, split folios are not added to LRU,
+ *free_folio_and_swap_cache()is not called, and new folios remain locked. *
- * None of the split folios are unlocked
+ * Return: 0 on success,-EAGAINif the folio cannot be split (e.g., due to
+ * insufficient reference count or extra pins).Sounds much better to me, thanks.
Thanks
Balbir
David Hildenbrand (Red Hat)
maintainerQuoted 83 lines · Balbir Singh
Quoted 45 lines · David Hildenbrand (Red Hat)
Quoted 44 lines · Balbir Singh
Code refactoring of
__folio_split()via helper__folio_freeze_and_split_unmapped()caused a regression with clang-20 withCONFIG_SHMEM=n, the compiler was not able to optimize away the call toshmem_uncharge()due to changes innr_shmem_dropped. Fix this by checking forshmem_mapping()prior to callingshmem_uncharge(),shmem_mapping()returns false whenCONFIG_SHMEM=n.smatch also complained about parameter end being used without initialization, which is a false positive, but keep the tool happy by sending in initialized parameters. end is initialized to 0.
Add detailed documentation comments for
folio_split_unmapped()Cc Andrew Morton <[email protected]>Cc David Hildenbrand <[email protected]>Cc Zi Yan <[email protected]>Cc Joshua Hahn <[email protected]>Cc Rakie Kim <[email protected]>Cc Byungchul Park <[email protected]>Cc Gregory Price <[email protected]>Cc Ying Huang <[email protected]>Cc Alistair Popple <[email protected]>Cc Oscar Salvador <[email protected]>Cc Lorenzo Stoakes <[email protected]>Cc Baolin Wang <[email protected]>Cc "Liam R. Howlett" <[email protected]>Cc Nico Pache <[email protected]>Cc Ryan Roberts <[email protected]>Cc Dev Jain <[email protected]>Cc Barry Song <[email protected]>Cc Lyude Paul <[email protected]>Cc Danilo Krummrich <[email protected]>Cc David Airlie <[email protected]>Cc Simona Vetter <[email protected]>Cc Ralph Campbell <[email protected]>Cc Mika Penttilä <[email protected]>Cc Matthew Brost <[email protected]>Cc Francois Dugast <[email protected]>Signed-off-by Balbir Singh <[email protected]>--- mm/huge_memory.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-)Quoted 10 lines
mm/huge_memory.c static int __folio_freeze_and_split_unmapped(struct folio *folio, unsigned int n · line 3753
Quoted 8 lines
mm/huge_memory.c +0
-0@@ -3751,6 +3751,7 @@ static int __folio_freeze_and_split_unmapped(struct folio *folio, unsigned int n int ret = 0; struct deferred_split *ds_queue; + VM_WARN_ON_ONCE(!mapping && end != 0);You could drop the "!= 0"
Ack
VM_WARN_ONE(!mapping && end);Quoted 22 lines
Quoted 13 lines
mm/huge_memory.c +1
-1/* Prevent deferred_split_scan() touching ->_refcount */ ds_queue = folio_split_queue_lock(folio); if (folio_ref_freeze(folio, 1 + extra_pins)) {@@ -3919,7 +3920,7 @@ static int __folio_split(struct folio *folio, unsigned int new_order, int nr_shmem_dropped = 0; int remap_flags = 0; int extra_pins, ret; - pgoff_t end; + pgoff_t end = 0; bool is_hzp; VM_WARN_ON_ONCE_FOLIO(!folio_test_locked(folio), folio);mm/huge_memory.c static int __folio_split(struct folio *folio, unsigned int new_order, · line 4053
Quoted 4 lines
mm/huge_memory.c +1
-0@@ -4049,7 +4050,7 @@ static int __folio_split(struct folio *folio, unsigned int new_order, local_irq_enable(); - if (nr_shmem_dropped) + if (mapping && shmem_mapping(mapping) && nr_shmem_dropped) shmem_uncharge(mapping->host, nr_shmem_dropped);That looks questionable. We shouldn't add runtime check to handle buildtime things.
Likely what you want is instead
Quoted 7 lines
Quoted 3 lines
if (
IS_ENABLED(CONFIG_SHMEM)&&nr_shmem_dropped)
shmem_uncharge()
shmem_mapping()returns false forCONFIG_SHMEM=nandshmem_mapping()checks that the mapping is indeed for shmem ops before uncharging. Happy to change it if you like, your version is more readable
Good point, but the questionable thing is that it looks like nr_shmem_dropped could be set for non-shmem mappings, when it's really just a compiler thing.
What about handling it through a proper stub so we can keep this calling code simple?
include/linux/shmem_fs.h +4 -1
@@ -136,11 +136,15 @@ static inline bool shmem_hpage_pmd_enabled(void)#ifdef CONFIG_SHMEM extern unsigned long shmem_swap_usage (struct vm_area_struct *vma); +extern void shmem_uncharge (struct inode *inode,long pages);#else static inline unsigned long shmem_swap_usage (struct vm_area_struct *vma) {return 0 ; } +static inline void shmem_uncharge (struct inode *inode,long pages) +{ +}#endif extern unsigned long shmem_partial_swap_usage (struct address_space *mapping,pgoff_t start,pgoff_t end);
@@ -194,7 +198,6 @@ static inline pgoff_t shmem_fallocend(struct inode *inode, pgoff_t eof) }extern bool shmem_charge (struct inode *inode,long pages); -extern void shmem_uncharge (struct inode *inode,long pages);#ifdef CONFIG_USERFAULTFD #ifdef CONFIG_SHMEM
Signature · 3 lines
Cheers David
Quoted 118 lines · David Hildenbrand (Red Hat)
Quoted 83 lines · Balbir Singh
Quoted 45 lines · David Hildenbrand (Red Hat)
Quoted 44 lines · Balbir Singh
Code refactoring of
__folio_split()via helper__folio_freeze_and_split_unmapped()caused a regression with clang-20 withCONFIG_SHMEM=n, the compiler was not able to optimize away the call toshmem_uncharge()due to changes innr_shmem_dropped. Fix this by checking forshmem_mapping()prior to callingshmem_uncharge(),shmem_mapping()returns false whenCONFIG_SHMEM=n.smatch also complained about parameter end being used without initialization, which is a false positive, but keep the tool happy by sending in initialized parameters. end is initialized to 0.
Add detailed documentation comments for
folio_split_unmapped()Cc Andrew Morton <[email protected]>Cc David Hildenbrand <[email protected]>Cc Zi Yan <[email protected]>Cc Joshua Hahn <[email protected]>Cc Rakie Kim <[email protected]>Cc Byungchul Park <[email protected]>Cc Gregory Price <[email protected]>Cc Ying Huang <[email protected]>Cc Alistair Popple <[email protected]>Cc Oscar Salvador <[email protected]>Cc Lorenzo Stoakes <[email protected]>Cc Baolin Wang <[email protected]>Cc "Liam R. Howlett" <[email protected]>Cc Nico Pache <[email protected]>Cc Ryan Roberts <[email protected]>Cc Dev Jain <[email protected]>Cc Barry Song <[email protected]>Cc Lyude Paul <[email protected]>Cc Danilo Krummrich <[email protected]>Cc David Airlie <[email protected]>Cc Simona Vetter <[email protected]>Cc Ralph Campbell <[email protected]>Cc Mika Penttilä <[email protected]>Cc Matthew Brost <[email protected]>Cc Francois Dugast <[email protected]>Signed-off-by Balbir Singh <[email protected]>---
mm/huge_memory.c| 32 ++++++++++++++++++++++----------1 file changed, 22 insertions(+), 10 deletions(-)Quoted 10 lines
mm/huge_memory.c static int __folio_freeze_and_split_unmapped(struct folio *folio, unsigned int n · line 3753
Quoted 8 lines
mm/huge_memory.c +0
-0@@ -3751,6 +3751,7 @@ static int __folio_freeze_and_split_unmapped(struct folio *folio, unsigned int n int ret = 0; struct deferred_split *ds_queue; + VM_WARN_ON_ONCE(!mapping && end != 0);You could drop the "!= 0"
Ack
VM_WARN_ONE(!mapping && end);Quoted 22 lines
Quoted 13 lines
mm/huge_memory.c +1
-1/* Prevent deferred_split_scan() touching ->_refcount */ ds_queue = folio_split_queue_lock(folio); if (folio_ref_freeze(folio, 1 + extra_pins)) {@@ -3919,7 +3920,7 @@ static int __folio_split(struct folio *folio, unsigned int new_order, int nr_shmem_dropped = 0; int remap_flags = 0; int extra_pins, ret; - pgoff_t end; + pgoff_t end = 0; bool is_hzp; VM_WARN_ON_ONCE_FOLIO(!folio_test_locked(folio), folio);mm/huge_memory.c static int __folio_split(struct folio *folio, unsigned int new_order, · line 4053
Quoted 4 lines
mm/huge_memory.c +1
-0@@ -4049,7 +4050,7 @@ static int __folio_split(struct folio *folio, unsigned int new_order, local_irq_enable(); - if (nr_shmem_dropped) + if (mapping && shmem_mapping(mapping) && nr_shmem_dropped) shmem_uncharge(mapping->host, nr_shmem_dropped);That looks questionable. We shouldn't add runtime check to handle buildtime things.
Likely what you want is instead
Quoted 7 lines
Quoted 3 lines
if (
IS_ENABLED(CONFIG_SHMEM)&&nr_shmem_dropped)
shmem_uncharge()
shmem_mapping()returns false forCONFIG_SHMEM=nandshmem_mapping()checks that the mapping is indeed for shmem ops before uncharging. Happy to change it if you like, your version is more readableGood point, but the questionable thing is that it looks like
nr_shmem_droppedcould be set for non-shmem mappings, when it's really just a compiler thing.What about handling it through a proper stub so we can keep this calling code simple?
include/linux/shmem_fs.h +0
-0@@ -136,11 +136,15 @@ static inline bool shmem_hpage_pmd_enabled(void)
#ifdefCONFIG_SHMEM
extern unsigned longshmem_swap_usage(struct vm_area_struct *vma); +extern voidshmem_uncharge(struct inode *inode, long pages); #else
static inline unsigned longshmem_swap_usage(struct vm_area_struct *vma){
return 0;
}include/linux/shmem_fs.h +3
-0+static inline void shmem_uncharge (struct inode *inode,long pages) +{ +}#endif
extern unsigned longshmem_partial_swap_usage(struct address_space *mapping, pgoff_t start, pgoff_t end);include/linux/shmem_fs.h +0
-0@@ -194,7 +198,6 @@ static inline pgoff_t shmem_fallocend(struct inode *inode, pgoff_t eof) }
Quoted 8 lines
extern boolshmem_charge(struct inode *inode, long pages); -extern voidshmem_uncharge(struct inode *inode, long pages);
#ifdefCONFIG_USERFAULTFD
#ifdefCONFIG_SHMEM
Agreed, I would like to let this patch proceed and then immediately follow up patch along the lines of CONFIG_SHMEM as separate independent patch (independent of this series). What do you think?
Balbir
changes.
David Hildenbrand (Red Hat)
maintainerQuoted 123 lines · Balbir Singh
Quoted 122 lines · David Hildenbrand (Red Hat)
Quoted 83 lines · Balbir Singh
Quoted 45 lines · David Hildenbrand (Red Hat)
Quoted 44 lines · Balbir Singh
Code refactoring of
__folio_split()via helper__folio_freeze_and_split_unmapped()caused a regression with clang-20 withCONFIG_SHMEM=n, the compiler was not able to optimize away the call toshmem_uncharge()due to changes innr_shmem_dropped. Fix this by checking forshmem_mapping()prior to callingshmem_uncharge(),shmem_mapping()returns false whenCONFIG_SHMEM=n.smatch also complained about parameter end being used without initialization, which is a false positive, but keep the tool happy by sending in initialized parameters. end is initialized to 0.
Add detailed documentation comments for
folio_split_unmapped()Cc Andrew Morton <[email protected]>Cc David Hildenbrand <[email protected]>Cc Zi Yan <[email protected]>Cc Joshua Hahn <[email protected]>Cc Rakie Kim <[email protected]>Cc Byungchul Park <[email protected]>Cc Gregory Price <[email protected]>Cc Ying Huang <[email protected]>Cc Alistair Popple <[email protected]>Cc Oscar Salvador <[email protected]>Cc Lorenzo Stoakes <[email protected]>Cc Baolin Wang <[email protected]>Cc "Liam R. Howlett" <[email protected]>Cc Nico Pache <[email protected]>Cc Ryan Roberts <[email protected]>Cc Dev Jain <[email protected]>Cc Barry Song <[email protected]>Cc Lyude Paul <[email protected]>Cc Danilo Krummrich <[email protected]>Cc David Airlie <[email protected]>Cc Simona Vetter <[email protected]>Cc Ralph Campbell <[email protected]>Cc Mika Penttilä <[email protected]>Cc Matthew Brost <[email protected]>Cc Francois Dugast <[email protected]>Signed-off-by Balbir Singh <[email protected]>--- mm/huge_memory.c | 32 ++++++++++++++++++++++---------- 1 file changed, 22 insertions(+), 10 deletions(-)Quoted 10 lines
mm/huge_memory.c static int __folio_freeze_and_split_unmapped(struct folio *folio, unsigned int n · line 3753
Quoted 8 lines
mm/huge_memory.c +0
-0@@ -3751,6 +3751,7 @@ static int __folio_freeze_and_split_unmapped(struct folio *folio, unsigned int n int ret = 0; struct deferred_split *ds_queue; + VM_WARN_ON_ONCE(!mapping && end != 0);You could drop the "!= 0"
Ack
VM_WARN_ONE(!mapping && end);Quoted 22 lines
Quoted 13 lines
mm/huge_memory.c +1
-1/* Prevent deferred_split_scan() touching ->_refcount */ ds_queue = folio_split_queue_lock(folio); if (folio_ref_freeze(folio, 1 + extra_pins)) {@@ -3919,7 +3920,7 @@ static int __folio_split(struct folio *folio, unsigned int new_order, int nr_shmem_dropped = 0; int remap_flags = 0; int extra_pins, ret; - pgoff_t end; + pgoff_t end = 0; bool is_hzp; VM_WARN_ON_ONCE_FOLIO(!folio_test_locked(folio), folio);mm/huge_memory.c static int __folio_split(struct folio *folio, unsigned int new_order, · line 4053
Quoted 4 lines
mm/huge_memory.c +1
-0@@ -4049,7 +4050,7 @@ static int __folio_split(struct folio *folio, unsigned int new_order, local_irq_enable(); - if (nr_shmem_dropped) + if (mapping && shmem_mapping(mapping) && nr_shmem_dropped) shmem_uncharge(mapping->host, nr_shmem_dropped);That looks questionable. We shouldn't add runtime check to handle buildtime things.
Likely what you want is instead
Quoted 7 lines
Quoted 3 lines
if (
IS_ENABLED(CONFIG_SHMEM)&&nr_shmem_dropped)
shmem_uncharge()
shmem_mapping()returns false forCONFIG_SHMEM=nandshmem_mapping()checks that the mapping is indeed for shmem ops before uncharging. Happy to change it if you like, your version is more readableGood point, but the questionable thing is that it looks like
nr_shmem_droppedcould be set for non-shmem mappings, when it's really just a compiler thing.What about handling it through a proper stub so we can keep this calling code simple?
include/linux/shmem_fs.h +4
-1@@ -136,11 +136,15 @@ static inline bool shmem_hpage_pmd_enabled(void) #ifdef CONFIG_SHMEM extern unsigned long shmem_swap_usage(struct vm_area_struct *vma); +extern void shmem_uncharge (struct inode *inode,long pages); #else static inline unsigned long shmem_swap_usage(struct vm_area_struct *vma) { return 0; } +static inline void shmem_uncharge (struct inode *inode,long pages) +{ +} #endif extern unsigned long shmem_partial_swap_usage(struct address_space *mapping, pgoff_t start, pgoff_t end);@@ -194,7 +198,6 @@ static inline pgoff_t shmem_fallocend(struct inode *inode, pgoff_t eof) } extern bool shmem_charge(struct inode *inode, long pages); -extern void shmem_uncharge (struct inode *inode,long pages);
Quoted 8 lines
include/linux/shmem_fs.h static inline pgoff_t shmem_fallocend(struct inode *inode, pgoff_t eof) · line 203
Quoted 4 lines
include/linux/shmem_fs.h +0
-0#ifdef CONFIG_USERFAULTFD #ifdef CONFIG_SHMEMAgreed, I would like to let this patch proceed and then immediately follow up patch along the lines of
CONFIG_SHMEMas separate independent patch (independent of this series). What do you think?
Let's do it properly right away, no need to hurry that much.
Signature · 3 lines
Cheers David