net: mana: Allow variable size indirection table
Subsystems (5)
PATCH v4 1/1 net: mana: Allow variable size indirection table
Allow variable size indirection table allocation in MANA instead of using a constant value MANA_INDIRECT_TABLE_SIZE. The size is now derived from the MANA_QUERY_VPORT_CONFIG and the indirection table is allocated dynamically.
---
Changes in v4:
* Skip NULLify after free
* Log proper errors in mana_probe() if mana_attach(), mana_probe_port() fails
* Implement mana_cleanup_indir_table() to avoid code duplication.
Changes in v3:
* Fixed the memory leak(save_table) in mana_set_rxfh()
Changes in v2:
* Rebased to latest net-next tree
* Rearranged cleanup code in mana_probe_port to avoid extra operations
--- drivers/infiniband/hw/mana/qp.c | 10 +-- drivers/net/ethernet/microsoft/mana/mana_en.c | 85 ++++++++++++++++--- .../ethernet/microsoft/mana/mana_ethtool.c | 27 ++++-- include/net/mana/gdma.h | 4 +- include/net/mana/mana.h | 9 +- 5 files changed, 104 insertions(+), 31 deletions(-)
drivers/infiniband/hw/mana/qp.c +5 -5
@@ -21,7 +21,7 @@ static int mana_ib_cfg_vport_steering(struct mana_ib_dev *dev, gc =mdev_to_gc (dev); - req_buf_size =struct_size (req, indir_tab,MANA_INDIRECT_TABLE_SIZE ); + req_buf_size =struct_size (req, indir_tab,MANA_INDIRECT_TABLE_DEF_SIZE ); req =kzalloc (req_buf_size,GFP_KERNEL );if (!req)return -ENOMEM ;
@@ -41,18 +41,18 @@ static int mana_ib_cfg_vport_steering(struct mana_ib_dev *dev,if (log_ind_tbl_size) req->rss_enable = true; - req->num_indir_entries =MANA_INDIRECT_TABLE_SIZE ; + req->num_indir_entries =MANA_INDIRECT_TABLE_DEF_SIZE ; req->indir_tab_offset = offsetof(struct mana_cfg_rx_steer_req_v2 , indir_tab); req->update_indir_tab = true; req->cqe_coalescing_enable =1 ;/* The ind table passed to the hardware must have -* MANA_INDIRECT_TABLE_SIZE entries. Adjust the verb +* MANA_INDIRECT_TABLE_DEF_SIZE entries. Adjust the verb * ind_table to MANA_INDIRECT_TABLE_SIZE if required */ ibdev_dbg (&dev->ib_dev,"ind table size %u\n" ,1 << log_ind_tbl_size); -for (i =0 ; i <MANA_INDIRECT_TABLE_SIZE ; i++) { +for (i =0 ; i <MANA_INDIRECT_TABLE_DEF_SIZE ; i++) { req->indir_tab[i] = ind_table[i % (1 << log_ind_tbl_size)];ibdev_dbg (&dev->ib_dev,"index %u handle 0x%llx\n" , i, req->indir_tab[i]);
@@ -137,7 +137,7 @@ static int mana_ib_create_qp_rss(struct ib_qp *ibqp, struct ib_pd *pd, } ind_tbl_size =1 << ind_tbl->log_ind_tbl_size; -if (ind_tbl_size >MANA_INDIRECT_TABLE_SIZE ) { +if (ind_tbl_size >MANA_INDIRECT_TABLE_DEF_SIZE ) {ibdev_dbg (&mdev->ib_dev,"Indirect table size %d exceeding limit\n" , ind_tbl_size);
drivers/net/ethernet/microsoft/mana/mana_en.c +72 -13
203 lines not on this page · raw message
drivers/net/ethernet/microsoft/mana/mana_ethtool.c +19 -8
@@ -245,7 +245,9 @@ static u32 mana_get_rxfh_key_size(struct net_device *ndev)static u32 mana_rss_indir_size (struct net_device *ndev) { -return MANA_INDIRECT_TABLE_SIZE ; +struct mana_port_context *apc =netdev_priv (ndev); + +return apc->indir_table_sz; } static int mana_get_rxfh(struct net_device *ndev,
@@ -257,7 +259,7 @@ static int mana_get_rxfh(struct net_device *ndev, rxfh->hfunc =ETH_RSS_HASH_TOP ;/* Toeplitz */ if (rxfh->indir) { -for (i =0 ; i <MANA_INDIRECT_TABLE_SIZE ; i++) +for (i =0 ; i < apc->indir_table_sz; i++) rxfh->indir[i] = apc->indir_table[i]; }
@@ -273,8 +275,8 @@ static int mana_set_rxfh(struct net_device *ndev, {struct mana_port_context *apc =netdev_priv (ndev);bool update_hash = false, update_table = false; -u32 save_table[MANA_INDIRECT_TABLE_SIZE ];u8 save_key[MANA_HASH_KEY_SIZE ]; +u32 *save_table;int i, err;if (!apc->port_is_up)
@@ -284,13 +286,19 @@ static int mana_set_rxfh(struct net_device *ndev, rxfh->hfunc != ETH_RSS_HASH_TOP)return -EOPNOTSUPP ; + save_table =kcalloc (apc->indir_table_sz,sizeof (u32),GFP_KERNEL ); +if (!save_table) +return -ENOMEM ; +if (rxfh->indir) { -for (i =0 ; i <MANA_INDIRECT_TABLE_SIZE ; i++) -if (rxfh->indir[i] >= apc->num_queues) -return -EINVAL ; +for (i =0 ; i < apc->indir_table_sz; i++) +if (rxfh->indir[i] >= apc->num_queues) { + err = -EINVAL ; + goto cleanup; + } update_table = true; -for (i =0 ; i <MANA_INDIRECT_TABLE_SIZE ; i++) { +for (i =0 ; i < apc->indir_table_sz; i++) { save_table[i] = apc->indir_table[i]; apc->indir_table[i] = rxfh->indir[i]; }
@@ -306,7 +314,7 @@ static int mana_set_rxfh(struct net_device *ndev,if (err) {/* recover to original values */ if (update_table) { -for (i =0 ; i <MANA_INDIRECT_TABLE_SIZE ; i++) +for (i =0 ; i < apc->indir_table_sz; i++) apc->indir_table[i] = save_table[i]; }
@@ -316,6 +324,9 @@ static int mana_set_rxfh(struct net_device *ndev,mana_config_rss (apc,TRI_STATE_TRUE , update_hash, update_table); } +cleanup: +kfree (save_table); +return err; }
include/net/mana/gdma.h +3 -1
@@ -543,11 +543,13 @@ enum {*/ #define GDMA_DRV_CAP_FLAG_1_NAPI_WKDONE_FIX BIT(2)#define GDMA_DRV_CAP_FLAG_1_HWC_TIMEOUT_RECONFIG BIT(3) +#define GDMA_DRV_CAP_FLAG_1_VARIABLE_INDIRECTION_TABLE_SUPPORT BIT(5)#define GDMA_DRV_CAP_FLAGS1 \ (GDMA_DRV_CAP_FLAG_1_EQ_SHARING_MULTI_VPORT | \ GDMA_DRV_CAP_FLAG_1_NAPI_WKDONE_FIX | \ - GDMA_DRV_CAP_FLAG_1_HWC_TIMEOUT_RECONFIG) + GDMA_DRV_CAP_FLAG_1_HWC_TIMEOUT_RECONFIG | \ + GDMA_DRV_CAP_FLAG_1_VARIABLE_INDIRECTION_TABLE_SUPPORT)#define GDMA_DRV_CAP_FLAGS2 0
include/net/mana/mana.h +5 -4
@@ -30,8 +30,8 @@ enum TRI_STATE { };/* Number of entries for hardware indirection table must be in power of 2 */ -#define MANA_INDIRECT_TABLE_SIZE 64 -#define MANA_INDIRECT_TABLE_MASK (MANA_INDIRECT_TABLE_SIZE - 1) +#define MANA_INDIRECT_TABLE_MAX_SIZE 512 +#define MANA_INDIRECT_TABLE_DEF_SIZE 64/* The Toeplitz hash key's length in bytes: should be multiple of 8 */ #define MANA_HASH_KEY_SIZE 40
@@ -410,10 +410,11 @@ struct mana_port_context {struct mana_tx_qp *tx_qp;/* Indirection Table for RX & TX. The values are queue indexes */ -u32 indir_table[MANA_INDIRECT_TABLE_SIZE ]; +u32 *indir_table; +u32 indir_table_sz;/* Indirection table containing RxObject Handles */ -mana_handle_t rxobj_table[MANA_INDIRECT_TABLE_SIZE ]; +mana_handle_t *rxobj_table;/* Hash key used by the NIC */ u8 hashkey[MANA_HASH_KEY_SIZE ];
Signature · 1 line
2.34.1
Leon Romanovsky
AppliedQuoted 6 lines · Shradha Gupta
Allow variable size indirection table allocation in MANA instead of using a constant value
MANA_INDIRECT_TABLE_SIZE. The size is now derived from theMANA_QUERY_VPORT_CONFIGand the indirection table is allocated dynamically.
Applied, thanks!
[1/1] net: mana: Allow variable size indirection table
https://git.kernel.org/rdma/rdma/c/7fc45cb68696c7
Best regards,
Signature · 1 line
Leon Romanovsky <[email protected]>
Quoted 21 lines · Shradha Gupta
Allow variable size indirection table allocation in MANA instead of using a constant value
MANA_INDIRECT_TABLE_SIZE. The size is now derived from theMANA_QUERY_VPORT_CONFIGand the indirection table is allocated dynamically.Signed-off-by Shradha Gupta <[email protected]>Reviewed-by Dexuan Cui <[email protected]>Reviewed-by Haiyang Zhang <[email protected]>---
Changes in v4:
* Skip NULLify after free
* Log proper errors inmana_probe()ifmana_attach(),mana_probe_port()fails
* Implementmana_cleanup_indir_table()to avoid code duplication.Changes in v3:
* Fixed the memoryleak(save_table)inmana_set_rxfh()Changes in v2:
* Rebased to latest net-next tree
* Rearranged cleanup code inmana_probe_portto avoid extra operations
Quoted 7 lines
--- drivers/infiniband/hw/mana/qp.c | 10 +-- drivers/net/ethernet/microsoft/mana/mana_en.c | 85 ++++++++++++++++--- .../ethernet/microsoft/mana/mana_ethtool.c | 27 ++++-- include/net/mana/gdma.h | 4 +- include/net/mana/mana.h | 9 +- 5 files changed, 104 insertions(+), 31 deletions(-)
Hi Jakub,
Like we talked, I created new shared branch for this patch:
https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git/log/?h=mana-shared
Because it took time, the base of this branch is v6.10-rc3 as I'm eager to get the commit c9d52fb313d3 ("PCI: Revert the cfg_access_lock lockdep mechanism") from Linus's master, and this shared patch gives me the reason to pull the fix.
I see that your net-next didn't get -rc3 tag yet, so please pull it after you advance net-next. After that I'll do the same in RDMA tree.
Thanks
This patch was applied to netdev/net-next.git (main) by Leon Romanovsky <[email protected]>:
Hello:
This patch was applied to netdev/net-next.git (main) by Leon Romanovsky <[email protected]>:
Quoted 10 lines · On Mon, 10 Jun 2024 03:28:39 -0700 you wrote:
Allow variable size indirection table allocation in MANA instead of using a constant value
MANA_INDIRECT_TABLE_SIZE. The size is now derived from theMANA_QUERY_VPORT_CONFIGand the indirection table is allocated dynamically.Signed-off-by Shradha Gupta <[email protected]>Reviewed-by Dexuan Cui <[email protected]>Reviewed-by Haiyang Zhang <[email protected]>[...]
Here is the summary with links:
- [net-next,v4] net: mana: Allow variable size indirection table
https://git.kernel.org/netdev/net-next/c/7fc45cb68696
You are awesome, thank you!
Signature · 2 lines
Deet-doot-dot, I am a bot. https://korg.docs.kernel.org/patchwork/pwbot.html