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 096FBA0C57 for ; Mon, 1 Nov 2021 09:45:48 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0284A40DF6; Mon, 1 Nov 2021 09:45:48 +0100 (CET) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by mails.dpdk.org (Postfix) with ESMTP id 07D6E40DF6; Mon, 1 Nov 2021 09:45:45 +0100 (CET) X-IronPort-AV: E=McAfee;i="6200,9189,10154"; a="254578798" X-IronPort-AV: E=Sophos;i="5.87,198,1631602800"; d="scan'208";a="254578798" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 01:45:32 -0700 X-IronPort-AV: E=Sophos;i="5.87,198,1631602800"; d="scan'208";a="499956407" Received: from unknown (HELO localhost.localdomain) ([10.240.183.93]) by orsmga008-auth.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 01 Nov 2021 01:45:29 -0700 From: dapengx.yu@intel.com To: Qiming Yang , Qi Zhang Cc: dev@dpdk.org, haiyue.wang@intel.com, Dapeng Yu , stable@dpdk.org Date: Mon, 1 Nov 2021 16:45:06 +0800 Message-Id: <20211101084506.513407-2-dapengx.yu@intel.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20211101084506.513407-1-dapengx.yu@intel.com> References: <20211101084506.513407-1-dapengx.yu@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] [PATCH 2/2] net/ice: fix flow redirect failure 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 Sender: "stable" From: Dapeng Yu When the switch flow rules are redirected, if rule is removed but not added successfully, the rule addition in the next time will not succeed because the rule's meta cannot be found. This patch uses the saved flow rule's meta when the flow rule is added again to make the addition succeed. Fixes: 397b4b3c5095 ("net/ice: enable flow redirect on switch") Cc: stable@dpdk.org Signed-off-by: Dapeng Yu --- drivers/net/ice/ice_switch_filter.c | 29 +++++++++++++++++++++++++++-- 1 file changed, 27 insertions(+), 2 deletions(-) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index 804cf9b812..0994ea00ae 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -1917,7 +1917,10 @@ ice_switch_redirect(struct ice_adapter *ad, struct rte_flow *flow, struct ice_flow_redirect *rd) { - struct ice_rule_query_data *rdata = flow->rule; + struct ice_rule_query_data *rdata; + struct ice_switch_filter_conf *filter_conf_ptr = + (struct ice_switch_filter_conf *)flow->rule; + struct ice_rule_query_data added_rdata = { 0 }; struct ice_adv_fltr_mgmt_list_entry *list_itr; struct ice_adv_lkup_elem *lkups_dp = NULL; struct LIST_HEAD_TYPE *list_head; @@ -1927,6 +1930,8 @@ ice_switch_redirect(struct ice_adapter *ad, uint16_t lkups_cnt; int ret; + rdata = &filter_conf_ptr->sw_query_data; + if (rdata->vsi_handle != rd->vsi_handle) return 0; @@ -1937,6 +1942,22 @@ ice_switch_redirect(struct ice_adapter *ad, if (rd->type != ICE_FLOW_REDIRECT_VSI) return -ENOTSUP; + if (!filter_conf_ptr->added) { + ret = ice_add_adv_rule(hw, filter_conf_ptr->lkups, + filter_conf_ptr->lkups_num, + &filter_conf_ptr->rule_info, + &added_rdata); + + if (ret) { + PMD_DRV_LOG(ERR, "Failed to replay the rule again"); + return -EINVAL; + } + + filter_conf_ptr->sw_query_data = added_rdata; + filter_conf_ptr->added = true; + return 0; + } + list_head = &sw->recp_list[rdata->rid].filt_rules; LIST_FOR_EACH_ENTRY(list_itr, list_head, ice_adv_fltr_mgmt_list_entry, list_entry) { @@ -1983,10 +2004,14 @@ ice_switch_redirect(struct ice_adapter *ad, /* Replay the rule */ ret = ice_add_adv_rule(hw, lkups_dp, lkups_cnt, - &rinfo, rdata); + &rinfo, &added_rdata); if (ret) { PMD_DRV_LOG(ERR, "Failed to replay the rule"); + filter_conf_ptr->added = false; ret = -EINVAL; + } else { + filter_conf_ptr->sw_query_data = added_rdata; + filter_conf_ptr->added = true; } out: -- 2.27.0