net: mana: Add handler for hardware servicing events
Subsystems (6)
Haiyang Zhang
maintainerPATCH v5 1/1 net: mana: Add handler for hardware servicing events
To collaborate with hardware servicing events, upon receiving the special EQE notification from the HW channel, remove the devices on this bus. Then, after a waiting period based on the device specs, rescan the parent bus to recover the devices.
---
v5:
Get refcnt of the pdev struct to avoid removal before running the work as suggested by Jakub Kicinski.
v4:
Renamed EQE type 135 to GDMA_EQE_HWC_RESET_REQUEST, since there can be multiple cases of this reset request.
v3:
Updated for checkpatch warnings as suggested by Simon Horman.
v2:
Added dev_dbg for service type as suggested by Shradha Gupta. Added driver cap bit.
--- .../net/ethernet/microsoft/mana/gdma_main.c | 75 +++++++++++++++++++ include/net/mana/gdma.h | 10 ++- 2 files changed, 83 insertions(+), 2 deletions(-)
drivers/net/ethernet/microsoft/mana/gdma_main.c +75 -0
@@ -352,11 +352,59 @@ void mana_gd_ring_cq(struct gdma_queue *cq, u8 arm_bit) }EXPORT_SYMBOL_NS (mana_gd_ring_cq,"NET_MANA" ); +#define MANA_SERVICE_PERIOD 10 + +struct mana_serv_work { +struct work_struct serv_work; +struct pci_dev *pdev; +}; + +static void mana_serv_func (struct work_struct *w) +{ +struct mana_serv_work *mns_wk; +struct pci_bus *bus, *parent; +struct pci_dev *pdev; + + mns_wk = container_of(w, struct mana_serv_work, serv_work); + pdev = mns_wk->pdev; + +pci_lock_rescan_remove (); + +if (!pdev) + goto out; + + bus = pdev->bus; +if (!bus) { +dev_err (&pdev->dev,"MANA service: no bus\n" ); + goto out; + } + + parent = bus->parent; +if (!parent) { +dev_err (&pdev->dev,"MANA service: no parent bus\n" ); + goto out; + } + +pci_stop_and_remove_bus_device (bus->self); + +msleep (MANA_SERVICE_PERIOD *1000 ); + +pci_rescan_bus (parent); + +out: +pci_unlock_rescan_remove (); + +pci_dev_put (pdev); +kfree (mns_wk); +module_put (THIS_MODULE ); +} +static void mana_gd_process_eqe (struct gdma_queue *eq) {u32 head = eq->head % (eq->queue_size /GDMA_EQE_SIZE );struct gdma_context *gc = eq->gdma_dev->gdma_context;struct gdma_eqe *eq_eqe_ptr = eq->queue_mem_ptr; +struct mana_serv_work *mns_wk;union gdma_eqe_info eqe_info;enum gdma_eqe_type type;struct gdma_event event;
@@ -400,6 +448,33 @@ static void mana_gd_process_eqe(struct gdma_queue *eq) eq->eq.callback (eq->eq.context, eq, &event);break ; +case GDMA_EQE_HWC_FPGA_RECONFIG : +dev_info (gc->dev,"Recv MANA service type:%d\n" , type); + +if (gc->in_service) { +dev_info (gc->dev,"Already in service\n" ); +break ; + } + +if (!try_module_get (THIS_MODULE )) { +dev_info (gc->dev,"Module is unloading\n" ); +break ; + } + + mns_wk =kzalloc (sizeof (*mns_wk),GFP_ATOMIC ); +if (!mns_wk) { +module_put (THIS_MODULE ); +break ; + } + +dev_info (gc->dev,"Start MANA service type:%d\n" , type); + gc->in_service = true; + mns_wk->pdev =to_pci_dev (gc->dev); +pci_dev_get (mns_wk->pdev); +INIT_WORK (&mns_wk->serv_work, mana_serv_func); +schedule_work (&mns_wk->serv_work); +break ; +default :break ; }
include/net/mana/gdma.h +8 -2
@@ -58,7 +58,7 @@ enum gdma_eqe_type {GDMA_EQE_HWC_INIT_EQ_ID_DB =129 ,GDMA_EQE_HWC_INIT_DATA =130 ,GDMA_EQE_HWC_INIT_DONE =131 , -GDMA_EQE_HWC_SOC_RECONFIG =132 , +GDMA_EQE_HWC_FPGA_RECONFIG =132 ,GDMA_EQE_HWC_SOC_RECONFIG_DATA =133 , GDMA_EQE_RNIC_QP_FATAL = 176, };
@@ -388,6 +388,8 @@ struct gdma_context {u32 test_event_eq_id;bool is_pf; +bool in_service; +phys_addr_t bar0_pa;void __iomem *bar0_va;void __iomem *shm_base;
@@ -558,12 +560,16 @@ enum {/* Driver can handle holes (zeros) in the device list */ #define GDMA_DRV_CAP_FLAG_1_DEV_LIST_HOLES_SUP BIT(11) +/* Driver can self reset on FPGA Reconfig EQE notification */ +#define GDMA_DRV_CAP_FLAG_1_HANDLE_RECONFIG_EQE BIT(17) +#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_VARIABLE_INDIRECTION_TABLE_SUPPORT | \ - GDMA_DRV_CAP_FLAG_1_DEV_LIST_HOLES_SUP) + GDMA_DRV_CAP_FLAG_1_DEV_LIST_HOLES_SUP | \ + GDMA_DRV_CAP_FLAG_1_HANDLE_RECONFIG_EQE)#define GDMA_DRV_CAP_FLAGS2 0
Signature · 1 line
2.34.1
Paolo Abeni
maintainerQuoted 17 lines · Haiyang Zhang
drivers/net/ethernet/microsoft/mana/gdma_main.c +13
-0@@ -400,6 +448,33 @@ static void mana_gd_process_eqe(struct gdma_queue *eq) eq->eq.callback (eq->eq.context, eq, &event);break ; +case GDMA_EQE_HWC_FPGA_RECONFIG : +dev_info (gc->dev,"Recv MANA service type:%d\n" , type); + +if (gc->in_service) { +dev_info (gc->dev,"Already in service\n" ); +break ; + } + +if (!try_module_get (THIS_MODULE )) { +dev_info (gc->dev,"Module is unloading\n" ); +break ; + } +
drivers/net/ethernet/microsoft/mana/gdma_main.c static void mana_gd_process_eqe(struct gdma_queue *eq) · line 473
Quoted 10 lines
drivers/net/ethernet/microsoft/mana/gdma_main.c +10
-0+ mns_wk =kzalloc (sizeof (*mns_wk),GFP_ATOMIC ); +if (!mns_wk) { +module_put (THIS_MODULE ); +break ; + } + +dev_info (gc->dev,"Start MANA service type:%d\n" , type); + gc->in_service = true; + mns_wk->pdev =to_pci_dev (gc->dev); +pci_dev_get (mns_wk->pdev);
Acquiring both the device and the module reference is confusing and likely unnecessary. pci_dev_get() should suffice.
/P
Haiyang Zhang
maintainerQuoted 44 lines
-----Original Message-----
From: Paolo Abeni <[email protected]>
Sent: Tuesday, May 27, 2025 5:29 AM
To: Haiyang Zhang <[email protected]>; [email protected]; [email protected]
Cc: Dexuan Cui <[email protected]>; [email protected]; KY Srinivasan <[email protected]>; Paul Rosswurm <[email protected]>; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Long Li <[email protected]>; [email protected]; linux- [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; [email protected]; Konstantin Taranov <[email protected]>; [email protected]; linux- [email protected]
Subject: [EXTERNAL] Re: [PATCH net-next,v5] net: mana: Add handler for hardware servicing eventsReview static void mana_gd_process_eqe(struct gdma_queue
Quoted 1 line · Haiyang Zhang
(quoted diff) +0
-0@@ -400,6 +448,33 @@ static void mana_gd_process_eqe(struct gdma_queue*eq)
Quoted 21 lines
drivers/net/ethernet/microsoft/mana/gdma_main.c +18
-0eq->eq.callback (eq->eq.context, eq, &event);break ; +case GDMA_EQE_HWC_FPGA_RECONFIG : +dev_info (gc->dev,"Recv MANA service type:%d\n" , type); + +if (gc->in_service) { +dev_info (gc->dev,"Already in service\n" ); +break ; + } + +if (!try_module_get (THIS_MODULE )) { +dev_info (gc->dev,"Module is unloading\n" ); +break ; + } + + mns_wk =kzalloc (sizeof (*mns_wk),GFP_ATOMIC ); +if (!mns_wk) { +module_put (THIS_MODULE ); +break ; + }
Quoted 9 lines
drivers/net/ethernet/microsoft/mana/gdma_main.c static void mana_gd_process_eqe(struct gdma_queue *eq) · line 473
Quoted 5 lines
drivers/net/ethernet/microsoft/mana/gdma_main.c +5
-0+ +dev_info (gc->dev,"Start MANA service type:%d\n" , type); + gc->in_service = true; + mns_wk->pdev =to_pci_dev (gc->dev); +pci_dev_get (mns_wk->pdev);Acquiring both the device and the module reference is confusing and likely unnecessary.
pci_dev_get()should suffice.
Thanks for the review. I updated the patch accordingly, and submitted v6 yesterday.
Thanks,
- Haiyang