mm/vmscan: fix incorrect return type for cgroup_reclaim()
Subsystems (3)
PATCH 1/1 mm/vmscan: fix incorrect return type for cgroup_reclaim()
From: chenqiwu <[email protected]>
The return type of cgroup_reclaim() is bool, but the correct type should be struct mem_cgroup pointer. As a result, cgroup_reclaim() can be used to wrap sc->target_mem_cgroup in vmscan code.
--- mm/vmscan.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-)
mm/vmscan.c +21 -18
@@ -238,7 +238,7 @@ static void unregister_memcg_shrinker(struct shrinker *shrinker)up_write (&shrinker_rwsem); } -static bool cgroup_reclaim (struct scan_control *sc) +static struct mem_cgroup *cgroup_reclaim (struct scan_control *sc) {return sc->target_mem_cgroup; }
@@ -276,9 +276,9 @@ static void unregister_memcg_shrinker(struct shrinker *shrinker) { } -static bool cgroup_reclaim (struct scan_control *sc) +static struct mem_cgroup *cgroup_reclaim (struct scan_control *sc) { -return false; +return NULL ; }static bool writeback_throttling_sane (struct scan_control *sc)
@@ -984,7 +984,7 @@ static enum page_references page_check_references(struct page *page,int referenced_ptes, referenced_page;unsigned long vm_flags; - referenced_ptes =page_referenced (page,1 , sc->target_mem_cgroup, + referenced_ptes =page_referenced (page,1 ,cgroup_reclaim (sc), &vm_flags); referenced_page =TestClearPageReferenced (page);
@@ -1422,7 +1422,7 @@ static unsigned long shrink_page_list(struct list_head *page_list,count_vm_event (PGLAZYFREED );count_memcg_page_event (page,PGLAZYFREED ); }else if (!mapping || !__remove_mapping (mapping, page, true, - sc->target_mem_cgroup)) +cgroup_reclaim (sc))) goto keep_locked;unlock_page (page);
@@ -1907,6 +1907,7 @@ static int current_may_throttle(void)enum vm_event_item item;struct pglist_data *pgdat =lruvec_pgdat (lruvec);struct zone_reclaim_stat *reclaim_stat = &lruvec->reclaim_stat; +struct mem_cgroup *target_memcg =cgroup_reclaim (sc);bool stalled = false;while (unlikely (too_many_isolated (pgdat, file, sc))) {
@@ -1933,7 +1934,7 @@ static int current_may_throttle(void) reclaim_stat->recent_scanned[file] += nr_taken; item =current_is_kswapd () ?PGSCAN_KSWAPD :PGSCAN_DIRECT ; -if (!cgroup_reclaim (sc)) +if (!target_memcg)__count_vm_events (item, nr_scanned);__count_memcg_events (lruvec_memcg (lruvec), item, nr_scanned);spin_unlock_irq (&pgdat->lru_lock);
@@ -1947,7 +1948,7 @@ static int current_may_throttle(void)spin_lock_irq (&pgdat->lru_lock); item =current_is_kswapd () ?PGSTEAL_KSWAPD :PGSTEAL_DIRECT ; -if (!cgroup_reclaim (sc)) +if (!target_memcg)__count_vm_events (item, nr_reclaimed);__count_memcg_events (lruvec_memcg (lruvec), item, nr_reclaimed); reclaim_stat->recent_rotated[0 ] += stat.nr_activate[0 ];
@@ -2041,7 +2042,7 @@ static void shrink_active_list(unsigned long nr_to_scan, } } -if (page_referenced (page,0 , sc->target_mem_cgroup, +if (page_referenced (page,0 ,cgroup_reclaim (sc), &vm_flags)) { nr_rotated +=hpage_nr_pages (page);/*
@@ -2625,7 +2626,7 @@ static inline bool should_continue_reclaim(struct pglist_data *pgdat,static void shrink_node_memcgs (pg_data_t *pgdat,struct scan_control *sc) { -struct mem_cgroup *target_memcg = sc->target_mem_cgroup; +struct mem_cgroup *target_memcg =cgroup_reclaim (sc);struct mem_cgroup *memcg; memcg =mem_cgroup_iter (target_memcg,NULL ,NULL );
@@ -2686,10 +2687,11 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc)struct reclaim_state *reclaim_state = current->reclaim_state;unsigned long nr_reclaimed, nr_scanned;struct lruvec *target_lruvec; +struct mem_cgroup *target_memcg =cgroup_reclaim (sc);bool reclaimable = false;unsigned long file; - target_lruvec =mem_cgroup_lruvec (sc->target_mem_cgroup, pgdat); + target_lruvec =mem_cgroup_lruvec (target_memcg, pgdat); again:memset (&sc->nr,0 ,sizeof (sc->nr));
@@ -2744,7 +2746,7 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc)* thrashing file LRU becomes infinitely more attractive than * anon pages. Try to detect this based on file LRU size. */ -if (!cgroup_reclaim (sc)) { +if (!target_memcg) {unsigned long total_high_wmark =0 ;unsigned long free, anon;int z;
@@ -2782,7 +2784,7 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc) }/* Record the subtree's reclaim efficiency */ -vmpressure (sc->gfp_mask, sc->target_mem_cgroup, true, +vmpressure (sc->gfp_mask, target_memcg, true, sc->nr_scanned - nr_scanned, sc->nr_reclaimed - nr_reclaimed);
@@ -2833,7 +2835,7 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc)* stalling in wait_iff_congested(). */ if ((current_is_kswapd () || - (cgroup_reclaim (sc) &&writeback_throttling_sane (sc))) && + (target_memcg &&writeback_throttling_sane (sc))) && sc->nr.dirty && sc->nr.dirty == sc->nr.congested)set_bit (LRUVEC_CONGESTED , &target_lruvec->flags);
@@ -3020,14 +3022,15 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,pg_data_t *last_pgdat;struct zoneref *z;struct zone *zone; +struct mem_cgroup *target_memcg =cgroup_reclaim (sc); retry:delayacct_freepages_start (); -if (!cgroup_reclaim (sc)) +if (!target_memcg)__count_zid_vm_events (ALLOCSTALL , sc->reclaim_idx,1 ); do { - vmpressure_prio(sc->gfp_mask, sc->target_mem_cgroup, + vmpressure_prio(sc->gfp_mask, target_memcg, sc->priority); sc->nr_scanned = 0; shrink_zones(zonelist, sc);
@@ -3053,12 +3056,12 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,continue ; last_pgdat = zone->zone_pgdat; -snapshot_refaults (sc->target_mem_cgroup, zone->zone_pgdat); +snapshot_refaults (target_memcg, zone->zone_pgdat); -if (cgroup_reclaim (sc)) { +if (target_memcg) {struct lruvec *lruvec; - lruvec =mem_cgroup_lruvec (sc->target_mem_cgroup, + lruvec =mem_cgroup_lruvec (target_memcg, zone->zone_pgdat);clear_bit (LRUVEC_CONGESTED , &lruvec->flags); }
Signature · 1 line
1.9.1
Michal Hocko
reviewerQuoted 5 lines · On Thu 19-03-20 23:50:26, [email protected] wrote:
From: chenqiwu <[email protected]>
The return type of
cgroup_reclaim()is bool, but the correct type should be structmem_cgrouppointer. As a result,cgroup_reclaim()can be used to wrapsc->target_mem_cgroupin vmscan code.
Why is this an improvement? While we can hide the scan_control dereference I am not seeing why this would be so much better. Quite worse TBH because cgroup_reclaim is a predicate while you make it return an object. This might be highly subjective thing, though.
Does the patch result in a better code generation at least. Because without any obvious improvement I am not sure this is worth inclusion.
Quoted 169 lines
Signed-off-by chenqiwu <[email protected]>--- mm/vmscan.c | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-)mm/vmscan.c +21
-18@@ -238,7 +238,7 @@ static void unregister_memcg_shrinker(struct shrinker *shrinker)up_write (&shrinker_rwsem); } -static bool cgroup_reclaim (struct scan_control *sc) +static struct mem_cgroup *cgroup_reclaim (struct scan_control *sc) {return sc->target_mem_cgroup; }@@ -276,9 +276,9 @@ static void unregister_memcg_shrinker(struct shrinker *shrinker) { } -static bool cgroup_reclaim (struct scan_control *sc) +static struct mem_cgroup *cgroup_reclaim (struct scan_control *sc) { -return false; +return NULL ; }static bool writeback_throttling_sane (struct scan_control *sc)@@ -984,7 +984,7 @@ static enum page_references page_check_references(struct page *page,int referenced_ptes, referenced_page;unsigned long vm_flags; - referenced_ptes =page_referenced (page,1 , sc->target_mem_cgroup, + referenced_ptes =page_referenced (page,1 ,cgroup_reclaim (sc), &vm_flags); referenced_page =TestClearPageReferenced (page);@@ -1422,7 +1422,7 @@ static unsigned long shrink_page_list(struct list_head *page_list,count_vm_event (PGLAZYFREED );count_memcg_page_event (page,PGLAZYFREED ); }else if (!mapping || !__remove_mapping (mapping, page, true, - sc->target_mem_cgroup)) +cgroup_reclaim (sc))) goto keep_locked;unlock_page (page);@@ -1907,6 +1907,7 @@ static int current_may_throttle(void)enum vm_event_item item;struct pglist_data *pgdat =lruvec_pgdat (lruvec);struct zone_reclaim_stat *reclaim_stat = &lruvec->reclaim_stat; +struct mem_cgroup *target_memcg =cgroup_reclaim (sc);bool stalled = false;while (unlikely (too_many_isolated (pgdat, file, sc))) {@@ -1933,7 +1934,7 @@ static int current_may_throttle(void) reclaim_stat->recent_scanned[file] += nr_taken; item =current_is_kswapd () ?PGSCAN_KSWAPD :PGSCAN_DIRECT ; -if (!cgroup_reclaim (sc)) +if (!target_memcg)__count_vm_events (item, nr_scanned);__count_memcg_events (lruvec_memcg (lruvec), item, nr_scanned);spin_unlock_irq (&pgdat->lru_lock);@@ -1947,7 +1948,7 @@ static int current_may_throttle(void)spin_lock_irq (&pgdat->lru_lock); item =current_is_kswapd () ?PGSTEAL_KSWAPD :PGSTEAL_DIRECT ; -if (!cgroup_reclaim (sc)) +if (!target_memcg)__count_vm_events (item, nr_reclaimed);__count_memcg_events (lruvec_memcg (lruvec), item, nr_reclaimed); reclaim_stat->recent_rotated[0 ] += stat.nr_activate[0 ];@@ -2041,7 +2042,7 @@ static void shrink_active_list(unsigned long nr_to_scan, } } -if (page_referenced (page,0 , sc->target_mem_cgroup, +if (page_referenced (page,0 ,cgroup_reclaim (sc), &vm_flags)) { nr_rotated +=hpage_nr_pages (page);/* @@ -2625,7 +2626,7 @@ static inline bool should_continue_reclaim(struct pglist_data *pgdat,static void shrink_node_memcgs (pg_data_t *pgdat,struct scan_control *sc) { -struct mem_cgroup *target_memcg = sc->target_mem_cgroup; +struct mem_cgroup *target_memcg =cgroup_reclaim (sc);struct mem_cgroup *memcg; memcg =mem_cgroup_iter (target_memcg,NULL ,NULL );@@ -2686,10 +2687,11 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc)struct reclaim_state *reclaim_state = current->reclaim_state;unsigned long nr_reclaimed, nr_scanned;struct lruvec *target_lruvec; +struct mem_cgroup *target_memcg =cgroup_reclaim (sc);bool reclaimable = false;unsigned long file; - target_lruvec =mem_cgroup_lruvec (sc->target_mem_cgroup, pgdat); + target_lruvec =mem_cgroup_lruvec (target_memcg, pgdat); again:memset (&sc->nr,0 ,sizeof (sc->nr));@@ -2744,7 +2746,7 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc)* thrashing file LRU becomes infinitely more attractive than * anon pages. Try to detect this based on file LRU size. */ -if (!cgroup_reclaim (sc)) { +if (!target_memcg) {unsigned long total_high_wmark =0 ;unsigned long free, anon;int z;@@ -2782,7 +2784,7 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc) }/* Record the subtree's reclaim efficiency */ -vmpressure (sc->gfp_mask, sc->target_mem_cgroup, true, +vmpressure (sc->gfp_mask, target_memcg, true, sc->nr_scanned - nr_scanned, sc->nr_reclaimed - nr_reclaimed);@@ -2833,7 +2835,7 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc)* stalling in wait_iff_congested(). */ if ((current_is_kswapd () || - (cgroup_reclaim (sc) &&writeback_throttling_sane (sc))) && + (target_memcg &&writeback_throttling_sane (sc))) && sc->nr.dirty && sc->nr.dirty == sc->nr.congested)set_bit (LRUVEC_CONGESTED , &target_lruvec->flags);@@ -3020,14 +3022,15 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,pg_data_t *last_pgdat;struct zoneref *z;struct zone *zone; +struct mem_cgroup *target_memcg =cgroup_reclaim (sc); retry:delayacct_freepages_start (); -if (!cgroup_reclaim (sc)) +if (!target_memcg)__count_zid_vm_events (ALLOCSTALL , sc->reclaim_idx,1 ); do { - vmpressure_prio(sc->gfp_mask, sc->target_mem_cgroup, + vmpressure_prio(sc->gfp_mask, target_memcg, sc->priority); sc->nr_scanned = 0; shrink_zones(zonelist, sc);@@ -3053,12 +3056,12 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,continue ; last_pgdat = zone->zone_pgdat; -snapshot_refaults (sc->target_mem_cgroup, zone->zone_pgdat); +snapshot_refaults (target_memcg, zone->zone_pgdat); -if (cgroup_reclaim (sc)) { +if (target_memcg) {struct lruvec *lruvec; - lruvec =mem_cgroup_lruvec (sc->target_mem_cgroup, + lruvec =mem_cgroup_lruvec (target_memcg, zone->zone_pgdat);clear_bit (LRUVEC_CONGESTED , &lruvec->flags); }Signature · 1 line
1.9.1
Signature · 2 lines
Michal Hocko SUSE Labs
Quoted 7 lines · Michal Hocko
Quoted 5 lines · On Thu 19-03-20 23:50:26, [email protected] wrote:
From: chenqiwu <[email protected]>
The return type of
cgroup_reclaim()is bool, but the correct type should be structmem_cgrouppointer. As a result,cgroup_reclaim()can be used to wrapsc->target_mem_cgroupin vmscan code.
Quoted 7 lines
Why is this an improvement? While we can hide the
scan_controldereference I am not seeing why this would be so much better. Quite worse TBH becausecgroup_reclaimis a predicate while you make it return an object. This might be highly subjective thing, though.Does the patch result in a better code generation at least. Because without any obvious improvement I am not sure this is worth inclusion.
I tend to agree with Michal. The returned bool looks good.
If you really care about the internal conversion, maybe a slight change as below?
static struct mem_cgroup *cgroup_reclaim(struct scan_control *sc)
{
return !!sc->target_mem_cgroup;
}Quoted 5 lines · [email protected] writes:
From: chenqiwu <[email protected]>
The return type of
cgroup_reclaim()is bool, but the correct type should be structmem_cgrouppointer. As a result,cgroup_reclaim()can be used to wrapsc->target_mem_cgroupin vmscan code.
The code changes looks okay to me, but the changelog and patch subject could do with some improvement. For example, the type isn't "incorrect" before and "correct" now, per se, it's just coercing from *struct mem_cgroup to bool.
Could you make it more clear what your intent is in the patch? If it's that you found the code confusing, you can just write something like:
mm/vmscan: return target_mem_cgroup from cgroup_reclaim
Previously the code splits apart the action of checking whether we are in cgroup reclaim from getting the target memory cgroup for that reclaim. This split is confusing and seems unnecessary, since cgroup_reclaim itself only checks if sc->target_mem_cgroup is NULL or not, so merge the two use cases into one by returning the target_mem_cgroup itself from cgroup_reclaim.
Quoted 1 line
Signed-off-by chenqiwu <[email protected]>
After improving the patch title and summary, you can add:
Quoted 169 lines
---
mm/vmscan.c| 39 +++++++++++++++++++++------------------1 file changed, 21 insertions(+), 18 deletions(-)mm/vmscan.c +12
-10@@ -238,7 +238,7 @@ static void unregister_memcg_shrinker(struct shrinker *shrinker)up_write (&shrinker_rwsem); } -static bool cgroup_reclaim (struct scan_control *sc) +static struct mem_cgroup *cgroup_reclaim (struct scan_control *sc) {return sc->target_mem_cgroup; }@@ -276,9 +276,9 @@ static void unregister_memcg_shrinker(struct shrinker *shrinker) { } -static bool cgroup_reclaim (struct scan_control *sc) +static struct mem_cgroup *cgroup_reclaim (struct scan_control *sc) { -return false; +return NULL ; }static bool writeback_throttling_sane (struct scan_control *sc)@@ -984,7 +984,7 @@ static enum page_references page_check_references(struct page *page,int referenced_ptes, referenced_page;unsigned long vm_flags; - referenced_ptes =page_referenced (page,1 , sc->target_mem_cgroup, + referenced_ptes =page_referenced (page,1 ,cgroup_reclaim (sc), &vm_flags); referenced_page =TestClearPageReferenced (page);@@ -1422,7 +1422,7 @@ static unsigned long shrink_page_list(struct list_head *page_list,count_vm_event (PGLAZYFREED );count_memcg_page_event (page,PGLAZYFREED ); }else if (!mapping || !__remove_mapping (mapping, page, true, - sc->target_mem_cgroup)) +cgroup_reclaim (sc))) goto keep_locked;unlock_page (page);@@ -1907,6 +1907,7 @@ static int current_may_throttle(void)enum vm_event_item item;struct pglist_data *pgdat =lruvec_pgdat (lruvec);struct zone_reclaim_stat *reclaim_stat = &lruvec->reclaim_stat; +struct mem_cgroup *target_memcg =cgroup_reclaim (sc);bool stalled = false;while (unlikely (too_many_isolated (pgdat, file, sc))) {@@ -1933,7 +1934,7 @@ static int current_may_throttle(void) reclaim_stat->recent_scanned[file] += nr_taken; item =current_is_kswapd () ?PGSCAN_KSWAPD :PGSCAN_DIRECT ; -if (!cgroup_reclaim (sc)) +if (!target_memcg)__count_vm_events (item, nr_scanned);__count_memcg_events (lruvec_memcg (lruvec), item, nr_scanned);spin_unlock_irq (&pgdat->lru_lock);@@ -1947,7 +1948,7 @@ static int current_may_throttle(void)spin_lock_irq (&pgdat->lru_lock); item =current_is_kswapd () ?PGSTEAL_KSWAPD :PGSTEAL_DIRECT ; -if (!cgroup_reclaim (sc)) +if (!target_memcg)__count_vm_events (item, nr_reclaimed);__count_memcg_events (lruvec_memcg (lruvec), item, nr_reclaimed); reclaim_stat->recent_rotated[0 ] += stat.nr_activate[0 ];@@ -2041,7 +2042,7 @@ static void shrink_active_list(unsigned long nr_to_scan, } } -if (page_referenced (page,0 , sc->target_mem_cgroup, +if (page_referenced (page,0 ,cgroup_reclaim (sc), &vm_flags)) { nr_rotated +=hpage_nr_pages (page);/* @@ -2625,7 +2626,7 @@ static inline bool should_continue_reclaim(struct pglist_data *pgdat,static void shrink_node_memcgs (pg_data_t *pgdat,struct scan_control *sc) { -struct mem_cgroup *target_memcg = sc->target_mem_cgroup; +struct mem_cgroup *target_memcg =cgroup_reclaim (sc);struct mem_cgroup *memcg; memcg =mem_cgroup_iter (target_memcg,NULL ,NULL );@@ -2686,10 +2687,11 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc)struct reclaim_state *reclaim_state = current->reclaim_state;unsigned long nr_reclaimed, nr_scanned;struct lruvec *target_lruvec; +struct mem_cgroup *target_memcg =cgroup_reclaim (sc);bool reclaimable = false;unsigned long file; - target_lruvec =mem_cgroup_lruvec (sc->target_mem_cgroup, pgdat); + target_lruvec =mem_cgroup_lruvec (target_memcg, pgdat);again:
memset(&sc->nr, 0, sizeof(sc->nr));mm/vmscan.c +4
-3@@ -2744,7 +2746,7 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc)* thrashing file LRU becomes infinitely more attractive than * anon pages. Try to detect this based on file LRU size. */ -if (!cgroup_reclaim (sc)) { +if (!target_memcg) {unsigned long total_high_wmark =0 ;unsigned long free, anon;int z;@@ -2782,7 +2784,7 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc) }/* Record the subtree's reclaim efficiency */ -vmpressure (sc->gfp_mask, sc->target_mem_cgroup, true, +vmpressure (sc->gfp_mask, target_memcg, true, sc->nr_scanned - nr_scanned, sc->nr_reclaimed - nr_reclaimed);@@ -2833,7 +2835,7 @@ static void shrink_node(pg_data_t *pgdat, struct scan_control *sc)* stalling in wait_iff_congested(). */ if ((current_is_kswapd () || - (cgroup_reclaim (sc) &&writeback_throttling_sane (sc))) && + (target_memcg &&writeback_throttling_sane (sc))) && sc->nr.dirty && sc->nr.dirty == sc->nr.congested)set_bit (LRUVEC_CONGESTED , &target_lruvec->flags);@@ -3020,14 +3022,15 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,pg_data_t *last_pgdat;struct zoneref *z;struct zone *zone; +struct mem_cgroup *target_memcg =cgroup_reclaim (sc);retry:
delayacct_freepages_start();mm/vmscan.c +1
-1-if (!cgroup_reclaim (sc)) +if (!target_memcg)__count_zid_vm_events(ALLOCSTALL, sc->reclaim_idx, 1); do {mm/vmscan.c +1
-1- vmpressure_prio(sc->gfp_mask, sc->target_mem_cgroup, + vmpressure_prio(sc->gfp_mask, target_memcg,sc->priority); sc->nr_scanned = 0; shrink_zones(zonelist, sc);mm/vmscan.c +3
-3@@ -3053,12 +3056,12 @@ static unsigned long do_try_to_free_pages(struct zonelist *zonelist,continue ; last_pgdat = zone->zone_pgdat; -snapshot_refaults (sc->target_mem_cgroup, zone->zone_pgdat); +snapshot_refaults (target_memcg, zone->zone_pgdat); -if (cgroup_reclaim (sc)) { +if (target_memcg) {struct lruvec *lruvec; - lruvec =mem_cgroup_lruvec (sc->target_mem_cgroup, + lruvec =mem_cgroup_lruvec (target_memcg, zone->zone_pgdat);clear_bit (LRUVEC_CONGESTED , &lruvec->flags); }Signature · 1 line
1.9.1
Quoted 14 lines · Chris Down
Quoted 5 lines · [email protected] writes:
From: chenqiwu <[email protected]>
The return type of
cgroup_reclaim()is bool, but the correct type should be structmem_cgrouppointer. As a result,cgroup_reclaim()can be used to wrapsc->target_mem_cgroupin vmscan code.The code changes looks okay to me, but the changelog and patch subject could do with some improvement. For example, the type isn't "incorrect" before and "correct" now, per se, it's just coercing from *struct
mem_cgroupto bool.Could you make it more clear what your intent is in the patch? If it's that you found the code confusing, you can just write something like:
Quoted 8 lines
mm/vmscan: return
target_mem_cgroupfromcgroup_reclaimPreviously the code splits apart the action of checking whether we are
in cgroup reclaim from getting the target memory cgroup for that
reclaim. This split is confusing and seems unnecessary, sincecgroup_reclaimitself only checks ifsc->target_mem_cgroupis NULL or
not, so merge the two use cases into one by returning thetarget_mem_cgroupitself fromcgroup_reclaim.
Thank you for this better changelog; I have a better idea about what this patch is doing now.
Quoted 10 lines
mm/vmscan.c static void unregister_memcg_shrinker(struct shrinker *shrinker) · line 282
Quoted 10 lines
mm/vmscan.c +2
-2@@ -276,9 +276,9 @@ static void unregister_memcg_shrinker(struct shrinker *shrinker) { } -static bool cgroup_reclaim (struct scan_control *sc) +static struct mem_cgroup *cgroup_reclaim (struct scan_control *sc) { -return false; +return NULL ; }
I think this is actually the important bit. For those who build their kernels with cgroups disabled, it will save a small number of instructions since cgroup_reclaim() will be NULL rather than dereferencing sc->target_mem_group. It'd be nice to have that saving quantified as part of the changelog.
Quoted 6 lines
mm/vmscan.c static inline bool should_continue_reclaim(struct pglist_data *pgdat, · line 2629
Quoted 6 lines
mm/vmscan.c +1
-1@@ -2625,7 +2626,7 @@ static inline bool should_continue_reclaim(struct pglist_data *pgdat,static void shrink_node_memcgs (pg_data_t *pgdat,struct scan_control *sc) { -struct mem_cgroup *target_memcg = sc->target_mem_cgroup; +struct mem_cgroup *target_memcg =cgroup_reclaim (sc);
It feels like the name is wrong, doesn't it? cgroup_reclaim() doesn't really scream to me "I return a mem_cgroup pointer". I can't think of a good name, but maybe someone else can.
Quoted 7 lines · Matthew Wilcox
On Thu, Mar 19, 2020 at 04:20:25PM +0000, Chris Down wrote:
I think this is actually the important bit. For those who build their kernels with cgroups disabled, it will save a small number of instructions since
cgroup_reclaim()will be NULL rather than dereferencingsc->target_mem_group. It'd be nice to have that saving quantified as part of the changelog.
I agree.
Quoted 12 lines
Quoted 7 lines
mm/vmscan.c static inline bool should_continue_reclaim(struct pglist_data *pgdat, · line 2629
Quoted 7 lines
mm/vmscan.c +1
-1@@ -2625,7 +2626,7 @@ static inline bool should_continue_reclaim(struct pglist_data *pgdat,static void shrink_node_memcgs (pg_data_t *pgdat,struct scan_control *sc) { -struct mem_cgroup *target_memcg = sc->target_mem_cgroup; +struct mem_cgroup *target_memcg =cgroup_reclaim (sc);It feels like the name is wrong, doesn't it?
cgroup_reclaim()doesn't really scream to me "I return amem_cgrouppointer". I can't think of a good name, but maybe someone else can.
I can't think of a good name, too. Maybe we just keep it unchanged if nobody else can.
Michal Hocko
reviewerQuoted 1 line · Matthew Wilcox
On Thu, Mar 19, 2020 at 04:20:25PM +0000, Chris Down wrote:
[...]
Quoted 4 lines
Quoted 4 lines
Quoted 4 lines
(quoted diff) +1
-1-static bool cgroup_reclaim(struct scan_control *sc) +static struct mem_cgroup *cgroup_reclaim(struct scan_control *sc){
mm/vmscan.c +0
-1-return false;
Quoted 8 lines
Quoted 2 lines
Quoted 2 lines
mm/vmscan.c +1
-0+return NULL ;}
I think this is actually the important bit. For those who build their kernels with cgroups disabled, it will save a small number of instructions since
cgroup_reclaim()will be NULL rather than dereferencingsc->target_mem_group. It'd be nice to have that saving quantified as part of the changelog.
I gave it a try and you are right that !MEMCG is slightly better. But MEMCG=y which is a more common configuration I would say is worse
text data bss dec hex filename
40661 24060 12 64733 fcdd mm/vmscan.memcg.after.o 40556 24060 12 64628 fc74 mm/vmscan.memcg.before.o 36240 23076 8 59324 e7bc mm/vmscan.nomemcg.after.o 36283 23076 8 59367 e7e7 mm/vmscan.nomemcg.before.o
This is with gcc version 9.2.1 20200306 (Debian 9.2.1-31).
Signature · 2 lines
Michal Hocko SUSE Labs
Quoted 25 lines · Chris Down
Quoted 5 lines · [email protected] writes:
From: chenqiwu <[email protected]>
The return type of
cgroup_reclaim()is bool, but the correct type should be structmem_cgrouppointer. As a result,cgroup_reclaim()can be used to wrapsc->target_mem_cgroupin vmscan code.The code changes looks okay to me, but the changelog and patch subject could do with some improvement. For example, the type isn't "incorrect" before and "correct" now, per se, it's just coercing from *struct
mem_cgroupto bool.Could you make it more clear what your intent is in the patch? If it's that you found the code confusing, you can just write something like:
mm/vmscan: return
target_mem_cgroupfromcgroup_reclaimPreviously the code splits apart the action of checking whether
we are in cgroup reclaim from getting the target memory cgroup
for that reclaim. This split is confusing and seems unnecessary,
sincecgroup_reclaimitself only checks ifsc->target_mem_cgroup
is NULL or not, so merge the two use cases into one by returning
thetarget_mem_cgroupitself fromcgroup_reclaim.
Quoted 6 lines
Quoted 1 line
Signed-off-by chenqiwu <[email protected]>After improving the patch title and summary, you can add:
Acked-by Chris Down <[email protected]>
Hi Chris,
Thanks for your review. I will resend this as patch v2.
BTW, sc->target_mem_cgroup is just used when CONFIG_MEMCG=y, so wrap it with config CONFIG_MEMCG will save some space for those who build their kernels with cgroups disabled.
Qiwu