eth: bnxt: use the new RSS API
Subsystems (4)
Jakub Kicinski
maintainercover eth: bnxt: use the new RSS API
Convert bnxt from using the set_rxfh API to separate create/modify/remove callbacks.
Two small extensions to the core APIs are necessary:
- the ability to discard contexts if for some catastrophic reasons device can no longer provide them;
- the ability to reserve space in the context for RSS table growth.
The driver is adjusted to store indirection tables on u32 to make it easier to use core structs directly.
With that out of the way the conversion is fairly straightforward.
Since the opposition to discarding contexts was relatively mild and its what bnxt does already, I'm sticking to that. We may very well need to revisit that at a later time.
v2:
- move "lost context" helper to common.c to avoid build problems when ethtool-nl isn't enabled
- add a note about the counter proposal in the commit message
- move key_off to the end, under the private label (hiding from kdoc)
- remove bnxt_get_max_rss_ctx_ring()
- switch from sizeof(u32) to sizeof(*indir_tbl)
- add a sentence to the commit msg
- store a pointer to struct ethtool_rxfh_param instead of adding the ethtool_rxfh_priv_context() helper
v1: https://lore.kernel.org/all/[email protected]/
Jakub Kicinski (11):
net: ethtool: let drivers remove lost RSS contexts
net: ethtool: let drivers declare max size of RSS indir table and key
eth: bnxt: allow deleting RSS contexts when the device is down
eth: bnxt: move from .set_rxfh to .create_rxfh_context and friends
eth: bnxt: remove rss_ctx_bmap
eth: bnxt: depend on core cleaning up RSS contexts
eth: bnxt: use context priv for struct bnxt_rss_ctx
eth: bnxt: use the RSS context XArray instead of the local list
eth: bnxt: pad out the correct indirection table
eth: bnxt: bump the entry size in indir tables to u32
eth: bnxt: use the indir table from ethtool context
drivers/net/ethernet/broadcom/bnxt/bnxt.c | 126 +++++-------- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 17 +- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 165 ++++++++++-------- include/linux/ethtool.h | 20 +-- net/ethtool/common.c | 14 ++ net/ethtool/ioctl.c | 46 +++-- 6 files changed, 194 insertions(+), 194 deletions(-)
Signature · 1 line
2.45.2
Jakub Kicinski
maintainerPATCH 1/11 net: ethtool: let drivers remove lost RSS contexts
RSS contexts may get lost from a device, in various extreme circumstances. Specifically if the firmware leaks resources and resets, or crashes and either recovers in partially working state or the crash causes a different FW version to run - creating the context again may fail.
Drivers should do their absolute best to prevent this from happening. When it does, however, telling user that a context exists, when it can't possibly be used any more is counter productive. Add a helper for drivers to discard contexts. Print an error, in the future netlink notification will also be sent.
More robust approaches were proposed, like keeping the contexts but marking them as "dead" (but possibly resurrected by next reset). That may be better but it's unclear at this stage whether the effort is worth the benefits.
--
I'm keeping this patch as is, since this is the simplest solution, and nobody has strong opinions.
v2:
- move to common.c to avoid build problems when ethtool-nl isn't enabled
- add a note about the counter proposal in the commit message
--- include/linux/ethtool.h | 2 ++ net/ethtool/common.c | 14 ++++++++++++++ 2 files changed, 16 insertions(+)
include/linux/ethtool.h +2 -0
@@ -210,6 +210,8 @@ static inline size_t ethtool_rxfh_context_size(u32 indir_size, u32 key_size, return struct_size_t(struct ethtool_rxfh_context, data, flex_len); } +void ethtool_rxfh_context_lost (struct net_device *dev,u32 context_id); +/* declare a link mode bitmap */ #define __ETHTOOL_DECLARE_LINK_MODE_MASK (name) \ DECLARE_BITMAP(name, __ETHTOOL_LINK_MODE_MASK_NBITS)
net/ethtool/common.c +14 -0
@@ -741,3 +741,17 @@ ethtool_forced_speed_maps_init(struct ethtool_forced_speed_map *maps, u32 size) } }EXPORT_SYMBOL_GPL (ethtool_forced_speed_maps_init); + +void ethtool_rxfh_context_lost (struct net_device *dev,u32 context_id) +{ +struct ethtool_rxfh_context *ctx; + +WARN_ONCE (!rtnl_is_locked () && + !lockdep_is_held_type (&dev->ethtool->rss_lock,-1 ), +"RSS context lock assertion failed\n" ); + +netdev_err (dev,"device error, RSS context %d lost\n" , context_id); + ctx =xa_erase (&dev->ethtool->rss_ctx, context_id); +kfree (ctx); +} +EXPORT_SYMBOL (ethtool_rxfh_context_lost);
Signature · 1 line
2.45.2
Jakub Kicinski
maintainerPATCH 2/11 net: ethtool: let drivers declare max size of RSS indir table and key
In reply to Jakub KicinskiSome drivers (bnxt but I think also mlx5 from ML discussions) change the size of the indirection table depending on the number of Rx rings. Decouple the max table size from the size of the currently used table, so that we can reserve space in the context for table growth.
Static members in ethtool_ops are good enough for now, we can add callbacks to read the max size more dynamically if someone needs that.
--
v2:
- move key_off to the end, under the private label (hiding from kdoc)
--- include/linux/ethtool.h | 20 +++++++----------- net/ethtool/ioctl.c | 46 ++++++++++++++++++++++++++++++++--------- 2 files changed, 44 insertions(+), 22 deletions(-)
include/linux/ethtool.h +8 -12
@@ -181,6 +181,7 @@ struct ethtool_rxfh_context {/* private: driver private data, indirection table, and hash key are * stored sequentially in @data area. Use below helpers to access. */ +u32 key_off;u8 data[]__aligned(sizeof(void *)) ; };
@@ -196,18 +197,7 @@ static inline u32 *ethtool_rxfh_context_indir(struct ethtool_rxfh_context *ctx)static inline u8 *ethtool_rxfh_context_key (struct ethtool_rxfh_context *ctx) { -return (u8 *)(ethtool_rxfh_context_indir (ctx) + ctx->indir_size); -} - -static inline size_t ethtool_rxfh_context_size (u32 indir_size,u32 key_size, -u16 priv_size) -{ -size_t indir_bytes =array_size (indir_size,sizeof (u32)); -size_t flex_len; - - flex_len =size_add (size_add (indir_bytes, key_size), -ALIGN (priv_size,sizeof (u32))); - return struct_size_t(struct ethtool_rxfh_context, data, flex_len); +return &ctx->data[ctx->key_off]; }void ethtool_rxfh_context_lost (struct net_device *dev,u32 context_id);
@@ -723,6 +713,10 @@ struct ethtool_rxfh_param {* contexts. * @cap_rss_sym_xor_supported: indicates if the driver supports symmetric-xor * RSS. +* @rxfh_indir_space: max size of RSS indirection tables, if indirection table +* size as returned by @get_rxfh_indir_size may change during lifetime +* of the device. Leave as 0 if the table size is constant. +* @rxfh_key_space: same as @rxfh_indir_space, but for the key. * @rxfh_priv_size: size of the driver private data area the core should * allocate for an RSS context (in &struct ethtool_rxfh_context). * @rxfh_max_context_id: maximum (exclusive) supported RSS context ID. If this
@@ -940,6 +934,8 @@ struct ethtool_ops { u32 cap_link_lanes_supported:1; u32 cap_rss_ctx_supported:1; u32 cap_rss_sym_xor_supported:1; +u32 rxfh_indir_space; +u16 rxfh_key_space;u16 rxfh_priv_size;u32 rxfh_max_context_id;u32 supported_coalesce_params;
net/ethtool/ioctl.c +36 -10
62 lines not on this page · raw message
Signature · 1 line
2.45.2
Jakub Kicinski
maintainerPATCH 3/11 eth: bnxt: allow deleting RSS contexts when the device is down
In reply to Jakub KicinskiContexts get deleted from FW when the device is down, but they are kept in SW and re-added back on open. bnxt_set_rxfh_context() apparently does not want to deal with complexity of dealing with both the device down and device up cases. This is perhaps acceptable for creating new contexts, but not being able to delete contexts makes core-driven cleanups messy. Specifically with the new RSS API core will try to delete contexts automatically after bringing the device down.
Support the delete-while-down case. Skip the FW logic and delete just the driver state.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 10 ++++++---- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 6 ++++-- 2 files changed, 10 insertions(+), 6 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +6 -4
@@ -10210,10 +10210,12 @@ void bnxt_del_one_rss_ctx(struct bnxt *bp, struct bnxt_rss_ctx *rss_ctx,struct bnxt_ntuple_filter *ntp_fltr;int i; -bnxt_hwrm_vnic_free_one (bp, &rss_ctx->vnic); -for (i =0 ; i <BNXT_MAX_CTX_PER_VNIC ; i++) { -if (vnic->fw_rss_cos_lb_ctx[i] !=INVALID_HW_RING_ID ) -bnxt_hwrm_vnic_ctx_free_one (bp, vnic, i); +if (netif_running (bp->dev)) { +bnxt_hwrm_vnic_free_one (bp, &rss_ctx->vnic); +for (i =0 ; i <BNXT_MAX_CTX_PER_VNIC ; i++) { +if (vnic->fw_rss_cos_lb_ctx[i] !=INVALID_HW_RING_ID ) +bnxt_hwrm_vnic_ctx_free_one (bp, vnic, i); + } }if (!all)return ;
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +4 -2
@@ -1874,6 +1874,7 @@ static int bnxt_set_rxfh_context(struct bnxt *bp,struct bnxt_rss_ctx *rss_ctx;struct bnxt_vnic_info *vnic;bool modify = false; +bool delete;int bit_id;int rc;
@@ -1882,7 +1883,8 @@ static int bnxt_set_rxfh_context(struct bnxt *bp,return -EOPNOTSUPP ; } -if (!netif_running (bp->dev)) { + delete = *rss_context !=ETH_RXFH_CONTEXT_ALLOC && rxfh->rss_delete; +if (!netif_running (bp->dev) && !delete) {NL_SET_ERR_MSG_MOD (extack,"Unable to set RSS contexts when interface is down" );return -EAGAIN ; }
@@ -1894,7 +1896,7 @@ static int bnxt_set_rxfh_context(struct bnxt *bp, *rss_context);return -EINVAL ; } -if (*rss_context && rxfh->rss_delete) { +if (delete) {bnxt_del_one_rss_ctx (bp, rss_ctx, true);return 0 ; }
Signature · 1 line
2.45.2
Jakub Kicinski
maintainerPATCH 4/11 eth: bnxt: move from .set_rxfh to .create_rxfh_context and friends
In reply to Jakub KicinskiUse the new ethtool ops for RSS context management. The conversion is pretty straightforward cut / paste of the right chunks of the combined handler. Main change is that we let the core pick the IDs (bitmap will be removed separately for ease of review), so we need to tell the core when we lose a context.
Since the new API passes rxfh as const, change bnxt_modify_rss() to also take const.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 1 + .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 119 +++++++++++------- 2 files changed, 75 insertions(+), 45 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +1 -0
@@ -10257,6 +10257,7 @@ static void bnxt_hwrm_realloc_rss_ctx_vnic(struct bnxt *bp)netdev_err (bp->dev,"Failed to restore RSS ctx %d\n" , rss_ctx->index);bnxt_del_one_rss_ctx (bp, rss_ctx, true); +ethtool_rxfh_context_lost (bp->dev, rss_ctx->index); } } }
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +74 -45
185 lines not on this page · raw message
Signature · 1 line
2.45.2
Jakub Kicinski
maintainerPATCH 5/11 eth: bnxt: remove rss_ctx_bmap
In reply to Jakub KicinskiCore will allocate IDs for the driver, from the range [1, BNXT_MAX_ETH_RSS_CTX], no need to track the allocations.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 13 ++----------- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 2 -- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 5 ----- 3 files changed, 2 insertions(+), 18 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +2 -11
@@ -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--; -clear_bit (rss_ctx->index, bp->rss_ctx_bmap);kfree (rss_ctx); }
@@ -10281,20 +10280,12 @@ void bnxt_clear_rss_ctxs(struct bnxt *bp, bool all)list_for_each_entry_safe (rss_ctx, tmp, &bp->rss_ctx_list, list)bnxt_del_one_rss_ctx (bp, rss_ctx, all); - -if (all) -bitmap_free (bp->rss_ctx_bmap); }static void bnxt_init_multi_rss_ctx (struct bnxt *bp) { - bp->rss_ctx_bmap =bitmap_zalloc (BNXT_RSS_CTX_BMAP_LEN ,GFP_KERNEL ); -if (bp->rss_ctx_bmap) { -/* burn index 0 since we cannot have context 0 */ -__set_bit (0 , bp->rss_ctx_bmap); -INIT_LIST_HEAD (&bp->rss_ctx_list); - bp->rss_cap |=BNXT_RSS_CAP_MULTI_RSS_CTX ; - } +INIT_LIST_HEAD (&bp->rss_ctx_list); + bp->rss_cap |=BNXT_RSS_CAP_MULTI_RSS_CTX ; }/* Allow PF, trusted VFs and VFs with default VLAN to be in promiscuous mode */
drivers/net/ethernet/broadcom/bnxt/bnxt.h +0 -2
@@ -1298,7 +1298,6 @@ struct bnxt_rss_ctx { };#define BNXT_MAX_ETH_RSS_CTX 32 -#define BNXT_RSS_CTX_BMAP_LEN (BNXT_MAX_ETH_RSS_CTX + 1)#define BNXT_VNIC_ID_INVALID 0xffffffffstruct bnxt_hw_rings {
@@ -2332,7 +2331,6 @@ struct bnxt {struct bnxt_ring_grp_info *grp_info;struct bnxt_vnic_info *vnic_info;struct list_head rss_ctx_list; -unsigned long *rss_ctx_bmap;u32 num_rss_ctx;int nr_vnics;u16 *rss_indir_tbl;
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +0 -5
@@ -1902,11 +1902,6 @@ static int bnxt_create_rxfh_context(struct net_device *dev,return -EINVAL ; } -if (test_and_set_bit (rxfh->rss_context, bp->rss_ctx_bmap)) { -NL_SET_ERR_MSG_MOD (extack,"Context ID conflict" ); -return -EINVAL ; - } -if (!bnxt_rfs_capable (bp, true)) {NL_SET_ERR_MSG_MOD (extack,"Out hardware resources" );return -ENOMEM ;
Signature · 1 line
2.45.2
Jakub Kicinski
maintainerPATCH 6/11 eth: bnxt: depend on core cleaning up RSS contexts
In reply to Jakub KicinskiNew RSS context API removes old contexts on netdev unregister. No need to wipe them manually.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 11 ++++------- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 2 +- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +- 3 files changed, 6 insertions(+), 9 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +4 -7
@@ -10274,12 +10274,12 @@ struct bnxt_rss_ctx *bnxt_alloc_rss_ctx(struct bnxt *bp)return rss_ctx; } -void bnxt_clear_rss_ctxs (struct bnxt *bp,bool all) +void bnxt_clear_rss_ctxs (struct bnxt *bp) {struct bnxt_rss_ctx *rss_ctx, *tmp;list_for_each_entry_safe (rss_ctx, tmp, &bp->rss_ctx_list, list) -bnxt_del_one_rss_ctx (bp, rss_ctx, all); +bnxt_del_one_rss_ctx (bp, rss_ctx, false); }static void bnxt_init_multi_rss_ctx (struct bnxt *bp)
@@ -12331,7 +12331,7 @@ static void __bnxt_close_nic(struct bnxt *bp, bool irq_re_init,msleep (20 );if (BNXT_SUPPORTS_MULTI_RSS_CTX (bp)) -bnxt_clear_rss_ctxs (bp, false); +bnxt_clear_rss_ctxs (bp);/* Flush rings and disable interrupts */ bnxt_shutdown_nic (bp, irq_re_init);
@@ -15246,8 +15246,7 @@ static void bnxt_remove_one(struct pci_dev *pdev)bnxt_free_l2_filters (bp, true);bnxt_free_ntp_fltrs (bp, true); -if (BNXT_SUPPORTS_MULTI_RSS_CTX (bp)) -bnxt_clear_rss_ctxs (bp, true); +WARN_ON (bp->num_rss_ctx);clear_bit (BNXT_STATE_IN_FW_RESET , &bp->state);/* Flush any pending tasks */ cancel_work_sync (&bp->sp_task);
@@ -15898,8 +15897,6 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)bnxt_clear_int_mode (bp); init_err_pci_clean: -if (BNXT_SUPPORTS_MULTI_RSS_CTX (bp)) -bnxt_clear_rss_ctxs (bp, true);bnxt_hwrm_func_drv_unrgtr (bp);bnxt_free_hwrm_resources (bp);bnxt_hwmon_uninit (bp);
drivers/net/ethernet/broadcom/bnxt/bnxt.h +1 -1
@@ -2847,7 +2847,7 @@ 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,bool all); +void bnxt_clear_rss_ctxs (struct bnxt *bp);int bnxt_open_nic (struct bnxt *,bool ,bool );int bnxt_half_open_nic (struct bnxt *bp);void bnxt_half_close_nic (struct bnxt *bp);
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +1 -1
@@ -976,7 +976,7 @@ static int bnxt_set_channels(struct net_device *dev,bnxt_clear_usr_fltrs (bp, true);if (BNXT_SUPPORTS_MULTI_RSS_CTX (bp)) -bnxt_clear_rss_ctxs (bp, false); +bnxt_clear_rss_ctxs (bp);if (netif_running (dev)) {if (BNXT_PF (bp)) {/* TODO CHIMP_FW: Send message to all VF's
Signature · 1 line
2.45.2
Jakub Kicinski
maintainerPATCH 7/11 eth: bnxt: use context priv for struct bnxt_rss_ctx
In reply to Jakub KicinskiCore 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.
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 14 ----------- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 1 - .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 24 +++++++------------ 3 files changed, 9 insertions(+), 30 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +0 -14
@@ -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;
drivers/net/ethernet/broadcom/bnxt/bnxt.h +0 -1
@@ -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);
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +9 -15
@@ -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 |
Signature · 1 line
2.45.2
Jakub Kicinski
maintainerPATCH 8/11 eth: bnxt: use the RSS context XArray instead of the local list
In reply to Jakub KicinskiCore already maintains all RSS contexts in an XArray, no need to keep a second list in the driver.
Remove bnxt_get_max_rss_ctx_ring() completely since core performs the same check already.
---
v2:
- remove bnxt_get_max_rss_ctx_ring()
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 56 +++++++------------ drivers/net/ethernet/broadcom/bnxt/bnxt.h | 3 - .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 17 ++---- 3 files changed, 26 insertions(+), 50 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +21 -35
@@ -5970,17 +5970,20 @@ bnxt_cfg_rfs_ring_tbl_idx(struct bnxt *bp,struct hwrm_cfa_ntuple_filter_alloc_input *req, struct bnxt_ntuple_filter *fltr) { - struct bnxt_rss_ctx *rss_ctx, *tmp; u16 rxq = fltr->base.rxq;if (fltr->base.flags &BNXT_ACT_RSS_CTX ) { -list_for_each_entry_safe (rss_ctx, tmp, &bp->rss_ctx_list, list) { -if (rss_ctx->index == fltr->base.fw_vnic_id) { -struct bnxt_vnic_info *vnic = &rss_ctx->vnic; +struct ethtool_rxfh_context *ctx; +struct bnxt_rss_ctx *rss_ctx; +struct bnxt_vnic_info *vnic; - req->dst_id =cpu_to_le16 (vnic->fw_vnic_id); -break ; - } + ctx =xa_load (&bp->dev->ethtool->rss_ctx, + fltr->base.fw_vnic_id); +if (ctx) { + rss_ctx =ethtool_rxfh_context_priv (ctx); + vnic = &rss_ctx->vnic; + + req->dst_id =cpu_to_le16 (vnic->fw_vnic_id); }return ; }
@@ -6282,21 +6285,6 @@ static u16 bnxt_get_max_rss_ring(struct bnxt *bp)return max_ring; } -u16 bnxt_get_max_rss_ctx_ring (struct bnxt *bp) -{ -u16 i, tbl_size, max_ring =0 ; -struct bnxt_rss_ctx *rss_ctx; - - tbl_size =bnxt_get_rxfh_indir_size (bp->dev); - -list_for_each_entry (rss_ctx, &bp->rss_ctx_list, list) { -for (i =0 ; i < tbl_size; i++) - max_ring =max (max_ring, rss_ctx->rss_indir_tbl[i]); - } - -return max_ring; -} -int bnxt_get_nr_rss_ctxs (struct bnxt *bp,int rx_rings) {if (bp->flags &BNXT_FLAG_CHIP_P5_PLUS ) {
@@ -10237,16 +10225,17 @@ void bnxt_del_one_rss_ctx(struct bnxt *bp, struct bnxt_rss_ctx *rss_ctx, vnic->rss_table, vnic->rss_table_dma_addr);kfree (rss_ctx->rss_indir_tbl); -list_del (&rss_ctx->list); bp->num_rss_ctx--; }static void bnxt_hwrm_realloc_rss_ctx_vnic (struct bnxt *bp) {bool set_tpa = !!(bp->flags &BNXT_FLAG_TPA ); -struct bnxt_rss_ctx *rss_ctx, *tmp; +struct ethtool_rxfh_context *ctx; +unsigned long context; -list_for_each_entry_safe (rss_ctx, tmp, &bp->rss_ctx_list, list) { +xa_for_each (&bp->dev->ethtool->rss_ctx, context, ctx) { +struct bnxt_rss_ctx *rss_ctx =ethtool_rxfh_context_priv (ctx);struct bnxt_vnic_info *vnic = &rss_ctx->vnic; if (bnxt_hwrm_vnic_alloc(bp, vnic, 0, bp->rx_nr_rings) ||
@@ -10262,16 +10251,14 @@ static void bnxt_hwrm_realloc_rss_ctx_vnic(struct bnxt *bp)void bnxt_clear_rss_ctxs (struct bnxt *bp) { -struct bnxt_rss_ctx *rss_ctx, *tmp; +struct ethtool_rxfh_context *ctx; +unsigned long context; + +xa_for_each (&bp->dev->ethtool->rss_ctx, context, ctx) { +struct bnxt_rss_ctx *rss_ctx =ethtool_rxfh_context_priv (ctx); -list_for_each_entry_safe (rss_ctx, tmp, &bp->rss_ctx_list, list)bnxt_del_one_rss_ctx (bp, rss_ctx, false); -} - -static void bnxt_init_multi_rss_ctx (struct bnxt *bp) -{ -INIT_LIST_HEAD (&bp->rss_ctx_list); - bp->rss_cap |=BNXT_RSS_CAP_MULTI_RSS_CTX ; + } }/* Allow PF, trusted VFs and VFs with default VLAN to be in promiscuous mode */
@@ -15859,8 +15846,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent)INIT_LIST_HEAD (&bp->usr_fltr_list);if (BNXT_SUPPORTS_NTUPLE_VNIC (bp)) -bnxt_init_multi_rss_ctx (bp); - + bp->rss_cap |=BNXT_RSS_CAP_MULTI_RSS_CTX ; rc =register_netdev (dev);if (rc)
drivers/net/ethernet/broadcom/bnxt/bnxt.h +0 -3
@@ -1291,7 +1291,6 @@ struct bnxt_vnic_info { };struct bnxt_rss_ctx { -struct list_head list;struct bnxt_vnic_info vnic;u16 *rss_indir_tbl;u8 index;
@@ -2330,7 +2329,6 @@ struct bnxt {/* grp_info indexed by completion ring index */ struct bnxt_ring_grp_info *grp_info;struct bnxt_vnic_info *vnic_info; -struct list_head rss_ctx_list;u32 num_rss_ctx;int nr_vnics;u16 *rss_indir_tbl;
@@ -2812,7 +2810,6 @@ int bnxt_hwrm_vnic_set_tpa(struct bnxt *bp, struct bnxt_vnic_info *vnic,void bnxt_fill_ipv6_mask (__be32 mask[4 ]);int bnxt_alloc_rss_indir_tbl (struct bnxt *bp,struct bnxt_rss_ctx *rss_ctx);void bnxt_set_dflt_rss_indir_tbl (struct bnxt *bp,struct bnxt_rss_ctx *rss_ctx); -u16 bnxt_get_max_rss_ctx_ring (struct bnxt *bp);int bnxt_get_nr_rss_ctxs (struct bnxt *bp,int rx_rings);int bnxt_hwrm_vnic_cfg (struct bnxt *bp,struct bnxt_vnic_info *vnic); int bnxt_hwrm_vnic_alloc(struct bnxt *bp, struct bnxt_vnic_info *vnic,
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +5 -12
@@ -961,12 +961,6 @@ static int bnxt_set_channels(struct net_device *dev,return rc; } -if (req_rx_rings < bp->rx_nr_rings && - req_rx_rings <=bnxt_get_max_rss_ctx_ring (bp)) { -netdev_warn (dev,"Can't deactivate rings used by RSS contexts\n" ); -return -EINVAL ; - } -if (bnxt_get_nr_rss_ctxs (bp, req_rx_rings) !=bnxt_get_nr_rss_ctxs (bp, bp->rx_nr_rings) &&netif_is_rxfh_configured (dev)) {
@@ -1216,12 +1210,12 @@ static int bnxt_grxclsrule(struct bnxt *bp, struct ethtool_rxnfc *cmd)static struct bnxt_rss_ctx *bnxt_get_rss_ctx_from_index (struct bnxt *bp,u32 index) { -struct bnxt_rss_ctx *rss_ctx, *tmp; +struct ethtool_rxfh_context *ctx; -list_for_each_entry_safe (rss_ctx, tmp, &bp->rss_ctx_list, list) -if (rss_ctx->index == index) -return rss_ctx; -return NULL ; + ctx =xa_load (&bp->dev->ethtool->rss_ctx, index); +if (!ctx) +return NULL ; +return ethtool_rxfh_context_priv (ctx); } static int bnxt_alloc_rss_ctx_rss_table(struct bnxt *bp,
@@ -1909,7 +1903,6 @@ static int bnxt_create_rxfh_context(struct net_device *dev, 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;
Signature · 1 line
2.45.2
Jakub Kicinski
maintainerPATCH 9/11 eth: bnxt: pad out the correct indirection table
In reply to Jakub Kicinskibnxt allocates tables of max size, and changes the used size based on number of active rings. The unused entries get padded out with zeros. bnxt_modify_rss() seems to always pad out the table of the main / default RSS context, instead of the table of the modified context.
I haven't observed any behavior change due to this patch, so I don't think it's a fix. Not entirely sure what role the padding plays, 0 is a valid queue ID.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +1 -1
@@ -1856,7 +1856,7 @@ static void bnxt_modify_rss(struct bnxt *bp, struct bnxt_rss_ctx *rss_ctx, indir_tbl[i] = rxfh->indir[i]; pad = bp->rss_indir_tbl_entries - tbl_size;if (pad) -memset (&bp->rss_indir_tbl[i],0 , pad *sizeof (u16)); +memset (&indir_tbl[i],0 , pad *sizeof (u16)); } }
Signature · 1 line
2.45.2
Jakub Kicinski
maintainerPATCH 10/11 eth: bnxt: bump the entry size in indir tables to u32
In reply to Jakub KicinskiEthtool core stores indirection table with u32 entries, "just to be safe". Switch the type in the driver, so that it's easier to swap local tables for the core ones. Memory allocations already use sizeof(*entry), switch the memset()s as well.
--
v2:
- switch from sizeof(u32) to sizeof(*indir_tbl)
- add a sentence to the commit msg
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 8 ++++---- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 4 ++-- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +4 -4
@@ -6225,7 +6225,7 @@ static u16 bnxt_cp_ring_for_tx(struct bnxt *bp, struct bnxt_tx_ring_info *txr)int bnxt_alloc_rss_indir_tbl (struct bnxt *bp,struct bnxt_rss_ctx *rss_ctx) {int entries; -u16 *tbl; +u32 *tbl;if (bp->flags &BNXT_FLAG_CHIP_P5_PLUS ) entries =BNXT_MAX_RSS_TABLE_ENTRIES_P5 ;
@@ -6248,7 +6248,7 @@ int bnxt_alloc_rss_indir_tbl(struct bnxt *bp, struct bnxt_rss_ctx *rss_ctx)void bnxt_set_dflt_rss_indir_tbl (struct bnxt *bp,struct bnxt_rss_ctx *rss_ctx) {u16 max_rings, max_entries, pad, i; -u16 *rss_indir_tbl; +u32 *rss_indir_tbl;if (!bp->rx_nr_rings)return ;
@@ -6269,12 +6269,12 @@ void bnxt_set_dflt_rss_indir_tbl(struct bnxt *bp, struct bnxt_rss_ctx *rss_ctx) pad = bp->rss_indir_tbl_entries - max_entries;if (pad) -memset (&rss_indir_tbl[i],0 , pad *sizeof (u16)); +memset (&rss_indir_tbl[i],0 , pad *sizeof (*rss_indir_tbl)); }static u16 bnxt_get_max_rss_ring (struct bnxt *bp) { -u16 i, tbl_size, max_ring =0 ; +u32 i, tbl_size, max_ring =0 ;if (!bp->rss_indir_tbl)return 0 ;
drivers/net/ethernet/broadcom/bnxt/bnxt.h +2 -2
@@ -1292,7 +1292,7 @@ struct bnxt_vnic_info {struct bnxt_rss_ctx {struct bnxt_vnic_info vnic; -u16 *rss_indir_tbl; +u32 *rss_indir_tbl;u8 index; };
@@ -2331,7 +2331,7 @@ struct bnxt {struct bnxt_vnic_info *vnic_info;u32 num_rss_ctx;int nr_vnics; -u16 *rss_indir_tbl; +u32 *rss_indir_tbl;u16 rss_indir_tbl_entries;u32 rss_hash_cfg;u32 rss_hash_delta;
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +3 -3
@@ -1804,7 +1804,7 @@ static int bnxt_get_rxfh(struct net_device *dev,u32 rss_context = rxfh->rss_context;struct bnxt_rss_ctx *rss_ctx =NULL ;struct bnxt *bp =netdev_priv (dev); -u16 *indir_tbl = bp->rss_indir_tbl; +u32 *indir_tbl = bp->rss_indir_tbl;struct bnxt_vnic_info *vnic;u32 i, tbl_size;
@@ -1848,7 +1848,7 @@ static void bnxt_modify_rss(struct bnxt *bp, struct bnxt_rss_ctx *rss_ctx, }if (rxfh->indir) {u32 i, pad, tbl_size =bnxt_get_rxfh_indir_size (bp->dev); -u16 *indir_tbl = bp->rss_indir_tbl; +u32 *indir_tbl = bp->rss_indir_tbl;if (rss_ctx) indir_tbl = rss_ctx->rss_indir_tbl;
@@ -1856,7 +1856,7 @@ static void bnxt_modify_rss(struct bnxt *bp, struct bnxt_rss_ctx *rss_ctx, indir_tbl[i] = rxfh->indir[i]; pad = bp->rss_indir_tbl_entries - tbl_size;if (pad) -memset (&indir_tbl[i],0 , pad *sizeof (u16)); +memset (&indir_tbl[i],0 , pad *sizeof (*indir_tbl)); } }
Signature · 1 line
2.45.2
Jakub Kicinski
maintainerPATCH 11/11 eth: bnxt: use the indir table from ethtool context
In reply to Jakub KicinskiInstead of allocating a separate indir table in the vnic use the one already present in the RSS context allocated by the core. This saves some LoC and also we won't have to worry about syncing the local version back to the core, once core learns how to dump contexts.
---
v2:
- store a pointer to struct ethtool_rxfh_param instead of adding the ethtool_rxfh_priv_context() helper
--- drivers/net/ethernet/broadcom/bnxt/bnxt.c | 23 +++++------- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 7 ++-- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 36 +++++++++---------- 3 files changed, 29 insertions(+), 37 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt.c +9 -14
@@ -6222,10 +6222,9 @@ static u16 bnxt_cp_ring_for_tx(struct bnxt *bp, struct bnxt_tx_ring_info *txr)return bnxt_cp_ring_from_grp (bp, &txr->tx_ring_struct); } -int bnxt_alloc_rss_indir_tbl (struct bnxt *bp,struct bnxt_rss_ctx *rss_ctx) +static int bnxt_alloc_rss_indir_tbl (struct bnxt *bp) {int entries; -u32 *tbl;if (bp->flags &BNXT_FLAG_CHIP_P5_PLUS ) entries =BNXT_MAX_RSS_TABLE_ENTRIES_P5 ;
@@ -6233,19 +6232,16 @@ int bnxt_alloc_rss_indir_tbl(struct bnxt *bp, struct bnxt_rss_ctx *rss_ctx) entries =HW_HASH_INDEX_SIZE ; bp->rss_indir_tbl_entries = entries; - tbl =kmalloc_array (entries,sizeof (*bp->rss_indir_tbl),GFP_KERNEL ); -if (!tbl) + bp->rss_indir_tbl = +kmalloc_array (entries,sizeof (*bp->rss_indir_tbl),GFP_KERNEL ); +if (!bp->rss_indir_tbl)return -ENOMEM ; -if (rss_ctx) - rss_ctx->rss_indir_tbl = tbl; -else - bp->rss_indir_tbl = tbl; -return 0 ; } -void bnxt_set_dflt_rss_indir_tbl (struct bnxt *bp,struct bnxt_rss_ctx *rss_ctx) +void bnxt_set_dflt_rss_indir_tbl (struct bnxt *bp, +struct ethtool_rxfh_context *rss_ctx) {u16 max_rings, max_entries, pad, i;u32 *rss_indir_tbl;
@@ -6260,7 +6256,7 @@ void bnxt_set_dflt_rss_indir_tbl(struct bnxt *bp, struct bnxt_rss_ctx *rss_ctx) max_entries =bnxt_get_rxfh_indir_size (bp->dev);if (rss_ctx) - rss_indir_tbl = &rss_ctx->rss_indir_tbl[0 ]; + rss_indir_tbl =ethtool_rxfh_context_indir (rss_ctx);else rss_indir_tbl = &bp->rss_indir_tbl[0 ];
@@ -6326,7 +6322,7 @@ static void bnxt_fill_hw_rss_tbl_p5(struct bnxt *bp,if (vnic->flags &BNXT_VNIC_NTUPLE_FLAG ) j =ethtool_rxfh_indir_default (i, bp->rx_nr_rings);else if (vnic->flags &BNXT_VNIC_RSSCTX_FLAG ) - j = vnic->rss_ctx->rss_indir_tbl[i]; + j =ethtool_rxfh_context_indir (vnic->rss_ctx)[i];else j = bp->rss_indir_tbl[i]; rxr = &bp->rx_ring[j];
@@ -10224,7 +10220,6 @@ void bnxt_del_one_rss_ctx(struct bnxt *bp, struct bnxt_rss_ctx *rss_ctx,dma_free_coherent (&bp->pdev->dev, vnic->rss_table_size, vnic->rss_table, vnic->rss_table_dma_addr); -kfree (rss_ctx->rss_indir_tbl); bp->num_rss_ctx--; }
@@ -15689,7 +15684,7 @@ static int bnxt_init_one(struct pci_dev *pdev, const struct pci_device_id *ent) bp->flags |=BNXT_FLAG_CHIP_P7 ; } - rc =bnxt_alloc_rss_indir_tbl (bp,NULL ); + rc =bnxt_alloc_rss_indir_tbl (bp);if (rc) goto init_err_pci_clean;
drivers/net/ethernet/broadcom/bnxt/bnxt.h +3 -4
@@ -1286,13 +1286,12 @@ struct bnxt_vnic_info {#define BNXT_VNIC_RFS_NEW_RSS_FLAG 0x10#define BNXT_VNIC_NTUPLE_FLAG 0x20#define BNXT_VNIC_RSSCTX_FLAG 0x40 -struct bnxt_rss_ctx *rss_ctx; +struct ethtool_rxfh_context *rss_ctx;u32 vnic_id; };struct bnxt_rss_ctx {struct bnxt_vnic_info vnic; -u32 *rss_indir_tbl;u8 index; };
@@ -2808,8 +2807,8 @@ int bnxt_hwrm_cfa_ntuple_filter_alloc(struct bnxt *bp,int bnxt_hwrm_vnic_set_tpa (struct bnxt *bp,struct bnxt_vnic_info *vnic,u32 tpa_flags);void bnxt_fill_ipv6_mask (__be32 mask[4 ]); -int bnxt_alloc_rss_indir_tbl (struct bnxt *bp,struct bnxt_rss_ctx *rss_ctx); -void bnxt_set_dflt_rss_indir_tbl (struct bnxt *bp,struct bnxt_rss_ctx *rss_ctx); +void bnxt_set_dflt_rss_indir_tbl (struct bnxt *bp, +struct ethtool_rxfh_context *rss_ctx);int bnxt_get_nr_rss_ctxs (struct bnxt *bp,int rx_rings);int bnxt_hwrm_vnic_cfg (struct bnxt *bp,struct bnxt_vnic_info *vnic); int bnxt_hwrm_vnic_alloc(struct bnxt *bp, struct bnxt_vnic_info *vnic,
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +17 -19
@@ -1218,11 +1218,10 @@ static struct bnxt_rss_ctx *bnxt_get_rss_ctx_from_index(struct bnxt *bp,return ethtool_rxfh_context_priv (ctx); } -static int bnxt_alloc_rss_ctx_rss_table (struct bnxt *bp, -struct bnxt_rss_ctx *rss_ctx) +static int bnxt_alloc_vnic_rss_table (struct bnxt *bp, +struct bnxt_vnic_info *vnic) {int size =L1_CACHE_ALIGN (BNXT_MAX_RSS_TABLE_SIZE_P5 ); -struct bnxt_vnic_info *vnic = &rss_ctx->vnic; vnic->rss_table_size = size +HW_HASH_KEY_SIZE ; vnic->rss_table = dma_alloc_coherent(&bp->pdev->dev,
@@ -1801,7 +1800,6 @@ static u32 bnxt_get_rxfh_key_size(struct net_device *dev)static int bnxt_get_rxfh (struct net_device *dev,struct ethtool_rxfh_param *rxfh) { -u32 rss_context = rxfh->rss_context;struct bnxt_rss_ctx *rss_ctx =NULL ;struct bnxt *bp =netdev_priv (dev);u32 *indir_tbl = bp->rss_indir_tbl;
@@ -1815,10 +1813,13 @@ static int bnxt_get_rxfh(struct net_device *dev, vnic = &bp->vnic_info[BNXT_VNIC_DEFAULT ];if (rxfh->rss_context) { - rss_ctx =bnxt_get_rss_ctx_from_index (bp, rss_context); -if (!rss_ctx) +struct ethtool_rxfh_context *ctx; + + ctx =xa_load (&bp->dev->ethtool->rss_ctx, rxfh->rss_context); +if (!ctx)return -EINVAL ; - indir_tbl = rss_ctx->rss_indir_tbl; + indir_tbl =ethtool_rxfh_context_indir (ctx); + rss_ctx =ethtool_rxfh_context_priv (ctx); vnic = &rss_ctx->vnic; }
@@ -1834,7 +1835,8 @@ static int bnxt_get_rxfh(struct net_device *dev,return 0 ; } -static void bnxt_modify_rss (struct bnxt *bp,struct bnxt_rss_ctx *rss_ctx, +static void bnxt_modify_rss (struct bnxt *bp,struct ethtool_rxfh_context *ctx, +struct bnxt_rss_ctx *rss_ctx,const struct ethtool_rxfh_param *rxfh) {if (rxfh->key) {
@@ -1851,7 +1853,7 @@ static void bnxt_modify_rss(struct bnxt *bp, struct bnxt_rss_ctx *rss_ctx,u32 *indir_tbl = bp->rss_indir_tbl;if (rss_ctx) - indir_tbl = rss_ctx->rss_indir_tbl; + indir_tbl =ethtool_rxfh_context_indir (ctx);for (i =0 ; i < tbl_size; i++) indir_tbl[i] = rxfh->indir[i]; pad = bp->rss_indir_tbl_entries - tbl_size;
@@ -1906,18 +1908,14 @@ static int bnxt_create_rxfh_context(struct net_device *dev, bp->num_rss_ctx++; vnic = &rss_ctx->vnic; - vnic->rss_ctx = rss_ctx; + vnic->rss_ctx = ctx; vnic->flags |=BNXT_VNIC_RSSCTX_FLAG ; vnic->vnic_id =BNXT_VNIC_ID_INVALID ; - rc =bnxt_alloc_rss_ctx_rss_table (bp, rss_ctx); + rc =bnxt_alloc_vnic_rss_table (bp, vnic);if (rc) goto out; - rc =bnxt_alloc_rss_indir_tbl (bp, rss_ctx); -if (rc) - goto out; - -bnxt_set_dflt_rss_indir_tbl (bp, rss_ctx); +bnxt_set_dflt_rss_indir_tbl (bp, ctx);memcpy (vnic->rss_hash_key, bp->rss_hash_key,HW_HASH_KEY_SIZE ); rc =bnxt_hwrm_vnic_alloc (bp, vnic,0 , bp->rx_nr_rings);
@@ -1931,7 +1929,7 @@ static int bnxt_create_rxfh_context(struct net_device *dev,NL_SET_ERR_MSG_MOD (extack,"Unable to setup TPA" ); goto out; } -bnxt_modify_rss (bp, rss_ctx, rxfh); +bnxt_modify_rss (bp, ctx, rss_ctx, rxfh); rc =__bnxt_setup_vnic_p5 (bp, vnic);if (rc) {
@@ -1961,7 +1959,7 @@ static int bnxt_modify_rxfh_context(struct net_device *dev, rss_ctx =ethtool_rxfh_context_priv (ctx); -bnxt_modify_rss (bp, rss_ctx, rxfh); +bnxt_modify_rss (bp, ctx, rss_ctx, rxfh);return bnxt_hwrm_vnic_rss_cfg_p5 (bp, &rss_ctx->vnic); }
@@ -1990,7 +1988,7 @@ static int bnxt_set_rxfh(struct net_device *dev,if (rxfh->hfunc && rxfh->hfunc !=ETH_RSS_HASH_TOP )return -EOPNOTSUPP ; -bnxt_modify_rss (bp,NULL , rxfh); +bnxt_modify_rss (bp,NULL ,NULL , rxfh);bnxt_clear_usr_fltrs (bp, false);if (netif_running (bp->dev)) {
Signature · 1 line
2.45.2
Quoted 18 lines · Jakub Kicinski
Convert bnxt from using the
set_rxfhAPI to separate create/modify/remove callbacks.Two small extensions to the core APIs are necessary:
- the ability to discard contexts if for some catastrophic reasons device can no longer provide them;
- the ability to reserve space in the context for RSS table growth.The driver is adjusted to store indirection tables on u32 to make it easier to use core structs directly.
With that out of the way the conversion is fairly straightforward.
Since the opposition to discarding contexts was relatively mild and its what bnxt does already, I'm sticking to that. We may very well need to revisit that at a later time.
Quoted 11 lines
v2:
- move "lost context" helper tocommon.cto avoid build problems when ethtool-nl isn't enabled
- add a note about the counter proposal in the commit message
- movekey_offto the end, under the private label (hiding from kdoc)
- removebnxt_get_max_rss_ctx_ring()
- switch from sizeof(u32) tosizeof(*indir_tbl)
- add a sentence to the commit msg
- store a pointer to structethtool_rxfh_paraminstead of adding theethtool_rxfh_priv_context()helper
v1: https://lore.kernel.org/all/[email protected]/
For a moment I was confused and a little scared not seeing v2 in the subject line, until I opened the email :)
Series LGTM. Thanks to Edward and you for a cleaner infrastructure. For the series:
Quoted 26 lines
Jakub Kicinski (11):
net: ethtool: let drivers remove lost RSS contexts
net: ethtool: let drivers declare max size of RSS indir table and key
eth: bnxt: allow deleting RSS contexts when the device is down
eth: bnxt: move from .set_rxfh to .create_rxfh_context and friends
eth: bnxt: removerss_ctx_bmap
eth: bnxt: depend on core cleaning up RSS contexts
eth: bnxt: use context priv for structbnxt_rss_ctx
eth: bnxt: use the RSS context XArray instead of the local list
eth: bnxt: pad out the correct indirection table
eth: bnxt: bump the entry size in indir tables to u32
eth: bnxt: use the indir table from ethtool contextdrivers/net/ethernet/broadcom/bnxt/bnxt.c | 126 +++++-------- drivers/net/ethernet/broadcom/bnxt/bnxt.h | 17 +- .../net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 165 ++++++++++-------- include/linux/ethtool.h | 20 +-- net/ethtool/common.c | 14 ++ net/ethtool/ioctl.c | 46 +++-- 6 files changed, 194 insertions(+), 194 deletions(-)--
2.45.2
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Hello:
This series was applied to netdev/net-next.git (main) by Jakub Kicinski <[email protected]>:
Quoted 9 lines · On Thu, 11 Jul 2024 15:07:02 -0700 you wrote:
Convert bnxt from using the
set_rxfhAPI to separate create/modify/remove callbacks.Two small extensions to the core APIs are necessary:
- the ability to discard contexts if for some catastrophic reasons device can no longer provide them;
- the ability to reserve space in the context for RSS table growth.[...]
Here is the summary with links:
- [net-next,01/11] net: ethtool: let drivers remove lost RSS contexts
https://git.kernel.org/netdev/net-next/c/d69ba6bbaf1f - [net-next,02/11] net: ethtool: let drivers declare max size of RSS indir table and key https://git.kernel.org/netdev/net-next/c/28c8757a792b - [net-next,03/11] eth: bnxt: allow deleting RSS contexts when the device is down https://git.kernel.org/netdev/net-next/c/667ac333dbb7 - [net-next,04/11] eth: bnxt: move from .set_rxfh to .create_rxfh_context and friends https://git.kernel.org/netdev/net-next/c/5c466b4d4e75 - [net-next,05/11] eth: bnxt: remove rss_ctx_bmap https://git.kernel.org/netdev/net-next/c/1a49a23c034b - [net-next,06/11] eth: bnxt: depend on core cleaning up RSS contexts https://git.kernel.org/netdev/net-next/c/bf30162915f8 - [net-next,07/11] eth: bnxt: use context priv for struct bnxt_rss_ctx https://git.kernel.org/netdev/net-next/c/63d4769cf74a - [net-next,08/11] eth: bnxt: use the RSS context XArray instead of the local list https://git.kernel.org/netdev/net-next/c/20c8ad72eb7f - [net-next,09/11] eth: bnxt: pad out the correct indirection table https://git.kernel.org/netdev/net-next/c/9c34c6c28c70 - [net-next,10/11] eth: bnxt: bump the entry size in indir tables to u32 https://git.kernel.org/netdev/net-next/c/73afb518af4a - [net-next,11/11] eth: bnxt: use the indir table from ethtool context https://git.kernel.org/netdev/net-next/c/46e457a454de
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html