From: illusion wang Add ops_mutex_lock to serialize concurrent hardware-modifying dispatch resource operations, preventing race conditions between PF local calls and remote mailbox message handlers that manipulate MSI-X mapping and mailbox IRQ state. 1. Introduce disp_mgt->ops_mutex_lock, initialized via devm_mutex_init at disp_mgt allocation time; symmetrically destroyed automatically by devres on device detach, eliminating double mutex_destroy risk. 2. Add NBL_OPS_CALL_LOCK_RET macro to wrap hardware-modifying ops with exclusive lock protection for unified locking semantics. 3. Wrap configure_msix_map / destroy_msix_map / set_mailbox_irq with ops_mutex_lock; these ops mutate shared MSI-X and IRQ hardware state and can race between local PF control paths and cross-PF mailbox RPCs. The read-only get_vsi_id / get_eth_id routines only consume static init-time metadata with no concurrent writers, so they require no locking. Signed-off-by: illusion wang --- .../nebula-matrix/nbl/nbl_core/nbl_dispatch.c | 46 +++++++++++++------ .../nebula-matrix/nbl/nbl_core/nbl_dispatch.h | 16 +++++++ 2 files changed, 47 insertions(+), 15 deletions(-) diff --git a/drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_dispatch.c b/drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_dispatch.c index 68d239a5c3db..5cbc5f6684a3 100644 --- a/drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_dispatch.c +++ b/drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_dispatch.c @@ -3,6 +3,7 @@ * Copyright (c) 2025 Nebula Matrix Limited. */ #include +#include #include #include "nbl_dispatch.h" @@ -182,9 +183,9 @@ static int nbl_disp_configure_msix_map(struct nbl_dispatch_mgt *disp_mgt, struct nbl_resource_mgt *p = disp_mgt->res_ops_tbl->priv; struct nbl_common_info *common = disp_mgt->common; - return NBL_OPS_CALL_RET(res_ops->configure_msix_map, (p, - common->mgt_pf, num_net_msix, - num_others_msix, net_msix_mask_en)); + return NBL_OPS_CALL_LOCK_RET(disp_mgt, res_ops->configure_msix_map, p, + common->mgt_pf, num_net_msix, + num_others_msix, net_msix_mask_en); } static int @@ -243,11 +244,12 @@ static void nbl_disp_chan_configure_msix_map_resp(void *priv, u16 src_id, if (!res_ops->configure_msix_map) { err = NBL_CHAN_RESP_UNIMPLEMENTED; } else { - ret = NBL_OPS_CALL_RET(res_ops->configure_msix_map, - (p, src_id, - le16_to_cpu(param.num_net_msix), - le16_to_cpu(param.num_others_msix), - !!le16_to_cpu(param.msix_mask_en))); + ret = NBL_OPS_CALL_LOCK_RET(disp_mgt, + res_ops->configure_msix_map, p, + src_id, + le16_to_cpu(param.num_net_msix), + le16_to_cpu(param.num_others_msix), + !!le16_to_cpu(param.msix_mask_en)); if (ret) err = NBL_CHAN_RESP_ERR; } @@ -301,7 +303,8 @@ static void nbl_disp_chan_destroy_msix_map_resp(void *priv, u16 src_id, if (!res_ops->destroy_msix_map) { err = NBL_CHAN_RESP_UNIMPLEMENTED; } else { - ret = NBL_OPS_CALL_RET(res_ops->destroy_msix_map, (p, src_id)); + ret = NBL_OPS_CALL_LOCK_RET(disp_mgt, res_ops->destroy_msix_map, + p, src_id); if (ret) err = NBL_CHAN_RESP_ERR; } @@ -372,8 +375,8 @@ static void nbl_disp_chan_set_mailbox_irq_resp(void *priv, u16 src_id, if (!res_ops->set_mailbox_irq) { err = NBL_CHAN_RESP_UNIMPLEMENTED; } else { - ret = NBL_OPS_CALL_RET(res_ops->set_mailbox_irq, - (p, src_id, vector_id, enable_msix)); + ret = NBL_OPS_CALL_LOCK_RET(disp_mgt, res_ops->set_mailbox_irq, + p, src_id, vector_id, enable_msix); if (ret) err = NBL_CHAN_RESP_ERR; } @@ -394,8 +397,8 @@ static int nbl_disp_destroy_msix_map(struct nbl_dispatch_mgt *disp_mgt) struct nbl_resource_mgt *p = disp_mgt->res_ops_tbl->priv; struct nbl_common_info *common = disp_mgt->common; - return NBL_OPS_CALL_RET(res_ops->destroy_msix_map, (p, - common->mgt_pf)); + return NBL_OPS_CALL_LOCK_RET(disp_mgt, res_ops->destroy_msix_map, p, + common->mgt_pf); } static int nbl_disp_set_mailbox_irq(struct nbl_dispatch_mgt *disp_mgt, @@ -405,8 +408,8 @@ static int nbl_disp_set_mailbox_irq(struct nbl_dispatch_mgt *disp_mgt, struct nbl_resource_mgt *p = disp_mgt->res_ops_tbl->priv; struct nbl_common_info *common = disp_mgt->common; - return NBL_OPS_CALL_RET(res_ops->set_mailbox_irq, (p, - common->mgt_pf, vector_id, enable_msix)); + return NBL_OPS_CALL_LOCK_RET(disp_mgt, res_ops->set_mailbox_irq, p, + common->mgt_pf, vector_id, enable_msix); } static int nbl_disp_get_vsi_id(struct nbl_dispatch_mgt *disp_mgt, u16 type, @@ -532,12 +535,16 @@ nbl_disp_setup_disp_mgt(struct nbl_common_info *common) { struct nbl_dispatch_mgt *disp_mgt; struct device *dev = common->dev; + int err; disp_mgt = devm_kzalloc(dev, sizeof(*disp_mgt), GFP_KERNEL); if (!disp_mgt) return ERR_PTR(-ENOMEM); disp_mgt->common = common; + err = devm_mutex_init(common->dev, &disp_mgt->ops_mutex_lock); + if (err) + return ERR_PTR(err); return disp_mgt; } @@ -598,6 +605,15 @@ int nbl_disp_init(struct nbl_adapter *adapter) if (common->has_ctrl) nbl_disp_setup_ctrl_lvl(disp_mgt, NBL_DISP_CTRL_LVL_MGT); + /* + * For non-control PF with network capability, enable net control + * level. + * All dispatch ops declared with NBL_DISP_CTRL_LVL_MGT fall back + * to remote mailbox msg_req handlers when MGT bit is not set. + */ + if (common->has_net) + nbl_disp_setup_ctrl_lvl(disp_mgt, NBL_DISP_CTRL_LVL_NET); + return 0; } diff --git a/drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_dispatch.h b/drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_dispatch.h index f06b90075af4..ea0971bfe59d 100644 --- a/drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_dispatch.h +++ b/drivers/net/ethernet/nebula-matrix/nbl/nbl_core/nbl_dispatch.h @@ -13,12 +13,28 @@ #include "../nbl_include/nbl_def_common.h" #include "../nbl_core.h" +#define NBL_OPS_CALL_LOCK_RET(disp_mgt, func, ...) \ +({ \ + typeof(disp_mgt) _disp_mgt = (disp_mgt); \ + typeof(func) _func = (func); \ + typeof(_func(__VA_ARGS__)) _ret = 0; \ + \ + if (_func) { \ + mutex_lock(&_disp_mgt->ops_mutex_lock); \ + _ret = _func(__VA_ARGS__); \ + mutex_unlock(&_disp_mgt->ops_mutex_lock); \ + } \ + _ret; \ +}) + struct nbl_dispatch_mgt { struct nbl_common_info *common; struct nbl_resource_ops_tbl *res_ops_tbl; struct nbl_channel_ops_tbl *chan_ops_tbl; struct nbl_dispatch_ops_tbl *disp_ops_tbl; DECLARE_BITMAP(ctrl_lvl, NBL_DISP_CTRL_LVL_MAX); + /* use for the caller not in interrupt */ + struct mutex ops_mutex_lock; }; #endif -- 2.47.3