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 X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5A12EC433E0 for ; Tue, 19 May 2020 08:54:14 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3583B20756 for ; Tue, 19 May 2020 08:54:14 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="WTiX5baH" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728616AbgESIyI (ORCPT ); Tue, 19 May 2020 04:54:08 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60806 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728594AbgESIyI (ORCPT ); Tue, 19 May 2020 04:54:08 -0400 Received: from mail-lj1-x243.google.com (mail-lj1-x243.google.com [IPv6:2a00:1450:4864:20::243]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A940CC061A0C for ; Tue, 19 May 2020 01:54:07 -0700 (PDT) Received: by mail-lj1-x243.google.com with SMTP id z18so4636065lji.12 for ; Tue, 19 May 2020 01:54:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=1LtAw1HpkgoStGUiv5KqkpAKTjRo/vHAX75wJ6jW+ro=; b=WTiX5baHiDtDmo1do3xDhi6Pls2uH5z/qAtdLfDWoKk5dMpUzjkSnWDCgJSvwc3qrs eCTb1/m69dQtLdvUQYunob4H4tLW2JuQwJFlsuwMRS0QTY4O1MOU8fyz8X//4Kt8QuDn VAKnExp5lLChSmeqgMGgLeIiH05AyfMjQoJIk= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=1LtAw1HpkgoStGUiv5KqkpAKTjRo/vHAX75wJ6jW+ro=; b=E58eyDN/BflP2NLKE1GTGoaCP7f7zw13xx/obyWvapB0Mw8+L1M6fj07H5O9zW8TnL TrWivuPPXglkyFrB7tpUxIkYSWHvH8Fm15/N9N4bgg4HKz+Ug2mIZPA6lboagANOj8u9 v+aiv5b9bU6qfq/0Ii1SdAfXMkNYQb2V7KmK0J9dnS/nw9sgp079L11D8ZP6T5j7NZfW XBJjvD2EU/uFYRNVenWa2YWcX5X7Hr0fhotIkJi6SIgdPvZX8SbIH7COlKwilODR7GF2 36Yxyokt71HNALwRgE0gmt76J1rgVijQxRaVFCz50BxNp1U1CMNCNKNZYnmaUYZXHZSK jh1w== X-Gm-Message-State: AOAM531I9g784XTIKb5Lcsoqr6gAsiV6DK9lvx+fMkpinKEh8i1Vdzbg xVnmiqXQu0F7ZU772XHZPwyLo7dtwC52rodf3F/TyJ3zGy8= X-Google-Smtp-Source: ABdhPJwZ8zGQj0WBswOa0UCzyx8W2h8yp/DSuPewhQBihLT4Go4pnhmmGuXkiHtPrXW1PW3n9dVVQmcbr94vXZ/rcIA= X-Received: by 2002:a2e:8ed7:: with SMTP id e23mr3779224ljl.32.1589878446014; Tue, 19 May 2020 01:54:06 -0700 (PDT) MIME-Version: 1.0 References: <20200513164140.7956-1-pablo@netfilter.org> <20200513164140.7956-8-pablo@netfilter.org> In-Reply-To: <20200513164140.7956-8-pablo@netfilter.org> From: Sriharsha Basavapatna Date: Tue, 19 May 2020 14:23:54 +0530 Message-ID: Subject: Re: [PATCH 7/8 net] bnxt_tc: update indirect block support To: Pablo Neira Ayuso Cc: netfilter-devel@vger.kernel.org, David Miller , netdev@vger.kernel.org, paulb@mellanox.com, Oz Shlomo , vladbu@mellanox.com, jiri@resnulli.us, kuba@kernel.org, saeedm@mellanox.com, Michael Chan , Sriharsha Basavapatna Content-Type: text/plain; charset="UTF-8" Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org On Wed, May 13, 2020 at 10:12 PM Pablo Neira Ayuso wrote: > > Register ndo callback via flow_indr_dev_register() and > flow_indr_dev_unregister(). > > Signed-off-by: Pablo Neira Ayuso > --- > drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 - > drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 51 +++++--------------- > 2 files changed, 12 insertions(+), 40 deletions(-) > > diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h > index f6a3250ef1c5..e7d1c12673bd 100644 > --- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h > +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h > @@ -1857,7 +1857,6 @@ struct bnxt { > u8 dsn[8]; > struct bnxt_tc_info *tc_info; > struct list_head tc_indr_block_list; > - struct notifier_block tc_netdev_nb; > struct dentry *debugfs_pdev; > struct device *hwmon_dev; > }; > diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c > index 782ea0771221..0eef4f5e4a46 100644 > --- a/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c > +++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c > @@ -1939,53 +1939,25 @@ static int bnxt_tc_setup_indr_block(struct net_device *netdev, struct bnxt *bp, > return 0; > } > > -static int bnxt_tc_setup_indr_cb(struct net_device *netdev, void *cb_priv, > - enum tc_setup_type type, void *type_data) > -{ > - switch (type) { > - case TC_SETUP_BLOCK: > - return bnxt_tc_setup_indr_block(netdev, cb_priv, type_data); > - default: > - return -EOPNOTSUPP; > - } > -} > - > static bool bnxt_is_netdev_indr_offload(struct net_device *netdev) > { > return netif_is_vxlan(netdev); > } > > -static int bnxt_tc_indr_block_event(struct notifier_block *nb, > - unsigned long event, void *ptr) > +static int bnxt_tc_setup_indr_cb(struct net_device *netdev, void *cb_priv, > + enum tc_setup_type type, void *type_data) > { > - struct net_device *netdev; > - struct bnxt *bp; > - int rc; > - > - netdev = netdev_notifier_info_to_dev(ptr); > if (!bnxt_is_netdev_indr_offload(netdev)) > - return NOTIFY_OK; > - > - bp = container_of(nb, struct bnxt, tc_netdev_nb); > + return -EOPNOTSUPP; > > - switch (event) { > - case NETDEV_REGISTER: > - rc = __flow_indr_block_cb_register(netdev, bp, > - bnxt_tc_setup_indr_cb, > - bp); > - if (rc) > - netdev_info(bp->dev, > - "Failed to register indirect blk: dev: %s\n", > - netdev->name); > - break; > - case NETDEV_UNREGISTER: > - __flow_indr_block_cb_unregister(netdev, > - bnxt_tc_setup_indr_cb, > - bp); > + switch (type) { > + case TC_SETUP_BLOCK: > + return bnxt_tc_setup_indr_block(netdev, cb_priv, type_data); > + default: > break; > } > > - return NOTIFY_DONE; > + return -EOPNOTSUPP; > } > > static const struct rhashtable_params bnxt_tc_flow_ht_params = { > @@ -2074,8 +2046,8 @@ int bnxt_init_tc(struct bnxt *bp) > > /* init indirect block notifications */ > INIT_LIST_HEAD(&bp->tc_indr_block_list); > - bp->tc_netdev_nb.notifier_call = bnxt_tc_indr_block_event; > - rc = register_netdevice_notifier(&bp->tc_netdev_nb); > + > + rc = flow_indr_dev_register(bnxt_tc_setup_indr_cb, bp); > if (!rc) > return 0; > > @@ -2101,7 +2073,8 @@ void bnxt_shutdown_tc(struct bnxt *bp) > if (!bnxt_tc_flower_enabled(bp)) > return; > > - unregister_netdevice_notifier(&bp->tc_netdev_nb); > + flow_indr_dev_unregister(bnxt_tc_setup_indr_cb, bp, > + bnxt_tc_setup_indr_block_cb); Why does the driver need to provide the "cb" again during unregister, since both "cb" and "cb_priv" are already provided during register() ? This interface could be simplified/improved if flow_indr_dev_register() returns an opaque handle to the object it creates (struct flow_indr_dev *) ? The driver should just pass this handle during unregistration. Also, why do we need the extra (3rd) argument (flow_setup_cb_t / bnxt_tc_setup_indr_block_cb) during unreg ? It is handled internally by the driver as a part of FLOW_BLOCK_BIND / UNBIND ? Thanks, -Harsha > rhashtable_destroy(&tc_info->flow_table); > rhashtable_destroy(&tc_info->l2_table); > rhashtable_destroy(&tc_info->decap_l2_table); > -- > 2.20.1 >