mm: Replace zero-length array with flexible-array member
Subsystems (5)
PATCH RESEND 1/3 mm: Replace zero-length array with flexible-array member
From: chenqiwu <[email protected]>
The current codebase makes use of the zero-length array language extension to the C90 standard, but the preferred mechanism to declare variable-length types such as these ones is a flexible array member[1][2], introduced in C99:
struct foo {
int stuff;
struct boo array[];
};By making use of the mechanism above, we will get a compiler warning in case the flexible array does not occur last in the structure, which will help us prevent some kind of undefined behavior bugs from being inadvertently introduced[3] to the codebase from now on.
Also, notice that, dynamic memory allocations won't be affected by this change:
"Flexible array members have incomplete type, and so the sizeof operator may not be applied. As a quirk of the original implementation of zero-length arrays, sizeof evaluates to zero."[1]
This issue was found with the help of Coccinelle.
[1] https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
[2] https://github.com/KSPP/linux/issues/21
[3] commit 76497732932f ("cxgb3/l2t: Fix undefined behaviour")
--- include/linux/mm.h | 2 +- include/linux/mmzone.h | 2 +- include/linux/swap.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
include/linux/mm.h +1 -1
@@ -1718,7 +1718,7 @@ struct frame_vector {unsigned int nr_frames;/* Number of frames stored in ptrs array */ bool got_ref;/* Did we pin pages by getting page ref? */ bool is_pfns;/* Does array contain pages or pfns? */ -void *ptrs[0 ];/* Array of pinned pfns / pages. Use +void *ptrs[];/* Array of pinned pfns / pages. Use * pfns_vector_pages() or pfns_vector_pfns() * for access */ };
include/linux/mmzone.h +1 -1
@@ -1147,7 +1147,7 @@ struct mem_section_usage {DECLARE_BITMAP (subsection_map,SUBSECTIONS_PER_SECTION );#endif /* See declaration of similar field in struct zone */ -unsigned long pageblock_flags[0 ]; +unsigned long pageblock_flags[]; };void subsection_map_init (unsigned long pfn,unsigned long nr_pages);
include/linux/swap.h +1 -1
@@ -275,7 +275,7 @@ struct swap_info_struct {*/ struct work_struct discard_work;/* discard worker */ struct swap_cluster_list discard_clusters;/* discard clusters list */ -struct plist_node avail_lists[0 ];/* +struct plist_node avail_lists[];/* * entries in swap_avail_heads, one * entry per node. * Must be last as the number of the
Signature · 1 line
1.9.1
PATCH RESEND 2/3 mm/swapfile: use list_{prev,next}_entry() instead of open-coding
From: chenqiwu <[email protected]>
Use list_{prev,next}_entry() instead of list_entry() for better code readability.
--- mm/swapfile.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
mm/swapfile.c +6 -10
@@ -3654,7 +3654,7 @@ static bool swap_count_continued(struct swap_info_struct *si,spin_lock (&si->cont_lock); offset &= ~PAGE_MASK ; - page = list_entry(head->lru.next, struct page, lru); + page =list_next_entry (head, lru); map =kmap_atomic (page) + offset;if (count ==SWAP_MAP_MAX )/* initial increment from swap_map */
@@ -3666,13 +3666,13 @@ static bool swap_count_continued(struct swap_info_struct *si,*/ while (*map == (SWAP_CONT_MAX |COUNT_CONTINUED )) {kunmap_atomic (map); - page = list_entry(page->lru.next, struct page, lru); + page =list_next_entry (page, lru);BUG_ON (page == head); map =kmap_atomic (page) + offset; }if (*map ==SWAP_CONT_MAX ) {kunmap_atomic (map); - page = list_entry(page->lru.next, struct page, lru); + page =list_next_entry (page, lru);if (page == head) { ret = false;/* add count continuation */ goto out;
@@ -3682,12 +3682,10 @@ static bool swap_count_continued(struct swap_info_struct *si, } *map +=1 ;kunmap_atomic (map); - page = list_entry(page->lru.prev, struct page, lru); -while (page != head) { +while ((page =list_prev_entry (page, lru)) != head) { map =kmap_atomic (page) + offset; *map =COUNT_CONTINUED ;kunmap_atomic (map); - page = list_entry(page->lru.prev, struct page, lru); } ret = true;/* incremented */
@@ -3698,7 +3696,7 @@ static bool swap_count_continued(struct swap_info_struct *si,BUG_ON (count !=COUNT_CONTINUED );while (*map ==COUNT_CONTINUED ) {kunmap_atomic (map); - page = list_entry(page->lru.next, struct page, lru); + page =list_next_entry (page, lru);BUG_ON (page == head); map =kmap_atomic (page) + offset; }
@@ -3707,13 +3705,11 @@ static bool swap_count_continued(struct swap_info_struct *si,if (*map ==0 ) count =0 ;kunmap_atomic (map); - page = list_entry(page->lru.prev, struct page, lru); -while (page != head) { +while ((page =list_prev_entry (page, lru)) != head) { map =kmap_atomic (page) + offset; *map =SWAP_CONT_MAX | count; count =COUNT_CONTINUED ;kunmap_atomic (map); - page = list_entry(page->lru.prev, struct page, lru); } ret = count ==COUNT_CONTINUED ; }
Signature · 1 line
1.9.1
PATCH RESEND 3/3 mm/vmscan: make several optimizations for isolate_lru_pages()
In reply to [email protected]From: chenqiwu <[email protected]>
1) Simplify the code of initializing some variables.
1) Constify the LRU isolation mode.
2) Define a page_zoneidx variable to reduce the redundant code of page_zonenum().
--- mm/vmscan.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-)
mm/vmscan.c +8 -8
@@ -1638,16 +1638,15 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan,struct list_head *src = &lruvec->lists[lru];unsigned long nr_taken =0 ;unsigned long nr_zone_taken[MAX_NR_ZONES ] = {0 }; -unsigned long nr_skipped[MAX_NR_ZONES ] = {0 , }; +unsigned long nr_skipped[MAX_NR_ZONES ] = {0 };unsigned long skipped =0 ; -unsigned long scan, total_scan, nr_pages; +unsigned long scan =0 , total_scan =0 , nr_pages;LIST_HEAD (pages_skipped); -isolate_mode_t mode = (sc->may_unmap ?0 :ISOLATE_UNMAPPED ); +const isolate_mode_t mode = (sc->may_unmap ?0 :ISOLATE_UNMAPPED ); - total_scan =0 ; - scan =0 ;while (scan < nr_to_scan && !list_empty (src)) {struct page *page; +enum zone_type page_zoneidx; page =lru_to_page (src);prefetchw_prev_lru_page (page, src, flags);
@@ -1657,9 +1656,10 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan, nr_pages =compound_nr (page); total_scan += nr_pages; -if (page_zonenum (page) > sc->reclaim_idx) { + page_zoneidx =page_zonenum (page); +if (page_zoneidx > sc->reclaim_idx) {list_move (&page->lru, &pages_skipped); - nr_skipped[page_zonenum (page)] += nr_pages; + nr_skipped[page_zoneidx] += nr_pages;continue ; }
@@ -1677,7 +1677,7 @@ static unsigned long isolate_lru_pages(unsigned long nr_to_scan,switch (__isolate_lru_page (page, mode)) {case 0 : nr_taken += nr_pages; - nr_zone_taken[page_zonenum (page)] += nr_pages; + nr_zone_taken[page_zoneidx] += nr_pages;list_move (&page->lru, dst);break ;
Signature · 1 line
1.9.1
Re: [RESEND PATCH 3/3] mm/vmscan: make several optimizations for isolate_lru_pages()
mm/vmscan.c static unsigned long isolate_lru_pages(unsigned long nr_to_scan, · line 1648
Quoted 6 lines · On Sat, Apr 11, 2020 at 06:11:56PM +0800, [email protected] wrote:
1) Simplify the code of initializing some variables.
mm/vmscan.c +1
-3-unsigned long scan, total_scan, nr_pages; +unsigned long scan =0 , total_scan =0 , nr_pages; - total_scan =0 ; - scan =0 ;
I do not find this to be a simplification.
Re: [RESEND PATCH 3/3] mm/vmscan: make several optimizations for isolate_lru_pages()
Quoted 10 lines · Matthew Wilcox
mm/vmscan.c static unsigned long isolate_lru_pages(unsigned long nr_to_scan, · line 1648
Quoted 6 lines · On Sat, Apr 11, 2020 at 06:11:56PM +0800, [email protected] wrote:
1) Simplify the code of initializing some variables.
mm/vmscan.c +1
-3-unsigned long scan, total_scan, nr_pages; +unsigned long scan =0 , total_scan =0 , nr_pages; - total_scan =0 ; - scan =0 ;I do not find this to be a simplification.
Hi willy,
This slightly simplify the code by definition and initialization meanwhile instead of separating them into the two steps. This can save two lines of code.
Qiwu
Re: [RESEND PATCH 3/3] mm/vmscan: make several optimizations for isolate_lru_pages()
Quoted 11 lines · chenqiwu
Quoted 10 lines · Matthew Wilcox
mm/vmscan.c static unsigned long isolate_lru_pages(unsigned long nr_to_scan, · line 1648
Quoted 6 lines · On Sat, Apr 11, 2020 at 06:11:56PM +0800, [email protected] wrote:
1) Simplify the code of initializing some variables.
mm/vmscan.c +1
-3-unsigned long scan, total_scan, nr_pages; +unsigned long scan =0 , total_scan =0 , nr_pages; - total_scan =0 ; - scan =0 ;I do not find this to be a simplification.
Quoted 4 lines
Hi willy,
This slightly simplify the code by definition and initialization meanwhile instead of separating them into the two steps. This can save two lines of code.
And it buries the initialisation on a more complicated line. Number of lines is not the only metric.
Quoted 24 lines · On Sat, Apr 11, 2020 at 06:11:54PM +0800, [email protected] wrote:
From: chenqiwu <[email protected]>
The current codebase makes use of the zero-length array language extension to the C90 standard, but the preferred mechanism to declare variable-length types such as these ones is a flexible array member[1][2], introduced in C99:
struct foo { int stuff; struct boo array[]; };By making use of the mechanism above, we will get a compiler warning in case the flexible array does not occur last in the structure, which will help us prevent some kind of undefined behavior bugs from being inadvertently introduced[3] to the codebase from now on.
Also, notice that, dynamic memory allocations won't be affected by this change:
"Flexible array members have incomplete type, and so the sizeof operator may not be applied. As a quirk of the original implementation of zero-length arrays, sizeof evaluates to zero."[1]
Quoted 7 lines
This issue was found with the help of Coccinelle.
[1] https://gcc.gnu.org/onlinedocs/gcc/Zero-Length.html
[2] https://github.com/KSPP/linux/issues/21
[3] commit76497732932f("cxgb3/l2t: Fix undefined behaviour")Signed-off-by chenqiwu <[email protected]>
The change looks good to me.
Quoted 47 lines
---
include/linux/mm.h | 2 +- include/linux/mmzone.h | 2 +- include/linux/swap.h | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)include/linux/mm.h +1
-1@@ -1718,7 +1718,7 @@ struct frame_vector {unsigned int nr_frames;/* Number of frames stored in ptrs array */ bool got_ref;/* Did we pin pages by getting page ref? */ bool is_pfns;/* Does array contain pages or pfns? */ -void *ptrs[0 ];/* Array of pinned pfns / pages. Use +void *ptrs[];/* Array of pinned pfns / pages. Use * pfns_vector_pages() or pfns_vector_pfns() * for access */ };include/linux/mmzone.h +1
-1@@ -1147,7 +1147,7 @@ struct mem_section_usage {DECLARE_BITMAP (subsection_map,SUBSECTIONS_PER_SECTION );#endif /* See declaration of similar field in struct zone */ -unsigned long pageblock_flags[0 ]; +unsigned long pageblock_flags[]; };void subsection_map_init (unsigned long pfn,unsigned long nr_pages);include/linux/swap.h +1
-1@@ -275,7 +275,7 @@ struct swap_info_struct {*/ struct work_struct discard_work;/* discard worker */ struct swap_cluster_list discard_clusters;/* discard clusters list */ -struct plist_node avail_lists[0 ];/* +struct plist_node avail_lists[];/* * entries in swap_avail_heads, one * entry per node. * Must be last as the number of the Signature · 1 line
1.9.1
Signature · 2 lines
Wei Yang Help you, Help me