From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id B1005432D6; Wed, 8 Nov 2023 12:49:23 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6704642DFD; Wed, 8 Nov 2023 12:49:23 +0100 (CET) Received: from mgamail.intel.com (mgamail.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id C43C840A73; Wed, 8 Nov 2023 12:49:21 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1699444162; x=1730980162; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=LjN0JS4bSv8BSdKLJ81CiNzIXs52e1OeSqzScjCQ+tA=; b=j1k81w5ifXRQNojhz8ZaTfVi698f2iMAtXsQfvU8tlhf+N0OJvqsXLI4 tIi20EbH+NMbCT2yT6TO/m+AyryMSXK6uhM5MzubkiQvGQ1qXvSRK1sVg W+rbT0Yfh876hW14ip74nha3HibGFvSnBOf4DgjbIbyFx98ODlPU9eNXf cPNtTtLi/ep609Nur5/YsrvdWYaQPDyyZZc8W2MpxEwE7DS/N155z6fOe cnwfDVmKNOvoGAX7tXSsLBhquQtwe7k8id2FrRLr7vPJS+jwY2TG0Mejw qQNyUypXO6H1uYNaXRCbThPZmYiXas7nvrD/hOQ4nwZkcdmiOL4Ynbh9m Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10887"; a="369084905" X-IronPort-AV: E=Sophos;i="6.03,286,1694761200"; d="scan'208";a="369084905" Received: from fmviesa001.fm.intel.com ([10.60.135.141]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2023 03:49:20 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.03,286,1694761200"; d="scan'208";a="11163082" Received: from unknown (HELO localhost.localdomain) ([10.239.252.253]) by smtpauth.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 08 Nov 2023 03:49:18 -0800 From: Mingjin Ye To: dev@dpdk.org Cc: qiming.yang@intel.com, yidingx.zhou@intel.com, Mingjin Ye , stable@dpdk.org, Qi Zhang Subject: [PATCH v7] net/ice: fix crash on closing representor ports Date: Wed, 8 Nov 2023 11:39:34 +0000 Message-Id: <20231108113934.341321-1-mingjinx.ye@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231107101223.225726-1-mingjinx.ye@intel.com> References: <20231107101223.225726-1-mingjinx.ye@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org The data resource in struct rte_eth_dev is cleared and points to NULL when the DCF port is closed. If the DCF representor port is closed after the DCF port is closed, a segmentation fault occurs because the representor port accesses the data resource released by the DCF port. This patch fixes this issue by synchronizing the state of DCF ports and representor ports to the peer in real time when their state changes. Fixes: c7e1a1a3bfeb ("net/ice: refactor DCF VLAN handling") Cc: stable@dpdk.org Signed-off-by: Mingjin Ye --- v2: Reformat code to remove unneeded fixlines. --- v3: New solution. --- v4: Optimize v2 patch. --- v5: optimization. --- v6: Optimize and resolve conflicts. --- v7: optimization. --- drivers/net/ice/ice_dcf_ethdev.c | 30 ++++++++++++++-- drivers/net/ice/ice_dcf_ethdev.h | 3 ++ drivers/net/ice/ice_dcf_vf_representor.c | 46 ++++++++++++++++++++++-- 3 files changed, 73 insertions(+), 6 deletions(-) diff --git a/drivers/net/ice/ice_dcf_ethdev.c b/drivers/net/ice/ice_dcf_ethdev.c index 29699c2c32..5d845bba31 100644 --- a/drivers/net/ice/ice_dcf_ethdev.c +++ b/drivers/net/ice/ice_dcf_ethdev.c @@ -1618,6 +1618,26 @@ ice_dcf_free_repr_info(struct ice_dcf_adapter *dcf_adapter) } } +int +ice_dcf_handle_vf_repr_close(struct ice_dcf_adapter *dcf_adapter, + uint16_t vf_id) +{ + struct ice_dcf_repr_info *vf_rep_info; + + if (dcf_adapter->num_reprs >= vf_id) { + PMD_DRV_LOG(ERR, "Invalid VF id: %d", vf_id); + return -1; + } + + if (!dcf_adapter->repr_infos) + return 0; + + vf_rep_info = &dcf_adapter->repr_infos[vf_id]; + vf_rep_info->vf_rep_eth_dev = NULL; + + return 0; +} + static int ice_dcf_init_repr_info(struct ice_dcf_adapter *dcf_adapter) { @@ -1641,11 +1661,10 @@ ice_dcf_dev_close(struct rte_eth_dev *dev) if (rte_eal_process_type() != RTE_PROC_PRIMARY) return 0; + ice_dcf_vf_repr_notify_all(adapter, false); (void)ice_dcf_dev_stop(dev); ice_free_queues(dev); - - ice_dcf_free_repr_info(adapter); ice_dcf_uninit_parent_adapter(dev); ice_dcf_uninit_hw(dev, &adapter->real_hw); @@ -1835,7 +1854,7 @@ ice_dcf_dev_reset(struct rte_eth_dev *dev) ice_dcf_reset_hw(dev, hw); } - ret = ice_dcf_dev_uninit(dev); + ret = ice_dcf_dev_close(dev); if (ret) return ret; @@ -1940,12 +1959,17 @@ ice_dcf_dev_init(struct rte_eth_dev *eth_dev) ice_dcf_stats_reset(eth_dev); dcf_config_promisc(adapter, false, false); + ice_dcf_vf_repr_notify_all(adapter, true); + return 0; } static int ice_dcf_dev_uninit(struct rte_eth_dev *eth_dev) { + struct ice_dcf_adapter *adapter = eth_dev->data->dev_private; + + ice_dcf_free_repr_info(adapter); ice_dcf_dev_close(eth_dev); return 0; diff --git a/drivers/net/ice/ice_dcf_ethdev.h b/drivers/net/ice/ice_dcf_ethdev.h index 4baaec4b8b..6dcbaac5eb 100644 --- a/drivers/net/ice/ice_dcf_ethdev.h +++ b/drivers/net/ice/ice_dcf_ethdev.h @@ -60,6 +60,7 @@ struct ice_dcf_vf_repr { struct rte_ether_addr mac_addr; uint16_t switch_domain_id; uint16_t vf_id; + bool dcf_valid; struct ice_dcf_vlan outer_vlan_info; /* DCF always handle outer VLAN */ }; @@ -80,6 +81,8 @@ int ice_dcf_vf_repr_init(struct rte_eth_dev *vf_rep_eth_dev, void *init_param); int ice_dcf_vf_repr_uninit(struct rte_eth_dev *vf_rep_eth_dev); int ice_dcf_vf_repr_init_vlan(struct rte_eth_dev *vf_rep_eth_dev); void ice_dcf_vf_repr_stop_all(struct ice_dcf_adapter *dcf_adapter); +void ice_dcf_vf_repr_notify_all(struct ice_dcf_adapter *dcf_adapter, bool valid); +int ice_dcf_handle_vf_repr_close(struct ice_dcf_adapter *dcf_adapter, uint16_t vf_id); bool ice_dcf_adminq_need_retry(struct ice_adapter *ad); #endif /* _ICE_DCF_ETHDEV_H_ */ diff --git a/drivers/net/ice/ice_dcf_vf_representor.c b/drivers/net/ice/ice_dcf_vf_representor.c index b9fcfc80ad..af281f069a 100644 --- a/drivers/net/ice/ice_dcf_vf_representor.c +++ b/drivers/net/ice/ice_dcf_vf_representor.c @@ -50,9 +50,28 @@ ice_dcf_vf_repr_dev_stop(struct rte_eth_dev *dev) return 0; } +static void +ice_dcf_vf_repr_notify_one(struct rte_eth_dev *dev, bool valid) +{ + struct ice_dcf_vf_repr *repr = dev->data->dev_private; + + repr->dcf_valid = valid; +} + static int ice_dcf_vf_repr_dev_close(struct rte_eth_dev *dev) { + struct ice_dcf_vf_repr *repr = dev->data->dev_private; + struct ice_dcf_adapter *dcf_adapter; + int err; + + if (repr->dcf_valid) { + dcf_adapter = repr->dcf_eth_dev->data->dev_private; + err = ice_dcf_handle_vf_repr_close(dcf_adapter, repr->vf_id); + if (err) + PMD_DRV_LOG(ERR, "VF representor invalid"); + } + return ice_dcf_vf_repr_uninit(dev); } @@ -111,14 +130,15 @@ ice_dcf_vf_repr_link_update(__rte_unused struct rte_eth_dev *ethdev, static __rte_always_inline struct ice_dcf_hw * ice_dcf_vf_repr_hw(struct ice_dcf_vf_repr *repr) { - struct ice_dcf_adapter *dcf_adapter = - repr->dcf_eth_dev->data->dev_private; + struct ice_dcf_adapter *dcf_adapter; - if (!dcf_adapter) { + if (!repr->dcf_valid) { PMD_DRV_LOG(ERR, "DCF for VF representor has been released\n"); return NULL; } + dcf_adapter = repr->dcf_eth_dev->data->dev_private; + return &dcf_adapter->real_hw; } @@ -414,6 +434,7 @@ ice_dcf_vf_repr_init(struct rte_eth_dev *vf_rep_eth_dev, void *init_param) repr->dcf_eth_dev = param->dcf_eth_dev; repr->switch_domain_id = param->switch_domain_id; repr->vf_id = param->vf_id; + repr->dcf_valid = true; repr->outer_vlan_info.port_vlan_ena = false; repr->outer_vlan_info.stripping_ena = false; repr->outer_vlan_info.tpid = RTE_ETHER_TYPE_VLAN; @@ -488,3 +509,22 @@ ice_dcf_vf_repr_stop_all(struct ice_dcf_adapter *dcf_adapter) vf_rep_eth_dev->data->dev_started = 0; } } + +void +ice_dcf_vf_repr_notify_all(struct ice_dcf_adapter *dcf_adapter, bool valid) +{ + uint16_t vf_id; + struct rte_eth_dev *vf_rep_eth_dev; + + if (!dcf_adapter->repr_infos) + return; + + for (vf_id = 0; vf_id < dcf_adapter->real_hw.num_vfs; vf_id++) { + vf_rep_eth_dev = dcf_adapter->repr_infos[vf_id].vf_rep_eth_dev; + + if (!vf_rep_eth_dev) + continue; + + ice_dcf_vf_repr_notify_one(vf_rep_eth_dev, valid); + } +} -- 2.25.1