From patchwork Tue Apr 25 10:40:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Bhansali X-Patchwork-Id: 126502 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 3B844429EA; Tue, 25 Apr 2023 12:41:11 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BD91040ED6; Tue, 25 Apr 2023 12:41:10 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 8BC8A40395 for ; Tue, 25 Apr 2023 12:41:09 +0200 (CEST) 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 33P9Emib013086 for ; Tue, 25 Apr 2023 03:41:08 -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=Bvei2DhDERrmSI9tLKGTQ8ZoMt8bvM1nk6fIkk5/+O0=; b=K8Pm4SGeBm7EJbp8gqKpY6biuEd3g7eDK2v7KSWTKS0S0DSNB1WJ13sqStuzNOhp1SIj bBAB1W2OSO/wfdEw+B1wtD6+OytfO3UKUABCLqhVOQI+V1DLbit+DxKhlmke9ejA6XjR hmPktCvHIlrBr0T7OBbktbwsiWsQ9XJtQ7i01CgxDMRDb7yplKRMlh+wG4ecc1Nd1dk5 JUbNVXco/2XK63Q+dIX5PbhJOVgRexdfHd/KVOqHKK2ojIEvj1vdoGbIH+aLlv4CMGQ/ S2v+dqPjS3ccsY6vlhf5PxPRNSnMB5VVYUhMu9EGN3olLZva/3OGC6DOAzyr2uohJljA aw== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3q6c2f89q2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Tue, 25 Apr 2023 03:41:08 -0700 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.48; Tue, 25 Apr 2023 03:41:06 -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; Tue, 25 Apr 2023 03:41:06 -0700 Received: from localhost.localdomain (unknown [10.28.36.158]) by maili.marvell.com (Postfix) with ESMTP id 580CB5B692B; Tue, 25 Apr 2023 03:41:04 -0700 (PDT) From: Rahul Bhansali To: , Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao CC: , Rahul Bhansali Subject: [PATCH 1/5] common/cnxk: fix IPsec IPv6 tunnel address byte swap Date: Tue, 25 Apr 2023 16:10:06 +0530 Message-ID: <20230425104010.339177-1-rbhansali@marvell.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 X-Proofpoint-GUID: -nczcKNPxi7YuU2m9WAwYxNWkGKEzOn8 X-Proofpoint-ORIG-GUID: -nczcKNPxi7YuU2m9WAwYxNWkGKEzOn8 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_03,2023-04-25_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 Fix the IPsec IPv6 tunnel address bytes swap during SA configurations in session create/update. Fixes: 78d03027f2c ("common/cnxk: add IPsec common code") Signed-off-by: Rahul Bhansali --- drivers/common/cnxk/cnxk_security.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/drivers/common/cnxk/cnxk_security.c b/drivers/common/cnxk/cnxk_security.c index 79427d48fe..13ca2c7791 100644 --- a/drivers/common/cnxk/cnxk_security.c +++ b/drivers/common/cnxk/cnxk_security.c @@ -274,6 +274,14 @@ ot_ipsec_inb_ctx_size(struct roc_ot_ipsec_inb_sa *sa) return size; } +static void +ot_ipsec_update_ipv6_addr_endianness(uint64_t *addr) +{ + *addr = rte_be_to_cpu_64(*addr); + addr++; + *addr = rte_be_to_cpu_64(*addr); +} + static int ot_ipsec_inb_tunnel_hdr_fill(struct roc_ot_ipsec_inb_sa *sa, struct rte_security_ipsec_xform *ipsec_xfrm) @@ -310,6 +318,10 @@ ot_ipsec_inb_tunnel_hdr_fill(struct roc_ot_ipsec_inb_sa *sa, memcpy(&sa->outer_hdr.ipv6.dst_addr, &tunnel->ipv6.dst_addr, sizeof(struct in6_addr)); + /* IP Source and Dest are in LE/CPU endian */ + ot_ipsec_update_ipv6_addr_endianness((uint64_t *)&sa->outer_hdr.ipv6.src_addr); + ot_ipsec_update_ipv6_addr_endianness((uint64_t *)&sa->outer_hdr.ipv6.dst_addr); + break; default: return -EINVAL; @@ -499,6 +511,10 @@ cnxk_ot_ipsec_outb_sa_fill(struct roc_ot_ipsec_outb_sa *sa, memcpy(&sa->outer_hdr.ipv6.dst_addr, &tunnel->ipv6.dst_addr, sizeof(struct in6_addr)); + /* IP Source and Dest are in LE/CPU endian */ + ot_ipsec_update_ipv6_addr_endianness((uint64_t *)&sa->outer_hdr.ipv6.src_addr); + ot_ipsec_update_ipv6_addr_endianness((uint64_t *)&sa->outer_hdr.ipv6.dst_addr); + /* Outer header flow label source */ if (!ipsec_xfrm->options.copy_flabel) { sa->w2.s.ipv4_df_src_or_ipv6_flw_lbl_src = From patchwork Tue Apr 25 10:40:07 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Bhansali X-Patchwork-Id: 126503 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 EB62F429EA; Tue, 25 Apr 2023 12:41:19 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DB609410F2; Tue, 25 Apr 2023 12:41:19 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id E3539410F2 for ; Tue, 25 Apr 2023 12:41:17 +0200 (CEST) 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 33P9ElH9012965 for ; Tue, 25 Apr 2023 03:41:17 -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=y3pCO8ShzHZ73CP2nVmI8c3tfYr1+kjoZBEI6ronlFA=; b=GZs0H9paqaEcWQOd5QZSSizwHZGUDVovklaIVDQmcZOSVOTVoccG9+/0gqsRKg14IGgs cUntb6lCHNYeeagpt0RxVrs5BuCCrFWdmM1d9o4bgRvllcQFB+UzNNrV+X9x4qmH6QR+ jxS8+Jgd0wL09F3tEXxs/ZRZ7J+EHnyNdyBA9vBpprId+Noj2DYhlHXXJxaLjWykJCpf 4x64HvcdmtHtONomKPggLxRpD2NGcn8t0ZbndGxhQTWq+Fgmz//lNdE+QhL7IsFzQOuH ij833DXxLLI9zYvJL6agQpZdhS0Pcn6Autn25TgrH8H6/HDPis1136BOQS/ZhIGtW5bI nA== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3q6c2f89rd-2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Tue, 25 Apr 2023 03:41:16 -0700 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.48; Tue, 25 Apr 2023 03:41:15 -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; Tue, 25 Apr 2023 03:41:15 -0700 Received: from localhost.localdomain (unknown [10.28.36.158]) by maili.marvell.com (Postfix) with ESMTP id B28463F7057; Tue, 25 Apr 2023 03:41:13 -0700 (PDT) From: Rahul Bhansali To: , Pavan Nikhilesh , "Shijith Thotton" CC: , Rahul Bhansali Subject: [PATCH 2/5] event/cnxk: set Rx offload flags Date: Tue, 25 Apr 2023 16:10:07 +0530 Message-ID: <20230425104010.339177-2-rbhansali@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230425104010.339177-1-rbhansali@marvell.com> References: <20230425104010.339177-1-rbhansali@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: JcJbA6J0LsZ5xJ__iOUzARdIySKuj_u3 X-Proofpoint-ORIG-GUID: JcJbA6J0LsZ5xJ__iOUzARdIySKuj_u3 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_03,2023-04-25_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 Configure event dev Rx offload flags with rx adapter start/stop callbacks. Signed-off-by: Rahul Bhansali --- drivers/event/cnxk/cnxk_eventdev_adptr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/event/cnxk/cnxk_eventdev_adptr.c b/drivers/event/cnxk/cnxk_eventdev_adptr.c index 5ec436382c..6d975362e8 100644 --- a/drivers/event/cnxk/cnxk_eventdev_adptr.c +++ b/drivers/event/cnxk/cnxk_eventdev_adptr.c @@ -331,9 +331,9 @@ int cnxk_sso_rx_adapter_start(const struct rte_eventdev *event_dev, const struct rte_eth_dev *eth_dev) { - RTE_SET_USED(event_dev); - RTE_SET_USED(eth_dev); - + struct cnxk_eth_dev *cnxk_eth_dev = eth_dev->data->dev_private; + struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev); + dev->rx_offloads |= cnxk_eth_dev->rx_offload_flags; return 0; } @@ -341,9 +341,9 @@ int cnxk_sso_rx_adapter_stop(const struct rte_eventdev *event_dev, const struct rte_eth_dev *eth_dev) { - RTE_SET_USED(event_dev); RTE_SET_USED(eth_dev); - + struct cnxk_sso_evdev *dev = cnxk_sso_pmd_priv(event_dev); + dev->rx_offloads = 0; return 0; } From patchwork Tue Apr 25 10:40:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Bhansali X-Patchwork-Id: 126504 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 1D1E7429EA; Tue, 25 Apr 2023 12:41:37 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0D74A42BC9; Tue, 25 Apr 2023 12:41:37 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 108EA40395 for ; Tue, 25 Apr 2023 12:41:34 +0200 (CEST) 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 33P9EojC013107 for ; Tue, 25 Apr 2023 03:41:34 -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=FGf5XCg76hJv2aYcPG+Ne0JiOkAJWgg66D1/XwLh1rE=; b=WiwwYjd88yqQPJA+ap4ZdIW955oX/NS5aBVUAjYyfo6s6hg4IVj+Fxf0VmBBMyz9opYy Bir3JdHLZcf4FGqgBAMMOlwfrFG79x/1MFSMar45lN8tyny+7iHalMSn9/p1FblFHZlD Z5N6O+VTJGYJ6/zd63MvwR3i2rm2P0WDDvstNXAi0vRMkxNGDAXcUNLkDm2Gi/L7V8Dz OgK+cGaajjvoqVXaL27IlkszNDZ8b3vsdLA2JUuHNi5IOlyvcZ1GksGaJdTidKcUTekv lRXZKOes5Xj0yH7vJ7r60opp/KIS0KLh76qeLcL1qCj0jGpIHqL/G9PRwK81GsiMtykr +g== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3q6c2f89sm-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Tue, 25 Apr 2023 03:41:33 -0700 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.48; Tue, 25 Apr 2023 03:41:31 -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; Tue, 25 Apr 2023 03:41:31 -0700 Received: from localhost.localdomain (unknown [10.28.36.158]) by maili.marvell.com (Postfix) with ESMTP id 3A46D3F7057; Tue, 25 Apr 2023 03:41:30 -0700 (PDT) From: Rahul Bhansali To: , Pavan Nikhilesh , "Shijith Thotton" CC: , Rahul Bhansali Subject: [PATCH 3/5] event/cnxk: fix Tx adapter data pointer Date: Tue, 25 Apr 2023 16:10:08 +0530 Message-ID: <20230425104010.339177-3-rbhansali@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230425104010.339177-1-rbhansali@marvell.com> References: <20230425104010.339177-1-rbhansali@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: OUKvYYbjRfLgBZu8Mhdg29UtVDBlUAvV X-Proofpoint-ORIG-GUID: OUKvYYbjRfLgBZu8Mhdg29UtVDBlUAvV X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_03,2023-04-25_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 Dpdk test application crashes when event inline IPsec test ran for second time onwards. In case of event device cleanup, Tx adapter data pointer is free but not set back to NULL, which causes incomplete initialization on next run. Fixes: 6a24c7c4bcd ("event/cnxk: add Tx adapter freeing") Signed-off-by: Rahul Bhansali --- drivers/event/cnxk/cnxk_eventdev_adptr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/event/cnxk/cnxk_eventdev_adptr.c b/drivers/event/cnxk/cnxk_eventdev_adptr.c index 6d975362e8..9a02026ea6 100644 --- a/drivers/event/cnxk/cnxk_eventdev_adptr.c +++ b/drivers/event/cnxk/cnxk_eventdev_adptr.c @@ -635,6 +635,7 @@ cnxk_sso_tx_adapter_free(uint8_t id __rte_unused, if (dev->tx_adptr_data_sz && dev->tx_adptr_active_mask == 0) { dev->tx_adptr_data_sz = 0; free(dev->tx_adptr_data); + dev->tx_adptr_data = NULL; } return 0; From patchwork Tue Apr 25 10:40:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Bhansali X-Patchwork-Id: 126505 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 4E5CC429EA; Tue, 25 Apr 2023 12:41:52 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3DFB7410DD; Tue, 25 Apr 2023 12:41:52 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id AD61B410DD for ; Tue, 25 Apr 2023 12:41:48 +0200 (CEST) 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 33P9EpZF013176 for ; Tue, 25 Apr 2023 03:41:46 -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=TxratY1HiMQIFTbFmss5GvIS+vIm+x3G0WFbTWRQc0A=; b=RkDUErmzX5md/9AGrvZos+xyw5B9DBvFLYEAQ09KMLJ1XJuF9JXZHajNCsFCz5YJSjHN VkP9b6FNN8sHq6ClD9gcBYvlC+0ZUKu1J/eab+ZVJxNtaTjvkNGHoqfFGUWPtXbqwhJd JlbPu0cPdDrlpwucaBXfi3VV7NOjfS/Oi8EySY/o0AxT/k2XoV0Ajv78oWwrO0iukXjM IPsZwLEXJfst4eW9H6tNhxKJdr+DHb/3Iyc9eIFdk9JpYjm7OyXVJpU74w3bxS18grOk YOkF+2/za5GB+EB3XxtTYae4EEmlUSj3HdQqKGPNi3tbFc4i+JJ8hPWXm7JAwH78Ouyv fw== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3q6c2f89u2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Tue, 25 Apr 2023 03:41:46 -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; Tue, 25 Apr 2023 03:41:44 -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; Tue, 25 Apr 2023 03:41:44 -0700 Received: from localhost.localdomain (unknown [10.28.36.158]) by maili.marvell.com (Postfix) with ESMTP id A4E433F7057; Tue, 25 Apr 2023 03:41:42 -0700 (PDT) From: Rahul Bhansali To: , Pavan Nikhilesh , "Shijith Thotton" CC: , Rahul Bhansali Subject: [PATCH 4/5] event/cnxk: fix mempool cookies check Date: Tue, 25 Apr 2023 16:10:09 +0530 Message-ID: <20230425104010.339177-4-rbhansali@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230425104010.339177-1-rbhansali@marvell.com> References: <20230425104010.339177-1-rbhansali@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: zE1bpyG7qdgAVEZAnwCqQU4qxGY3G01H X-Proofpoint-ORIG-GUID: zE1bpyG7qdgAVEZAnwCqQU4qxGY3G01H X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_03,2023-04-25_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 Fix for mempool cookies get mark to be done before meta to mbuf processing. Fixes: 7a709964d9b ("net/cnxk: use NPA batch burst free for meta buffers") Signed-off-by: Rahul Bhansali --- drivers/event/cnxk/cn10k_worker.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/event/cnxk/cn10k_worker.h b/drivers/event/cnxk/cn10k_worker.h index 06c71c6092..1e519d8156 100644 --- a/drivers/event/cnxk/cn10k_worker.h +++ b/drivers/event/cnxk/cn10k_worker.h @@ -22,9 +22,6 @@ cn10k_wqe_to_mbuf(uint64_t wqe, const uint64_t __mbuf, uint8_t port_id, (flags & NIX_RX_OFFLOAD_TSTAMP_F ? 8 : 0); struct rte_mbuf *mbuf = (struct rte_mbuf *)__mbuf; - /* Mark mempool obj as "get" as it is alloc'ed by NIX */ - RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool, (void **)&mbuf, 1, 1); - cn10k_nix_cqe_to_mbuf((struct nix_cqe_hdr_s *)wqe, tag, (struct rte_mbuf *)mbuf, lookup_mem, mbuf_init | ((uint64_t)port_id) << 48, flags); @@ -166,6 +163,10 @@ cn10k_sso_hws_post_process(struct cn10k_sso_hws *ws, uint64_t *u64, mbuf = u64[1] - sizeof(struct rte_mbuf); rte_prefetch0((void *)mbuf); + + /* Mark mempool obj as "get" as it is alloc'ed by NIX */ + RTE_MEMPOOL_CHECK_COOKIES(((struct rte_mbuf *)mbuf)->pool, (void **)&mbuf, 1, 1); + if (flags & NIX_RX_OFFLOAD_SECURITY_F) { const uint64_t mbuf_init = 0x100010000ULL | RTE_PKTMBUF_HEADROOM | From patchwork Tue Apr 25 10:40:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Bhansali X-Patchwork-Id: 126506 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 AD8A0429EA; Tue, 25 Apr 2023 12:41:56 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6DF1F42D0B; Tue, 25 Apr 2023 12:41:54 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 9B80A40395 for ; Tue, 25 Apr 2023 12:41:51 +0200 (CEST) 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 33P9EpZL013176 for ; Tue, 25 Apr 2023 03:41:50 -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=vV4VlBw1EKwgOKdHl6LfRgBaVLLZEQeq2n9TOvNzLos=; b=b95Jlc1XYg5H03MrXfhGaLN/8Hdywms6Petg4J2OoGdduSvMfcaCLwgVJd3N5mVSDMZT lt5kmZsj9/6RP3CUNn7Kzvc+3vaPmOjMABP1gzcV97M4mGzZZlXntil7swq1IqFfCgeS c6pVjGkXCrcXx4EneTGgBqRCxueukPUN4Rt9omLCI8sCX6kpAuudF62WWEnFMHpIuXj1 xV9XKZkdLHyv/jbDtYfPL3IxTgAgxwY1Yw8BWsQBw1OHlb9GLE8FfmgBQ9WhPTsGd3YW WO//2J88v9FpMbc2TZYGpXkBloiGAXAAaZ/fo7bsdlR07pU9cSeOqdh1LyzB71pomx0R Sw== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3q6c2f89ud-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Tue, 25 Apr 2023 03:41:50 -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; Tue, 25 Apr 2023 03:41:48 -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; Tue, 25 Apr 2023 03:41:48 -0700 Received: from localhost.localdomain (unknown [10.28.36.158]) by maili.marvell.com (Postfix) with ESMTP id 79A423F7057; Tue, 25 Apr 2023 03:41:46 -0700 (PDT) From: Rahul Bhansali To: , Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao CC: , Rahul Bhansali Subject: [PATCH 5/5] net/cnxk: add mempool check for frag attach Date: Tue, 25 Apr 2023 16:10:10 +0530 Message-ID: <20230425104010.339177-5-rbhansali@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230425104010.339177-1-rbhansali@marvell.com> References: <20230425104010.339177-1-rbhansali@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: MTvIxoYQcZ5WSeU6cTlRBd_9mquKOXMs X-Proofpoint-ORIG-GUID: MTvIxoYQcZ5WSeU6cTlRBd_9mquKOXMs X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-04-25_03,2023-04-25_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 Add mempool cookies get mark to all frags in case of reassembly failure. Signed-off-by: Rahul Bhansali --- drivers/net/cnxk/cn10k_rx.h | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/drivers/net/cnxk/cn10k_rx.h b/drivers/net/cnxk/cn10k_rx.h index 9fdb5565e9..cbaf994aa2 100644 --- a/drivers/net/cnxk/cn10k_rx.h +++ b/drivers/net/cnxk/cn10k_rx.h @@ -211,6 +211,9 @@ nix_sec_attach_frags(const struct cpt_parse_hdr_s *hdr, /* Update dynamic field with userdata */ *rte_security_dynfield(mbuf) = (uint64_t)inb_priv->userdata; + /* Mark frag as get */ + RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool, (void **)&mbuf, 1, 1); + cnxk_ip_reassembly_dynfield(mbuf, off)->nb_frags = hdr->w0.num_frags - 2; cnxk_ip_reassembly_dynfield(mbuf, off)->next_frag = NULL; @@ -239,6 +242,9 @@ nix_sec_attach_frags(const struct cpt_parse_hdr_s *hdr, /* Update dynamic field with userdata */ *rte_security_dynfield(mbuf) = (uint64_t)inb_priv->userdata; + /* Mark frag as get */ + RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool, (void **)&mbuf, 1, 1); + cnxk_ip_reassembly_dynfield(mbuf, off)->nb_frags = hdr->w0.num_frags - 3; cnxk_ip_reassembly_dynfield(mbuf, off)->next_frag = NULL; @@ -263,6 +269,9 @@ nix_sec_attach_frags(const struct cpt_parse_hdr_s *hdr, mbuf->ol_flags = ol_flags; mbuf->next = NULL; + /* Mark frag as get */ + RTE_MEMPOOL_CHECK_COOKIES(mbuf->pool, (void **)&mbuf, 1, 1); + /* Update dynamic field with userdata */ *rte_security_dynfield(mbuf) = (uint64_t)inb_priv->userdata;