From patchwork Thu Feb 16 14:51:26 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakesh Kudurumalla X-Patchwork-Id: 124084 X-Patchwork-Delegate: ferruh.yigit@amd.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 23B1441CB2; Thu, 16 Feb 2023 15:52:00 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 10F6542D94; Thu, 16 Feb 2023 15:52:00 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 2C6D742D9B for ; Thu, 16 Feb 2023 15:51:58 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31G8E3JN019070; Thu, 16 Feb 2023 06:51:40 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=vGOHgo+1OHmGWYQrbfpWUgiKj0DmFww+QJhyFjOQi/Y=; b=dWTmZZ4itSS9h1bf6P+/UvtEOMDev3pfZh9jaHymmhSaumOUYt6sQn8W0Bzd5TeB0swx ELEdfCGaPqnCNmVCtcEmSzgQ3PrWnb5yn/lk3svomDg4e3Bti1lu1gSjJKSEh89EUZ+W XPwuBqQGana61b9spycApT5vK4k7qJr+HAjQcnC2UVGtpxgT9+WfqDLcJ/kkDo8x9iUU R0TSIYigjg2SxhFT/YfAMFIIqCovrmFCGRP/LqBAN+2gTrDDZ5tReEtkfzJ2tYQFJ9Ib /bO+RwuH3zqydxfTVzniqQtIoFFilB64KGYYizR4xoMvgYjtUBD/MRTl5Hhf9KZwSrtD 7w== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3nsg6w9vfj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 16 Feb 2023 06:51:40 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Thu, 16 Feb 2023 06:51:38 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Thu, 16 Feb 2023 06:51:38 -0800 Received: from localhost.localdomain (unknown [10.28.36.154]) by maili.marvell.com (Postfix) with ESMTP id EF60B3F7097; Thu, 16 Feb 2023 06:51:35 -0800 (PST) From: Rakesh Kudurumalla To: Ferruh Yigit , Ori Kam , "Thomas Monjalon" , Andrew Rybchenko CC: , , , "Rakesh Kudurumalla" Subject: [PATCH v11 1/3] ethdev: skip congestion management configuration Date: Thu, 16 Feb 2023 20:21:26 +0530 Message-ID: <20230216145128.1734257-1-rkudurumalla@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230215174251.1698253-1-rkudurumalla@marvell.com> References: <20230215174251.1698253-1-rkudurumalla@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: QxCJem8tHdu_-g8s2OsT6H9VgOUEOB6Y X-Proofpoint-GUID: QxCJem8tHdu_-g8s2OsT6H9VgOUEOB6Y X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-16_10,2023-02-16_01,2023-02-09_01 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 Introduce new flow action to skip congestion management configuration This feature helps to skip the congestion management processing based on per flow or the packet color identified by rte_flow meter object. For example, If one Rx queue configured as RED congestion and application wants tobypass the RED congestion processing for all GREEN color packet can be expressed though RTE_FLOW_ACTION_TYPE_SKIP_CMAN flow action Signed-off-by: Rakesh Kudurumalla Acked-by: Ori Kam Acked-by: Jerin Jacob --- v11: Updated sample command to apply congestion configuration with dpdk-testpmd application doc/guides/nics/features/default.ini | 1 + doc/guides/prog_guide/rte_flow.rst | 22 ++++++++++++++++++++++ doc/guides/rel_notes/release_23_03.rst | 6 ++++++ lib/ethdev/rte_flow.h | 11 +++++++++++ 4 files changed, 40 insertions(+) diff --git a/doc/guides/nics/features/default.ini b/doc/guides/nics/features/default.ini index 976a020985..49e41b8002 100644 --- a/doc/guides/nics/features/default.ini +++ b/doc/guides/nics/features/default.ini @@ -200,6 +200,7 @@ set_tag = set_tp_dst = set_tp_src = set_ttl = +skip_cman = vf = vxlan_decap = vxlan_encap = diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index 8ad01ef05c..6b412e8585 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -1832,6 +1832,28 @@ Drop packets. | no properties | +---------------+ + +Action: ``SKIP_CMAN`` +^^^^^^^^^^^^^^^^^^^^^ + +Skip congestion management on received packets + +- Using ``rte_eth_cman_config_set()``, application can configure ethdev Rx + queue's congestion mechanism.Once applied packets congestion configuration + is bypassed on that particular ethdev Rx queue for all packets directed + to that receive queue + +.. _table_rte_flow_action_skip_cman: + +.. table:: SKIP_CMAN + + +---------------+ + | Field | + +===============+ + | no properties | + +---------------+ + + Action: ``COUNT`` ^^^^^^^^^^^^^^^^^ diff --git a/doc/guides/rel_notes/release_23_03.rst b/doc/guides/rel_notes/release_23_03.rst index 2ca30b3b49..39085a19a1 100644 --- a/doc/guides/rel_notes/release_23_03.rst +++ b/doc/guides/rel_notes/release_23_03.rst @@ -98,6 +98,12 @@ New Features * Added ``host_port_id`` in ``rte_flow_port_attr`` structure to reference the port hosting the shared objects. +* **Added support to skip congestion management configuration.** + + * Added a new action ``RTE_FLOW_ACTION_TYPE_SKIP_CMAN`` to skip + congestion management processing based on per flow or packet color + identified by rte_flow meter object + * **Updated AMD axgbe driver.** * Added multi-process support. diff --git a/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index fb984a1097..8b9c0f02c3 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -2820,6 +2820,17 @@ enum rte_flow_action_type { * No associated configuration structure. */ RTE_FLOW_ACTION_TYPE_SEND_TO_KERNEL, + + /** + * Skip congestion management configuration + * + * Using rte_eth_cman_config_set() API the application + * can configure ethdev Rx queue's congestion mechanism. + * Introducing RTE_FLOW_ACTION_TYPE_SKIP_CMAN flow action to skip the + * congestion configuration applied to the given ethdev Rx queue. + * + */ + RTE_FLOW_ACTION_TYPE_SKIP_CMAN, }; /** From patchwork Thu Feb 16 14:51:27 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakesh Kudurumalla X-Patchwork-Id: 124082 X-Patchwork-Delegate: ferruh.yigit@amd.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 057B741CB2; Thu, 16 Feb 2023 15:51:47 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D80A240EE3; Thu, 16 Feb 2023 15:51:46 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 0337040E03 for ; Thu, 16 Feb 2023 15:51:44 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31G7ZLVK007551; Thu, 16 Feb 2023 06:51:44 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=pBPjJkqlq+6IjqvRArzNzRjBuzOZ6id5PMyvsEJm/g8=; b=isk7CLoQj9zgIgcWkZGEGa6xKbEjaonPnSTty2M/36aCs6bbgMePtCjnaHji44K8AXH0 qmTo/TbCojIl4z+R/GrsIdosvpq4CdjiC+oNGNtgVA9ACKvt8l05/wJI0KY5ibkk5QWg /6yle6M8MyhUd1yoewwVbL2YVI6NCsDvVDMfMt6ax7MqNRZdfDukvoJjeOTvkf0VY+Z7 9YHwfB8sji0F1vBfcIoW4Rp0JjV+uJOuYZLO/SCoJNg8Wd0puVM9gzsH/kO07ToUZNt5 4OYmDzk7j103aKbSVSQWtHOIDDM4Nm9uhlfnvYlaO/0YnxhIu+SD6aL7NnAjpQeLbomj jA== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3nsg6w9vfw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 16 Feb 2023 06:51:44 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Thu, 16 Feb 2023 06:51:42 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Thu, 16 Feb 2023 06:51:42 -0800 Received: from localhost.localdomain (unknown [10.28.36.154]) by maili.marvell.com (Postfix) with ESMTP id D10A13F7089; Thu, 16 Feb 2023 06:51:39 -0800 (PST) From: Rakesh Kudurumalla To: Ori Kam , Aman Singh , "Yuying Zhang" CC: , , , "Rakesh Kudurumalla" Subject: [PATCH v11 2/3] app/testpmd: add skip cman support for testpmd Date: Thu, 16 Feb 2023 20:21:27 +0530 Message-ID: <20230216145128.1734257-2-rkudurumalla@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230216145128.1734257-1-rkudurumalla@marvell.com> References: <20230215174251.1698253-1-rkudurumalla@marvell.com> <20230216145128.1734257-1-rkudurumalla@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: Md8hZ7zyhb3kJYbNd7t8R7j2sd3oNBHt X-Proofpoint-GUID: Md8hZ7zyhb3kJYbNd7t8R7j2sd3oNBHt X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-16_10,2023-02-16_01,2023-02-09_01 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 added support for testpmd application to accept skip_cman action while configuring policy action Below is sample command given after configuring meter profile for which congestion configuration is applied for red and yellow color packets and bypassed for green color packets in dpdk-testpmd application add port meter policy 0 200 g_actions drop / skip_cman / end y_actions drop / end r_actions drop / end Signed-off-by: Rakesh Kudurumalla --- app/test-pmd/cmdline_flow.c | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/app/test-pmd/cmdline_flow.c b/app/test-pmd/cmdline_flow.c index 63a0b36622..e4b17aa22d 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -488,6 +488,7 @@ enum index { ACTION_END, ACTION_VOID, ACTION_PASSTHRU, + ACTION_SKIP_CMAN, ACTION_JUMP, ACTION_JUMP_GROUP, ACTION_MARK, @@ -1896,6 +1897,7 @@ static const enum index next_action[] = { ACTION_END, ACTION_VOID, ACTION_PASSTHRU, + ACTION_SKIP_CMAN, ACTION_JUMP, ACTION_MARK, ACTION_FLAG, @@ -5385,6 +5387,13 @@ static const struct token token_list[] = { .next = NEXT(NEXT_ENTRY(ACTION_NEXT)), .call = parse_vc, }, + [ACTION_SKIP_CMAN] = { + .name = "skip_cman", + .help = "bypass cman on received packets", + .priv = PRIV_ACTION(SKIP_CMAN, 0), + .next = NEXT(NEXT_ENTRY(ACTION_NEXT)), + .call = parse_vc, + }, [ACTION_JUMP] = { .name = "jump", .help = "redirect traffic to a given group", From patchwork Thu Feb 16 14:51:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakesh Kudurumalla X-Patchwork-Id: 124083 X-Patchwork-Delegate: ferruh.yigit@amd.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 7F7FE41CB2; Thu, 16 Feb 2023 15:51:51 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E00E542D77; Thu, 16 Feb 2023 15:51:49 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id B426B42D77 for ; Thu, 16 Feb 2023 15:51:48 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 31G8H3NU023904 for ; Thu, 16 Feb 2023 06:51:48 -0800 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=Ms0t2maTOFbl1vysS81BOwEKia1d9Qlqhsz4obRlNLQ=; b=RVV9OGMOr+7mWzFuHDMc4T6/z27yrPNiKLSgpdd/RSS/y8z5dsrrG0BNfvhlmx5KRA4g 8Yl6JRuScoMyvsDEAR9da9kGivN+jCmwS4US3gAnZfYYfdG47Gew65ZrPWyW/izMimT1 R+5oB6m77Um+QwVb00OemyBMxqBPLQanMG2sQCMRGQbu1tMCIv8GF8sAAv44q7NH0NBW o/Qpqu2sMv6+cvZIXMztR8D6lBteuKiaXXcsklNfQd32sz9oKWRzZnQDwZ8ZmMWaXEGY GYV7d+MOn0sDUB7kCvTMpikd44SNgZIFOBCBi7WL3EARIi4lMw9kw+CnfnpsGf2whPiT wg== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3nsg6w9vgf-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Thu, 16 Feb 2023 06:51:48 -0800 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Thu, 16 Feb 2023 06:51:45 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Thu, 16 Feb 2023 06:51:45 -0800 Received: from localhost.localdomain (unknown [10.28.36.154]) by maili.marvell.com (Postfix) with ESMTP id 7DD103F7096; Thu, 16 Feb 2023 06:51:43 -0800 (PST) From: Rakesh Kudurumalla To: Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao CC: , , Rakesh Kudurumalla Subject: [PATCH v11 3/3] net/cnxk: skip red drop for ingress policer Date: Thu, 16 Feb 2023 20:21:28 +0530 Message-ID: <20230216145128.1734257-3-rkudurumalla@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230216145128.1734257-1-rkudurumalla@marvell.com> References: <20230215174251.1698253-1-rkudurumalla@marvell.com> <20230216145128.1734257-1-rkudurumalla@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: O8zWJXs2BS0vCXXYE4LSghQ47FY9vgUy X-Proofpoint-GUID: O8zWJXs2BS0vCXXYE4LSghQ47FY9vgUy X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.170.22 definitions=2023-02-16_10,2023-02-16_01,2023-02-09_01 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 Dropping of packets is based on action configured to meter.If both skip_red and drop actions are configured then tail dropping in invoked else if only drop action is configured then RED drop is invoked.This action is supported only when RED is configured using rte_eth_cman_config_set() Signed-off-by: Rakesh Kudurumalla Acked-by: Nithin Dabilpuram --- doc/guides/nics/features/cnxk.ini | 1 + doc/guides/nics/features/cnxk_vf.ini | 1 + doc/guides/rel_notes/release_23_03.rst | 5 +++ drivers/net/cnxk/cnxk_ethdev.h | 1 + drivers/net/cnxk/cnxk_ethdev_mtr.c | 50 ++++++++++++++++++++++++++ 5 files changed, 58 insertions(+) diff --git a/doc/guides/nics/features/cnxk.ini b/doc/guides/nics/features/cnxk.ini index f81628da77..7947c044bb 100644 --- a/doc/guides/nics/features/cnxk.ini +++ b/doc/guides/nics/features/cnxk.ini @@ -94,4 +94,5 @@ queue = Y represented_port = Y rss = Y security = Y +skip_cman = Y vf = Y diff --git a/doc/guides/nics/features/cnxk_vf.ini b/doc/guides/nics/features/cnxk_vf.ini index c4ee32a9ad..873e1dcc0a 100644 --- a/doc/guides/nics/features/cnxk_vf.ini +++ b/doc/guides/nics/features/cnxk_vf.ini @@ -83,4 +83,5 @@ pf = Y queue = Y rss = Y security = Y +skip_cman = Y vf = Y diff --git a/doc/guides/rel_notes/release_23_03.rst b/doc/guides/rel_notes/release_23_03.rst index 39085a19a1..53d5b1416c 100644 --- a/doc/guides/rel_notes/release_23_03.rst +++ b/doc/guides/rel_notes/release_23_03.rst @@ -117,6 +117,11 @@ New Features * Added support for meter options. * Added support for rte_flow meter action. +* **Updated Marvell cnxk ethdev PMD.** + + * Added support to skip RED using new action + ``RTE_FLOW_ACTION_TYPE_SKIP_CMAN`` + * **Updated NVIDIA mlx5 driver.** * Added support for matching on ICMPv6 ID and sequence fields. diff --git a/drivers/net/cnxk/cnxk_ethdev.h b/drivers/net/cnxk/cnxk_ethdev.h index f0eab4244c..ba35873124 100644 --- a/drivers/net/cnxk/cnxk_ethdev.h +++ b/drivers/net/cnxk/cnxk_ethdev.h @@ -168,6 +168,7 @@ struct policy_actions { uint16_t queue; uint32_t mtr_id; struct action_rss *rss_desc; + bool skip_red; }; }; diff --git a/drivers/net/cnxk/cnxk_ethdev_mtr.c b/drivers/net/cnxk/cnxk_ethdev_mtr.c index dcfa4223d5..27a6e4ef3d 100644 --- a/drivers/net/cnxk/cnxk_ethdev_mtr.c +++ b/drivers/net/cnxk/cnxk_ethdev_mtr.c @@ -358,6 +358,9 @@ cnxk_nix_mtr_policy_validate(struct rte_eth_dev *dev, if (action->type == RTE_FLOW_ACTION_TYPE_VOID) supported[i] = true; + if (action->type == RTE_FLOW_ACTION_TYPE_SKIP_CMAN) + supported[i] = true; + if (!supported[i]) return update_mtr_err(i, error, true); } @@ -397,6 +400,10 @@ cnxk_fill_policy_actions(struct cnxk_mtr_policy_node *fmp, fmp->actions[i].action_fate = action->type; } + + if (action->type == + RTE_FLOW_ACTION_TYPE_SKIP_CMAN) + fmp->actions[i].skip_red = true; } } } @@ -1306,6 +1313,45 @@ nix_mtr_config_map(struct cnxk_meter_node *mtr, struct roc_nix_bpf_cfg *cfg) cfg->action[ROC_NIX_BPF_COLOR_RED] = ROC_NIX_BPF_ACTION_DROP; } +static void +nix_mtr_config_red(struct cnxk_meter_node *mtr, struct roc_nix_rq *rq, + struct roc_nix_bpf_cfg *cfg) +{ + struct cnxk_mtr_policy_node *policy = mtr->policy; + + if ((rq->red_pass && rq->red_pass >= rq->red_drop) || + (rq->spb_red_pass && rq->spb_red_pass >= rq->spb_red_drop) || + (rq->xqe_red_pass && rq->xqe_red_pass >= rq->xqe_red_drop)) { + if (policy->actions[RTE_COLOR_GREEN].action_fate == + RTE_FLOW_ACTION_TYPE_DROP) { + if (policy->actions[RTE_COLOR_GREEN].skip_red) + cfg->action[ROC_NIX_BPF_COLOR_GREEN] = + ROC_NIX_BPF_ACTION_DROP; + else + cfg->action[ROC_NIX_BPF_COLOR_GREEN] = + ROC_NIX_BPF_ACTION_RED; + } + if (policy->actions[RTE_COLOR_YELLOW].action_fate == + RTE_FLOW_ACTION_TYPE_DROP) { + if (policy->actions[RTE_COLOR_YELLOW].skip_red) + cfg->action[ROC_NIX_BPF_COLOR_YELLOW] = + ROC_NIX_BPF_ACTION_DROP; + else + cfg->action[ROC_NIX_BPF_COLOR_YELLOW] = + ROC_NIX_BPF_ACTION_RED; + } + if (policy->actions[RTE_COLOR_RED].action_fate == + RTE_FLOW_ACTION_TYPE_DROP) { + if (policy->actions[RTE_COLOR_RED].skip_red) + cfg->action[ROC_NIX_BPF_COLOR_RED] = + ROC_NIX_BPF_ACTION_DROP; + else + cfg->action[ROC_NIX_BPF_COLOR_RED] = + ROC_NIX_BPF_ACTION_RED; + } + } +} + static void nix_precolor_table_map(struct cnxk_meter_node *mtr, struct roc_nix_bpf_precolor *tbl, @@ -1483,6 +1529,10 @@ nix_mtr_configure(struct rte_eth_dev *eth_dev, uint32_t id) if (!mtr[i]->is_used) { memset(&cfg, 0, sizeof(struct roc_nix_bpf_cfg)); nix_mtr_config_map(mtr[i], &cfg); + for (j = 0; j < mtr[i]->rq_num; j++) { + rq = &dev->rqs[mtr[i]->rq_id[j]]; + nix_mtr_config_red(mtr[i], rq, &cfg); + } rc = roc_nix_bpf_config(nix, mtr[i]->bpf_id, lvl_map[mtr[i]->level], &cfg);