From patchwork Sun Jun 25 06:18:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Zhichao Zeng X-Patchwork-Id: 128976 X-Patchwork-Delegate: qi.z.zhang@intel.com Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2AE1342D46; Sun, 25 Jun 2023 08:11:53 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A395B40ED8; Sun, 25 Jun 2023 08:11:52 +0200 (CEST) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by mails.dpdk.org (Postfix) with ESMTP id 09E8040A7F for ; Sun, 25 Jun 2023 08:11:50 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1687673511; x=1719209511; h=from:to:cc:subject:date:message-id:reply-to:mime-version: content-transfer-encoding; bh=9WiKQKh7eB852aIz8UGt+TdCHCkKuZcG5aoSHTnsld4=; b=GVo/8K8vy4wUZ6t7oPeR89djfU9tvxh4n/tzDukrGfHo0sYdHhJcD4QB xy0KoKoUbd6PlQhsyXvNZ0gcjR42RS0Xrnx/uRWJbmRSRQshReJF1M6Ca IB3x6hjatdgj/c6Npp7qCjtKs8q8OHj4qfxd6/YOZnewRMNhhSQTjVCmA VEfuOgVBOKJGjF8JvU1R3l+ANIgMmloyPTSsA4k0U53IisAQ6UleNhG0g gNOkbGnx24BH+vq+fH52mU+HQEZGSt3NBFM2bxEkgbHKHBs8u1mcN902E cF+U1Vjf/YJ5Vu2dxKClknPgCvIjAQpyWip1msCvqPAmO5lNkt0nq91LM A==; X-IronPort-AV: E=McAfee;i="6600,9927,10751"; a="350800347" X-IronPort-AV: E=Sophos;i="6.01,156,1684825200"; d="scan'208";a="350800347" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jun 2023 23:11:50 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10751"; a="1046083776" X-IronPort-AV: E=Sophos;i="6.01,156,1684825200"; d="scan'208";a="1046083776" Received: from unknown (HELO zhichao-dpdk..) ([10.239.252.103]) by fmsmga005-auth.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jun 2023 23:11:47 -0700 From: Zhichao Zeng To: dev@dpdk.org Cc: qi.z.zhang@intel.com, Zhichao Zeng , Qiming Yang , Zhirun Yan Subject: [PATCH v2] net/ice: revert mark action in switch filter Date: Sun, 25 Jun 2023 14:18:23 +0800 Message-Id: <20230625061823.138544-1-zhichaox.zeng@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 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: , Reply-To: 20230621094125.3071251-1-zhichaox.zeng@intel.com Errors-To: dev-bounces@dpdk.org For current implementation, switch filter missed the consumption part of mark id for app, and switch filter captures the rules first instead of FDIR, which makes the FDIR rules lost. Revert this commit to disable mark action in switch filter and recover the mark action hit in FDIR by default. Fixes: e24f43f2c824 ("net/ice: support flow mark action in switch") Signed-off-by: Zhichao Zeng --- drivers/net/ice/ice_switch_filter.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/drivers/net/ice/ice_switch_filter.c b/drivers/net/ice/ice_switch_filter.c index 1ff4b1afda..110d8895fe 100644 --- a/drivers/net/ice/ice_switch_filter.c +++ b/drivers/net/ice/ice_switch_filter.c @@ -1715,7 +1715,6 @@ ice_switch_parse_action(struct ice_pf *pf, struct rte_eth_dev_data *dev_data = pf->adapter->pf.dev_data; const struct rte_flow_action_queue *act_q; const struct rte_flow_action_rss *act_qgrop; - const struct rte_flow_action_mark *act_mark; uint16_t base_queue, i; const struct rte_flow_action *action; enum rte_flow_action_type action_type; @@ -1768,13 +1767,6 @@ ice_switch_parse_action(struct ice_pf *pf, ICE_DROP_PACKET; break; - case RTE_FLOW_ACTION_TYPE_MARK: - act_mark = action->conf; - rule_info->sw_act.fltr_act = - ICE_SET_MARK; - rule_info->sw_act.markid = act_mark->id; - break; - case RTE_FLOW_ACTION_TYPE_VOID: break; @@ -1830,7 +1822,6 @@ ice_switch_check_action(const struct rte_flow_action *actions, case RTE_FLOW_ACTION_TYPE_RSS: case RTE_FLOW_ACTION_TYPE_QUEUE: case RTE_FLOW_ACTION_TYPE_DROP: - case RTE_FLOW_ACTION_TYPE_MARK: case RTE_FLOW_ACTION_TYPE_REPRESENTED_PORT: case RTE_FLOW_ACTION_TYPE_PORT_REPRESENTOR: actions_num++;