From mboxrd@z Thu Jan 1 00:00:00 1970 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AC5BDC4167B for ; Tue, 20 Dec 2022 22:21:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234257AbiLTWVG (ORCPT ); Tue, 20 Dec 2022 17:21:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37906 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234144AbiLTWU4 (ORCPT ); Tue, 20 Dec 2022 17:20:56 -0500 Received: from mail-pg1-x54a.google.com (mail-pg1-x54a.google.com [IPv6:2607:f8b0:4864:20::54a]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 78048DF7 for ; Tue, 20 Dec 2022 14:20:51 -0800 (PST) Received: by mail-pg1-x54a.google.com with SMTP id k16-20020a635a50000000b0042986056df6so7799282pgm.2 for ; Tue, 20 Dec 2022 14:20:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=1ansIL1FRceEaunvjXWkRml8VwJxoztX53tFJV02UIM=; b=nZPyP6eghnLsL3cHnT5phCwQAWoEeXv50rN1953ECPYOLu62c9Es/WNqaliQRtOq6W U4IDLaWkwt+Eo2JlbBsBoZU9LhMUJQMIns5LQKsa0qJUoYceD0eVFh2g24b9234ArQ5E V5MJPDtRENWt6xMFfeX69PggqXOtzgyMoHWXMAQHfUZs/PQqTyOkmQ7/siKKmVcbxCFg MJwSkLnkaAVeS40fxDG7LfDxK+0hv6vYZ6kXvT1LLtfOuH0D8trT4Zcm62S/xfpYF0sa pXR2EZJcQlPnrN2ABiFBNo+F2whxen4W0G74FK3LNLxP+/RNKvP1foBCd1H48GwpiuEb JORA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=1ansIL1FRceEaunvjXWkRml8VwJxoztX53tFJV02UIM=; b=FW3r4QS1gZROVn3i9C8KCifiy9lrOXfVURL9Qj0VYOSNbr9LFeUGa+tEb4VM/97LwB zPXT76to2yPOgiJ+oSe9/9A99sP050UaUjG3Ic/i9b/+p8RcEkokDe8ZUiMDvbqnkCzF ngDVCeFELncJJBURH9s3q2hJAHwuH7zAgXoqXm+U7CgEEC4NKLCzP6dvtpUJr7EMFvK6 4zqmFx+vkLxQO4yvktZ+aB3foQLBfFX3s2PoqpKVrlQNietn62TV7dSUPQg1MS7Dw+B6 OWilc2qNTwHWTP0+188pMFWjEZDb2QYMIPy9n/wztP1D82NMfyv0mE+nSLQQL8H/m7rr vSCQ== X-Gm-Message-State: ANoB5pkaW+18NkwuuIzX5cBriQePT70zWC16+6TzRnprxDP3Dsb6I+a3 0bfekLOduewrX2E8bpn9773YpHp6+A61BoKPy8rjWRpm4ZG2c5yBJnR6j2fB78quMiPRJBPIg9A rZtebW+vV9miogZURH114qpuc9OZAmyQrZTZNDoMPqmcuOhcdZw== X-Google-Smtp-Source: AA0mqf7DpHAbO99wZ4lDlUEBNVYC9QB4S33u2/k25knHa2xibKe+tWCLGxQNIck6RlK6ZMWrbgath6g= X-Received: from sdf.c.googlers.com ([fda3:e722:ac3:cc00:7f:e700:c0a8:5935]) (user=sdf job=sendgmr) by 2002:a63:481e:0:b0:46b:27b0:c245 with SMTP id v30-20020a63481e000000b0046b27b0c245mr70566944pga.611.1671574850829; Tue, 20 Dec 2022 14:20:50 -0800 (PST) Date: Tue, 20 Dec 2022 14:20:29 -0800 In-Reply-To: <20221220222043.3348718-1-sdf@google.com> Mime-Version: 1.0 References: <20221220222043.3348718-1-sdf@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Message-ID: <20221220222043.3348718-4-sdf@google.com> Subject: [PATCH bpf-next v5 03/17] bpf: Move offload initialization into late_initcall From: Stanislav Fomichev To: bpf@vger.kernel.org Cc: ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev, song@kernel.org, yhs@fb.com, john.fastabend@gmail.com, kpsingh@kernel.org, sdf@google.com, haoluo@google.com, jolsa@kernel.org, David Ahern , Jakub Kicinski , Willem de Bruijn , Jesper Dangaard Brouer , Anatoly Burakov , Alexander Lobakin , Magnus Karlsson , Maryam Tahhan , xdp-hints@xdp-project.net, netdev@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org So we don't have to initialize it manually from several paths. Cc: John Fastabend Cc: David Ahern Cc: Martin KaFai Lau Cc: Jakub Kicinski Cc: Willem de Bruijn Cc: Jesper Dangaard Brouer Cc: Anatoly Burakov Cc: Alexander Lobakin Cc: Magnus Karlsson Cc: Maryam Tahhan Cc: xdp-hints@xdp-project.net Cc: netdev@vger.kernel.org Signed-off-by: Stanislav Fomichev --- kernel/bpf/offload.c | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/kernel/bpf/offload.c b/kernel/bpf/offload.c index f5769a8ecbee..621e8738f304 100644 --- a/kernel/bpf/offload.c +++ b/kernel/bpf/offload.c @@ -56,7 +56,6 @@ static const struct rhashtable_params offdevs_params = { }; static struct rhashtable offdevs; -static bool offdevs_inited; static int bpf_dev_offload_check(struct net_device *netdev) { @@ -72,8 +71,6 @@ bpf_offload_find_netdev(struct net_device *netdev) { lockdep_assert_held(&bpf_devs_lock); - if (!offdevs_inited) - return NULL; return rhashtable_lookup_fast(&offdevs, &netdev, offdevs_params); } @@ -673,18 +670,6 @@ struct bpf_offload_dev * bpf_offload_dev_create(const struct bpf_prog_offload_ops *ops, void *priv) { struct bpf_offload_dev *offdev; - int err; - - down_write(&bpf_devs_lock); - if (!offdevs_inited) { - err = rhashtable_init(&offdevs, &offdevs_params); - if (err) { - up_write(&bpf_devs_lock); - return ERR_PTR(err); - } - offdevs_inited = true; - } - up_write(&bpf_devs_lock); offdev = kzalloc(sizeof(*offdev), GFP_KERNEL); if (!offdev) @@ -710,3 +695,10 @@ void *bpf_offload_dev_priv(struct bpf_offload_dev *offdev) return offdev->priv; } EXPORT_SYMBOL_GPL(bpf_offload_dev_priv); + +static int __init bpf_offload_init(void) +{ + return rhashtable_init(&offdevs, &offdevs_params); +} + +late_initcall(bpf_offload_init); -- 2.39.0.314.g84b9a713c41-goog