From patchwork Thu Jun 15 13:09:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nithin Dabilpuram X-Patchwork-Id: 128745 X-Patchwork-Delegate: jerinj@marvell.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 9077142CC6; Thu, 15 Jun 2023 15:10:08 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id ADAEE41156; Thu, 15 Jun 2023 15:10:04 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 544A140EE3 for ; Thu, 15 Jun 2023 15:10:01 +0200 (CEST) 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 35FBAqPJ001322 for ; Thu, 15 Jun 2023 06:10:00 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=LEX9VuDfLSc2OgopqbIiGwLMqvbuN7yPdj/6q3pddQM=; b=IkUym+5rYB2J94gCv+4i5suAC8I07sQFvTwUhrrcdl9iyuBXZQcgBci1boIg8hT3Wn/7 i3wCTr3cyRrv9aRTRw5DFrPHnHW7PQivHWPRfpJePamGVS5GYdlM+Guj2kut0p/KT/f8 ZFU5KhjWwh9M3wamgGZi7h5iZfPLWiHc9rTNtYNVKvfdYOPBVrhYej6bcoCghnb6pFxg uovoTrmwEbb+kvaosQRObEk+E4H0Xg8NfDAYTw9hhyTyq+nuvnXcmZPF9bD8yEPGJxOZ wh6gUfhECtmBDSlW16iTfTzc01fm9EW8LBWDlFRjui35bLrX50GhSwW9aZd7OIcT/A0n fA== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3r7ky1u45j-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Thu, 15 Jun 2023 06:10:00 -0700 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.48; Thu, 15 Jun 2023 06:09:29 -0700 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.48 via Frontend Transport; Thu, 15 Jun 2023 06:09:29 -0700 Received: from hyd1588t430.caveonetworks.com (unknown [10.29.52.204]) by maili.marvell.com (Postfix) with ESMTP id B89203F7085; Thu, 15 Jun 2023 06:09:27 -0700 (PDT) From: Nithin Dabilpuram To: Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao CC: , Subject: [PATCH 1/3] net/cnxk: fix incorrect check cookies with security offload Date: Thu, 15 Jun 2023 18:39:22 +0530 Message-ID: <20230615130924.828208-1-ndabilpuram@marvell.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Proofpoint-GUID: dWozezN1ssU8G3D-x_pCDoeoNti3AoDY X-Proofpoint-ORIG-GUID: dWozezN1ssU8G3D-x_pCDoeoNti3AoDY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-06-15_08,2023-06-14_02,2023-05-22_02 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 Fix missing/incorrect check cookies call's with security offload enabled on Rx and Tx. Fixes: 55bfac717c72 ("net/cnxk: support Tx security offload on cn10k") Fixes: 0ed7107373b4 ("net/cnxk: remove duplicate mempool debug checks") Signed-off-by: Nithin Dabilpuram --- drivers/net/cnxk/cn10k_rx.h | 12 ++++++------ drivers/net/cnxk/cn10k_tx.h | 2 ++ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/drivers/net/cnxk/cn10k_rx.h b/drivers/net/cnxk/cn10k_rx.h index b7074906a6..8148866e44 100644 --- a/drivers/net/cnxk/cn10k_rx.h +++ b/drivers/net/cnxk/cn10k_rx.h @@ -1241,6 +1241,12 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts, mbuf2 = (struct rte_mbuf *)vgetq_lane_u64(mbuf23, 0); mbuf3 = (struct rte_mbuf *)vgetq_lane_u64(mbuf23, 1); + /* Mark mempool obj as "get" as it is alloc'ed by NIX */ + RTE_MEMPOOL_CHECK_COOKIES(mbuf0->pool, (void **)&mbuf0, 1, 1); + RTE_MEMPOOL_CHECK_COOKIES(mbuf1->pool, (void **)&mbuf1, 1, 1); + RTE_MEMPOOL_CHECK_COOKIES(mbuf2->pool, (void **)&mbuf2, 1, 1); + RTE_MEMPOOL_CHECK_COOKIES(mbuf3->pool, (void **)&mbuf3, 1, 1); + if (!(flags & NIX_RX_VWQE_F)) { /* Mask to get packet len from NIX_RX_SG_S */ const uint8x16_t shuf_msk = { @@ -1753,12 +1759,6 @@ cn10k_nix_recv_pkts_vector(void *args, struct rte_mbuf **mbufs, uint16_t pkts, vst1q_u64((uint64_t *)&mbufs[packets], mbuf01); vst1q_u64((uint64_t *)&mbufs[packets + 2], mbuf23); - /* Mark mempool obj as "get" as it is alloc'ed by NIX */ - RTE_MEMPOOL_CHECK_COOKIES(mbuf0->pool, (void **)&mbuf0, 1, 1); - RTE_MEMPOOL_CHECK_COOKIES(mbuf1->pool, (void **)&mbuf1, 1, 1); - RTE_MEMPOOL_CHECK_COOKIES(mbuf2->pool, (void **)&mbuf2, 1, 1); - RTE_MEMPOOL_CHECK_COOKIES(mbuf3->pool, (void **)&mbuf3, 1, 1); - nix_mbuf_validate_next(mbuf0); nix_mbuf_validate_next(mbuf1); nix_mbuf_validate_next(mbuf2); diff --git a/drivers/net/cnxk/cn10k_tx.h b/drivers/net/cnxk/cn10k_tx.h index 17793493cc..17e27aff40 100644 --- a/drivers/net/cnxk/cn10k_tx.h +++ b/drivers/net/cnxk/cn10k_tx.h @@ -1866,10 +1866,12 @@ cn10k_nix_xmit_store(struct cn10k_eth_txq *txq, vst1q_u64(LMT_OFF(laddr, 0, 16), cmd2); vst1q_u64(LMT_OFF(laddr, 0, 32), cmd1); } + RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool, (void **)&mbuf, 1, 0); } else { /* Store the prepared send desc to LMT lines */ vst1q_u64(LMT_OFF(laddr, 0, 0), cmd0); vst1q_u64(LMT_OFF(laddr, 0, 16), cmd1); + RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool, (void **)&mbuf, 1, 0); } } From patchwork Thu Jun 15 13:09:23 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nithin Dabilpuram X-Patchwork-Id: 128744 X-Patchwork-Delegate: jerinj@marvell.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 3226C42CC6; Thu, 15 Jun 2023 15:10:02 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id B853540EE3; Thu, 15 Jun 2023 15:10:01 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 159A640E0F for ; Thu, 15 Jun 2023 15:10:00 +0200 (CEST) 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 35FBB1n6002209 for ; Thu, 15 Jun 2023 06:10:00 -0700 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=VtyurhUyMV+BCbVrZyDLPeDj06c75loKxaHR5/d3PRk=; b=Sl2AI0CvWLjGIC7CJo+xkxQudBSP9Jt0h+rkNoyCAOEr9WD0m5lOVf7AD+KPgkpAu1J5 FEbyTZSuA0zvm5OSipmX0d7gLMAFaTxVnBxgvG8rzuiYfQxwSrWqy0k+/nw3nfExGpDJ yhvYXj9JH8cQ/A2dG3ktRu66Ff607Y/n/sOpLCb2uruB2pa38vav/fDtLP/zncK1SCN4 RDi4U+7rHEjW6NAZqD0vHfMhJW13zaeGvtKyMh48NFjogGH6ZZ34zy8bphPUKFAxjSTg SZaNhKpUoJk7VnqO19jrFXjtzTwixdwdDRUXspYq41LNScX8QyjW8hG5JoXMKXhOpBD+ iw== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3r7ky1u45r-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Thu, 15 Jun 2023 06:10:00 -0700 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.48; Thu, 15 Jun 2023 06:09:32 -0700 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.48 via Frontend Transport; Thu, 15 Jun 2023 06:09:32 -0700 Received: from hyd1588t430.caveonetworks.com (unknown [10.29.52.204]) by maili.marvell.com (Postfix) with ESMTP id 4E0373F7089; Thu, 15 Jun 2023 06:09:30 -0700 (PDT) From: Nithin Dabilpuram To: Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao CC: , Subject: [PATCH 2/3] net/cnxk: support backpressure on SPB pool Date: Thu, 15 Jun 2023 18:39:23 +0530 Message-ID: <20230615130924.828208-2-ndabilpuram@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230615130924.828208-1-ndabilpuram@marvell.com> References: <20230615130924.828208-1-ndabilpuram@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: FzdjNOtaNDy73W4zaXBwQ55YL1qX3nrE X-Proofpoint-ORIG-GUID: FzdjNOtaNDy73W4zaXBwQ55YL1qX3nrE X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-06-15_08,2023-06-14_02,2023-05-22_02 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 From: Sunil Kumar Kori With current implementation, backpressure can be configured only on lpb_pool but a RQ can be configured with spb_pool too and spb_pool can also participate to assert backpressure. Enabling backpressure support on spb_pool for 802.3x and 802.1qbb both. Signed-off-by: Sunil Kumar Kori --- drivers/net/cnxk/cnxk_ethdev_ops.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/net/cnxk/cnxk_ethdev_ops.c b/drivers/net/cnxk/cnxk_ethdev_ops.c index da5ee19c85..3ade8eed36 100644 --- a/drivers/net/cnxk/cnxk_ethdev_ops.c +++ b/drivers/net/cnxk/cnxk_ethdev_ops.c @@ -308,7 +308,9 @@ cnxk_nix_flow_ctrl_set(struct rte_eth_dev *eth_dev, fc_cfg.rq_cfg.tc = 0; fc_cfg.rq_cfg.rq = rq->qid; fc_cfg.rq_cfg.pool = rq->aura_handle; + fc_cfg.rq_cfg.spb_pool = rq->spb_aura_handle; fc_cfg.rq_cfg.cq_drop = cq->drop_thresh; + fc_cfg.rq_cfg.pool_drop_pct = ROC_NIX_AURA_THRESH; rc = roc_nix_fc_config_set(nix, &fc_cfg); if (rc) @@ -1198,7 +1200,9 @@ nix_priority_flow_ctrl_rq_conf(struct rte_eth_dev *eth_dev, uint16_t qid, fc_cfg.rq_cfg.enable = !!tx_pause; fc_cfg.rq_cfg.rq = rq->qid; fc_cfg.rq_cfg.pool = rxq->qconf.mp->pool_id; + fc_cfg.rq_cfg.spb_pool = rq->spb_aura_handle; fc_cfg.rq_cfg.cq_drop = cq->drop_thresh; + fc_cfg.rq_cfg.pool_drop_pct = ROC_NIX_AURA_THRESH; rc = roc_nix_fc_config_set(nix, &fc_cfg); if (rc) return rc; From patchwork Thu Jun 15 13:09:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nithin Dabilpuram X-Patchwork-Id: 128746 X-Patchwork-Delegate: jerinj@marvell.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 586C242CC6; Thu, 15 Jun 2023 15:10:16 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BD81B42C76; Thu, 15 Jun 2023 15:10:05 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 2BE56410D0 for ; Thu, 15 Jun 2023 15:10:02 +0200 (CEST) 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 35FBAqPL001322 for ; Thu, 15 Jun 2023 06:10:01 -0700 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=cdzUi9We1ztolxawX++YIkxN4EMBHHFgvURKLC/VQLk=; b=RpA0E0I7HjvBsA1QXZ/PRjtfrn/UMEaWMKtNOmMsnsf3gY98W4LU1liZQ92/m82M8suV 1PuiILiqq2nCCgk7yalrqGW8sGcVe1hwle0jV969qy8u5c5ABPKz80dCZSBqf/dISty2 QtmmE0Xuv55mOnsHlLov01UP5Jnhcpq6ch16S+sSNySXxSxbW5MvjPnGN2gVGf4vNBOp 7MYx0Al4K2ah7d6dTK5ndrcQz7oXqijSgoe1fHeWFlycwxoC2xpbJTsF4Z26TYnGBF29 kybnwYc2hpRLiU18CSccl3qJonNVVqVhkO4q0JtjrXc5Y8PtlKjOirMEE39XfH4Ktcqp 9g== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3r7ky1u45j-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Thu, 15 Jun 2023 06:10:01 -0700 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.48; Thu, 15 Jun 2023 06:09:35 -0700 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.48 via Frontend Transport; Thu, 15 Jun 2023 06:09:35 -0700 Received: from hyd1588t430.caveonetworks.com (unknown [10.29.52.204]) by maili.marvell.com (Postfix) with ESMTP id D7D5A3F7092; Thu, 15 Jun 2023 06:09:32 -0700 (PDT) From: Nithin Dabilpuram To: Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao CC: , , Akhil Goyal Subject: [PATCH 3/3] common/cnxk: update minimum size of packet Date: Thu, 15 Jun 2023 18:39:24 +0530 Message-ID: <20230615130924.828208-3-ndabilpuram@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230615130924.828208-1-ndabilpuram@marvell.com> References: <20230615130924.828208-1-ndabilpuram@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: Ifi8qpe55ef1qokBUrHxMH3_qPl09Jls X-Proofpoint-ORIG-GUID: Ifi8qpe55ef1qokBUrHxMH3_qPl09Jls X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-06-15_08,2023-06-14_02,2023-05-22_02 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 From: Akhil Goyal In case of MACsec, short packets may also come, hence reduced the minimum packet size to 40B. Signed-off-by: Akhil Goyal --- drivers/common/cnxk/hw/nix.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/common/cnxk/hw/nix.h b/drivers/common/cnxk/hw/nix.h index fbdf1b64f6..26dcda680e 100644 --- a/drivers/common/cnxk/hw/nix.h +++ b/drivers/common/cnxk/hw/nix.h @@ -2128,7 +2128,7 @@ struct nix_lso_format { #define NIX_SDP_MAX_HW_FRS 65535UL #define NIX_SDP_16K_HW_FRS 16380UL #define NIX_RPM_MAX_HW_FRS 16380UL -#define NIX_MIN_HW_FRS 60UL +#define NIX_MIN_HW_FRS 40UL /** NIX policer rate limits */ #define NIX_BPF_MAX_RATE_DIV_EXP 12