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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id D7E60C433EF for ; Sun, 19 Jun 2022 15:50:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6DEFE8D0009; Sun, 19 Jun 2022 11:50:52 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 66A588D0006; Sun, 19 Jun 2022 11:50:52 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5089F8D0009; Sun, 19 Jun 2022 11:50:52 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 3B22D8D0006 for ; Sun, 19 Jun 2022 11:50:52 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 114A033812 for ; Sun, 19 Jun 2022 15:50:52 +0000 (UTC) X-FDA: 79595423544.07.87FBCD5 Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) by imf06.hostedemail.com (Postfix) with ESMTP id A69591800A4 for ; Sun, 19 Jun 2022 15:50:51 +0000 (UTC) Received: by mail-pj1-f48.google.com with SMTP id a11-20020a17090acb8b00b001eca0041455so651449pju.1 for ; Sun, 19 Jun 2022 08:50:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=fG2YxPMk3XHSDo57as/MEaodXX0vf3EFBzxExOHzp94=; b=XkgPPFKVR0Jb570fcBCjFqP4oTrs6/NzA9SwpN40QvOkpRrkdVm4xtW+wtc1OeLYnQ 7n5ljaFkzV62y5SctU2XLyM5Ncv2PvQXvXlTPFHLGngn5hRYSNnk/hAML04kw5vaftoC kicAFGjW8BsQmffGKtlas6ScJlQuTDHwrwdPMjdRMG4+MbIEI/+4yBkDRHeRmPwSA9pr ZFBtd8SEVoAv/qVyE5F76lxq6R1Jd47JM6IooznrhE3yduAUu+K8GZYPIRZc5jleBog6 Z2XpWHdYxSbHdu+VIYBfO0TJAdtxROQ77z4rPcz4rXDjpZ0kS+mzu8bj5jSq4/PuEIPu a4HQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=fG2YxPMk3XHSDo57as/MEaodXX0vf3EFBzxExOHzp94=; b=0YHEbjjzyYsSpD8PSWVPVIUSEugs5GQIGQ8dYdSN9HWf31P9eKYnhhfN7iQSGeuOpL N+8rPTaplDGXku7beNtmqiPQK+MlZVgyvSIRVviil2H8MKu5TtiZhT9duhI0lXjddT/h ONEBw13PWDA+rhN4SlaDlicg9Ep1ie7batv9eqmez000tHVe/91ckb4fESoKnTQqsGFH OZ+vk0q5qSiSz7iXhatLL1OU3mmvgtERFFqM5ky+TVJ9Ke6NOyuBI4FZwwzPnnGz7Wfz Bug1CtJbSPDdLyFiieZL7wymtuqS82bh335bb8L98BnSXGWCdnC/dljNp3BQCoG/aCDo x5SQ== X-Gm-Message-State: AJIora8sQpf+RXwZJhcnN1wlGXzQ+kj+qcQG4F1I8UcsWRFneXQen5nq oIZUWylqJGekyf9XwtiZpr0= X-Google-Smtp-Source: AGRyM1vxAU7OTmDElw6CQ4IfMkyUasemfaxdeD46XcwgZFgN1qsd8XEuFJv7/HuK+g+5Vt/uKY9xag== X-Received: by 2002:a17:90b:4d11:b0:1e8:436b:a9cc with SMTP id mw17-20020a17090b4d1100b001e8436ba9ccmr33074721pjb.40.1655653850770; Sun, 19 Jun 2022 08:50:50 -0700 (PDT) Received: from vultr.guest ([2001:19f0:6001:2b24:5400:4ff:fe09:b144]) by smtp.gmail.com with ESMTPSA id z10-20020a1709027e8a00b001690a7df347sm6381761pla.96.2022.06.19.08.50.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 19 Jun 2022 08:50:49 -0700 (PDT) From: Yafang Shao To: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, kafai@fb.com, songliubraving@fb.com, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, quentin@isovalent.com, hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeelb@google.com, songmuchun@bytedance.com, akpm@linux-foundation.org, cl@linux.com, penberg@kernel.org, rientjes@google.com, iamjoonsoo.kim@lge.com, vbabka@suse.cz Cc: linux-mm@kvack.org, bpf@vger.kernel.org, Yafang Shao Subject: [RFC PATCH bpf-next 04/10] mm, memcg: Make obj_cgroup_{charge, uncharge}_pages public Date: Sun, 19 Jun 2022 15:50:26 +0000 Message-Id: <20220619155032.32515-5-laoar.shao@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220619155032.32515-1-laoar.shao@gmail.com> References: <20220619155032.32515-1-laoar.shao@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1655653851; a=rsa-sha256; cv=none; b=r8ZglZg6rX3wtkw9xGqv3/cz8RD0u3NpIFuFXO4/ZaVtV/Ro2gSxgVcEx6h25QkEiBxtqO 3iWu5vXwyuvLBW8VjS2GdWAFgUF5O+2APgZWAw554H8MDERQbfqqMN8EFRZfIvgYatgVeS aVhsdZlhVkSdNoEhmgsUZ++jSnmJJ+s= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=XkgPPFKV; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf06.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.216.48 as permitted sender) smtp.mailfrom=laoar.shao@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1655653851; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=fG2YxPMk3XHSDo57as/MEaodXX0vf3EFBzxExOHzp94=; b=NeYOrk6ZhT75rI0+wAhkP+kR8Yv294IjsN4Rm1SlSrq9ExDQrQWpMSZ545M1+cWKg2JItj mSt8APM1H9+s4MxWJOWyFkQYfhGGJ11XLTaWR1h9cE8y25jQzQM/N/IawrK+mYLGGggIQW YxIBOW8EY3kaj1FobCf8yxYiVd9uvuo= Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=XkgPPFKV; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf06.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.216.48 as permitted sender) smtp.mailfrom=laoar.shao@gmail.com X-Rspam-User: X-Stat-Signature: k4ki1kets977upnqzm5f5ywbt6edbcp4 X-Rspamd-Queue-Id: A69591800A4 X-Rspamd-Server: rspam08 X-HE-Tag: 1655653851-561497 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: Make these two helpers public for later use. Signed-off-by: Yafang Shao --- include/linux/memcontrol.h | 4 ++++ mm/memcontrol.c | 11 ++++------- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 402b42670bcd..ec4637687d6a 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1709,6 +1709,10 @@ struct obj_cgroup *get_obj_cgroup_from_page(struct page *page); int obj_cgroup_charge(struct obj_cgroup *objcg, gfp_t gfp, size_t size); void obj_cgroup_uncharge(struct obj_cgroup *objcg, size_t size); +int obj_cgroup_charge_pages(struct obj_cgroup *objcg, gfp_t gfp, + unsigned int nr_pages); +void obj_cgroup_uncharge_pages(struct obj_cgroup *objcg, + unsigned int nr_pages); extern struct static_key_false memcg_kmem_enabled_key; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index 350a7849dac3..0ba321afba3b 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -260,9 +260,6 @@ bool mem_cgroup_kmem_disabled(void) return cgroup_memory_nokmem; } -static void obj_cgroup_uncharge_pages(struct obj_cgroup *objcg, - unsigned int nr_pages); - static void obj_cgroup_release(struct percpu_ref *ref) { struct obj_cgroup *objcg = container_of(ref, struct obj_cgroup, refcnt); @@ -2991,8 +2988,8 @@ static void memcg_account_kmem(struct mem_cgroup *memcg, int nr_pages) * @objcg: object cgroup to uncharge * @nr_pages: number of pages to uncharge */ -static void obj_cgroup_uncharge_pages(struct obj_cgroup *objcg, - unsigned int nr_pages) +void obj_cgroup_uncharge_pages(struct obj_cgroup *objcg, + unsigned int nr_pages) { struct mem_cgroup *memcg; @@ -3012,8 +3009,8 @@ static void obj_cgroup_uncharge_pages(struct obj_cgroup *objcg, * * Returns 0 on success, an error code on failure. */ -static int obj_cgroup_charge_pages(struct obj_cgroup *objcg, gfp_t gfp, - unsigned int nr_pages) +int obj_cgroup_charge_pages(struct obj_cgroup *objcg, gfp_t gfp, + unsigned int nr_pages) { struct mem_cgroup *memcg; int ret; -- 2.17.1