system/linux
system/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux synced 2024-09-30 00:10:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

eth: bnxt: use context priv for struct bnxt_rss_ctx

Browse source 
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>
This commit is contained in:
Jakub Kicinski 2024-07-11 15:07:09 -07:00
parent bf30162915
commit 63d4769cf7
3 changed files with 9 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
drivers/net/ethernet/broadcom/bnxt/bnxt.c
View file

@ -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;

1
drivers/net/ethernet/broadcom/bnxt/bnxt.h
View file

@ -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);

24
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c
View file

@ -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 |