From patchwork Sun Feb 5 06:58:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 13128978 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 B2C36C636CC for ; Sun, 5 Feb 2023 06:58:29 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2D1246B0073; Sun, 5 Feb 2023 01:58:29 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 25B4C6B0074; Sun, 5 Feb 2023 01:58:29 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0FC456B0075; Sun, 5 Feb 2023 01:58:29 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id F138D6B0073 for ; Sun, 5 Feb 2023 01:58:28 -0500 (EST) Received: from smtpin20.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id CB549A995A for ; Sun, 5 Feb 2023 06:58:28 +0000 (UTC) X-FDA: 80432334696.20.25BEF4F Received: from mail-pg1-f170.google.com (mail-pg1-f170.google.com [209.85.215.170]) by imf03.hostedemail.com (Postfix) with ESMTP id F351520005 for ; Sun, 5 Feb 2023 06:58:25 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=VbKKUeOj; spf=pass (imf03.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.215.170 as permitted sender) smtp.mailfrom=laoar.shao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1675580306; 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=m9R8PIufUvBWha2/FhSWxLkNgyIkPqx2ukwcdT04Lok=; b=spXTpxYfOUfs8iyvcwlZ9LAFOj559ejMn3X4BtrZBMdpl/rzeDi0DZd0ZugkQD+fQCdtGk hJn15Lav5JT4zwrFc7wcQ6HSL+V5aZ7f58e5xxamlRzCwT/AKphdI6akWz5M7pNQmDddCv boxUeBkBcC0msr7TtP8DBEWuYPSWjYk= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=VbKKUeOj; spf=pass (imf03.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.215.170 as permitted sender) smtp.mailfrom=laoar.shao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1675580306; a=rsa-sha256; cv=none; b=Gmm+LW1xrQLkF7Asbb9z1mIaJpXDaet58VcbOMWTpYRipWY2UvKCRYXl4Es6Y1JT58uSw4 XrvMP2F1iOtxsgwU9HJhFTlMd5PnxIu46ujbVZrmbvQXqcNimp83eoqa/q+ovgm0aP7RIb hl+Ej6Uz06TNERvLekCKV8Rlbn4Jy9o= Received: by mail-pg1-f170.google.com with SMTP id 78so6241965pgb.8 for ; Sat, 04 Feb 2023 22:58:25 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=m9R8PIufUvBWha2/FhSWxLkNgyIkPqx2ukwcdT04Lok=; b=VbKKUeOjFCh14UcFioJqXvV7nqLa/vg7qKYxZQoGJttshn6aRrjtM0mbljrXL0sSdo eoD9zvL2xe3uInT4uDMDjiP/qOwanJKqBrbwt1d1DwYYMEQZ33HOBD6TmXobYtliaD4y jL7qHagWDuT/Cpw7o2NXIPpUlagzQvrXu4hNJXh/5vE4ShSSJfiDwZahWSsv83KJATSd F4d2EZbJO3TWewtgx6041qZaYAkpmG9XlDGl3CNBeahJAPv1aHnjnW9jXuHbBSRsLScM IxkfodJ2ct1jHAS2KZ38cmjljEGipXaGxiHVk6qRU+Gz+xGTGRPKtSLFVu9vS9T1ECfi KzGg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=m9R8PIufUvBWha2/FhSWxLkNgyIkPqx2ukwcdT04Lok=; b=EhRKnW5wuko9/tjyZCpiBEuzkwG0rMrh9QL+5S2lnSzVeEQrdvH5/V4aRD9PJIlCSU grdmxOuQMfEYyrj1C5MvzebQw52b7llAwryWXl+IWWJXYd8BZrokf7q1EwdgMKp2oTtx WCH2KqPaeC3U7ds7FFmLUBde4Ahz2k0hDFWe4J2kWFQKWpuO2LBmVVrXyD0J5QJ2Hs0F ZdEdFGkiMdrcp129btOQlv4hKwYGlHox83iSUd7vpNtvIlbCfGuRhjKxAHLV3QK/ixKE vGvGLTBrcc2U275OIi3pj3hYBiJHyNoDqx3wbiISl0cunJcSJT7t4X4hOhmC/XLygCH+ 5xcQ== X-Gm-Message-State: AO0yUKV/+JcCPingNdHA62bQ/TnGKbOSdIb70NZxU3rnKju1Uv3wDiyu HiijoOwC6uik328YrbLCzldBa/0lSSEu7b+0 X-Google-Smtp-Source: AK7set+4lyC7iUWDzKd4aGLt9mkqm7oQ24mUCgV3ZViLbOOhJZFNntqClhmQMCQjtn8CHlsGmXAruQ== X-Received: by 2002:a05:6a00:22cc:b0:58d:f20b:5f2e with SMTP id f12-20020a056a0022cc00b0058df20b5f2emr21243710pfj.1.1675580304922; Sat, 04 Feb 2023 22:58:24 -0800 (PST) Received: from vultr.guest ([2401:c080:1c02:6a5:5400:4ff:fe4b:6fe6]) by smtp.gmail.com with ESMTPSA id 144-20020a621596000000b00593ce7ebbaasm4596114pfv.184.2023.02.04.22.58.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 04 Feb 2023 22:58:24 -0800 (PST) From: Yafang Shao To: tj@kernel.org, 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, sdf@google.com, haoluo@google.com, jolsa@kernel.org, hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeelb@google.com, muchun.song@linux.dev, akpm@linux-foundation.org Cc: bpf@vger.kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, Yafang Shao Subject: [PATCH bpf-next 1/5] mm: memcontrol: add new kernel parameter cgroup.memory=nobpf Date: Sun, 5 Feb 2023 06:58:01 +0000 Message-Id: <20230205065805.19598-2-laoar.shao@gmail.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230205065805.19598-1-laoar.shao@gmail.com> References: <20230205065805.19598-1-laoar.shao@gmail.com> MIME-Version: 1.0 X-Rspam-User: X-Rspamd-Server: rspam03 X-Stat-Signature: on93if78phrzwdt4yjijexzo8m5eyqaz X-Rspamd-Queue-Id: F351520005 X-HE-Tag: 1675580305-869141 X-HE-Meta: U2FsdGVkX19NeCImBmnuNofl1Znq4loNjkc9RV033qzY4kqNYxZk3eJI8Kpxd/qDxs70jvsHA7pxASy0cpfJOvzUg5iVvCRsYmZHdDNPzrQuNuxtje6iitx278ruKgC5viWadU+vkc++6KeHGJCi1dTmvH/IGVY3LWfVTZjyGWryODxPwaPRfLr86C8i9g6AaTjZRgw6iA2QDs210M2pMOle6i6AyeOIeFPSHZIN2rqh53Uo+953+fVXBvzfemIWTkSG0X3vGAoEIgaUrkOg7PHWvZIH23Vivtwu3OTvr8F9gAbGU2UUk/Lb4QNmHnbt0luJ9Oh2k9z3rRNIveTq7PGn76WAt5WpYPTtK14eApA/rfrAk6ei+fCTz5go0bAaFSpTJvILH7UsTK8ooKv1Q8yDJzSSd0K4L2rsjNoQ2Jn2StYuFNP7zDJQjofrv9FIXBj2zxNv0jpmvzP97DgfHx9SYmXvm1BQBXKpYdrz/xPgdSFsv98KOM0uKKOANItaxq+APQnloCeVKvlEzee53pIu2htE0CJw47tThfW/zqQ2DK02AullZpzbmVdESkoWIDsqx3JtUAl8s15qf4P3TRuVxYe+cIPkAQy8XEhaBdV3j0+1I3Bh3wWcVg0X7/E2i26sHhLwUctJ/MF8pvKxDBqYHUsugLyDgDViEVmUmkYmVOZTP8UZbqQkRlpLhCd5enC01n0Dwou30881Qmu2CLYdRMTNIVlDRHC8eBdyLZHCp0yZXtrj+HtH8fbOb87IThFPNROpUoJWe4Qq/YYWUF9H/bW7JwE5axB4Y/evpHgCHkL/2uU1zNNbtARrGNnHAh4J8eLHHfEOFYtzGCohf5GogaQcKwdUI2ZUo0riDeWf/o/iYdJO61OKMomLETqEsDKLNZxWrA+Q4bYgw0ULJtyUEbMVZxUuUbkM+yQwZyDKEcN7mv/fl4bnc7TDiU0I+H4cuffWNduKKwixWk+ gMYDCzBF wJpCGCO6+yyiH712vn6iMO4wwIquI2oBTJuPgxD8Pwyt4Ya4dAsnkgoAcFsWlRBHJx/SzCfMxmw/1uepI66XPjuq5nM+hO6M8BIQzTz3/lREg1chS2is3nDhJxKYjlPCaKCh9Q5jF9VxgRd1qP/ft8Qm3+kU7G3g+OMqsEgMop8pgwdiQa8+SD0Os+mJZv5dw7MP0gEan9VSIsaLXGiuqZEyHYfKFpi0zoAEKB3SsRikzgYHdoV3h6oHvnXVu+e+11dnFMLjb1o3mHKbmjeeNA7f8ZCQlYVAYYl16KdJ04jGCYDbmuNsDEAuGo/zXhk8p3lP8ek+g9wLSQCtu9oTTWNhvE/svjg02MuF4J0WBYs81BU6Foy432wS3YRvE7M+OdPINo8p6DDw9/2TxLd3rWLVgPHbjqrc+DNJeJeFLg0UI4aRxbfLQCscxBMi5FsTIdAKRjISl7OmAwQNAwSFgylbwA/MrE01t49rGNqD4vTVmEOKYduQ+U78veEwuQ2xzjSOS/nG5yQ6385In25h3Zpfw1VbVu/LAJpdeEVfRtwMKX9M= 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: Add new kernel parameter cgroup.memory=nobpf to allow user disable bpf memory accounting. This is a preparation for the followup patch. Signed-off-by: Yafang Shao --- Documentation/admin-guide/kernel-parameters.txt | 1 + include/linux/memcontrol.h | 11 +++++++++++ mm/memcontrol.c | 18 ++++++++++++++++++ 3 files changed, 30 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 6cfa6e3..29fb41e 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -557,6 +557,7 @@ Format: nosocket -- Disable socket memory accounting. nokmem -- Disable kernel memory accounting. + nobpf -- Disable BPF memory accounting. checkreqprot= [SELINUX] Set initial checkreqprot flag value. Format: { "0" | "1" } diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index d3c8203..26d4bf2 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -1751,6 +1751,12 @@ static inline void set_shrinker_bit(struct mem_cgroup *memcg, 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); +extern struct static_key_false memcg_bpf_enabled_key; +static inline bool memcg_bpf_enabled(void) +{ + return static_branch_likely(&memcg_bpf_enabled_key); +} + extern struct static_key_false memcg_kmem_enabled_key; static inline bool memcg_kmem_enabled(void) @@ -1829,6 +1835,11 @@ static inline struct obj_cgroup *get_obj_cgroup_from_page(struct page *page) return NULL; } +static inline bool memcg_bpf_enabled(void) +{ + return false; +} + static inline bool memcg_kmem_enabled(void) { return false; diff --git a/mm/memcontrol.c b/mm/memcontrol.c index ab457f0..590526f 100644 --- a/mm/memcontrol.c +++ b/mm/memcontrol.c @@ -89,6 +89,9 @@ /* Kernel memory accounting disabled? */ static bool cgroup_memory_nokmem __ro_after_init; +/* BPF memory accounting disabled? */ +static bool cgroup_memory_nobpf __ro_after_init; + #ifdef CONFIG_CGROUP_WRITEBACK static DECLARE_WAIT_QUEUE_HEAD(memcg_cgwb_frn_waitq); #endif @@ -348,6 +351,9 @@ static void memcg_reparent_objcgs(struct mem_cgroup *memcg, */ DEFINE_STATIC_KEY_FALSE(memcg_kmem_enabled_key); EXPORT_SYMBOL(memcg_kmem_enabled_key); + +DEFINE_STATIC_KEY_FALSE(memcg_bpf_enabled_key); +EXPORT_SYMBOL(memcg_bpf_enabled_key); #endif /** @@ -5362,6 +5368,11 @@ static struct mem_cgroup *mem_cgroup_alloc(void) if (cgroup_subsys_on_dfl(memory_cgrp_subsys) && !cgroup_memory_nosocket) static_branch_inc(&memcg_sockets_enabled_key); +#if defined(CONFIG_MEMCG_KMEM) + if (!cgroup_memory_nobpf) + static_branch_inc(&memcg_bpf_enabled_key); +#endif + return &memcg->css; } @@ -5446,6 +5457,11 @@ static void mem_cgroup_css_free(struct cgroup_subsys_state *css) if (!cgroup_subsys_on_dfl(memory_cgrp_subsys) && memcg->tcpmem_active) static_branch_dec(&memcg_sockets_enabled_key); +#if defined(CONFIG_MEMCG_KMEM) + if (!cgroup_memory_nobpf) + static_branch_dec(&memcg_bpf_enabled_key); +#endif + vmpressure_cleanup(&memcg->vmpressure); cancel_work_sync(&memcg->high_work); mem_cgroup_remove_from_trees(memcg); @@ -7310,6 +7326,8 @@ static int __init cgroup_memory(char *s) cgroup_memory_nosocket = true; if (!strcmp(token, "nokmem")) cgroup_memory_nokmem = true; + if (!strcmp(token, "nobpf")) + cgroup_memory_nobpf = true; } return 1; }