From patchwork Wed Aug 10 15:18:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yafang Shao X-Patchwork-Id: 12940675 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 1BEC3C19F2A for ; Wed, 10 Aug 2022 15:19:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 104B26B0082; Wed, 10 Aug 2022 11:19:16 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 090D06B0083; Wed, 10 Aug 2022 11:19:15 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D86406B0085; Wed, 10 Aug 2022 11:19:15 -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 C399B6B0082 for ; Wed, 10 Aug 2022 11:19:15 -0400 (EDT) Received: from smtpin16.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 276B9C146F for ; Wed, 10 Aug 2022 15:19:15 +0000 (UTC) X-FDA: 79784041470.16.0894E14 Received: from mail-pf1-f179.google.com (mail-pf1-f179.google.com [209.85.210.179]) by imf27.hostedemail.com (Postfix) with ESMTP id C50EB4018D for ; Wed, 10 Aug 2022 15:19:06 +0000 (UTC) Received: by mail-pf1-f179.google.com with SMTP id u133so13973411pfc.10 for ; Wed, 10 Aug 2022 08:19:06 -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=6MxaJVkVqzqq1Kknlzxc81EzIkRTYeOwRhc2SFg8N/c=; b=UHSEQt3XIXfznt3a+ubZbeDFz66AINIJwJOLhdv8iQaZ/pSRMV7wThITwBmxC05Fi0 KKI8ViRUZnWN2KuTrILsThD1VM2522RlvqfVJELqcRjRUicVfOQfC1eBlnF0HgmxorHD vl95KCLj2Ar0+XkoQAI+ZGTub8AgH9LzsfIrnQXZnnNWR03KVxsc6Hv+RdwxpxYSByBy +dY3DLa7rRuktr93pPg1qRZKRoti9NSbEe6MJ1ahuzweyNR1JyoBmJ2qb3GgDosw2Rui mYhGhRIMsnPH3pvNlWCsv3Ohr+xNk7HyIOInDG8mzySuN1pRyzsK15T19wUk14N/rvsi Y4NA== 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=6MxaJVkVqzqq1Kknlzxc81EzIkRTYeOwRhc2SFg8N/c=; b=lmcrhU5Pmil916Z60JAPHgNA9H02kOl9a+oaEkAXKeIDTTn3Yk/DYFZXAotzrpW+nu zptTd6nbsvpmDPyUI38uyQF/qGIaB/nOMPkolnjyDfoBs/uKq6G8JBx7+Oi+G8IKZ8rp Sfxh4fbdt7ZYPro4Wo4LW6XL5oBnx6jR7ubnlbxrSvFKRF+kCtSiCEUc3+Fz57jc0VdY jtbaBe9QKP1NxMMk5/T/8099SK1oYoaRUYDcqDdVyAPyWO9rBJOQiAe6YJr6NE/XFDue 6BUh74rIRhglVkJ1A4XyHu2Wn9JJZt7FEf1XY+FCDI8fBZodGeVOvhnp2VrYNZxD9FjP teEA== X-Gm-Message-State: ACgBeo290pQ426rXDxVJmaP4El7HDXKpoeAqTKsZqhSuQCZLXvBXB8Rb K1JH+0++xPbZnlZ3NkkT7c8= X-Google-Smtp-Source: AA6agR5ytZN6hdOuMqFW2+9K97jQ/CcpaM1qMww3s46sJZmj8BHJWlMkVC0swgs0Kd2CpWegMFqhmA== X-Received: by 2002:aa7:88d1:0:b0:52f:8fb8:5ec6 with SMTP id k17-20020aa788d1000000b0052f8fb85ec6mr10316333pff.34.1660144745882; Wed, 10 Aug 2022 08:19:05 -0700 (PDT) Received: from vultr.guest ([2001:19f0:6001:5c3e:5400:4ff:fe19:c3bc]) by smtp.gmail.com with ESMTPSA id 85-20020a621558000000b0052b6ed5ca40sm2071935pfv.192.2022.08.10.08.19.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 10 Aug 2022 08:19:05 -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: [PATCH bpf-next 11/15] bpf: Use bpf_map_kzalloc in arraymap Date: Wed, 10 Aug 2022 15:18:36 +0000 Message-Id: <20220810151840.16394-12-laoar.shao@gmail.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20220810151840.16394-1-laoar.shao@gmail.com> References: <20220810151840.16394-1-laoar.shao@gmail.com> MIME-Version: 1.0 ARC-Authentication-Results: i=1; imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=UHSEQt3X; spf=pass (imf27.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.210.179 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=1660144753; a=rsa-sha256; cv=none; b=nncT+EsZQB5waLrG3U6BAHExAYj0fmj+AQd3qPqOUwjyTQZN8qvaRNrc6n+PJ1Y/8UYb3v CUohUGNCFmJ3QL2ykV1E0FL/EpIi7oCCxlQQmjBU/1qvAkcqpP5fwNH7/fTlETN1g+n1JE 5AwIoRQVGUszkvYtayQfZg0LEx8fwj0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1660144753; 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=6MxaJVkVqzqq1Kknlzxc81EzIkRTYeOwRhc2SFg8N/c=; b=NC/Cmh+N7dGZ0GFzYfSvTY/DvJhs87Fv7z95E7aUJjJBSwWIUa9NqwmtGEAmMFW2drb62a t291dyVlzX/o+2N9/yjlNB1s2scKkDfD3vOQhMM9W7ftqkdS9b95CIWg7VUN5TU0JRlfcc PWOHp6Q3f+ZB7aPET/khyiTUco5KCDw= Authentication-Results: imf27.hostedemail.com; dkim=pass header.d=gmail.com header.s=20210112 header.b=UHSEQt3X; spf=pass (imf27.hostedemail.com: domain of laoar.shao@gmail.com designates 209.85.210.179 as permitted sender) smtp.mailfrom=laoar.shao@gmail.com; dmarc=pass (policy=none) header.from=gmail.com X-Stat-Signature: fwgjradr5bpb4r1ojup3cjwah4gr3bgi X-Rspamd-Server: rspam11 X-Rspamd-Queue-Id: C50EB4018D X-Rspam-User: X-HE-Tag: 1660144746-169001 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 80974c5..3039832 100644 --- a/kernel/bpf/arraymap.c +++ b/kernel/bpf/arraymap.c @@ -1090,20 +1090,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;