From patchwork Wed Mar 3 05:59:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Muchun Song X-Patchwork-Id: 12112963 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.6 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 E62AAC433DB for ; Wed, 3 Mar 2021 06:02:02 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 270FB64DF4 for ; Wed, 3 Mar 2021 06:02:02 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 270FB64DF4 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=bytedance.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id AF9248D0126; Wed, 3 Mar 2021 01:02:01 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id ACF0E8D00FA; Wed, 3 Mar 2021 01:02:01 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 96F4C8D0126; Wed, 3 Mar 2021 01:02:01 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0246.hostedemail.com [216.40.44.246]) by kanga.kvack.org (Postfix) with ESMTP id 7ED1E8D00FA for ; Wed, 3 Mar 2021 01:02:01 -0500 (EST) Received: from smtpin06.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay01.hostedemail.com (Postfix) with ESMTP id 40EF51814C3A5 for ; Wed, 3 Mar 2021 06:02:01 +0000 (UTC) X-FDA: 77877517242.06.36E5066 Received: from mail-pj1-f46.google.com (mail-pj1-f46.google.com [209.85.216.46]) by imf24.hostedemail.com (Postfix) with ESMTP id B00F7A0009E9 for ; Wed, 3 Mar 2021 06:01:59 +0000 (UTC) Received: by mail-pj1-f46.google.com with SMTP id d13-20020a17090abf8db02900c0590648b1so2354400pjs.1 for ; Tue, 02 Mar 2021 22:02:00 -0800 (PST) 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=F82I5iLp8QFjgHMvqeGaLr+bXfCpx3cOa12t/BoWkUc=; b=V4sz59O76soBeKy1MtglLuevbONhfDwYgKBjaM6jRAq5iGUyXxuhFVAubUttj4Qaq2 eGQX8LQEEdLLnXDwgCwkwozmk5FnEcYk4fbUYIn1gPCBwWEQLJoGhaVfm/GpyBQWCFHL QMd45GCGTuAJfq5IyUuyUlmJxISaYqTi6ry4Nv6eKBD7/fRMCJA4UUkyiK16h6HNmq0z QPwHG4yKBTbj6BVvkcmRZcXBQ3mKRuKMf2ECWHcV/AcRModiP+2oaDmqXku4j4DwRZ0Y cF6TgUO2s+Fy+T5U1bwwwkeRHCaBUGolgLjyv4tit6qRB0qVLG/fp8tkJd8akHV7n6BC 2Ncg== 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=F82I5iLp8QFjgHMvqeGaLr+bXfCpx3cOa12t/BoWkUc=; b=o67erFpNU8LbfyP5MO+FlRlBWBpanMm+hEeWz8U9JS51kevv1ArfIoMe6EqHvrTm5p SoLKEAKgzh6mIqHgOwFf13Wco/GftRTmGUAkOF4Yf7k7QM76uQAdKJSFi69+rlU7UHTJ UVjONSfywy69J8w+AwRer5Wkq405m18aglAcqsX0YaExiRuQZKEbITz51BLivelNWQbk 6hxmvNllJBm9U4goHUDNiR1W1SXENOz6yNsrcMIpTk4dfOE6GacWz6Lh7kBxGMXG4Db0 kj0zGA7yPBzxbJSSUWGpKuNC7Ot/5rYTqNiIlf7tZYD0eL49hMAeKLouzpw/wstXHuK+ y10g== X-Gm-Message-State: AOAM531NH+cRnQBsOpqmfnR5AnnS0sqtIYwH/QhE+vPdCl+Fc4Mu16Ep KPUNzlHT5xd0vrMAu8Joy5/qGA== X-Google-Smtp-Source: ABdhPJxuvuQPCxWld98PGk2EfLaYsZ+wBxAcY5gKqkYYX2FVRttJA3tsDjGtOfGjpWzxBRS47UAmrA== X-Received: by 2002:a17:90b:3890:: with SMTP id mu16mr8063126pjb.9.1614751319812; Tue, 02 Mar 2021 22:01:59 -0800 (PST) Received: from localhost.localdomain ([139.177.225.227]) by smtp.gmail.com with ESMTPSA id x11sm6131088pjh.0.2021.03.02.22.01.56 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Tue, 02 Mar 2021 22:01:59 -0800 (PST) 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, Muchun Song Subject: [PATCH v2 1/5] mm: memcontrol: introduce obj_cgroup_{un}charge_page Date: Wed, 3 Mar 2021 13:59:13 +0800 Message-Id: <20210303055917.66054-2-songmuchun@bytedance.com> X-Mailer: git-send-email 2.21.0 (Apple Git-122) In-Reply-To: <20210303055917.66054-1-songmuchun@bytedance.com> References: <20210303055917.66054-1-songmuchun@bytedance.com> MIME-Version: 1.0 X-Stat-Signature: ewwaoqwsobhpqg1z9s4dgpuwuzmnam9p X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: B00F7A0009E9 Received-SPF: none (bytedance.com>: No applicable sender policy available) receiver=imf24; identity=mailfrom; envelope-from=""; helo=mail-pj1-f46.google.com; client-ip=209.85.216.46 X-HE-DKIM-Result: pass/pass X-HE-Tag: 1614751319-931920 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: We know that the unit of slab object charging is bytes, the unit of kmem page charging is PAGE_SIZE. If we want to reuse obj_cgroup APIs to charge the kmem pages, we should pass PAGE_SIZE (as third parameter) to obj_cgroup_charge(). Because the size is already PAGE_SIZE, we can skip touch the objcg stock. And obj_cgroup_{un}charge_page() are introduced to charge in units of page level. In the later patch, we also can reuse those two helpers to charge or uncharge a number of kernel pages to a object cgroup. This is just a code movement without any functional changes. Signed-off-by: Muchun Song --- mm/memcontrol.c | 46 +++++++++++++++++++++++++++++++--------------- 1 file changed, 31 insertions(+), 15 deletions(-) diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 845eec01ef9d..faae16def127 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -3056,6 +3056,34 @@ static void memcg_free_cache_id(int id) ida_simple_remove(&memcg_cache_ida, id); } +static inline void obj_cgroup_uncharge_page(struct obj_cgroup *objcg, + unsigned int nr_pages) +{ + rcu_read_lock(); + __memcg_kmem_uncharge(obj_cgroup_memcg(objcg), nr_pages); + rcu_read_unlock(); +} + +static int obj_cgroup_charge_page(struct obj_cgroup *objcg, gfp_t gfp, + unsigned int nr_pages) +{ + struct mem_cgroup *memcg; + int ret; + + rcu_read_lock(); +retry: + memcg = obj_cgroup_memcg(objcg); + if (unlikely(!css_tryget(&memcg->css))) + goto retry; + rcu_read_unlock(); + + ret = __memcg_kmem_charge(memcg, gfp, nr_pages); + + css_put(&memcg->css); + + return ret; +} + /** * __memcg_kmem_charge: charge a number of kernel pages to a memcg * @memcg: memory cgroup to charge @@ -3180,11 +3208,8 @@ static void drain_obj_stock(struct memcg_stock_pcp *stock) unsigned int nr_pages = stock->nr_bytes >> PAGE_SHIFT; unsigned int nr_bytes = stock->nr_bytes & (PAGE_SIZE - 1); - if (nr_pages) { - rcu_read_lock(); - __memcg_kmem_uncharge(obj_cgroup_memcg(old), nr_pages); - rcu_read_unlock(); - } + if (nr_pages) + obj_cgroup_uncharge_page(old, nr_pages); /* * The leftover is flushed to the centralized per-memcg value. @@ -3242,7 +3267,6 @@ static void refill_obj_stock(struct obj_cgroup *objcg, unsigned int nr_bytes) int obj_cgroup_charge(struct obj_cgroup *objcg, gfp_t gfp, size_t size) { - struct mem_cgroup *memcg; unsigned int nr_pages, nr_bytes; int ret; @@ -3259,24 +3283,16 @@ int obj_cgroup_charge(struct obj_cgroup *objcg, gfp_t gfp, size_t size) * refill_obj_stock(), called from this function or * independently later. */ - rcu_read_lock(); -retry: - memcg = obj_cgroup_memcg(objcg); - if (unlikely(!css_tryget(&memcg->css))) - goto retry; - rcu_read_unlock(); - nr_pages = size >> PAGE_SHIFT; nr_bytes = size & (PAGE_SIZE - 1); if (nr_bytes) nr_pages += 1; - ret = __memcg_kmem_charge(memcg, gfp, nr_pages); + ret = obj_cgroup_charge_page(objcg, gfp, nr_pages); if (!ret && nr_bytes) refill_obj_stock(objcg, PAGE_SIZE - nr_bytes); - css_put(&memcg->css); return ret; }