From patchwork Fri Jul 29 15:23:08 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 12932537 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 46CB1C19F2A for ; Fri, 29 Jul 2022 15:23:38 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D6C006B007D; Fri, 29 Jul 2022 11:23:37 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D16CF8E0001; Fri, 29 Jul 2022 11:23:37 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BB82C6B0080; Fri, 29 Jul 2022 11:23:37 -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 AD7876B007D for ; Fri, 29 Jul 2022 11:23:37 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 73BFB16112E for ; Fri, 29 Jul 2022 15:23:37 +0000 (UTC) X-FDA: 79740506874.13.5283429 Received: from mail-pg1-f171.google.com (mail-pg1-f171.google.com [209.85.215.171]) by imf07.hostedemail.com (Postfix) with ESMTP id CF4F4400AC for ; Fri, 29 Jul 2022 15:23:36 +0000 (UTC) Received: by mail-pg1-f171.google.com with SMTP id d7so1228719pgc.13 for ; Fri, 29 Jul 2022 08:23:36 -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=XcXG9h+ovnptbv0fZ4hOiyXlQOwZMvCOBp/cMXUb/u8=; b=IWFv+lclDgiPa3ymhPY9q6aCXqaeG/qISakVlu0Nxc7vWmoHPhw+T4sGoi6JRopsnP beNYUbztVH4F05vhDRIEp5hpbNu8la/64Le0T/TATOhuurnQSIn4f4qzv3WX+Zxu5YlA BzTeCxjeYl9BaU8uiZ1pVgzP/UKYZnzLA2YkKOufmRKU7RGSyTMesWuhc7upiOeKpLNr hZtaAoJLyXQgVZ0QK/wkFk1ll2QD+5tmLlkr0eaIISFO6LKcrhBECvUjmQ5GANuf84KW AOsNdYkzh6EcccD3engjSYNrarMZbKYDurIFIbooVl9jO899EeL5EM2L1C6q03lTpL4l o9rg== 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=XcXG9h+ovnptbv0fZ4hOiyXlQOwZMvCOBp/cMXUb/u8=; b=XR1gF4C9YOSQoQWmjF90CAUW/q36XH5DikzFqtACj4h2dGgZ9IjU6EPU4Nto6qD3T/ Eay0nYljy28tJkZIh3ydB/9M/Erg06kyYpP1Y2WRFffRyrf3sPZTYCrmNQkgz/prEaN/ CcwKNH2xrcILIkGymHnAAnaVpzDxb50soPZTB6oa+3h6lHjaGM6CsY4zRCuODG4xgmPk p8qgLDKBqTV12Dpo1tRQhIKfSLczPK2x2nFVx86zJ7CSAlH2WAh5VOQ7GtoxDFsjrmLP HWkkyCEvve8UQrcU9yxRsk7/hgfgurzljCbqWsrbu0FBxAlrSO9t9LTwphRVaR/8Ecnu l48A== X-Gm-Message-State: ACgBeo3cKddRCHq8iVFvAVBeF48hVJ8j8JcULJ/5I89WJZ0DGwQsPoE8 MBfLxxREL6enAux9ojRZQMg= X-Google-Smtp-Source: AA6agR7SIQhSbBEU1Bv1FwPss3jvTX+PEYUQva3Awy8g6XTzQUfPeNSOJJ5hWGFT56tk2s0IpV4uIQ== X-Received: by 2002:aa7:8289:0:b0:52c:e97c:dbe4 with SMTP id s9-20020aa78289000000b0052ce97cdbe4mr860524pfm.49.1659108215736; Fri, 29 Jul 2022 08:23:35 -0700 (PDT) Received: from vultr.guest ([2001:19f0:6001:2912:5400:4ff:fe16:4344]) by smtp.gmail.com with ESMTPSA id b12-20020a1709027e0c00b0016d3a354cffsm3714219plm.89.2022.07.29.08.23.33 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 08:23:34 -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 Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, linux-mm@kvack.org, Yafang Shao Subject: [RFC PATCH bpf-next 07/15] bpf: Define bpf_map_get_memcg for !CONFIG_MEMCG_KMEM Date: Fri, 29 Jul 2022 15:23:08 +0000 Message-Id: <20220729152316.58205-8-laoar.shao@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220729152316.58205-1-laoar.shao@gmail.com> References: <20220729152316.58205-1-laoar.shao@gmail.com> MIME-Version: 1.0 ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=IWFv+lcl; spf=pass (imf07.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.215.171 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=1659108216; a=rsa-sha256; cv=none; b=qFb49vs97kj1bNBjhblsTBUlUnyxSx43+2tFNByhWvA3FDVVpc+TB480AbgTmDgi3mruB4 1gFj4QzHxPqjBcu9lK0fs6OhbygHug0n+4jjtPorrmnDsLiFUMiHIJ5mf2f3lxfm37zfTg xjW0mTRzSzrXtFw37CfAcFb7vhmkh0A= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659108216; 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=XcXG9h+ovnptbv0fZ4hOiyXlQOwZMvCOBp/cMXUb/u8=; b=vASMEWdhRNynLquJfNE+eBiAsGfwfPCxamsQNX0DIKJma8OTVuzvt5qAtwKPUI6LiFE9KV QYUbEU3NZ+C1kTlqHLJXGsqLLable8plE4IMWz7c/yMf1GkFwdy3I0wyy4nDoemSrpno+N tQQPSjDy1wuutoKiqUJSRMUkfHrrbZg= X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: CF4F4400AC Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=IWFv+lcl; spf=pass (imf07.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.215.171 as permitted sender) smtp.mailfrom=laoar.shao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Stat-Signature: fmjmmojekaz7k1n69xi1qn7hferzq9tt X-Rspam-User: X-HE-Tag: 1659108216-418816 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: Then we can use this helper when CONFIG_MEMCG_KMEM is not set. Signed-off-by: Yafang Shao --- include/linux/memcontrol.h | 10 ++++++++++ kernel/bpf/syscall.c | 7 ++++++- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/include/linux/memcontrol.h b/include/linux/memcontrol.h index 9ecead1042b9..2f0a611f12e5 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 a6f68ade200f..7289ee1a300a 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -433,7 +433,7 @@ 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; + return root_memcg(); } void *bpf_map_kmalloc_node(const struct bpf_map *map, size_t size, gfp_t flags, @@ -488,6 +488,11 @@ static void bpf_map_save_memcg(struct bpf_map *map) static void bpf_map_release_memcg(struct bpf_map *map) { } + +static struct mem_cgroup *bpf_map_get_memcg(const struct bpf_map *map) +{ + return root_memcg(); +} #endif /*