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 ED4C0A0505 for ; Fri, 20 May 2022 12:37:51 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E2DF742BA4; Fri, 20 May 2022 12:37:51 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id EE84440222; Fri, 20 May 2022 12:37:46 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1653043069; x=1684579069; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=g1UAUj1hm3DFy4imZ57rMGFHXfJzhO/2i0i5dVNJSl4=; b=Gf+OTiBey9V96emtTJYt6dOi+MrMsJQRqZ5RZ7dXNhTYxnyKCWkRUb5b BInmboE+IcAGpC7luJLJGEepkSAleTLMrTkT/HgnM3d6P3rdbHpjXKf81 kSsnRTt1oeGVOsQw6neasMaoRl4tEgvm6+WWQhL2ZDWTWIMEzwg0gYAX5 G4gp3nsZzVDrX+wH7peVYu612bCxiuoDbfLLcO1FLIoSjFly3Cg5BXiRu iutELVV9AD3gpQUZzGZk2jcVYZYEcgULCU9e4u1YbPgWUqr6jNLLnM9TI wtwg4Di1luKIyfu7SL5asDR4h/BVLuAfIz/IZWsPrQZtfit81jhTMKoZa A==; X-IronPort-AV: E=McAfee;i="6400,9594,10352"; a="272694698" X-IronPort-AV: E=Sophos;i="5.91,238,1647327600"; d="scan'208";a="272694698" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2022 03:37:45 -0700 X-IronPort-AV: E=Sophos;i="5.91,238,1647327600"; d="scan'208";a="599157575" Received: from unknown (HELO localhost.localdomain) ([10.239.251.253]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 20 May 2022 03:37:43 -0700 From: peng1x.zhang@intel.com To: qiming.yang@intel.com, qi.z.zhang@intel.com, dev@dpdk.org Cc: Peng Zhang , stable@dpdk.org Subject: [PATCH v3] net/ice: fix DCF state checking mechanism Date: Fri, 20 May 2022 18:31:12 +0000 Message-Id: <20220520183112.26546-1-peng1x.zhang@intel.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20220511154930.509436-1-peng1x.zhang@intel.com> References: <20220511154930.509436-1-peng1x.zhang@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 From: Peng Zhang DCF state previously checking mechanism cannot detect DCF state correctly in given situation,so PMD will report incorrect error code and mislead user. In this patch, DCF state checking mechanism is fixed through create or delete rule successfully or not. Then error code will be set as EAGAIN in given situation, while not EINVAL. The given situation as following steps show: step 1. DPDK DCF state has been set to on after VF has reset and multiple rules are creating. step 2. A VF reset happen immediately, kernel send an event to DPDK DCF and set STATE to pause. step 3. Before DPDK DCF receive the event, it is possible a rule creation is ongoing,then in virtual channel queue, the rule request is in front of the "re-connect", then it will be rejected. step 4. But the DPDK DCF state is not set to pause, error code will be set as EINVAL, not EAGAIN. Fixes: 285f63fc6bb7 ("net/ice: track DCF state of PF") Cc: stable@dpdk.org Signed-off-by: Peng Zhang --- v3 Changes: - Add the situation description, expected error code and incorrect error code in commit log. v2 Changes: - Modify DCF state checking mechanism. drivers/net/ice/ice_dcf_parent.c | 3 --- drivers/net/ice/ice_switch_filter.c | 20 ++++++-------------- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/drivers/net/ice/ice_dcf_parent.c b/drivers/net/ice/ice_dcf_parent.c index 2f96dedcce..5b02e0197f 100644 --- a/drivers/net/ice/ice_dcf_parent.c +++ b/drivers/net/ice/ice_dcf_parent.c @@ -121,7 +121,6 @@ ice_dcf_vsi_update_service_handler(void *param) struct ice_dcf_hw *hw = reset_param->dcf_hw; struct ice_dcf_adapter *adapter = container_of(hw, struct ice_dcf_adapter, real_hw); - struct ice_adapter *parent_adapter = &adapter->parent; pthread_detach(pthread_self()); @@ -130,8 +129,6 @@ ice_dcf_vsi_update_service_handler(void *param) rte_spinlock_lock(&vsi_update_lock); if (!ice_dcf_handle_vsi_update_event(hw)) { - __atomic_store_n(&parent_adapter->dcf_state_on, true, - __ATOMIC_RELAXED); ice_dcf_update_vf_vsi_map(&adapter->parent.hw, hw->num_vfs, hw->vf_vsi_map); } diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index 36c9bffb73..3d36c63e97 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -403,13 +403,6 @@ ice_switch_create(struct ice_adapter *ad, goto error; } - if (ice_dcf_adminq_need_retry(ad)) { - rte_flow_error_set(error, EAGAIN, - RTE_FLOW_ERROR_TYPE_ITEM, NULL, - "DCF is not on"); - goto error; - } - ret = ice_add_adv_rule(hw, list, lkups_cnt, rule_info, &rule_added); if (!ret) { filter_conf_ptr = rte_zmalloc("ice_switch_filter", @@ -432,6 +425,9 @@ ice_switch_create(struct ice_adapter *ad, filter_conf_ptr->fltr_status = ICE_SW_FLTR_ADDED; flow->rule = filter_conf_ptr; + + if (ad->hw.dcf_enabled) + __atomic_store_n(&ad->dcf_state_on, true, __ATOMIC_RELAXED); } else { if (ice_dcf_adminq_need_retry(ad)) ret = -EAGAIN; @@ -490,13 +486,6 @@ ice_switch_destroy(struct ice_adapter *ad, return -rte_errno; } - if (ice_dcf_adminq_need_retry(ad)) { - rte_flow_error_set(error, EAGAIN, - RTE_FLOW_ERROR_TYPE_ITEM, NULL, - "DCF is not on"); - return -rte_errno; - } - ret = ice_rem_adv_rule_by_id(hw, &filter_conf_ptr->sw_query_data); if (ret) { if (ice_dcf_adminq_need_retry(ad)) @@ -508,6 +497,9 @@ ice_switch_destroy(struct ice_adapter *ad, RTE_FLOW_ERROR_TYPE_HANDLE, NULL, "fail to destroy switch filter rule"); return -rte_errno; + } else { + if (ad->hw.dcf_enabled) + __atomic_store_n(&ad->dcf_state_on, true, __ATOMIC_RELAXED); } ice_switch_filter_rule_free(flow); -- 2.25.1