From patchwork Thu Feb 9 08:35:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakesh Kudurumalla X-Patchwork-Id: 123517 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 2F46541C49; Thu, 9 Feb 2023 09:36:09 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B42A640DF8; Thu, 9 Feb 2023 09:36:08 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id E04BE4067B for ; Thu, 9 Feb 2023 09:36:06 +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 3191pg5D019169; Thu, 9 Feb 2023 00:36:04 -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=vnIC4mxyjTP1JalA0j4b0+W3Gb1cIsaqm1UB+jL97R0=; b=ZdA53iVRBvwejdZmyCBEOfIsbgZ/8CJYPF57fuY4fdbCvpBbj5tsDPsLIOkVNKMxQCKy eZZFi5S5wvNUAdWxVB5mzPFYb1mlYb/IkgH7Gk2Ctp5yA0aqav7ityxxjFTVIFiEAr8u mMrEdyyTfaFiIIjiSm7ojc0GaBBCbq60XTcr8V2nbSt3bI1crj9k5qbM5ON9E+E57T4P w4e7tE83EyTz+KYwGCWU8URQ7wWkfRrYPkC6hbPTbS5nxtR/NXEE2UuiMZAiX9h3hFgY itzRlOH6uUFEPtTsNbfEHn02N1OLoejZXl0z8wuzogUxqGmrY1k4vW1vyh27Hr4FIsHZ aw== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3nm65m1hea-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 09 Feb 2023 00:36:04 -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; Thu, 9 Feb 2023 00:36:03 -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; Thu, 9 Feb 2023 00:36:03 -0800 Received: from localhost.localdomain (unknown [10.28.36.154]) by maili.marvell.com (Postfix) with ESMTP id 9E5525B6930; Thu, 9 Feb 2023 00:36:00 -0800 (PST) From: Rakesh Kudurumalla To: Ori Kam , Thomas Monjalon , "Ferruh Yigit" , Andrew Rybchenko CC: , , , "Rakesh Kudurumalla" Subject: [PATCH v4 1/3] ethdev: skip congestion management configuration Date: Thu, 9 Feb 2023 14:05:55 +0530 Message-ID: <20230209083558.958566-1-rkudurumalla@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230209072402.957747-1-rkudurumalla@marvell.com> References: <20230209072402.957747-1-rkudurumalla@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: HFmCmjVjveE0M48Wace78QxvFlTSQO6r X-Proofpoint-ORIG-GUID: HFmCmjVjveE0M48Wace78QxvFlTSQO6r 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_05,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 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 --- v4: updated commit message doc/guides/prog_guide/rte_flow.rst | 22 ++++++++++++++++++++++ lib/ethdev/rte_flow.h | 11 +++++++++++ 2 files changed, 33 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..f4eb4232d4 100644 --- a/lib/ethdev/rte_flow.h +++ b/lib/ethdev/rte_flow.h @@ -2203,6 +2203,17 @@ enum rte_flow_action_type { */ RTE_FLOW_ACTION_TYPE_DROP, + /** + * 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, + /** * Enables counters for this flow rule. * From patchwork Thu Feb 9 08:35:56 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakesh Kudurumalla X-Patchwork-Id: 123518 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 0848941C49; Thu, 9 Feb 2023 09:36:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id E492942670; Thu, 9 Feb 2023 09:36:14 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 6573A4067B for ; Thu, 9 Feb 2023 09:36:13 +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 3195Wm9c011582; Thu, 9 Feb 2023 00:36:12 -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=eF4nPfkys50/Miy0yTJWdXPU87xt4yh1znucUNHAw4eM29pzJFZqfH301bbHQ3WHqYGp 6/iZ6RVKMSEtV41zGIWkarbtn0mXMUXkMt0YAdiFAmSFx2WYNg8HVSCDCQHs324iidEr nwcy11NDg+aJMfHcnj8O8ASwkwEOymjsUYnjkgNE6J/4GHQxfbUZXmpA05sRI7Kke+vt rljQqQmaVGnJDxEDLMCy1cTw1TBdDy3pRnI4+tgZmbpeQ3FsA0Om8DPA4S+k8/JSTBZJ jD7EkzrCX2NUlQHslqUKFs18SEcJIyXxJ4dDHkAbl0DNRBsGkDlWbTpF7FZenWJwl9c8 IA== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3nm65m1hex-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 09 Feb 2023 00:36:12 -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; Thu, 9 Feb 2023 00:36:10 -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; Thu, 9 Feb 2023 00:36:10 -0800 Received: from localhost.localdomain (unknown [10.28.36.154]) by maili.marvell.com (Postfix) with ESMTP id 388E25B6930; Thu, 9 Feb 2023 00:36:07 -0800 (PST) From: Rakesh Kudurumalla To: Ori Kam , Aman Singh , "Yuying Zhang" CC: , , , "Rakesh Kudurumalla" Subject: [PATCH v4 2/3] app/testpmd: add skip cman support for testpmd Date: Thu, 9 Feb 2023 14:05:56 +0530 Message-ID: <20230209083558.958566-2-rkudurumalla@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230209083558.958566-1-rkudurumalla@marvell.com> References: <20230209072402.957747-1-rkudurumalla@marvell.com> <20230209083558.958566-1-rkudurumalla@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: __JN-mHNZXyctKsH0QMv0TzfSouOhOsx X-Proofpoint-ORIG-GUID: __JN-mHNZXyctKsH0QMv0TzfSouOhOsx 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_05,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 08:35:57 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rakesh Kudurumalla X-Patchwork-Id: 123519 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 6DF1841C49; Thu, 9 Feb 2023 09:36:19 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1D09642B71; Thu, 9 Feb 2023 09:36:19 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id BCF6442BAC for ; Thu, 9 Feb 2023 09:36:16 +0100 (CET) Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3198Mk9L018546 for ; Thu, 9 Feb 2023 00:36:15 -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=GLH8w6F7BInB8Dq2WjPtRAB251Kl1/PSHcNcsYkWWDpTsR1RxJ+eb4/H+Kvp1USwhOpA HR+jzRwovpVwz/yBYiO7nWQxsR+rKFw1rk8iIYOvlUJmZDJF3ITSrSGWWN+F37BrJ86g S3FhJTjZjR/qROiuOKplxL/HMmtVv5QGiVvLIkMJgeJmhDaekLXf6KOndodJsOxoqHKa 3R4UID9/q0rSrW6Smg/KVIIHbppdXGY8bJsQdIguuBCKgRS+iibJGXSUVt0KPbRS+ml3 Gxinmb9hmnTe+PqctEBQ6GT2k1e9M3Zr9IQ6spApELwblK3brgU2bp+miFacwvtxN+YT Xg== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3nkdys0n41-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Thu, 09 Feb 2023 00:36:15 -0800 Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Thu, 9 Feb 2023 00:36:14 -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; Thu, 9 Feb 2023 00:36:14 -0800 Received: from localhost.localdomain (unknown [10.28.36.154]) by maili.marvell.com (Postfix) with ESMTP id C34275B6931; Thu, 9 Feb 2023 00:36:11 -0800 (PST) From: Rakesh Kudurumalla To: Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao CC: , , Rakesh Kudurumalla Subject: [PATCH v4 3/3] net/cnxk: skip red drop for ingress policer Date: Thu, 9 Feb 2023 14:05:57 +0530 Message-ID: <20230209083558.958566-3-rkudurumalla@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230209083558.958566-1-rkudurumalla@marvell.com> References: <20230209072402.957747-1-rkudurumalla@marvell.com> <20230209083558.958566-1-rkudurumalla@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: H5FItH6DFD3ilyxP8mVKSE-vknETnvcw X-Proofpoint-GUID: H5FItH6DFD3ilyxP8mVKSE-vknETnvcw 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_05,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);