From patchwork Thu May 18 15:48:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Bhansali X-Patchwork-Id: 127015 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 56B7342AF1; Thu, 18 May 2023 17:49:26 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C401942BFE; Thu, 18 May 2023 17:49:25 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 24FCD4014F; Thu, 18 May 2023 17:49:24 +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 34IF1oDD016998; Thu, 18 May 2023 08:49:23 -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=oatacDwzRnRqtA/u5QYMURA05HlyZtgfeOGD75mwsvk=; b=P2F95AhgeK9I+QjhWD6WrNMMn1xOLpMOTTDQqYV523Ad/a3xynnU7AIsnGkpkPgZ/SsR EJwHIC5fT3Pfixi/8NNq2UyVoBgRdLawxzTpIt6tHMgyJiU/qMmxov3ruN5D7cjLi5Zf g0hUClmmyvskox1LI/pdpAQQnbqdLHyK7qYBvdK8lMGITj370qWu9ISWLpvPofRymmxQ tB6r/GwINawtxWy2bNLuttoBL98/ZDHMagWmxdJ8RHuwWiUepW8fCgy0p4UMsz1MSNAV LptnAdD6a0nnUV2KfeGWAxpA/TEobdX2+fJQHhe4RayvvWpY2sRafWwyUsgoVYI3HjwE 0g== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3qmyexcpv7-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 18 May 2023 08:49:23 -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; Thu, 18 May 2023 08:49:21 -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, 18 May 2023 08:49:21 -0700 Received: from localhost.localdomain (unknown [10.28.36.158]) by maili.marvell.com (Postfix) with ESMTP id 3C4183F7101; Thu, 18 May 2023 08:49:17 -0700 (PDT) From: Rahul Bhansali To: , Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao , Akhil Goyal , Srujana Challa , Tejasree Kondoj CC: , Rahul Bhansali , Subject: [PATCH v2 1/5] common/cnxk: fix IPsec IPv6 tunnel address byte swap Date: Thu, 18 May 2023 21:18:58 +0530 Message-ID: <20230518154902.2254743-1-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: G3oCE33TuXsul--3uUNcVQX7BfmuG179 X-Proofpoint-ORIG-GUID: G3oCE33TuXsul--3uUNcVQX7BfmuG179 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-18_12,2023-05-17_02,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: 78d03027f2cc ("common/cnxk: add IPsec common code") Cc: stable@dpdk.org Signed-off-by: Rahul Bhansali --- Changes in v2: update in commit message for fixes and cc tag drivers/common/cnxk/cnxk_security.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) -- 2.25.1 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 Thu May 18 15:48:59 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Bhansali X-Patchwork-Id: 127016 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 DCFC842AF1; Thu, 18 May 2023 17:49:33 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id CD45D42D31; Thu, 18 May 2023 17:49:33 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 223C842BDA for ; Thu, 18 May 2023 17:49:32 +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 34IF1m4M016965 for ; Thu, 18 May 2023 08:49:31 -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=iXlFMkptdIRCfqFVUOGdoGWIes9JZhl07RJ6P7Upvpw=; b=eTqKx6uOxK8KwORJYzV5tMpAWfh5EWCYTaMsMAfANAqKr1hBBII+KsE2hd0rftFeHYY0 eoedLqwqvfeR/75H7RdFnIXx9oroKfcI9kVBuFeAaPaetFJ1RJX2lNFOIK/bavTW5taL 6Q/MrGwaPhm1MIAipkmhmqEMOC8ZWdbwUJeGNUa5aRDCi2uvl0fYhsI6ORjI4BamtbjL mTuaaLIUcYUxwMXaGvG7x3Zvajk9WPiTIXCghM+Je1UONuTvtKKx11muGgP0nqQqhbfd s6Hx4yIcorooSr+OiguriLBYpCUOU9tEYbZZMz4rBxWbocNNkqNw8qPG8/Sxv1r/tA78 zg== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3qmyexcpvp-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Thu, 18 May 2023 08:49:31 -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; Thu, 18 May 2023 08:49:29 -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, 18 May 2023 08:49:29 -0700 Received: from localhost.localdomain (unknown [10.28.36.158]) by maili.marvell.com (Postfix) with ESMTP id B95463F7050; Thu, 18 May 2023 08:49:27 -0700 (PDT) From: Rahul Bhansali To: , Pavan Nikhilesh , "Shijith Thotton" CC: , Rahul Bhansali Subject: [PATCH v2 2/5] event/cnxk: set Rx offload flags Date: Thu, 18 May 2023 21:18:59 +0530 Message-ID: <20230518154902.2254743-2-rbhansali@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230518154902.2254743-1-rbhansali@marvell.com> References: <20230425104010.339177-1-rbhansali@marvell.com> <20230518154902.2254743-1-rbhansali@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: W47cFInEIKjKpKNdaXN770hbQ-X_mWZY X-Proofpoint-ORIG-GUID: W47cFInEIKjKpKNdaXN770hbQ-X_mWZY X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-18_12,2023-05-17_02,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 --- Changes in v2: No change drivers/event/cnxk/cnxk_eventdev_adptr.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) -- 2.25.1 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 Thu May 18 15:49:00 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Bhansali X-Patchwork-Id: 127017 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 0689642AF1; Thu, 18 May 2023 17:49:41 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id EDA8E42D3E; Thu, 18 May 2023 17:49:40 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 5B61D42BAC; Thu, 18 May 2023 17:49:39 +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 34IDHoJj004789; Thu, 18 May 2023 08:49:38 -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=pvGsi6nhCclOpWx+uZdTAiVDZpXGEdJ7KWRUJ6aq9hQ=; b=bSlDXenjeWtNmO0TD56UKAyV4hGeSnCLvkhmiTKIBoM9etVcgzVxXhmqcTkUcBjGazr8 p8aW/vGidg26A6dP/26AfFxo9YdK7PXqwAskEhcHw8jJHJWw0ElNwd+6kUm7J+H2Kv4V /acpoEqMBeLPCgmg+inW01gPsG8xM7O//GsArdhkIrqwRt4upD0fOcJ3+Ym3XNw0yQP/ R63Sor8M5nZrJI7ToC0gX3IwYqPOhS1mKzmfMJiuhD89aHGHnVyInRE6tJsqLBDZwpCX AeDkfjpuZbiiHcxzYSlOkVV8eragqlQZ9a8lYfBV3Ei3Vmdm+An1ANof8ZuuKSYFG3Qa xg== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3qmyexcpvt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 18 May 2023 08:49:38 -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; Thu, 18 May 2023 08:49:36 -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, 18 May 2023 08:49:36 -0700 Received: from localhost.localdomain (unknown [10.28.36.158]) by maili.marvell.com (Postfix) with ESMTP id 1818A3F705E; Thu, 18 May 2023 08:49:33 -0700 (PDT) From: Rahul Bhansali To: , Pavan Nikhilesh , "Shijith Thotton" , Volodymyr Fialko CC: , Rahul Bhansali , Subject: [PATCH v2 3/5] event/cnxk: fix Tx adapter data pointer Date: Thu, 18 May 2023 21:19:00 +0530 Message-ID: <20230518154902.2254743-3-rbhansali@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230518154902.2254743-1-rbhansali@marvell.com> References: <20230425104010.339177-1-rbhansali@marvell.com> <20230518154902.2254743-1-rbhansali@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: 0p99VqAYbbdqdJEyHqNPW8sA1C4kjlWs X-Proofpoint-ORIG-GUID: 0p99VqAYbbdqdJEyHqNPW8sA1C4kjlWs X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-18_12,2023-05-17_02,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: 6a24c7c4bcd1 ("event/cnxk: add Tx adapter freeing") Cc: stable@dpdk.org Signed-off-by: Rahul Bhansali --- Changes in v2: update in commit message for fixes and cc tag drivers/event/cnxk/cnxk_eventdev_adptr.c | 1 + 1 file changed, 1 insertion(+) -- 2.25.1 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 Thu May 18 15:49:01 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Bhansali X-Patchwork-Id: 127018 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 45FC542AF1; Thu, 18 May 2023 17:49:46 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 341D242D42; Thu, 18 May 2023 17:49:46 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by mails.dpdk.org (Postfix) with ESMTP id 5285542BC9; Thu, 18 May 2023 17:49:44 +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 34IA9Svx012878; Thu, 18 May 2023 08:49:43 -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=G4zlkznEw9URsuR266H6AQeQZuu0eua9ICOYDt2pYoM=; b=NZ0DuHwtyh4hsk8zrfHx0e+Jf8AH2JyX07pAAd97/gFnTgONWGxI8JheDba+OyG3Kf7r 3M0OtNbUxCdyKw0KhMsflHVYJMY+eDlOITJf7RhFp4mrQprwYztSmIek7jSb6RP1LB6Z SeVrvKmFHZDvCyPdTuF8a5CJb1Orkw9balYa5MDigkj/v3r13NrdNPZC2EPDNWfadPFr XHwMwIA2WoH3BThvzR+yC8mVk985b0w4naR6VuiBim89jwm2mgmISeaXdS5FV7Q+eGvy UuUnwBOoq0WElomXr83DKWlR9S7hiPzVp4j7OJaKQzbSLJ7afJvFLXRcatucTe7Z6ZQ5 eQ== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3qn7jbbk3v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Thu, 18 May 2023 08:49:43 -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; Thu, 18 May 2023 08:49:41 -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, 18 May 2023 08:49:41 -0700 Received: from localhost.localdomain (unknown [10.28.36.158]) by maili.marvell.com (Postfix) with ESMTP id 837DF3F7065; Thu, 18 May 2023 08:49:39 -0700 (PDT) From: Rahul Bhansali To: , Pavan Nikhilesh , "Shijith Thotton" , Jerin Jacob , "Nithin Dabilpuram" CC: Rahul Bhansali , Subject: [PATCH v2 4/5] event/cnxk: fix mempool cookies check Date: Thu, 18 May 2023 21:19:01 +0530 Message-ID: <20230518154902.2254743-4-rbhansali@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230518154902.2254743-1-rbhansali@marvell.com> References: <20230425104010.339177-1-rbhansali@marvell.com> <20230518154902.2254743-1-rbhansali@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: 8GR1jUONHWEti1NG_iDM_n4mZT8kagzy X-Proofpoint-ORIG-GUID: 8GR1jUONHWEti1NG_iDM_n4mZT8kagzy X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-18_12,2023-05-17_02,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: 7a709964d9bb ("net/cnxk: use NPA batch burst free for meta buffers") Cc: stable@dpdk.org Signed-off-by: Rahul Bhansali --- Changes in v2: update in commit message for fixes and cc tag drivers/event/cnxk/cn10k_worker.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) -- 2.25.1 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 Thu May 18 15:49:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Rahul Bhansali X-Patchwork-Id: 127019 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 2B57E42AF1; Thu, 18 May 2023 17:49:52 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 7824F42D4A; Thu, 18 May 2023 17:49:49 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 8136042BC9 for ; Thu, 18 May 2023 17:49:48 +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 34IDIw41005821 for ; Thu, 18 May 2023 08:49:48 -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=V7/mc41QFlOEK0A9baMYKArRYcemz5QqAnruyVd8GIU=; b=c9EmAQlbJamVU4bjNZxmXebzbExZV0GtgS4VQKQbiRsnj3KgdB3QFpWgCOO2Le46Fubx OkohvfFHuxaoMu20nypsAbWN5O+PNoRadcbRR8UYH8GU7B0afUbd49nVGYCztoD4OcPF 9cySEJHe59cmZzpCfryfS6Eh/Zzx6UNingnx87AfLyoLUawxfD99mJFDzs1eLop353wk HHwxA7Txz0DIEyksQJePd0waJrZcJwob2nZaPAsoNiq2ZRj4ulsdlswsuIHGhOc5JD7O oaP5k1MgZzva1W+RH4Qf/g1zGSpV6Caf242IoTF+jJ1cvS/w6kAH3IW3AGhdQYQIcQEf dw== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3qmyexcpw2-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Thu, 18 May 2023 08:49:47 -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, 18 May 2023 08:49:45 -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, 18 May 2023 08:49:45 -0700 Received: from localhost.localdomain (unknown [10.28.36.158]) by maili.marvell.com (Postfix) with ESMTP id 9BDBB3F7066; Thu, 18 May 2023 08:49:43 -0700 (PDT) From: Rahul Bhansali To: , Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao CC: , Rahul Bhansali Subject: [PATCH v2 5/5] net/cnxk: add mempool check for frag attach Date: Thu, 18 May 2023 21:19:02 +0530 Message-ID: <20230518154902.2254743-5-rbhansali@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230518154902.2254743-1-rbhansali@marvell.com> References: <20230425104010.339177-1-rbhansali@marvell.com> <20230518154902.2254743-1-rbhansali@marvell.com> MIME-Version: 1.0 X-Proofpoint-GUID: eK6br_IZikSZJ9ubwbZvuVin8jneY-Lk X-Proofpoint-ORIG-GUID: eK6br_IZikSZJ9ubwbZvuVin8jneY-Lk X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-18_12,2023-05-17_02,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 --- Changes in v2: No change drivers/net/cnxk/cn10k_rx.h | 9 +++++++++ 1 file changed, 9 insertions(+) -- 2.25.1 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;