From patchwork Fri Sep 2 02:29:59 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 12963569 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 195D3ECAAD2 for ; Fri, 2 Sep 2022 02:30:32 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A6BE0800A0; Thu, 1 Sep 2022 22:30:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A1ABF8008D; Thu, 1 Sep 2022 22:30:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 8BC0D800A0; Thu, 1 Sep 2022 22:30:31 -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 7C7DC8008D for ; Thu, 1 Sep 2022 22:30:31 -0400 (EDT) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 4B449C07DA for ; Fri, 2 Sep 2022 02:30:31 +0000 (UTC) X-FDA: 79865566662.04.731C392 Received: from mail-pg1-f182.google.com (mail-pg1-f182.google.com [209.85.215.182]) by imf01.hostedemail.com (Postfix) with ESMTP id D5B134004D for ; Fri, 2 Sep 2022 02:30:30 +0000 (UTC) Received: by mail-pg1-f182.google.com with SMTP id q63so751901pga.9 for ; Thu, 01 Sep 2022 19:30:30 -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:subject:date; bh=Y3yvFjkfqipQf2Go42LgC412HcIZU4AC9eg6yB/qVpc=; b=CypXU69T4bEXY+gyJWc7edwtpEaxlWD1Ugkcbwbvka6ieQ5OsoQOHYfhs+YODiohDf pNAR5QbYm6Zshluujo9IVXCkqVCjbXi44Xe0kptUT2lh7dy4LacuWeHyDLh9IvlhSymK taagPSh3KOQuxrfcWbeZNborlIBHsmdJBlsL2r0gmjjig0PrP0KsOpnrKnG/RcqbgF57 kVlCz2rIVCZ5qsHx5yTbDgRpZa4+y45I6Adih3Pyju1d2Cj+o9e1zA1y324ULU+zZpRt 4LrQju+8fICS/me/SAomVEpSeA7fGxqZ/gSEB+v/Y4U0cWI3zfWxEtAdiLZ5RKbbhEEr 8Jhg== 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; bh=Y3yvFjkfqipQf2Go42LgC412HcIZU4AC9eg6yB/qVpc=; b=KK7FS8LCcasWbFE1r9C6N1v5gnyJwTm0aiPA4p28gL7W7EzDRW1wcQtIeLpY83T4BS Uk+R3vy5OrM44PF9R/V/v5nc1KB8PtlaLIJdTbGZpBXcPbWRBhxN8UKSkto13BnQKoyR 2kW+eVf9ABVGiKiSaYXgkB9RDrXCo2r7YpVMIdVwoncTympm4ito5E56QR1XBtFl7k4B Nuhbq3AQ29trtfJfg9PVafebAEjdVLJ2i5XDuRH5Fdl0+5pIajXclTtkkyxMwPPQpBgb JQYuuzj/HfSl/qlMIAgO1S7HaMi4sfIQXdraNskAz70RoKdC5GXkAF4Tm574sB4Lgi9F 7XBQ== X-Gm-Message-State: ACgBeo0ZbHSl3O4GAsQhGSrykLHqBnAlqgtFImxr/Zpi4y2hca5tlJ7E Iif3KS8YWcxHnYsYcI4iDwQ= X-Google-Smtp-Source: AA6agR4wYf+PukhsNAMGFdVQd31/KYbkBHPDW2ZE/BYHzB0NpNVJUfvxe0otbZctReSshoToCfvzmA== X-Received: by 2002:a63:485a:0:b0:41d:ed37:d937 with SMTP id x26-20020a63485a000000b0041ded37d937mr29497744pgk.336.1662085829772; Thu, 01 Sep 2022 19:30:29 -0700 (PDT) Received: from vultr.guest ([2001:19f0:6001:50ea:5400:4ff:fe1f:fbe2]) by smtp.gmail.com with ESMTPSA id j4-20020a170902da8400b0017297a6b39dsm269719plx.265.2022.09.01.19.30.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Sep 2022 19:30:28 -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 v3 09/13] bpf: Use bpf_map_kvcalloc in bpf_local_storage Date: Fri, 2 Sep 2022 02:29:59 +0000 Message-Id: <20220902023003.47124-10-laoar.shao@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220902023003.47124-1-laoar.shao@gmail.com> References: <20220902023003.47124-1-laoar.shao@gmail.com> MIME-Version: 1.0 ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1662085830; 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=Y3yvFjkfqipQf2Go42LgC412HcIZU4AC9eg6yB/qVpc=; b=O3wtkbN9akKOWXWdSvT8jh9d+xle9chEwEsnVfFNqu5Lpf93fMBIrju8y9E4SHzyP2HCzZ pmjyPdRgyvNCjQ3hWhb2Olb2Au37H5SvQoobqWADYEIz8YLaC4YYL9uzAiLuQj2rFNdyEh t24uaJFlRv6VmogKFadMFn1o4MeDMFE= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=CypXU69T; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf01.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.215.182 as permitted sender) smtp.mailfrom=laoar.shao@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1662085830; a=rsa-sha256; cv=none; b=64OJzbUq9SLMkunPNajs1m4NZl8mXYYZ8DsT4ub/b3H0kz1TzQcpdqcvNDXXr8ff+U3WLL EK0/E5Ptwfch+4AkiZZrfQH5uidVvZICS9WszWPqTFJI4XcSngfxqJekEwev2QArdCYwqy od/FUwpULZUO4oko5LIHD+lCB1JsSw4= Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=CypXU69T; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf01.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.215.182 as permitted sender) smtp.mailfrom=laoar.shao@gmail.com X-Rspamd-Queue-Id: D5B134004D X-Stat-Signature: 3epoq7aqiy9g8mq4mjux4rcq353kiuzu X-Rspam-User: X-Rspamd-Server: rspam02 X-HE-Tag: 1662085830-623484 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: Introduce new helper bpf_map_kvcalloc() for this memory allocation. Signed-off-by: Yafang Shao --- include/linux/bpf.h | 8 ++++++++ kernel/bpf/bpf_local_storage.c | 4 ++-- kernel/bpf/syscall.c | 15 +++++++++++++++ 3 files changed, 25 insertions(+), 2 deletions(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index e8ac29f..52d8df0 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -1657,6 +1657,8 @@ int generic_map_delete_batch(struct bpf_map *map, void *bpf_map_kmalloc_node(const struct bpf_map *map, size_t size, gfp_t flags, int node); void *bpf_map_kzalloc(const struct bpf_map *map, size_t size, gfp_t flags); +void *bpf_map_kvcalloc(struct bpf_map *map, size_t n, size_t size, + gfp_t flags); void __percpu *bpf_map_alloc_percpu(const struct bpf_map *map, size_t size, size_t align, gfp_t flags); #else @@ -1673,6 +1675,12 @@ void __percpu *bpf_map_alloc_percpu(const struct bpf_map *map, size_t size, return kzalloc(size, flags); } +static inline void * +bpf_map_kvcalloc(struct bpf_map *map, size_t n, size_t size, gfp_t flags) +{ + return kvcalloc(n, size, flags); +} + static inline void __percpu * bpf_map_alloc_percpu(const struct bpf_map *map, size_t size, size_t align, gfp_t flags) diff --git a/kernel/bpf/bpf_local_storage.c b/kernel/bpf/bpf_local_storage.c index 44498d7d..8a24828 100644 --- a/kernel/bpf/bpf_local_storage.c +++ b/kernel/bpf/bpf_local_storage.c @@ -620,8 +620,8 @@ struct bpf_local_storage_map *bpf_local_storage_map_alloc(union bpf_attr *attr) nbuckets = max_t(u32, 2, nbuckets); smap->bucket_log = ilog2(nbuckets); - smap->buckets = kvcalloc(sizeof(*smap->buckets), nbuckets, - GFP_USER | __GFP_NOWARN | __GFP_ACCOUNT); + smap->buckets = bpf_map_kvcalloc(&smap->map, sizeof(*smap->buckets), + nbuckets, GFP_USER | __GFP_NOWARN); if (!smap->buckets) { bpf_map_area_free(smap, &smap->map); return ERR_PTR(-ENOMEM); diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index eefe590..034accd 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -489,6 +489,21 @@ void *bpf_map_kzalloc(const struct bpf_map *map, size_t size, gfp_t flags) return ptr; } +void *bpf_map_kvcalloc(struct bpf_map *map, size_t n, size_t size, + gfp_t flags) +{ + struct mem_cgroup *memcg, *old_memcg; + void *ptr; + + memcg = bpf_map_get_memcg(map); + old_memcg = set_active_memcg(memcg); + ptr = kvcalloc(n, size, flags | __GFP_ACCOUNT); + set_active_memcg(old_memcg); + bpf_map_put_memcg(memcg); + + return ptr; +} + void __percpu *bpf_map_alloc_percpu(const struct bpf_map *map, size_t size, size_t align, gfp_t flags) {