lkml.org 
[lkml]   [2018]   [Jun]   [8]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    /
    From
    Date
    SubjectRe: [PATCH v7 15/17] mm: Generalize shrink_slab() calls in shrink_node()
    On Tue, May 22, 2018 at 3:09 AM Kirill Tkhai <ktkhai@virtuozzo.com> wrote:
    >
    > From: Vladimir Davydov <vdavydov.dev@gmail.com>
    >
    > The patch makes shrink_slab() be called for root_mem_cgroup
    > in the same way as it's called for the rest of cgroups.
    > This simplifies the logic and improves the readability.
    >
    > Signed-off-by: Vladimir Davydov <vdavydov.dev@gmail.com>
    > ktkhai: Description written.
    > Signed-off-by: Kirill Tkhai <ktkhai@virtuozzo.com>
    > ---
    > mm/vmscan.c | 21 ++++++---------------
    > 1 file changed, 6 insertions(+), 15 deletions(-)
    >
    > diff --git a/mm/vmscan.c b/mm/vmscan.c
    > index f26ca1e00efb..6dbc659db120 100644
    > --- a/mm/vmscan.c
    > +++ b/mm/vmscan.c
    > @@ -628,10 +628,8 @@ static unsigned long shrink_slab_memcg(gfp_t gfp_mask, int nid,
    > * @nid is passed along to shrinkers with SHRINKER_NUMA_AWARE set,
    > * unaware shrinkers will receive a node id of 0 instead.
    > *
    > - * @memcg specifies the memory cgroup to target. If it is not NULL,
    > - * only shrinkers with SHRINKER_MEMCG_AWARE set will be called to scan
    > - * objects from the memory cgroup specified. Otherwise, only unaware
    > - * shrinkers are called.
    > + * @memcg specifies the memory cgroup to target. Unaware shrinkers
    > + * are called only if it is the root cgroup.
    > *
    > * @priority is sc->priority, we take the number of objects and >> by priority
    > * in order to get the scan target.
    > @@ -645,7 +643,7 @@ static unsigned long shrink_slab(gfp_t gfp_mask, int nid,
    > struct shrinker *shrinker;
    > unsigned long freed = 0;
    >

    Shouldn't there be a VM_BUG_ON(!memcg) here?

    > - if (memcg && !mem_cgroup_is_root(memcg))
    > + if (!mem_cgroup_is_root(memcg))
    > return shrink_slab_memcg(gfp_mask, nid, memcg, priority);
    >
    > if (!down_read_trylock(&shrinker_rwsem))
    > @@ -658,9 +656,6 @@ static unsigned long shrink_slab(gfp_t gfp_mask, int nid,
    > .memcg = memcg,
    > };
    >
    > - if (!!memcg != !!(shrinker->flags & SHRINKER_MEMCG_AWARE))
    > - continue;
    > -
    > if (!(shrinker->flags & SHRINKER_NUMA_AWARE))
    > sc.nid = 0;
    >
    > @@ -690,6 +685,7 @@ void drop_slab_node(int nid)
    > struct mem_cgroup *memcg = NULL;
    >
    > freed = 0;
    > + memcg = mem_cgroup_iter(NULL, NULL, NULL);
    > do {
    > freed += shrink_slab(GFP_KERNEL, nid, memcg, 0);
    > } while ((memcg = mem_cgroup_iter(NULL, memcg, NULL)) != NULL);
    > @@ -2709,9 +2705,8 @@ static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc)
    > shrink_node_memcg(pgdat, memcg, sc, &lru_pages);
    > node_lru_pages += lru_pages;
    >
    > - if (memcg)
    > - shrink_slab(sc->gfp_mask, pgdat->node_id,
    > - memcg, sc->priority);
    > + shrink_slab(sc->gfp_mask, pgdat->node_id,
    > + memcg, sc->priority);
    >
    > /* Record the group's reclaim efficiency */
    > vmpressure(sc->gfp_mask, memcg, false,
    > @@ -2735,10 +2730,6 @@ static bool shrink_node(pg_data_t *pgdat, struct scan_control *sc)
    > }
    > } while ((memcg = mem_cgroup_iter(root, memcg, &reclaim)));
    >
    > - if (global_reclaim(sc))
    > - shrink_slab(sc->gfp_mask, pgdat->node_id, NULL,
    > - sc->priority);
    > -
    > if (reclaim_state) {
    > sc->nr_reclaimed += reclaim_state->reclaimed_slab;
    > reclaim_state->reclaimed_slab = 0;
    >

    \
     
     \ /
      Last update: 2018-06-08 21:21    [W:3.589 / U:0.044 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site