eth: bnxt: use context priv for struct bnxt_rss_ctx

Core can allocate space for per-context driver-private data,
use it for struct bnxt_rss_ctx. Inline bnxt_alloc_rss_ctx()
at this point, most of the init (as in the actions bnxt_del_one_rss_ctx()
will undo) is open coded in bnxt_create_rxfh_context(), anyway.

Reviewed-by: Pavan Chebbi <pavan.chebbi@broadcom.com>
Link: https://patch.msgid.link/20240711220713.283778-8-kuba@kernel.org
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.c b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
index d6a4ce5066c65e66581bfd24dfc3f280d1233aef..e3cc34712f3344bd02989de77e350ec9680feba0 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.c
@@ -10239,7 +10239,6 @@ void bnxt_del_one_rss_ctx(struct bnxt *bp, struct bnxt_rss_ctx *rss_ctx,
        kfree(rss_ctx->rss_indir_tbl);
        list_del(&rss_ctx->list);
        bp->num_rss_ctx--;
-       kfree(rss_ctx);
 }
 
 static void bnxt_hwrm_realloc_rss_ctx_vnic(struct bnxt *bp)
@@ -10261,19 +10260,6 @@ static void bnxt_hwrm_realloc_rss_ctx_vnic(struct bnxt *bp)
        }
 }
 
-struct bnxt_rss_ctx *bnxt_alloc_rss_ctx(struct bnxt *bp)
-{
-       struct bnxt_rss_ctx *rss_ctx = NULL;
-
-       rss_ctx = kzalloc(sizeof(*rss_ctx), GFP_KERNEL);
-       if (rss_ctx) {
-               rss_ctx->vnic.rss_ctx = rss_ctx;
-               list_add_tail(&rss_ctx->list, &bp->rss_ctx_list);
-               bp->num_rss_ctx++;
-       }
-       return rss_ctx;
-}
-
 void bnxt_clear_rss_ctxs(struct bnxt *bp)
 {
        struct bnxt_rss_ctx *rss_ctx, *tmp;

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt.h b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
index df96524a8b8b11fa73d13220639320722fc3b052..c5fd7a4e6681e930184783636de989b5139bc73a 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt.h
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt.h
@@ -2846,7 +2846,6 @@ int bnxt_hwrm_vnic_rss_cfg_p5(struct bnxt *bp, struct bnxt_vnic_info *vnic);
 int __bnxt_setup_vnic_p5(struct bnxt *bp, struct bnxt_vnic_info *vnic);
 void bnxt_del_one_rss_ctx(struct bnxt *bp, struct bnxt_rss_ctx *rss_ctx,
                          bool all);
-struct bnxt_rss_ctx *bnxt_alloc_rss_ctx(struct bnxt *bp);
 void bnxt_clear_rss_ctxs(struct bnxt *bp);
 int bnxt_open_nic(struct bnxt *, bool, bool);
 int bnxt_half_open_nic(struct bnxt *bp);

diff --git a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
index 5a64c0ea56c0b9cd18409c708ad4b10dd0283f9f..de8e13412151e7dbaa47ed902dbda30dd5f73d4c 100644 (file)
--- a/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
+++ b/drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
@@ -1907,11 +1907,13 @@ static int bnxt_create_rxfh_context(struct net_device *dev,
                return -ENOMEM;
        }
 
-       rss_ctx = bnxt_alloc_rss_ctx(bp);
-       if (!rss_ctx)
-               return -ENOMEM;
+       rss_ctx = ethtool_rxfh_context_priv(ctx);
+
+       list_add_tail(&rss_ctx->list, &bp->rss_ctx_list);
+       bp->num_rss_ctx++;
 
        vnic = &rss_ctx->vnic;
+       vnic->rss_ctx = rss_ctx;
        vnic->flags |= BNXT_VNIC_RSSCTX_FLAG;
        vnic->vnic_id = BNXT_VNIC_ID_INVALID;
        rc = bnxt_alloc_rss_ctx_rss_table(bp, rss_ctx);
@@ -1964,12 +1966,7 @@ static int bnxt_modify_rxfh_context(struct net_device *dev,
        if (rc)
                return rc;
 
-       rss_ctx = bnxt_get_rss_ctx_from_index(bp, rxfh->rss_context);
-       if (!rss_ctx) {
-               NL_SET_ERR_MSG_FMT_MOD(extack, "RSS context %u not found",
-                                      rxfh->rss_context);
-               return -EINVAL;
-       }
+       rss_ctx = ethtool_rxfh_context_priv(ctx);
 
        bnxt_modify_rss(bp, rss_ctx, rxfh);
 
@@ -1984,12 +1981,7 @@ static int bnxt_remove_rxfh_context(struct net_device *dev,
        struct bnxt *bp = netdev_priv(dev);
        struct bnxt_rss_ctx *rss_ctx;
 
-       rss_ctx = bnxt_get_rss_ctx_from_index(bp, rss_context);
-       if (!rss_ctx) {
-               NL_SET_ERR_MSG_FMT_MOD(extack, "RSS context %u not found",
-                                      rss_context);
-               return -EINVAL;
-       }
+       rss_ctx = ethtool_rxfh_context_priv(ctx);
 
        bnxt_del_one_rss_ctx(bp, rss_ctx, true);
        return 0;
@@ -5298,6 +5290,8 @@ const struct ethtool_ops bnxt_ethtool_ops = {
        .cap_link_lanes_supported       = 1,
        .cap_rss_ctx_supported          = 1,
        .rxfh_max_context_id            = BNXT_MAX_ETH_RSS_CTX,
+       .rxfh_indir_space               = BNXT_MAX_RSS_TABLE_ENTRIES_P5,
+       .rxfh_priv_size                 = sizeof(struct bnxt_rss_ctx),
        .supported_coalesce_params = ETHTOOL_COALESCE_USECS |
                                     ETHTOOL_COALESCE_MAX_FRAMES |
                                     ETHTOOL_COALESCE_USECS_IRQ |