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 BD94DA050F; Wed, 27 Apr 2022 09:19:15 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 4261A4113F; Wed, 27 Apr 2022 09:19:15 +0200 (CEST) Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by mails.dpdk.org (Postfix) with ESMTP id 2D8E140691; Wed, 27 Apr 2022 09:19:13 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1651043953; x=1682579953; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=l5cYzVq5+9ynNrC0db77RRpKeGvtzEnUahfRagEPoKw=; b=TxOoS1Y/3aNxAArIC6yZmmiPdj0XxsZpmyi0huPtW0ozm/4g1FXAzURp M1PAkL6rl4CCfehiMxiAjY0mDh9b9E82zSlTYSKeNcq4POCcW0q5e15az 31aTrp241Bau95Y7zH9aLaUHQXCEJP+W8MHBHIWRmjkltDzHmeHJwPUh1 f3eLWP7s5XBjNAC93DEXTvkPakQK1ak08QYCo9RzECikQffiRWqMtUwC4 Em0MQdQgA5rkRXSmRXUxDM8SmQmOZp3eiweHW96m4T4Lnn0IADvoYDjuj 1OZ7GA3YjQPMgQ5EUnIw+J+twqqnvFGRhcxgR8q7Goepa9RxpsFxOaWx2 g==; X-IronPort-AV: E=McAfee;i="6400,9594,10329"; a="263434590" X-IronPort-AV: E=Sophos;i="5.90,292,1643702400"; d="scan'208";a="263434590" Received: from orsmga006.jf.intel.com ([10.7.209.51]) by fmsmga102.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Apr 2022 00:19:12 -0700 X-IronPort-AV: E=Sophos;i="5.90,292,1643702400"; d="scan'208";a="533074741" Received: from unknown (HELO localhost.localdomain) ([10.239.251.174]) by orsmga006-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Apr 2022 00:19:09 -0700 From: Yiding Zhou To: dev@dpdk.org, jingjing.wu@intel.com, beilei.xing@intel.com Cc: qiming.yang@intel.com, qi.z.zhang@intel.com, stable@dpdk.org, Yiding Zhou Subject: [PATCH v2] net/iavf: fix segfaults when calling API after VF reset failed Date: Wed, 27 Apr 2022 23:25:24 +0800 Message-Id: <20220427152524.228930-1-yidingx.zhou@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220421170827.2753175-1-yidingx.zhou@intel.com> References: <20220421170827.2753175-1-yidingx.zhou@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 Some pointers will be set to NULL when iavf_dev_reset() failed, for example vf->vf_res, vf->vsi_res vf->rss_key and etc. APIs access these NULL pointers will trigger segfault. This patch adds closed flag to indicate that the VF is closed, and rejects API calls in this state to avoid coredump. Fixes: e74e1bb6280d ("net/iavf: enable port reset") Cc: stable@dpdk.org Signed-off-by: Yiding Zhou --- drivers/net/iavf/iavf.h | 1 + drivers/net/iavf/iavf_ethdev.c | 57 +++++++++++++++++++++++++++++++--- drivers/net/iavf/iavf_rxtx.c | 10 ++++++ drivers/net/iavf/iavf_vchnl.c | 17 ++++++++++ 4 files changed, 81 insertions(+), 4 deletions(-) diff --git a/drivers/net/iavf/iavf.h b/drivers/net/iavf/iavf.h index a01d18e61b..b3b582dd21 100644 --- a/drivers/net/iavf/iavf.h +++ b/drivers/net/iavf/iavf.h @@ -298,6 +298,7 @@ struct iavf_adapter { bool tx_vec_allowed; uint32_t ptype_tbl[IAVF_MAX_PKT_TYPE] __rte_cache_min_aligned; bool stopped; + bool closed; uint16_t fdir_ref_cnt; struct iavf_devargs devargs; }; diff --git a/drivers/net/iavf/iavf_ethdev.c b/drivers/net/iavf/iavf_ethdev.c index d6190ac24a..91b6e64840 100644 --- a/drivers/net/iavf/iavf_ethdev.c +++ b/drivers/net/iavf/iavf_ethdev.c @@ -229,9 +229,15 @@ static const struct eth_dev_ops iavf_eth_dev_ops = { }; static int -iavf_tm_ops_get(struct rte_eth_dev *dev __rte_unused, +iavf_tm_ops_get(struct rte_eth_dev *dev, void *arg) { + struct iavf_adapter *adapter = + IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); + + if (adapter->closed) + return -EIO; + if (!arg) return -EINVAL; @@ -342,6 +348,9 @@ iavf_set_mc_addr_list(struct rte_eth_dev *dev, return -EINVAL; } + if (adapter->closed) + return -EIO; + /* flush previous addresses */ err = iavf_add_del_mc_addr_list(adapter, vf->mc_addrs, vf->mc_addrs_num, false); @@ -613,6 +622,9 @@ iavf_dev_configure(struct rte_eth_dev *dev) dev->data->nb_tx_queues); int ret; + if (ad->closed) + return -EIO; + ad->rx_bulk_alloc_allowed = true; /* Initialize to TRUE. If any of Rx queues doesn't meet the * vector Rx/Tx preconditions, it will be reset. @@ -932,6 +944,9 @@ iavf_dev_start(struct rte_eth_dev *dev) PMD_INIT_FUNC_TRACE(); + if (adapter->closed) + return -1; + adapter->stopped = 0; vf->max_pkt_len = dev->data->mtu + IAVF_ETH_OVERHEAD; @@ -1009,6 +1024,9 @@ iavf_dev_stop(struct rte_eth_dev *dev) PMD_INIT_FUNC_TRACE(); + if (adapter->closed) + return -1; + if (!(vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_WB_ON_ITR) && dev->data->dev_conf.intr_conf.rxq != 0) rte_intr_disable(intr_handle); @@ -1046,6 +1064,9 @@ iavf_dev_info_get(struct rte_eth_dev *dev, struct rte_eth_dev_info *dev_info) IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); struct iavf_info *vf = &adapter->vf; + if (adapter->closed) + return -EIO; + dev_info->max_rx_queues = IAVF_MAX_NUM_QUEUES_LV; dev_info->max_tx_queues = IAVF_MAX_NUM_QUEUES_LV; dev_info->min_rx_bufsize = IAVF_BUF_SIZE_MIN; @@ -1286,6 +1307,9 @@ iavf_dev_vlan_filter_set(struct rte_eth_dev *dev, uint16_t vlan_id, int on) struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter); int err; + if (adapter->closed) + return -EIO; + if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_VLAN_V2) { err = iavf_add_del_vlan_v2(adapter, vlan_id, on); if (err) @@ -1362,6 +1386,9 @@ iavf_dev_vlan_offload_set(struct rte_eth_dev *dev, int mask) struct rte_eth_conf *dev_conf = &dev->data->dev_conf; int err; + if (adapter->closed) + return -EIO; + if (vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_VLAN_V2) return iavf_dev_vlan_offload_set_v2(dev, mask); @@ -1394,6 +1421,9 @@ iavf_dev_rss_reta_update(struct rte_eth_dev *dev, uint16_t i, idx, shift; int ret; + if (adapter->closed) + return -EIO; + if (!(vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_RSS_PF)) return -ENOTSUP; @@ -1439,6 +1469,9 @@ iavf_dev_rss_reta_query(struct rte_eth_dev *dev, struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter); uint16_t i, idx, shift; + if (adapter->closed) + return -EIO; + if (!(vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_RSS_PF)) return -ENOTSUP; @@ -1492,6 +1525,9 @@ iavf_dev_rss_hash_update(struct rte_eth_dev *dev, adapter->dev_data->dev_conf.rx_adv_conf.rss_conf = *rss_conf; + if (adapter->closed) + return -EIO; + if (!(vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_RSS_PF)) return -ENOTSUP; @@ -1545,6 +1581,9 @@ iavf_dev_rss_hash_conf_get(struct rte_eth_dev *dev, IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter); + if (adapter->closed) + return -EIO; + if (!(vf->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_RSS_PF)) return -ENOTSUP; @@ -1792,6 +1831,9 @@ iavf_dev_rx_queue_intr_enable(struct rte_eth_dev *dev, uint16_t queue_id) struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(adapter); uint16_t msix_intr; + if (adapter->closed) + return -EIO; + msix_intr = rte_intr_vec_list_index_get(pci_dev->intr_handle, queue_id); if (msix_intr == IAVF_MISC_VEC_ID) { @@ -2415,8 +2457,11 @@ static int iavf_dev_flow_ops_get(struct rte_eth_dev *dev, const struct rte_flow_ops **ops) { - if (!dev) - return -EINVAL; + struct iavf_adapter *adapter = + IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); + + if (adapter->closed) + return -EIO; *ops = &iavf_flow_ops; return 0; @@ -2557,7 +2602,7 @@ iavf_dev_init(struct rte_eth_dev *eth_dev) /* Start device watchdog */ iavf_dev_watchdog_enable(adapter); - + adapter->closed = false; return 0; @@ -2585,7 +2630,11 @@ iavf_dev_close(struct rte_eth_dev *dev) if (rte_eal_process_type() != RTE_PROC_PRIMARY) return 0; + if (adapter->closed) + return 0; + ret = iavf_dev_stop(dev); + adapter->closed = true; iavf_flow_flush(dev, NULL); iavf_flow_uninit(adapter); diff --git a/drivers/net/iavf/iavf_rxtx.c b/drivers/net/iavf/iavf_rxtx.c index 16e8d021f9..a2dc669bfd 100644 --- a/drivers/net/iavf/iavf_rxtx.c +++ b/drivers/net/iavf/iavf_rxtx.c @@ -554,6 +554,9 @@ iavf_dev_rx_queue_setup(struct rte_eth_dev *dev, uint16_t queue_idx, PMD_INIT_FUNC_TRACE(); + if (ad->closed) + return -EIO; + offloads = rx_conf->offloads | dev->data->dev_conf.rxmode.offloads; if (nb_desc % IAVF_ALIGN_RING_DESC != 0 || @@ -715,6 +718,9 @@ iavf_dev_tx_queue_setup(struct rte_eth_dev *dev, PMD_INIT_FUNC_TRACE(); + if (adapter->closed) + return -EIO; + offloads = tx_conf->offloads | dev->data->dev_conf.txmode.offloads; if (nb_desc % IAVF_ALIGN_RING_DESC != 0 || @@ -2739,6 +2745,10 @@ iavf_prep_pkts(__rte_unused void *tx_queue, struct rte_mbuf **tx_pkts, struct iavf_tx_queue *txq = tx_queue; struct rte_eth_dev *dev = &rte_eth_devices[txq->port_id]; struct iavf_info *vf = IAVF_DEV_PRIVATE_TO_VF(dev->data->dev_private); + struct iavf_adapter *adapter = IAVF_DEV_PRIVATE_TO_ADAPTER(dev->data->dev_private); + + if (adapter->closed) + return 0; for (i = 0; i < nb_pkts; i++) { m = tx_pkts[i]; diff --git a/drivers/net/iavf/iavf_vchnl.c b/drivers/net/iavf/iavf_vchnl.c index 169e1f2012..1bd3559ec2 100644 --- a/drivers/net/iavf/iavf_vchnl.c +++ b/drivers/net/iavf/iavf_vchnl.c @@ -265,6 +265,11 @@ iavf_handle_pf_event_msg(struct rte_eth_dev *dev, uint8_t *msg, struct virtchnl_pf_event *pf_msg = (struct virtchnl_pf_event *)msg; + if (adapter->closed) { + PMD_DRV_LOG(DEBUG, "Port closed"); + return; + } + if (msglen < sizeof(struct virtchnl_pf_event)) { PMD_DRV_LOG(DEBUG, "Error event"); return; @@ -777,6 +782,9 @@ iavf_switch_queue(struct iavf_adapter *adapter, uint16_t qid, struct iavf_cmd_info args; int err; + if (adapter->closed) + return -EIO; + memset(&queue_select, 0, sizeof(queue_select)); queue_select.vsi_id = vf->vsi_res->vsi_id; if (rx) @@ -1241,6 +1249,9 @@ iavf_query_stats(struct iavf_adapter *adapter, struct iavf_cmd_info args; int err; + if (adapter->closed) + return -EIO; + memset(&q_stats, 0, sizeof(q_stats)); q_stats.vsi_id = vf->vsi_res->vsi_id; args.ops = VIRTCHNL_OP_GET_STATS; @@ -1269,6 +1280,9 @@ iavf_config_promisc(struct iavf_adapter *adapter, struct iavf_cmd_info args; int err; + if (adapter->closed) + return -EIO; + promisc.flags = 0; promisc.vsi_id = vf->vsi_res->vsi_id; @@ -1312,6 +1326,9 @@ iavf_add_del_eth_addr(struct iavf_adapter *adapter, struct rte_ether_addr *addr, struct iavf_cmd_info args; int err; + if (adapter->closed) + return -EIO; + list = (struct virtchnl_ether_addr_list *)cmd_buffer; list->vsi_id = vf->vsi_res->vsi_id; list->num_elements = 1; -- 2.25.1