From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 06B8445A74; Tue, 1 Oct 2024 08:01:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 8767040BA2; Tue, 1 Oct 2024 08:01:27 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 9B66240B9D for ; Tue, 1 Oct 2024 08:01:26 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.18.1.2/8.18.1.2) with ESMTP id 49107VRS021053 for ; Mon, 30 Sep 2024 23:01:26 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h= cc:content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pfpt0220; bh=b lzzipDC25BeYwP/DL8c0un09GxVwgZbpap6HmUqrMk=; b=UEwafXjL8OqFF8cIM 6KCbjfaE9qABUh2ww0IjJC/KjlCrG/uRDRie3fUprncCBXG8/+TgUed+XgFv0ES8 fV5HIkiKMtNWsIfoXbXb1fjMfo+fssXwquFfP3AtzFlm9QsAET/Mqmz1UdAU6INf bSKhWhhHhZ2AUAvZ8ah2Z+jkl7E6lhUu4zDi/kg9Za6Gj3tme7dpxg5gEukR6GpR kkzWCxUzyHa6VjB2+J9P7ETrubd5umq7dBa5Wvp4wa54QOjLYm4fFRPwQSsn4+qX Oz3Ue8eiUKpUoAWBZJ089F2s30/4mh3/luoRLGuabppMORbYdH5WzM6o0zqrNdZ7 +QOWQ== Received: from dc6wp-exch02.marvell.com ([4.21.29.225]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 41yt6gbxkg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Mon, 30 Sep 2024 23:01:25 -0700 (PDT) Received: from DC6WP-EXCH02.marvell.com (10.76.176.209) by DC6WP-EXCH02.marvell.com (10.76.176.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.4; Mon, 30 Sep 2024 23:01:25 -0700 Received: from maili.marvell.com (10.69.176.80) by DC6WP-EXCH02.marvell.com (10.76.176.209) with Microsoft SMTP Server id 15.2.1544.4 via Frontend Transport; Mon, 30 Sep 2024 23:01:25 -0700 Received: from hyd1588t430.caveonetworks.com (unknown [10.29.52.204]) by maili.marvell.com (Postfix) with ESMTP id D7EDB3F7072; Mon, 30 Sep 2024 23:01:21 -0700 (PDT) From: Nithin Dabilpuram To: , Nithin Dabilpuram , "Kiran Kumar K" , Sunil Kumar Kori , Satha Rao , Harman Kalra CC: Subject: [PATCH v2 08/17] net/cnxk: move PMD function defines to common code Date: Tue, 1 Oct 2024 11:30:46 +0530 Message-ID: <20241001060055.3747591-8-ndabilpuram@marvell.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241001060055.3747591-1-ndabilpuram@marvell.com> References: <20241001060055.3747591-1-ndabilpuram@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-GUID: W8nhuQKDDV7ibXDjq9thz75spKkHp2uX X-Proofpoint-ORIG-GUID: W8nhuQKDDV7ibXDjq9thz75spKkHp2uX X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1039,Hydra:6.0.680,FMLib:17.12.60.29 definitions=2024-09-06_09,2024-09-06_01,2024-09-02_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 Move PMD function definitions to common code for cn9k/cn10k since they are declared commonly. Also remove the reference to 'struct rte_security_session' since it is now a driver internal structure and not exported to application code. Signed-off-by: Nithin Dabilpuram --- drivers/net/cnxk/cn10k_ethdev_sec.c | 61 ---------------------------- drivers/net/cnxk/cnxk_ethdev_sec.c | 63 +++++++++++++++++++++++++++++ drivers/net/cnxk/rte_pmd_cnxk.h | 8 ++-- 3 files changed, 67 insertions(+), 65 deletions(-) diff --git a/drivers/net/cnxk/cn10k_ethdev_sec.c b/drivers/net/cnxk/cn10k_ethdev_sec.c index 5e509e97d4..074bb09822 100644 --- a/drivers/net/cnxk/cn10k_ethdev_sec.c +++ b/drivers/net/cnxk/cn10k_ethdev_sec.c @@ -1208,67 +1208,6 @@ cn10k_eth_sec_session_update(void *device, struct rte_security_session *sess, return 0; } -int -rte_pmd_cnxk_hw_sa_read(void *device, struct rte_security_session *sess, - union rte_pmd_cnxk_ipsec_hw_sa *data, uint32_t len) -{ - struct rte_eth_dev *eth_dev = (struct rte_eth_dev *)device; - struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev); - struct cnxk_eth_sec_sess *eth_sec; - int rc; - - eth_sec = cnxk_eth_sec_sess_get_by_sess(dev, sess); - if (eth_sec == NULL) - return -EINVAL; - - rc = roc_nix_inl_sa_sync(&dev->nix, eth_sec->sa, eth_sec->inb, - ROC_NIX_INL_SA_OP_FLUSH); - if (rc) - return -EINVAL; - rte_delay_ms(1); - memcpy(data, eth_sec->sa, len); - - return 0; -} - -int -rte_pmd_cnxk_hw_sa_write(void *device, struct rte_security_session *sess, - union rte_pmd_cnxk_ipsec_hw_sa *data, uint32_t len) -{ - struct rte_eth_dev *eth_dev = (struct rte_eth_dev *)device; - struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev); - struct cnxk_eth_sec_sess *eth_sec; - int rc = -EINVAL; - - eth_sec = cnxk_eth_sec_sess_get_by_sess(dev, sess); - if (eth_sec == NULL) - return rc; - rc = roc_nix_inl_ctx_write(&dev->nix, data, eth_sec->sa, eth_sec->inb, - len); - if (rc) - return rc; - - return 0; -} - -union rte_pmd_cnxk_cpt_res_s * -rte_pmd_cnxk_inl_ipsec_res(struct rte_mbuf *mbuf) -{ - const union nix_rx_parse_u *rx; - uint16_t desc_size; - uintptr_t wqe; - - if (!mbuf || !(mbuf->ol_flags & RTE_MBUF_F_RX_SEC_OFFLOAD)) - return NULL; - - wqe = (uintptr_t)(mbuf + 1); - rx = (const union nix_rx_parse_u *)(wqe + 8); - desc_size = (rx->desc_sizem1 + 1) * 16; - - /* rte_pmd_cnxk_cpt_res_s sits after SG list at 16B aligned address */ - return (void *)(wqe + 64 + desc_size); -} - static int cn10k_eth_sec_session_stats_get(void *device, struct rte_security_session *sess, struct rte_security_stats *stats) diff --git a/drivers/net/cnxk/cnxk_ethdev_sec.c b/drivers/net/cnxk/cnxk_ethdev_sec.c index 6f5319e534..cdd5656817 100644 --- a/drivers/net/cnxk/cnxk_ethdev_sec.c +++ b/drivers/net/cnxk/cnxk_ethdev_sec.c @@ -2,6 +2,8 @@ * Copyright(C) 2021 Marvell. */ +#include + #include #include @@ -295,6 +297,67 @@ cnxk_eth_sec_sess_get_by_sess(struct cnxk_eth_dev *dev, return NULL; } +int +rte_pmd_cnxk_hw_sa_read(void *device, void *__sess, union rte_pmd_cnxk_ipsec_hw_sa *data, + uint32_t len) +{ + struct rte_security_session *sess = __sess; + struct rte_eth_dev *eth_dev = (struct rte_eth_dev *)device; + struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev); + struct cnxk_eth_sec_sess *eth_sec; + int rc; + + eth_sec = cnxk_eth_sec_sess_get_by_sess(dev, sess); + if (eth_sec == NULL) + return -EINVAL; + + rc = roc_nix_inl_sa_sync(&dev->nix, eth_sec->sa, eth_sec->inb, ROC_NIX_INL_SA_OP_FLUSH); + if (rc) + return -EINVAL; + rte_delay_ms(1); + memcpy(data, eth_sec->sa, len); + + return 0; +} + +int +rte_pmd_cnxk_hw_sa_write(void *device, void *__sess, union rte_pmd_cnxk_ipsec_hw_sa *data, + uint32_t len) +{ + struct rte_security_session *sess = __sess; + struct rte_eth_dev *eth_dev = (struct rte_eth_dev *)device; + struct cnxk_eth_dev *dev = cnxk_eth_pmd_priv(eth_dev); + struct cnxk_eth_sec_sess *eth_sec; + int rc = -EINVAL; + + eth_sec = cnxk_eth_sec_sess_get_by_sess(dev, sess); + if (eth_sec == NULL) + return rc; + rc = roc_nix_inl_ctx_write(&dev->nix, data, eth_sec->sa, eth_sec->inb, len); + if (rc) + return rc; + + return 0; +} + +union rte_pmd_cnxk_cpt_res_s * +rte_pmd_cnxk_inl_ipsec_res(struct rte_mbuf *mbuf) +{ + const union nix_rx_parse_u *rx; + uint16_t desc_size; + uintptr_t wqe; + + if (!mbuf || !(mbuf->ol_flags & RTE_MBUF_F_RX_SEC_OFFLOAD)) + return NULL; + + wqe = (uintptr_t)(mbuf + 1); + rx = (const union nix_rx_parse_u *)(wqe + 8); + desc_size = (rx->desc_sizem1 + 1) * 16; + + /* rte_pmd_cnxk_cpt_res_s sits after SG list at 16B aligned address */ + return (void *)(wqe + 64 + desc_size); +} + static unsigned int cnxk_eth_sec_session_get_size(void *device __rte_unused) { diff --git a/drivers/net/cnxk/rte_pmd_cnxk.h b/drivers/net/cnxk/rte_pmd_cnxk.h index 88030046db..70f2f96fd4 100644 --- a/drivers/net/cnxk/rte_pmd_cnxk.h +++ b/drivers/net/cnxk/rte_pmd_cnxk.h @@ -495,7 +495,7 @@ union rte_pmd_cnxk_cpt_res_s { * @param device * Port identifier of Ethernet device. * @param sess - * Handle of the security session. + * Handle of the security session as void *. * @param[out] data * Destination pointer to copy SA context for application. * @param len @@ -505,7 +505,7 @@ union rte_pmd_cnxk_cpt_res_s { * 0 on success, a negative errno value otherwise. */ __rte_experimental -int rte_pmd_cnxk_hw_sa_read(void *device, struct rte_security_session *sess, +int rte_pmd_cnxk_hw_sa_read(void *device, void *sess, union rte_pmd_cnxk_ipsec_hw_sa *data, uint32_t len); /** * Write HW SA context to session. @@ -513,7 +513,7 @@ int rte_pmd_cnxk_hw_sa_read(void *device, struct rte_security_session *sess, * @param device * Port identifier of Ethernet device. * @param sess - * Handle of the security session. + * Handle of the security session as void *. * @param[in] data * Source data pointer from application to copy SA context into session. * @param len @@ -523,7 +523,7 @@ int rte_pmd_cnxk_hw_sa_read(void *device, struct rte_security_session *sess, * 0 on success, a negative errno value otherwise. */ __rte_experimental -int rte_pmd_cnxk_hw_sa_write(void *device, struct rte_security_session *sess, +int rte_pmd_cnxk_hw_sa_write(void *device, void *sess, union rte_pmd_cnxk_ipsec_hw_sa *data, uint32_t len); /** -- 2.34.1