From patchwork Thu Aug 18 14:31:09 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 12948112 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 4C047C00140 for ; Thu, 18 Aug 2022 23:01:07 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E4C4F8D0003; Thu, 18 Aug 2022 19:01:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DD5108D0002; Thu, 18 Aug 2022 19:01:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C4F008D0003; Thu, 18 Aug 2022 19:01:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id B23248D0002 for ; Thu, 18 Aug 2022 19:01:06 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 9169941884 for ; Thu, 18 Aug 2022 23:01:06 +0000 (UTC) X-FDA: 79814235732.27.26CDF7D Received: by imf27.hostedemail.com (Postfix, from userid 200) id 2E9FD41C78; Thu, 18 Aug 2022 16:13:15 +0000 (UTC) Received: from mail-qv1-f43.google.com (mail-qv1-f43.google.com [209.85.219.43]) by imf27.hostedemail.com (Postfix) with ESMTP id 21E50444AE for ; Thu, 18 Aug 2022 16:13:04 +0000 (UTC) Received: by mail-qv1-f43.google.com with SMTP id d1so1550589qvs.0 for ; Thu, 18 Aug 2022 09:13:04 -0700 (PDT) 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; bh=51S9dT2G3aXePCnrE/PN1X8bOnyFVMn8Ux5epyAQWQw=; b=Snljo/+katzYm1S8ojYVqCaSaKESK1ljndsaJlzs3c8AhsrzYbRv9I6T1bQBxxgppR 7T6YPv9CGg2pRiOTwx3jg27WxnB2YzkNqvaGBFMBO3Fw6+lCfz4SR3H/Cpmf/xlPbMaw J2aNdyXVOC5eliet6WkG0q/QNdHtRprClQoOLyotQNi7Vi2ynk2mepc4SAZtc773bHyh o9ykJMmMhaQz8teEky3Vke6Xn8Ppy5/K3jtvJXBpc2ssuO0anMN7Dpuwo312FLtSlW6B 3vZ57EgRgMqllC8fRv5gzJQZS4151OfxP0rQE/n+geleYz4CO38s8n3Uo8ai/1Jevdf8 ipTw== 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; bh=51S9dT2G3aXePCnrE/PN1X8bOnyFVMn8Ux5epyAQWQw=; b=2LzImwlRHA+6XRG4HNhHnG3WldStBomjYR9qzc+cF/7pQAZYMCB+s1S+IAfY2d4eja 2jdunmmAT05IGIcXeol9Bbe2htITLzoyQ++sjUVkZphX9zZFINk2UmIOFD0nONEIKvae pSoBb1PUzi6vTBSuoEvAEZJEIMJOkX8drLDT3UBMM17BsKKXfhuvz50hm7t6NCALd2FE yomD4D8AtI7c0mj33bnFBlr0Q6+DS7vR5OgQFSV4mbB+6Asor2CqCFomd+RzlTAVYAgG M5FfgP04c+YSv6PjI//hG0ashHyQSxKok69ZoIcx4Nn+KJsVw789EzRfJurbNlsw2FO1 sJlQ== X-Gm-Message-State: ACgBeo3h1NG6SJforB4C+D0XVH/FiVPUurjjG/6wGXP7NAZKVj3e8Gsx N8y9LWDmZzcFERQIzX0T2VNWKs9aWTHSsgwQ X-Google-Smtp-Source: AA6agR4/IcIPwFl8NjZf201BmyQdHaE6fvOSIZxi9N2e4RlcPtMrgMGi0rFoxp19D9oRoi7uY7hWEg== X-Received: by 2002:a05:6a00:3691:b0:535:d465:45c5 with SMTP id dw17-20020a056a00369100b00535d46545c5mr2313132pfb.30.1660833105886; Thu, 18 Aug 2022 07:31:45 -0700 (PDT) Received: from vultr.guest ([45.32.72.237]) by smtp.gmail.com with ESMTPSA id h5-20020a63f905000000b003fdc16f5de2sm1379124pgi.15.2022.08.18.07.31.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 07:31:45 -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, sdf@google.com, haoluo@google.com, jolsa@kernel.org, hannes@cmpxchg.org, mhocko@kernel.org, roman.gushchin@linux.dev, shakeelb@google.com, songmuchun@bytedance.com, akpm@linux-foundation.org, tj@kernel.org, lizefan.x@bytedance.com Cc: cgroups@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, linux-mm@kvack.org, Yafang Shao Subject: [PATCH bpf-next v2 03/12] bpf: Define bpf_map_{get,put}_memcg for !CONFIG_MEMCG_KMEM Date: Thu, 18 Aug 2022 14:31:09 +0000 Message-Id: <20220818143118.17733-4-laoar.shao@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220818143118.17733-1-laoar.shao@gmail.com> References: <20220818143118.17733-1-laoar.shao@gmail.com> MIME-Version: 1.0 ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1660839191; a=rsa-sha256; cv=none; b=kIgU2Ede1epMmncELbvSx7q01GpIsHtWCtUjtLy4WSu2xk1SZFYiNo0qol7pFgMIlfYAhl KwzfpDJ4ge3wQf+GBoSa2As0H4Nsu/vPI1m5ep9Auvdut++rlCF7sdh/PMjz6mEGHkmoZr UtZ5btll96RI1kJ5oJ99bkHXtvFJT6g= ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="Snljo/+k"; spf=pass (imf27.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.219.43 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=1660839191; 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=51S9dT2G3aXePCnrE/PN1X8bOnyFVMn8Ux5epyAQWQw=; b=GBXGMR61hhVUHBbeZ5dxta1HMy7mEtJ6BOiQDKWWGOIQ7/NI7HXFEoazd/R5OHIcLWxq4l 42ZvXUoQtQL/fS5ZeGa7tPQ9wl8RDkk/0gXHWGE7xpmUrnPLxNLZN2pVshYvCqxkDTbiKL sQHOkpRn/B5LKBGHNc/iE/ObmMu1zuE= Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="Snljo/+k"; spf=pass (imf27.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.219.43 as permitted sender) smtp.mailfrom=laoar.shao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspam-User: X-Rspamd-Queue-Id: 21E50444AE X-Rspamd-Server: rspam04 X-Stat-Signature: w3m7fj9xmn1cbw47xkhcu3656qa9ug3q X-HE-Tag: 1660839184-665994 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 can use this helper when CONFIG_MEMCG_KMEM or CONFIG_MEMCG is not set. It also moves bpf_map_{get,put}_memcg into include/linux/bpf.h, so these two helpers can be used in other source files. Signed-off-by: Yafang Shao --- include/linux/bpf.h | 26 ++++++++++++++++++++++++++ include/linux/memcontrol.h | 10 ++++++++++ kernel/bpf/syscall.c | 13 ------------- 3 files changed, 36 insertions(+), 13 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index a627a02..ded7d23 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -27,6 +27,7 @@ #include #include #include +#include struct bpf_verifier_env; struct bpf_verifier_log; @@ -2572,4 +2573,29 @@ static inline void bpf_cgroup_atype_get(u32 attach_btf_id, int cgroup_atype) {} static inline void bpf_cgroup_atype_put(int cgroup_atype) {} #endif /* CONFIG_BPF_LSM */ +#ifdef CONFIG_MEMCG_KMEM +static inline struct mem_cgroup *bpf_map_get_memcg(const struct bpf_map *map) +{ + if (map->objcg) + return get_mem_cgroup_from_objcg(map->objcg); + + return root_mem_cgroup; +} + +static inline void bpf_map_put_memcg(struct mem_cgroup *memcg) +{ + mem_cgroup_put(memcg); +} + +#else +static inline struct mem_cgroup *bpf_map_get_memcg(const struct bpf_map *map) +{ + return root_memcg(); +} + +static inline void bpf_map_put_memcg(struct mem_cgroup *memcg) +{ +} +#endif + #endif /* _LINUX_BPF_H */ diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 9ecead1..2f0a611 100644 --- a/include/linux/memcontrol.h +++ b/include/linux/memcontrol.h @@ -361,6 +361,11 @@ struct mem_cgroup { extern struct mem_cgroup *root_mem_cgroup; +static inline struct mem_cgroup *root_memcg(void) +{ + return root_mem_cgroup; +} + enum page_memcg_data_flags { /* page->memcg_data is a pointer to an objcgs vector */ MEMCG_DATA_OBJCGS = (1UL << 0), @@ -1138,6 +1143,11 @@ unsigned long mem_cgroup_soft_limit_reclaim(pg_data_t *pgdat, int order, #define MEM_CGROUP_ID_SHIFT 0 #define MEM_CGROUP_ID_MAX 0 +static inline struct mem_cgroup *root_memcg(void) +{ + return NULL; +} + static inline struct mem_cgroup *folio_memcg(struct folio *folio) { return NULL; diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 2f18ae2..19c3a81 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -433,19 +433,6 @@ static void bpf_map_release_memcg(struct bpf_map *map) obj_cgroup_put(map->objcg); } -static struct mem_cgroup *bpf_map_get_memcg(const struct bpf_map *map) -{ - if (map->objcg) - return get_mem_cgroup_from_objcg(map->objcg); - - return root_mem_cgroup; -} - -static void bpf_map_put_memcg(struct mem_cgroup *memcg) -{ - mem_cgroup_put(memcg); -} - void *bpf_map_kmalloc_node(const struct bpf_map *map, size_t size, gfp_t flags, int node) {