From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 004B6C433E2 for ; Mon, 8 Jun 2020 23:07:26 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id ACF3A2089D for ; Mon, 8 Jun 2020 23:07:25 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=fb.com header.i=@fb.com header.b="MgjOWytt" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ACF3A2089D Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=fb.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id DDFCD6B0010; Mon, 8 Jun 2020 19:07:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D1BB66B0022; Mon, 8 Jun 2020 19:07:16 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BDDD26B0023; Mon, 8 Jun 2020 19:07:16 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0038.hostedemail.com [216.40.44.38]) by kanga.kvack.org (Postfix) with ESMTP id 909E66B0022 for ; Mon, 8 Jun 2020 19:07:16 -0400 (EDT) Received: from smtpin07.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay03.hostedemail.com (Postfix) with ESMTP id 4B32A80412FF for ; Mon, 8 Jun 2020 23:07:16 +0000 (UTC) X-FDA: 76907582472.07.bells88_01136a226dbd Received: from filter.hostedemail.com (10.5.16.251.rfc1918.com [10.5.16.251]) by smtpin07.hostedemail.com (Postfix) with ESMTP id 20651180301A6 for ; Mon, 8 Jun 2020 23:07:16 +0000 (UTC) X-HE-Tag: bells88_01136a226dbd X-Filterd-Recvd-Size: 10508 Received: from mx0a-00082601.pphosted.com (mx0a-00082601.pphosted.com [67.231.145.42]) by imf35.hostedemail.com (Postfix) with ESMTP for ; Mon, 8 Jun 2020 23:07:15 +0000 (UTC) Received: from pps.filterd (m0044010.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 058N1ljw022560 for ; Mon, 8 Jun 2020 16:07:14 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=facebook; bh=NR0PB4rwSShMC0lNgDcnDeL9udt2jccWe3mfSH0bNtQ=; b=MgjOWyttCh74BHUkUCYJ5Wk15LuJqe8Lm1hXG09KNgQgO+6GpPs8WnY6CQnqBCvsVwWN g0yK/f1m8SeYiXIsNKikdjP+X08ZnWowunF+sscBJO3EZR6jj1vBgi6q01VEFySKuVaQ N6IU13Pv71PDwGbl8/9A/CW6Th3w1WbH+bw= Received: from maileast.thefacebook.com ([163.114.130.16]) by mx0a-00082601.pphosted.com with ESMTP id 31gu027j8c-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=NOT) for ; Mon, 08 Jun 2020 16:07:14 -0700 Received: from intmgw002.06.prn3.facebook.com (2620:10d:c0a8:1b::d) by mail.thefacebook.com (2620:10d:c0a8:83::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.1979.3; Mon, 8 Jun 2020 16:07:12 -0700 Received: by devvm1291.vll0.facebook.com (Postfix, from userid 111017) id 3CB1A1D8FE44; Mon, 8 Jun 2020 16:07:00 -0700 (PDT) Smtp-Origin-Hostprefix: devvm From: Roman Gushchin Smtp-Origin-Hostname: devvm1291.vll0.facebook.com To: Andrew Morton , Christoph Lameter CC: Johannes Weiner , Michal Hocko , Shakeel Butt , , Vlastimil Babka , , , Roman Gushchin Smtp-Origin-Cluster: vll0c01 Subject: [PATCH v6 05/19] mm: memcontrol: decouple reference counting from page accounting Date: Mon, 8 Jun 2020 16:06:40 -0700 Message-ID: <20200608230654.828134-6-guro@fb.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200608230654.828134-1-guro@fb.com> References: <20200608230654.828134-1-guro@fb.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-FB-Internal: Safe Content-Type: text/plain X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.216,18.0.687 definitions=2020-06-08_18:2020-06-08,2020-06-08 signatures=0 X-Proofpoint-Spam-Details: rule=fb_default_notspam policy=fb_default score=0 malwarescore=0 adultscore=0 lowpriorityscore=0 impostorscore=0 priorityscore=1501 spamscore=0 bulkscore=0 clxscore=1015 cotscore=-2147483648 phishscore=0 mlxlogscore=999 mlxscore=0 suspectscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2004280000 definitions=main-2006080160 X-FB-Internal: deliver X-Rspamd-Queue-Id: 20651180301A6 X-Spamd-Result: default: False [0.00 / 100.00] X-Rspamd-Server: rspam04 X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Johannes Weiner The reference counting of a memcg is currently coupled directly to how many 4k pages are charged to it. This doesn't work well with Roman's new slab controller, which maintains pools of objects and doesn't want to keep an extra balance sheet for the pages backing those objects. This unusual refcounting design (reference counts usually track pointers to an object) is only for historical reasons: memcg used to not take any css references and simply stalled offlining until all charges had been reparented and the page counters had dropped to zero. When we got rid of the reparenting requirement, the simple mechanical translation was to take a reference for every charge. More historical context can be found in commit e8ea14cc6ead ("mm: memcontrol: take a css reference for each charged page"), commit 64f219938941 ("mm: memcontrol: remove obsolete kmemcg pinning tricks") and commit b2052564e66d ("mm: memcontrol: continue cache reclaim from offlined groups"). The new slab controller exposes the limitations in this scheme, so let's switch it to a more idiomatic reference counting model based on actual kernel pointers to the memcg: - The per-cpu stock holds a reference to the memcg its caching - User pages hold a reference for their page->mem_cgroup. Transparent huge pages will no longer acquire tail references in advance, we'll get them if needed during the split. - Kernel pages hold a reference for their page->mem_cgroup - Pages allocated in the root cgroup will acquire and release css references for simplicity. css_get() and css_put() optimize that. - The current memcg_charge_slab() already hacked around the per-charge references; this change gets rid of that as well. Roman: 1) Rebased on top of the current mm tree: added css_get() in mem_cgroup_charge(), dropped mem_cgroup_try_charge() part 2) I've reformatted commit references in the commit log to make checkpatch.pl happy. Signed-off-by: Johannes Weiner Signed-off-by: Roman Gushchin Acked-by: Roman Gushchin --- mm/memcontrol.c | 37 +++++++++++++++++++++---------------- mm/slab.h | 2 -- 2 files changed, 21 insertions(+), 18 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index d18bf93e0f19..80282b2e8b7f 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -2094,13 +2094,17 @@ static void drain_stock(struct memcg_stock_pcp *s= tock) { struct mem_cgroup *old =3D stock->cached; =20 + if (!old) + return; + if (stock->nr_pages) { page_counter_uncharge(&old->memory, stock->nr_pages); if (do_memsw_account()) page_counter_uncharge(&old->memsw, stock->nr_pages); - css_put_many(&old->css, stock->nr_pages); stock->nr_pages =3D 0; } + + css_put(&old->css); stock->cached =3D NULL; } =20 @@ -2136,6 +2140,7 @@ static void refill_stock(struct mem_cgroup *memcg, = unsigned int nr_pages) stock =3D this_cpu_ptr(&memcg_stock); if (stock->cached !=3D memcg) { /* reset if necessary */ drain_stock(stock); + css_get(&memcg->css); stock->cached =3D memcg; } stock->nr_pages +=3D nr_pages; @@ -2594,12 +2599,10 @@ static int try_charge(struct mem_cgroup *memcg, g= fp_t gfp_mask, page_counter_charge(&memcg->memory, nr_pages); if (do_memsw_account()) page_counter_charge(&memcg->memsw, nr_pages); - css_get_many(&memcg->css, nr_pages); =20 return 0; =20 done_restock: - css_get_many(&memcg->css, batch); if (batch > nr_pages) refill_stock(memcg, batch - nr_pages); =20 @@ -2657,8 +2660,6 @@ static void cancel_charge(struct mem_cgroup *memcg,= unsigned int nr_pages) page_counter_uncharge(&memcg->memory, nr_pages); if (do_memsw_account()) page_counter_uncharge(&memcg->memsw, nr_pages); - - css_put_many(&memcg->css, nr_pages); } #endif =20 @@ -2964,6 +2965,7 @@ int __memcg_kmem_charge_page(struct page *page, gfp= _t gfp, int order) if (!ret) { page->mem_cgroup =3D memcg; __SetPageKmemcg(page); + return 0; } } css_put(&memcg->css); @@ -2986,12 +2988,11 @@ void __memcg_kmem_uncharge_page(struct page *page= , int order) VM_BUG_ON_PAGE(mem_cgroup_is_root(memcg), page); __memcg_kmem_uncharge(memcg, nr_pages); page->mem_cgroup =3D NULL; + css_put(&memcg->css); =20 /* slab pages do not have PageKmemcg flag set */ if (PageKmemcg(page)) __ClearPageKmemcg(page); - - css_put_many(&memcg->css, nr_pages); } #endif /* CONFIG_MEMCG_KMEM */ =20 @@ -3003,13 +3004,16 @@ void __memcg_kmem_uncharge_page(struct page *page= , int order) */ void mem_cgroup_split_huge_fixup(struct page *head) { + struct mem_cgroup *memcg =3D head->mem_cgroup; int i; =20 if (mem_cgroup_disabled()) return; =20 - for (i =3D 1; i < HPAGE_PMD_NR; i++) - head[i].mem_cgroup =3D head->mem_cgroup; + for (i =3D 1; i < HPAGE_PMD_NR; i++) { + css_get(&memcg->css); + head[i].mem_cgroup =3D memcg; + } } #endif /* CONFIG_TRANSPARENT_HUGEPAGE */ =20 @@ -5454,7 +5458,10 @@ static int mem_cgroup_move_account(struct page *pa= ge, */ smp_mb(); =20 - page->mem_cgroup =3D to; /* caller should have done css_get */ + css_get(&to->css); + css_put(&from->css); + + page->mem_cgroup =3D to; =20 __unlock_page_memcg(from); =20 @@ -6540,6 +6547,7 @@ int mem_cgroup_charge(struct page *page, struct mm_= struct *mm, gfp_t gfp_mask) if (ret) goto out_put; =20 + css_get(&memcg->css); commit_charge(page, memcg); =20 local_irq_disable(); @@ -6594,9 +6602,6 @@ static void uncharge_batch(const struct uncharge_ga= ther *ug) __this_cpu_add(ug->memcg->vmstats_percpu->nr_page_events, ug->nr_pages)= ; memcg_check_events(ug->memcg, ug->dummy_page); local_irq_restore(flags); - - if (!mem_cgroup_is_root(ug->memcg)) - css_put_many(&ug->memcg->css, ug->nr_pages); } =20 static void uncharge_page(struct page *page, struct uncharge_gather *ug) @@ -6634,6 +6639,7 @@ static void uncharge_page(struct page *page, struct= uncharge_gather *ug) =20 ug->dummy_page =3D page; page->mem_cgroup =3D NULL; + css_put(&ug->memcg->css); } =20 static void uncharge_list(struct list_head *page_list) @@ -6739,8 +6745,8 @@ void mem_cgroup_migrate(struct page *oldpage, struc= t page *newpage) page_counter_charge(&memcg->memory, nr_pages); if (do_memsw_account()) page_counter_charge(&memcg->memsw, nr_pages); - css_get_many(&memcg->css, nr_pages); =20 + css_get(&memcg->css); commit_charge(newpage, memcg); =20 local_irq_save(flags); @@ -6977,8 +6983,7 @@ void mem_cgroup_swapout(struct page *page, swp_entr= y_t entry) mem_cgroup_charge_statistics(memcg, page, -nr_entries); memcg_check_events(memcg, page); =20 - if (!mem_cgroup_is_root(memcg)) - css_put_many(&memcg->css, nr_entries); + css_put(&memcg->css); } =20 /** diff --git a/mm/slab.h b/mm/slab.h index 633eedb6bad1..8a574d9361c1 100644 --- a/mm/slab.h +++ b/mm/slab.h @@ -373,9 +373,7 @@ static __always_inline int memcg_charge_slab(struct p= age *page, lruvec =3D mem_cgroup_lruvec(memcg, page_pgdat(page)); mod_lruvec_state(lruvec, cache_vmstat_idx(s), nr_pages << PAGE_SHIFT); =20 - /* transer try_charge() page references to kmem_cache */ percpu_ref_get_many(&s->memcg_params.refcnt, nr_pages); - css_put_many(&memcg->css, nr_pages); out: css_put(&memcg->css); return ret; --=20 2.25.4