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 E841C427E0 for ; Mon, 20 Mar 2023 10:45:32 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E20E140A80; Mon, 20 Mar 2023 10:45:32 +0100 (CET) Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by mails.dpdk.org (Postfix) with ESMTP id 52BCF406BC; Mon, 20 Mar 2023 10:45:31 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679305531; x=1710841531; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=5VgKZhzoDHXR9GfBw7mcTgmaqjIE8oLsVIYWxiYLZYI=; b=lTMS0i6QKK82IQYqk/oRG/GdWydpw5iXtgl8EQoZ4pysb6lWmtCGjbVl Yb93XTaTx4/ZZDlVQc4D3aHrbcHwuyRj2quUYIWMc71qax8Lta0bkFnVX CiiScfBGocUHScMb0+R7rMBZdeIdykiSX89tdTqjDuDD2paKBhvH0JmR1 v0RDaXyvmw1pLbG8rbjcOU20uXXPbDR6+cK9kmBeGdy691iPrWiKQwZLb j8TlJ1KgpZ25tuCR6dKKXhXfemIMlSg+VTyiLHOns4hdxrsakyssf+9vG Fh6hIm7HduaL4OjgPWzNifO2MKfw75VRa8H6id8kW+1Cc9c1RCfR+A7Uc g==; X-IronPort-AV: E=McAfee;i="6600,9927,10654"; a="337335437" X-IronPort-AV: E=Sophos;i="5.98,274,1673942400"; d="scan'208";a="337335437" Received: from fmsmga004.fm.intel.com ([10.253.24.48]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2023 02:45:30 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10654"; a="750021848" X-IronPort-AV: E=Sophos;i="5.98,274,1673942400"; d="scan'208";a="750021848" Received: from unknown (HELO localhost.localdomain) ([10.239.252.253]) by fmsmga004-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 Mar 2023 02:45:28 -0700 From: Mingjin Ye To: dev@dpdk.org Cc: qiming.yang@intel.com, stable@dpdk.org, yidingx.zhou@intel.com, Mingjin Ye , Ke Zhang , Qi Zhang Subject: [PATCH v5] net/ice: fix ice dcf control thread crash Date: Mon, 20 Mar 2023 09:40:30 +0000 Message-Id: <20230320094030.18949-1-mingjinx.ye@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230317050936.5513-1-mingjinx.ye@intel.com> References: <20230317050936.5513-1-mingjinx.ye@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org The control thread accesses the hardware resources after the resources were released, which results in a segment error. The 'ice-reset' threads are detached, so thread resources cannot be reclaimed by `pthread_join` calls. This commit synchronizes the number of 'ice-reset' threads by adding two variables ('vsi_update_thread_num' and 'vsi_thread_lock' spinlock) to 'struct ice_dcf_hw'. When releasing HW resources, we clear the event callback function. That makes these threads exit quickly. After the number of 'ice-reset' threads decreased to be 0, we release resources. Fixes: 3b3757bda3c3 ("net/ice: get VF hardware index in DCF") Fixes: 931ee54072b1 ("net/ice: support QoS bandwidth config after VF reset in DCF") Fixes: c7e1a1a3bfeb ("net/ice: refactor DCF VLAN handling") Fixes: 0b02c9519432 ("net/ice: handle PF initialization by DCF") Fixes: b71573ec2fc2 ("net/ice: retry getting VF VSI map after failure") Fixes: 7564d5509611 ("net/ice: add DCF hardware initialization") Cc: stable@dpdk.org Signed-off-by: Ke Zhang Signed-off-by: Mingjin Ye --- v2: add pthread_exit() for windows --- v3: Optimization. It is unsafe for a thread to forcibly exit, which will cause the spin lock to not be released correctly --- v4: Safely wait for all event threads to end --- v5: Spinlock moved to struct ice_dcf_hw --- drivers/net/ice/ice_dcf.c | 21 +++++++++++++++++++-- drivers/net/ice/ice_dcf.h | 3 +++ drivers/net/ice/ice_dcf_parent.c | 23 +++++++++++++++++++++++ 3 files changed, 45 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/ice_dcf.c b/drivers/net/ice/ice_dcf.c index 1c3d22ae0f..53f62a06f4 100644 --- a/drivers/net/ice/ice_dcf.c +++ b/drivers/net/ice/ice_dcf.c @@ -543,6 +543,8 @@ ice_dcf_handle_vsi_update_event(struct ice_dcf_hw *hw) ice_dcf_disable_irq0(hw); for (;;) { + if (hw->vc_event_msg_cb == NULL) + break; if (ice_dcf_get_vf_resource(hw) == 0 && ice_dcf_get_vf_vsi_map(hw) >= 0) { err = 0; @@ -555,8 +557,10 @@ ice_dcf_handle_vsi_update_event(struct ice_dcf_hw *hw) rte_delay_ms(ICE_DCF_ARQ_CHECK_TIME); } - rte_intr_enable(pci_dev->intr_handle); - ice_dcf_enable_irq0(hw); + if (hw->vc_event_msg_cb != NULL) { + rte_intr_enable(pci_dev->intr_handle); + ice_dcf_enable_irq0(hw); + } rte_spinlock_unlock(&hw->vc_cmd_send_lock); @@ -639,6 +643,9 @@ ice_dcf_init_hw(struct rte_eth_dev *eth_dev, struct ice_dcf_hw *hw) rte_spinlock_init(&hw->vc_cmd_queue_lock); TAILQ_INIT(&hw->vc_cmd_queue); + rte_spinlock_init(&hw->vsi_thread_lock); + hw->vsi_update_thread_num = 0; + hw->arq_buf = rte_zmalloc("arq_buf", ICE_DCF_AQ_BUF_SZ, 0); if (hw->arq_buf == NULL) { PMD_INIT_LOG(ERR, "unable to allocate AdminQ buffer memory"); @@ -749,6 +756,12 @@ ice_dcf_uninit_hw(struct rte_eth_dev *eth_dev, struct ice_dcf_hw *hw) struct rte_pci_device *pci_dev = RTE_ETH_DEV_TO_PCI(eth_dev); struct rte_intr_handle *intr_handle = pci_dev->intr_handle; + /* Clear event callbacks, `VIRTCHNL_EVENT_DCF_VSI_MAP_UPDATE` + * event will be ignored and all running `ice-thread` threads + * will exit quickly. + */ + hw->vc_event_msg_cb = NULL; + if (hw->vf_res->vf_cap_flags & VIRTCHNL_VF_OFFLOAD_QOS) if (hw->tm_conf.committed) { ice_dcf_clear_bw(hw); @@ -760,6 +773,10 @@ ice_dcf_uninit_hw(struct rte_eth_dev *eth_dev, struct ice_dcf_hw *hw) rte_intr_callback_unregister(intr_handle, ice_dcf_dev_interrupt_handler, hw); + /* Wait for all `ice-thread` threads to exit. */ + while (hw->vsi_update_thread_num != 0) + rte_delay_ms(ICE_DCF_ARQ_CHECK_TIME); + ice_dcf_mode_disable(hw); iavf_shutdown_adminq(&hw->avf); diff --git a/drivers/net/ice/ice_dcf.h b/drivers/net/ice/ice_dcf.h index 7f42ebabe9..f95ef2794c 100644 --- a/drivers/net/ice/ice_dcf.h +++ b/drivers/net/ice/ice_dcf.h @@ -105,6 +105,9 @@ struct ice_dcf_hw { void (*vc_event_msg_cb)(struct ice_dcf_hw *dcf_hw, uint8_t *msg, uint16_t msglen); + rte_spinlock_t vsi_thread_lock; + int vsi_update_thread_num; + uint8_t *arq_buf; uint16_t num_vfs; diff --git a/drivers/net/ice/ice_dcf_parent.c b/drivers/net/ice/ice_dcf_parent.c index 01e390ddda..e48eb69c1a 100644 --- a/drivers/net/ice/ice_dcf_parent.c +++ b/drivers/net/ice/ice_dcf_parent.c @@ -130,6 +130,9 @@ ice_dcf_vsi_update_service_handler(void *param) rte_spinlock_lock(&vsi_update_lock); + if (hw->vc_event_msg_cb == NULL) + goto update_end; + if (!ice_dcf_handle_vsi_update_event(hw)) { __atomic_store_n(&parent_adapter->dcf_state_on, true, __ATOMIC_RELAXED); @@ -150,10 +153,14 @@ ice_dcf_vsi_update_service_handler(void *param) if (hw->tm_conf.committed) ice_dcf_replay_vf_bw(hw, reset_param->vf_id); +update_end: rte_spinlock_unlock(&vsi_update_lock); free(param); + rte_spinlock_lock(&hw->vsi_thread_lock); + hw->vsi_update_thread_num--; + rte_spinlock_unlock(&hw->vsi_thread_lock); return NULL; } @@ -183,6 +190,10 @@ start_vsi_reset_thread(struct ice_dcf_hw *dcf_hw, bool vfr, uint16_t vf_id) PMD_DRV_LOG(ERR, "Failed to start the thread for reset handling"); free(param); } + + rte_spinlock_lock(&dcf_hw->vsi_thread_lock); + dcf_hw->vsi_update_thread_num++; + rte_spinlock_unlock(&dcf_hw->vsi_thread_lock); } static uint32_t @@ -262,6 +273,18 @@ ice_dcf_handle_pf_event_msg(struct ice_dcf_hw *dcf_hw, PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_PF_DRIVER_CLOSE event"); break; case VIRTCHNL_EVENT_DCF_VSI_MAP_UPDATE: + /* If the event handling callback is empty, the event cannot + * be handled. Therefore we ignore this event. + */ + if (dcf_hw->vc_event_msg_cb == NULL) { + PMD_DRV_LOG(DEBUG, + "VIRTCHNL_EVENT_DCF_VSI_MAP_UPDATE event " + "received: VF%u with VSI num %u, ignore processing", + pf_msg->event_data.vf_vsi_map.vf_id, + pf_msg->event_data.vf_vsi_map.vsi_id); + break; + } + PMD_DRV_LOG(DEBUG, "VIRTCHNL_EVENT_DCF_VSI_MAP_UPDATE event : VF%u with VSI num %u", pf_msg->event_data.vf_vsi_map.vf_id, pf_msg->event_data.vf_vsi_map.vsi_id); -- 2.25.1