From patchwork Thu Aug 18 14:31: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: 12948093 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 B92CEC00140 for ; Thu, 18 Aug 2022 22:35:41 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 568978E0002; Thu, 18 Aug 2022 18:35:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 4F1068D0002; Thu, 18 Aug 2022 18:35:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3441B8E0002; Thu, 18 Aug 2022 18:35:41 -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 241C78D0002 for ; Thu, 18 Aug 2022 18:35:41 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id AEE631C797F for ; Thu, 18 Aug 2022 22:35:40 +0000 (UTC) X-FDA: 79814171640.03.B6E03D4 Received: by imf22.hostedemail.com (Postfix, from userid 200) id 87AF9C9B5A; Thu, 18 Aug 2022 16:28:06 +0000 (UTC) Received: from mail-oa1-f53.google.com (mail-oa1-f53.google.com [209.85.160.53]) by imf22.hostedemail.com (Postfix) with ESMTP id C30B0C577C for ; Thu, 18 Aug 2022 16:27:00 +0000 (UTC) Received: by mail-oa1-f53.google.com with SMTP id 586e51a60fabf-11c896b879bso2361517fac.3 for ; Thu, 18 Aug 2022 09:26:48 -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=wg2OeZwYg3Kz1nqXHwyNkbleHxYXQ5NXoZNmpCP8Llk=; b=R/So91AyylEMxXSEpTKpKv01qBGi6xOrsO4noHScLMrE+YO98wrVs063FgNuxiln9E dEOV2CN+RE5tNE1z5ZmERPvt6JN3yJolI3nO4D7eoOwHzHR3S3GwYf8gAP+Zp3dVkc1h Z6OgTgdGTt8p3N2cLkdNOMMqY7MRDmGpFg/mZ7MdHtfXixdsajHvr/B5hsZe4b+cNEpC c55C3O6Uh+Yd6+uu0O6olhxAZYTjxgcFlVzx7dW+WaNGl7QbddUZQSwdmV01ba77Jhdd HJ0cHxk3jJ7BaszZQWwQXr5U4CksixminXvUIPa/uoHfx9aVA/VbkVu91OGPozK0RZSh u7rg== 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=wg2OeZwYg3Kz1nqXHwyNkbleHxYXQ5NXoZNmpCP8Llk=; b=Zc9owiTpjRbfNXcKeOUv8FYJ3OFVsrkytjH4JHt5oCUyFw7abpMQ2zDJ3pabaI1v1U Yl6IrXYWqU/nCU54rFlvmlv8fSQ258gMB3d+RJZWhEgCIp8dpwgQ7tSl6cABRzBDUYE7 hSs5iBKDqv2x5Ki4NvUfktCYsTA5H1j4WVRmko3+uV6tZmWfHpCo8qNZU8TaYa9y4IID RYd/z/Kpfgn4FV/R89i0SU368/RV23XBpkS5qX4csxnjzD1oPLhIPqGOGlZIWP9lVl9O K0VSEFA4csnK2mgRi2txy4SyKTyHSOgl4R7Yrms55K3mt3cRkMPaRvmMtrPUlUhQm/td jTLA== X-Gm-Message-State: ACgBeo0FxKhBVRzZ2UEcpf517BuYkZLLkzAEtJ4hycoG+1RN06GSYPUU 55I+c3/2a7Esj8zDb+xVifUPqfManD4qElvy X-Google-Smtp-Source: AA6agR7OEELPz4uROPaJyiezq+3PyARpNOx7by3N5XsqNh2UAUDM9ERvl5GthWrBFRaYDeIe9ZSj0Q== X-Received: by 2002:a17:90b:3889:b0:1f5:88cd:350d with SMTP id mu9-20020a17090b388900b001f588cd350dmr9116900pjb.9.1660833102811; Thu, 18 Aug 2022 07:31:42 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 18 Aug 2022 07:31:41 -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 02/12] bpf: Introduce new helper bpf_map_put_memcg() Date: Thu, 18 Aug 2022 14:31:08 +0000 Message-Id: <20220818143118.17733-3-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=1660840083; a=rsa-sha256; cv=none; b=pRR37AkHiDHSCzWrobyj3kdZl17jPX0XAZA5MQhQwKuKVyghEfRlfagVgnKtbEJRN3ouM5 2zlT2lvyT9izC7gcn/L+Geic/7gnqhiz4WvPu32kIUxC+4vOxALJbdqTRG0Ms9ZNCjOjyX q4srCFBzXa5WDU6hRHaS4y5IzUD3xZ0= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="R/So91Ay"; spf=pass (imf22.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.160.53 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=1660840083; 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=wg2OeZwYg3Kz1nqXHwyNkbleHxYXQ5NXoZNmpCP8Llk=; b=KO56zUzAFHnjOmUZ/ii1so6gTQf6SroEH6+swuVfWKVoPxRGodczw48LdrrUBu64/wVClI QiVtxPaUHxdUVgwxN/RsCCx37lFSGUpNtIi1crvuqEXJjvSq0EgzkD4TFyItzXCY3Xxrx4 +PN/kbgHi+GddksG5MqWPwzmsP/MEg0= X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: C30B0C577C Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b="R/So91Ay"; spf=pass (imf22.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.160.53 as permitted sender) smtp.mailfrom=laoar.shao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Stat-Signature: 4edxuouyirgcio6ojsdc43wubtxi7ipn X-Rspam-User: X-HE-Tag: 1660840020-121301 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: Replace the open-coded mem_cgroup_put() with a new helper bpf_map_put_memcg(). That could make it more clear. Signed-off-by: Yafang Shao --- kernel/bpf/syscall.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 83c7136..2f18ae2 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -441,6 +441,11 @@ static struct mem_cgroup *bpf_map_get_memcg(const struct bpf_map *map) 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) { @@ -451,7 +456,7 @@ void *bpf_map_kmalloc_node(const struct bpf_map *map, size_t size, gfp_t flags, old_memcg = set_active_memcg(memcg); ptr = kmalloc_node(size, flags | __GFP_ACCOUNT, node); set_active_memcg(old_memcg); - mem_cgroup_put(memcg); + bpf_map_put_memcg(memcg); return ptr; } @@ -465,7 +470,7 @@ void *bpf_map_kzalloc(const struct bpf_map *map, size_t size, gfp_t flags) old_memcg = set_active_memcg(memcg); ptr = kzalloc(size, flags | __GFP_ACCOUNT); set_active_memcg(old_memcg); - mem_cgroup_put(memcg); + bpf_map_put_memcg(memcg); return ptr; } @@ -480,7 +485,7 @@ void __percpu *bpf_map_alloc_percpu(const struct bpf_map *map, size_t size, old_memcg = set_active_memcg(memcg); ptr = __alloc_percpu_gfp(size, align, flags | __GFP_ACCOUNT); set_active_memcg(old_memcg); - mem_cgroup_put(memcg); + bpf_map_put_memcg(memcg); return ptr; }