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=-16.5 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,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 E9D82C4338F for ; Sat, 14 Aug 2021 05:25:41 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 76C8C610CF for ; Sat, 14 Aug 2021 05:25:41 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 76C8C610CF Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 0F0F46B006C; Sat, 14 Aug 2021 01:25:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 0A1E98D0002; Sat, 14 Aug 2021 01:25:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EAC076B0072; Sat, 14 Aug 2021 01:25:40 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0184.hostedemail.com [216.40.44.184]) by kanga.kvack.org (Postfix) with ESMTP id D22756B006C for ; Sat, 14 Aug 2021 01:25:40 -0400 (EDT) Received: from smtpin21.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id 70B8A1809CDF4 for ; Sat, 14 Aug 2021 05:25:40 +0000 (UTC) X-FDA: 78472548840.21.266B674 Received: from mail-pj1-f42.google.com (mail-pj1-f42.google.com [209.85.216.42]) by imf14.hostedemail.com (Postfix) with ESMTP id 2D74960022C6 for ; Sat, 14 Aug 2021 05:25:40 +0000 (UTC) Received: by mail-pj1-f42.google.com with SMTP id w13-20020a17090aea0db029017897a5f7bcso19041689pjy.5 for ; Fri, 13 Aug 2021 22:25:39 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=LkgVxlGCf6bKLlXW3fToFeS0WRPiohkGWt+flADM0c8=; b=zqH6VtO93wr+br2CK1IMWR7G+IWiaw9LQQVShcKzoJrmdoPK9ujf3qwfUfIXJJ36MN j3LdxNiTOIYBWFNvY9mhNcp42bLiKzIy/BFEOUivH9Vv8KQ7MVBW0jKwgzA9yeQZMuZI Qh/1JTb8wGBNsl9G8Zk9XHTPs5LDQfNBgA7jib/Dn4RVlN/Dd4q1usTvDfjPhWRRQ/k9 l0KHrAejHlpZ8+lO2/VV5ytbmFqPKi0C1v4eBbcKePdFtjxje8HkRd6TihIiY2fept2N g7ieAYrcfwQy/umPcdtzcQXFe4nAOHMk+5DWw5mapYrMy6K1XzOoSLG8p87bP4Pj2V5W KraQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=LkgVxlGCf6bKLlXW3fToFeS0WRPiohkGWt+flADM0c8=; b=J13eX5xgHZVaB7w/RFb865fUk7HqK8djkpCWdLwDxTn+FpO7dVYUgC3jhTnzmeKyMW g459WbHGGtpQhGXVEV0DSwuiQZapw/fQpNKlnyltSY1jdXAXXpGgsAdkfdkhpXJy9yeY pBt7l+oUy2i2EcnsBeOjf2CGLGEY9dm/5mn22ML87Co7RvqYu8zE1Z7oQ9+EF/jA97FF GJrKAbem0EEM/5PV5YVMD6xWpTvKFXMnviofhUyByD2TuQRPtgIfs4moYrFE1Am8L2lF nGSmh1dfZEWYEXP/nHpbGKJbx8t/T1g0Ahb3KkHCkzfpHq/khhZUQUWlRyJqJptKGb/H y9NQ== X-Gm-Message-State: AOAM530WU8UA19sXC+FnMT6vAIcuDPiRWh8RSlYieKyVKgLsb30oP8+Z ByvLCfVBfjB8uO9lS9V1bO9boA== X-Google-Smtp-Source: ABdhPJw9eg4WltKVUoPVy5UwA26m96K/Yiz/gagYIaWrb42c7e7FBwLkxyl3f6BMbsrb46sORKviRA== X-Received: by 2002:a17:902:ce83:b0:12d:97e1:e199 with SMTP id f3-20020a170902ce8300b0012d97e1e199mr4097060plg.16.1628918739240; Fri, 13 Aug 2021 22:25:39 -0700 (PDT) Received: from localhost.localdomain ([139.177.225.237]) by smtp.gmail.com with ESMTPSA id s5sm4783133pgp.81.2021.08.13.22.25.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 13 Aug 2021 22:25:38 -0700 (PDT) From: Muchun Song To: guro@fb.com, hannes@cmpxchg.org, mhocko@kernel.org, akpm@linux-foundation.org, shakeelb@google.com, vdavydov.dev@gmail.com Cc: linux-kernel@vger.kernel.org, linux-mm@kvack.org, duanxiongchun@bytedance.com, fam.zheng@bytedance.com, bsingharora@gmail.com, shy828301@gmail.com, alexs@kernel.org, smuchun@gmail.com, zhengqi.arch@bytedance.com, Muchun Song Subject: [PATCH v1 01/12] mm: memcontrol: prepare objcg API for non-kmem usage Date: Sat, 14 Aug 2021 13:25:08 +0800 Message-Id: <20210814052519.86679-2-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210814052519.86679-1-songmuchun@bytedance.com> References: <20210814052519.86679-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Rspamd-Queue-Id: 2D74960022C6 Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=bytedance-com.20150623.gappssmtp.com header.s=20150623 header.b=zqH6VtO9; dmarc=pass (policy=none) header.from=bytedance.com; spf=pass (imf14.hostedemail.com: domain of songmuchun@bytedance.com designates 209.85.216.42 as permitted sender) smtp.mailfrom=songmuchun@bytedance.com X-Rspamd-Server: rspam04 X-Stat-Signature: qgiia7kwn6hmess9srump7t46jutmckg X-HE-Tag: 1628918740-376605 Content-Transfer-Encoding: quoted-printable 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: Pagecache pages are charged at the allocation time and holding a reference to the original memory cgroup until being reclaimed. Depending on the memory pressure, specific patterns of the page sharing between different cgroups and the cgroup creation and destruction rates, a large number of dying memory cgroups can be pinned by pagecache pages. It makes the page reclaim less efficient and wastes memory. We can convert LRU pages and most other raw memcg pins to the objcg direction to fix this problem, and then the page->memcg will always point to an object cgroup pointer. Therefore, the infrastructure of objcg no longer only serves CONFIG_MEMCG_KMEM. In this patch, we move the infrastructure of the objcg out of the scope of the CONFIG_MEMCG_KMEM so that the LRU pages can reuse it to charge pages. We know that the LRU pages are not accounted at the root level. But the page->memcg_data points to the root_mem_cgroup. So the page->memcg_data of the LRU pages always points to a valid pointer. But the root_mem_cgroup dose not have an object cgroup. If we use obj_cgroup APIs to charge the LRU pages, we should set the page->memcg_data to a root object cgroup. So we also allocate an object cgroup for the root_mem_cgroup. Signed-off-by: Muchun Song --- include/linux/memcontrol.h | 4 ++- mm/memcontrol.c | 66 +++++++++++++++++++++++++++++-----------= ------ 2 files changed, 45 insertions(+), 25 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 0ff146486aed..41a35de93d75 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -221,7 +221,9 @@ struct memcg_cgwb_frn { struct obj_cgroup { struct percpu_ref refcnt; struct mem_cgroup *memcg; +#ifdef CONFIG_MEMCG_KMEM atomic_t nr_charged_bytes; +#endif union { struct list_head list; struct rcu_head rcu; @@ -319,9 +321,9 @@ struct mem_cgroup { #ifdef CONFIG_MEMCG_KMEM int kmemcg_id; enum memcg_kmem_state kmem_state; +#endif struct obj_cgroup __rcu *objcg; struct list_head objcg_list; /* list of inherited objcgs */ -#endif =20 MEMCG_PADDING(_pad2_); =20 diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 3e7c205a1852..7df2176e4f02 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -261,7 +261,6 @@ struct mem_cgroup *vmpressure_to_memcg(struct vmpress= ure *vmpr) return container_of(vmpr, struct mem_cgroup, vmpressure); } =20 -#ifdef CONFIG_MEMCG_KMEM extern spinlock_t css_set_lock; =20 bool mem_cgroup_kmem_disabled(void) @@ -269,15 +268,14 @@ bool mem_cgroup_kmem_disabled(void) return cgroup_memory_nokmem; } =20 +#ifdef CONFIG_MEMCG_KMEM static void obj_cgroup_uncharge_pages(struct obj_cgroup *objcg, unsigned int nr_pages); =20 -static void obj_cgroup_release(struct percpu_ref *ref) +static void obj_cgroup_release_kmem(struct obj_cgroup *objcg) { - struct obj_cgroup *objcg =3D container_of(ref, struct obj_cgroup, refcn= t); unsigned int nr_bytes; unsigned int nr_pages; - unsigned long flags; =20 /* * At this point all allocated objects are freed, and @@ -291,9 +289,9 @@ static void obj_cgroup_release(struct percpu_ref *ref= ) * 3) CPU1: a process from another memcg is allocating something, * the stock if flushed, * objcg->nr_charged_bytes =3D PAGE_SIZE - 92 - * 5) CPU0: we do release this object, + * 4) CPU0: we do release this object, * 92 bytes are added to stock->nr_bytes - * 6) CPU0: stock is flushed, + * 5) CPU0: stock is flushed, * 92 bytes are added to objcg->nr_charged_bytes * * In the result, nr_charged_bytes =3D=3D PAGE_SIZE. @@ -305,6 +303,19 @@ static void obj_cgroup_release(struct percpu_ref *re= f) =20 if (nr_pages) obj_cgroup_uncharge_pages(objcg, nr_pages); +} +#else +static inline void obj_cgroup_release_kmem(struct obj_cgroup *objcg) +{ +} +#endif + +static void obj_cgroup_release(struct percpu_ref *ref) +{ + struct obj_cgroup *objcg =3D container_of(ref, struct obj_cgroup, refcn= t); + unsigned long flags; + + obj_cgroup_release_kmem(objcg); =20 spin_lock_irqsave(&css_set_lock, flags); list_del(&objcg->list); @@ -333,10 +344,14 @@ static struct obj_cgroup *obj_cgroup_alloc(void) return objcg; } =20 -static void memcg_reparent_objcgs(struct mem_cgroup *memcg, - struct mem_cgroup *parent) +static void memcg_reparent_objcgs(struct mem_cgroup *memcg) { struct obj_cgroup *objcg, *iter; + struct mem_cgroup *parent; + + parent =3D parent_mem_cgroup(memcg); + if (!parent) + parent =3D root_mem_cgroup; =20 objcg =3D rcu_replace_pointer(memcg->objcg, NULL, true); =20 @@ -355,6 +370,7 @@ static void memcg_reparent_objcgs(struct mem_cgroup *= memcg, percpu_ref_kill(&objcg->refcnt); } =20 +#ifdef CONFIG_MEMCG_KMEM /* * This will be used as a shrinker list's index. * The main reason for not using cgroup id for this: @@ -3579,7 +3595,6 @@ static u64 mem_cgroup_read_u64(struct cgroup_subsys= _state *css, #ifdef CONFIG_MEMCG_KMEM static int memcg_online_kmem(struct mem_cgroup *memcg) { - struct obj_cgroup *objcg; int memcg_id; =20 if (cgroup_memory_nokmem) @@ -3592,14 +3607,6 @@ static int memcg_online_kmem(struct mem_cgroup *me= mcg) if (memcg_id < 0) return memcg_id; =20 - objcg =3D obj_cgroup_alloc(); - if (!objcg) { - memcg_free_cache_id(memcg_id); - return -ENOMEM; - } - objcg->memcg =3D memcg; - rcu_assign_pointer(memcg->objcg, objcg); - static_branch_enable(&memcg_kmem_enabled_key); =20 memcg->kmemcg_id =3D memcg_id; @@ -3623,8 +3630,6 @@ static void memcg_offline_kmem(struct mem_cgroup *m= emcg) if (!parent) parent =3D root_mem_cgroup; =20 - memcg_reparent_objcgs(memcg, parent); - kmemcg_id =3D memcg->kmemcg_id; BUG_ON(kmemcg_id < 0); =20 @@ -5151,8 +5156,8 @@ static struct mem_cgroup *mem_cgroup_alloc(void) memcg->socket_pressure =3D jiffies; #ifdef CONFIG_MEMCG_KMEM memcg->kmemcg_id =3D -1; - INIT_LIST_HEAD(&memcg->objcg_list); #endif + INIT_LIST_HEAD(&memcg->objcg_list); #ifdef CONFIG_CGROUP_WRITEBACK INIT_LIST_HEAD(&memcg->cgwb_list); for (i =3D 0; i < MEMCG_CGWB_FRN_CNT; i++) @@ -5224,16 +5229,22 @@ mem_cgroup_css_alloc(struct cgroup_subsys_state *= parent_css) static int mem_cgroup_css_online(struct cgroup_subsys_state *css) { struct mem_cgroup *memcg =3D mem_cgroup_from_css(css); + struct obj_cgroup *objcg; =20 /* * A memcg must be visible for expand_shrinker_info() * by the time the maps are allocated. So, we allocate maps * here, when for_each_mem_cgroup() can't skip it. */ - if (alloc_shrinker_info(memcg)) { - mem_cgroup_id_remove(memcg); - return -ENOMEM; - } + if (alloc_shrinker_info(memcg)) + goto remove_id; + + objcg =3D obj_cgroup_alloc(); + if (!objcg) + goto free_shrinker; + + objcg->memcg =3D memcg; + rcu_assign_pointer(memcg->objcg, objcg); =20 /* Online state pins memcg ID, memcg ID pins CSS */ refcount_set(&memcg->id.ref, 1); @@ -5243,6 +5254,12 @@ static int mem_cgroup_css_online(struct cgroup_sub= sys_state *css) queue_delayed_work(system_unbound_wq, &stats_flush_dwork, 2UL*HZ); return 0; + +free_shrinker: + free_shrinker_info(memcg); +remove_id: + mem_cgroup_id_remove(memcg); + return -ENOMEM; } =20 static void mem_cgroup_css_offline(struct cgroup_subsys_state *css) @@ -5266,6 +5283,7 @@ static void mem_cgroup_css_offline(struct cgroup_su= bsys_state *css) page_counter_set_low(&memcg->memory, 0); =20 memcg_offline_kmem(memcg); + memcg_reparent_objcgs(memcg); reparent_shrinker_deferred(memcg); wb_memcg_offline(memcg); =20 --=20 2.11.0