From patchwork Fri Jul 29 15:23:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 12932539 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 2DB36C19F2A for ; Fri, 29 Jul 2022 15:23:42 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C30036B0080; Fri, 29 Jul 2022 11:23:41 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BE0D46B0081; Fri, 29 Jul 2022 11:23:41 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id A0B616B0082; Fri, 29 Jul 2022 11:23:41 -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 90D586B0080 for ; Fri, 29 Jul 2022 11:23:41 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 7147A1C696F for ; Fri, 29 Jul 2022 15:23:41 +0000 (UTC) X-FDA: 79740507042.16.7B3D32F Received: from mail-pj1-f53.google.com (mail-pj1-f53.google.com [209.85.216.53]) by imf21.hostedemail.com (Postfix) with ESMTP id 1F4A31C00D5 for ; Fri, 29 Jul 2022 15:23:40 +0000 (UTC) Received: by mail-pj1-f53.google.com with SMTP id w17-20020a17090a8a1100b001f326c73df6so3942907pjn.3 for ; Fri, 29 Jul 2022 08:23:40 -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=/QlHQZkaHYaQUqr8wiHtqQx5hHw1sh9z9adPB7Jsz2k=; b=lvJP+1FG/ePBYe0WKUD8cI1RjJ3OLvTLP05nfMyRIXF9Cn5hW4SsClBM2ZTxhdhyfB VS+tbTDnauOxdE9A1b+U/wKrsxMm0JUSfjMQ4OA7ReBBgDPNlXNXM/4Exj46MrO6U2Qq eY+YxM/Dme8BG0xRfuw5ibtuq5M3bLSS6EQpip4wui5yyZk7p9sdOIa1gMhLu3jthyIV EE4K9ni/8hThPsbrOO+blVLo2ShKZpLSqE2i7c0Irm39kaiXJudhoRJRkOEQUBD8FCsU qKmoWH6ZmEaZWXbCwGh/RmnkYwg38/zFJ9PX38EE1F0XpJrJc9vnUIPcHcCtJZoBWkos VIIA== 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=/QlHQZkaHYaQUqr8wiHtqQx5hHw1sh9z9adPB7Jsz2k=; b=YHqYFh8DyAakab3UBF1x61wjnqLXD6WkQDz93sONKJMTxa546gOY0unaErRFV72nwm BYYiwBZZoXmXrY/KfJsor8lxJ0NLfb7YTvLD2KPJc63rOguA2a9Rb9+88CQg4MlJ64wu D1tL+WeHR4MKBSeAPJhHglL8KEfUluwmG611cTVGiL2bM/LAV5NtL+fq9fVzX88ncaXy lIFyyUzAo5E7trr5K9jUt062pe7J7sFq7vsRkuUgP5Vxl86YTaPTxcdw5UoAc0wiqZNf 7OVmRkllYBte1spjC05uEhogVQnS4TUDAP9vVZDgTEuvnjcceFdSJMNG+1AuyZgH56Zl G52A== X-Gm-Message-State: ACgBeo3xl8YAuSfmO7SHKauf2N0XG5ZpQw1HMacZZ2Eqlx83NE+Bl1g4 HJk+NtaQ+fPJo64LC2hx0BWYzEb4ja7+P797 X-Google-Smtp-Source: AA6agR5CclJJZ7kgrC33kQLUVREUZ4UgNBzC2JWzJideJc20Jf2HFETAMi58PCicfJv3XCN7cAM58g== X-Received: by 2002:a17:903:2343:b0:16c:1efe:1fe0 with SMTP id c3-20020a170903234300b0016c1efe1fe0mr4542669plh.106.1659108220144; Fri, 29 Jul 2022 08:23:40 -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.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 29 Jul 2022 08:23:39 -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 09/15] bpf: Use bpf_map_kzalloc in arraymap Date: Fri, 29 Jul 2022 15:23:10 +0000 Message-Id: <20220729152316.58205-10-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; imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=lvJP+1FG; spf=pass (imf21.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.216.53 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=1659108221; a=rsa-sha256; cv=none; b=mDltUAlrfIDGjuHE/dLspiz8TSABeJPzJiZKD7F6c8PXLypqoOCOg1C0wtEtZIjfU1sm5M eDGOnwy1UhRT/o9x2CCURUAmfamyG2PzK3OVvwZmg9/AcbqIbAnBtNEiqjoKnVR6WJjBMH msB4tyDnxDhuwJOYNGc7Sra57MpsouA= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1659108221; 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=/QlHQZkaHYaQUqr8wiHtqQx5hHw1sh9z9adPB7Jsz2k=; b=2ve/E1htnmQlomznOZTngi/YWkWw7oMsE73FTTXbeSiSBVIgduzAB80o2xgsLnJfKlXCUS sMkUJIFvY2SI2Mgu/xWj+aA7W5MGRE+ROAPTCtyGjZ+Z84vzo5UIkyxMMpkiWBigORrDaM 9R8YEAEEtscsCAz6P8bAa5+bV9cA8ys= Authentication-Results: imf21.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=lvJP+1FG; spf=pass (imf21.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.216.53 as permitted sender) smtp.mailfrom=laoar.shao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Rspamd-Server: rspam04 X-Rspam-User: X-Stat-Signature: kjns6xk59k61d4nbafsph9tmdtdagxrw X-Rspamd-Queue-Id: 1F4A31C00D5 X-HE-Tag: 1659108220-596897 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: Allocates memory after map creation, then we can use the generic helper bpf_map_kzalloc() instead of the open-coded kzalloc(). Signed-off-by: Yafang Shao --- kernel/bpf/arraymap.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/kernel/bpf/arraymap.c b/kernel/bpf/arraymap.c index 9517619dbe8d..bfcfc5df9983 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c @@ -1093,20 +1093,20 @@ static struct bpf_map *prog_array_map_alloc(union bpf_attr *attr) struct bpf_array_aux *aux; struct bpf_map *map; - aux = kzalloc(sizeof(*aux), GFP_KERNEL_ACCOUNT); - if (!aux) + map = array_map_alloc(attr); + if (IS_ERR(map)) return ERR_PTR(-ENOMEM); + aux = bpf_map_kzalloc(map, sizeof(*aux), GFP_KERNEL); + if (!aux) { + array_map_free(map); + return ERR_PTR(-ENOMEM); + } + INIT_WORK(&aux->work, prog_array_map_clear_deferred); INIT_LIST_HEAD(&aux->poke_progs); mutex_init(&aux->poke_mutex); - map = array_map_alloc(attr); - if (IS_ERR(map)) { - kfree(aux); - return map; - } - container_of(map, struct bpf_array, map)->aux = aux; aux->map = map;