From patchwork Thu Feb 9 07:24:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakesh Kudurumalla X-Patchwork-Id: 123513 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 AF31441C49; Thu, 9 Feb 2023 08:24:25 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9344E40DDA; Thu, 9 Feb 2023 08:24:25 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 4ED574067B for ; Thu, 9 Feb 2023 08:24:23 +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 3195Wm0Y011582; Wed, 8 Feb 2023 23:24:21 -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=U0r0ExBUC5mANbyd5jaCc+c62UYIh8yTvkQsKTtbQFk=; b=YZXMxhDIVyAtGhFIwmAEyzWv32ShXxBZw6qQHcp/5QZkbUTZ6mlcOuChQk+cBkbnqGqV oCQX3RpWp0HG9l6HLjOGQ//4uQlxJkVT/ohINeaoXRd2UzeNlYfErUtaLLclCKrahMOG y0kK5d73Jb7DtBQl4Mdz4IqyaqCaiZpmgqfVMzWo2JGKco/aFJjf6V7JvwPsXy+njdG7 iEWytSKOuKQib+sWw65XSB7gFkkXpaa6AN52qxA6p1f5lz13aFyKe0v46nwf2UYvAI/c FR6/rjH4cif/t8f3v3AoYIDLI4FkRxAwhHt3unw1gK+xEJKVEpmRV2WERYl6gFhsv50Z Wg== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3nm65m155r-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 08 Feb 2023 23:24:21 -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; Wed, 8 Feb 2023 23:24:19 -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; Wed, 8 Feb 2023 23:24:19 -0800 Received: from localhost.localdomain (unknown [10.28.36.154]) by maili.marvell.com (Postfix) with ESMTP id 8066B5B692C; Wed, 8 Feb 2023 23:24:15 -0800 (PST) From: Rakesh Kudurumalla To: Ori Kam , Thomas Monjalon , "Ferruh Yigit" , Andrew Rybchenko CC: , , , "Rakesh Kudurumalla" Subject: [PATCH v3 1/3] lib: skip congestion management configuration Date: Thu, 9 Feb 2023 12:54:00 +0530 Message-ID: <20230209072402.957747-1-rkudurumalla@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230125073231.4007078-1-rkudurumalla@marvell.com> References: <20230125073231.4007078-1-rkudurumalla@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: webBfeMpAFeRfZ2rF8vBoEDG4kndJ6WY X-Proofpoint-ORIG-GUID: webBfeMpAFeRfZ2rF8vBoEDG4kndJ6WY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-02-09_04,2023-02-08_02,2022-06-22_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 Skip the congestion management configuration applied using rte_eth_cman_config_set() API on the given ethdev Rx queue. Signed-off-by: Rakesh Kudurumalla --- v3: Updated comments and programmers guide regrading new action doc/guides/prog_guide/rte_flow.rst | 22 ++++++++++++++++++++++ lib/ethdev/rte_flow.h | 20 ++++++++++++++++++++ 2 files changed, 42 insertions(+) diff --git a/doc/guides/prog_guide/rte_flow.rst b/doc/guides/prog_guide/rte_flow.rst index 3e6242803d..0737b877da 100644 --- a/doc/guides/prog_guide/rte_flow.rst +++ b/doc/guides/prog_guide/rte_flow.rst @@ -1840,6 +1840,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/lib/ethdev/rte_flow.h b/lib/ethdev/rte_flow.h index b60987db4b..5ae00e2245 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -2203,6 +2203,26 @@ enum rte_flow_action_type { */ RTE_FLOW_ACTION_TYPE_DROP, + /** + * Skip congestion management configuration + * + * ethdev: introduce flow action to 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. + * + * 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 + */ + RTE_FLOW_ACTION_TYPE_SKIP_CMAN, + /** * Enables counters for this flow rule. * From patchwork Thu Feb 9 07:24:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakesh Kudurumalla X-Patchwork-Id: 123514 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 CF97841C49; Thu, 9 Feb 2023 08:24:31 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BE2FE41611; Thu, 9 Feb 2023 08:24:31 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 1F3504067B for ; Thu, 9 Feb 2023 08:24:31 +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 3195Wm0Z011582; Wed, 8 Feb 2023 23:24:30 -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=VNtrAnKg6LMEG7Dtvz9oaO34epMBohx12x6YM1LN6Ks=; b=dpG+2940wPsoq7a3mNBsuutqcsKQzW/TBtPmUpzWtNLvNrAa1uiFAnnJzN2rUxdFqDrn icVBOVCpInLXPsRyGU6IfXCOf0kuzCej7UF54sc3GGXhpYO2LnLpJOQTf5WmzzsH6CdK tuLqPXK3pZXJ3kvxa2KvdQ0KOqBFyYwJoKUvDiNqlxLPBpsVOyzDMn29Sd1gw8HjG7fk 2x2E8SOtSjKQqfRirPUgwclj9XkaL3HOrE3uPjt2Ofbx+Ch2K/Far6utaWmMnZ5G1loz LoVy6sBgFr74O+kAE2d0y+yv+9TISfH7qivDBsi3XXLjgZQJNCe5jU4hIYlOQvSVYtlV nA== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3nm65m158a-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 08 Feb 2023 23:24:30 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 8 Feb 2023 23:24:27 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Wed, 8 Feb 2023 23:24:27 -0800 Received: from localhost.localdomain (unknown [10.28.36.154]) by maili.marvell.com (Postfix) with ESMTP id 6C9DD5B692B; Wed, 8 Feb 2023 23:24:25 -0800 (PST) From: Rakesh Kudurumalla To: Ori Kam , Aman Singh , "Yuying Zhang" CC: , , , "Rakesh Kudurumalla" Subject: [PATCH v3 2/3] app/testpmd: add skip cman support for testpmd Date: Thu, 9 Feb 2023 12:54:01 +0530 Message-ID: <20230209072402.957747-2-rkudurumalla@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230209072402.957747-1-rkudurumalla@marvell.com> References: <20230125073231.4007078-1-rkudurumalla@marvell.com> <20230209072402.957747-1-rkudurumalla@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: geRmuge4cmhFFK7Aa1V80gCYi03MVibP X-Proofpoint-ORIG-GUID: geRmuge4cmhFFK7Aa1V80gCYi03MVibP X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-02-09_04,2023-02-08_02,2022-06-22_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 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 88108498e0..fc003e0096 100644 --- a/app/test-pmd/cmdline_flow.c +++ b/app/test-pmd/cmdline_flow.c @@ -472,6 +472,7 @@ enum index { ACTION_END, ACTION_VOID, ACTION_PASSTHRU, + ACTION_SKIP_CMAN, ACTION_JUMP, ACTION_JUMP_GROUP, ACTION_MARK, @@ -1825,6 +1826,7 @@ static const enum index next_action[] = { ACTION_END, ACTION_VOID, ACTION_PASSTHRU, + ACTION_SKIP_CMAN, ACTION_JUMP, ACTION_MARK, ACTION_FLAG, @@ -5159,6 +5161,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 9 07:24:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakesh Kudurumalla X-Patchwork-Id: 123515 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 1B0CB41C49; Thu, 9 Feb 2023 08:24:37 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 090A34161A; Thu, 9 Feb 2023 08:24:37 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 9D2274067B for ; Thu, 9 Feb 2023 08:24:35 +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 3191pgtD019169 for ; Wed, 8 Feb 2023 23:24:35 -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=Xpx6ja1h2IctH/4eeTKnyJGNacqe7aIesK1q1QmykK4=; b=Lxuhm+BPPxbIXQ/3g1Tx2vVow4IhW8U/kcC4XgDzNaXtp46dboIuT8JL4C+xla+4zFbB 0lN/4RBc4EyMOqMW83iOLVdctuERDCc++878M5GkJF2cMsPJp58E4ErwzDo2jB7IfFT5 OBnFzdFDumGFnIVycZS8tQRXFFpljE3R1iLAJBAbbeNJsyjt5wRxE1HWVapRpgKqeA79 7snuGa8hQ3Kzu14RS6fU5Z1hOyTfLFEWhUXlj48SLoIRMn47afY6A6zncW5cD9NyBOe/ csxEgRxKYzGOeqEmXiA47ndKRQrqnzAW9S406udujjWRQqSD3EaBdWrbux+C25TSXWYl cQ== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3nm65m158t-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Wed, 08 Feb 2023 23:24:34 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Wed, 8 Feb 2023 23:24:32 -0800 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server id 15.0.1497.42 via Frontend Transport; Wed, 8 Feb 2023 23:24:32 -0800 Received: from localhost.localdomain (unknown [10.28.36.154]) by maili.marvell.com (Postfix) with ESMTP id 464A75B692A; Wed, 8 Feb 2023 23:24:30 -0800 (PST) From: Rakesh Kudurumalla To: Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao CC: , , Rakesh Kudurumalla Subject: [PATCH v3 3/3] net/cnxk: skip red drop for ingress policer Date: Thu, 9 Feb 2023 12:54:02 +0530 Message-ID: <20230209072402.957747-3-rkudurumalla@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230209072402.957747-1-rkudurumalla@marvell.com> References: <20230125073231.4007078-1-rkudurumalla@marvell.com> <20230209072402.957747-1-rkudurumalla@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: r1ukWI5OYu41BxEh8y_IaIOnS87Hv8yG X-Proofpoint-ORIG-GUID: r1ukWI5OYu41BxEh8y_IaIOnS87Hv8yG X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.219,Aquarius:18.0.930,Hydra:6.0.562,FMLib:17.11.122.1 definitions=2023-02-09_04,2023-02-08_02,2022-06-22_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 --- doc/guides/nics/features/cnxk.ini | 1 + drivers/net/cnxk/cnxk_ethdev.h | 1 + drivers/net/cnxk/cnxk_ethdev_mtr.c | 50 ++++++++++++++++++++++++++++++ 3 files changed, 52 insertions(+) diff --git a/doc/guides/nics/features/cnxk.ini b/doc/guides/nics/features/cnxk.ini index f81628da77..753da67c5a 100644 --- a/doc/guides/nics/features/cnxk.ini +++ b/doc/guides/nics/features/cnxk.ini @@ -80,6 +80,7 @@ vxlan_gpe = Y [rte_flow actions] count = Y +skip_cman = Y drop = Y flag = Y mark = Y 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);