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 8709EA0C55; Wed, 13 Oct 2021 21:22:59 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A91634123A; Wed, 13 Oct 2021 21:22:55 +0200 (CEST) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id CE00B4111B for ; Wed, 13 Oct 2021 21:22:54 +0200 (CEST) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.1.2/8.16.1.2) with SMTP id 19DIvHkC030377; Wed, 13 Oct 2021 12:22: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=XPFTVqQWAIDrJtRMzWZxE9GHuKMeeWF72E7UgQluqgo=; b=Jzq5+vV5aqrskXQb2u/Bvddf7Ij51LNz674uzrL6DcCmsFBF6N7mcobP84wcfy5G1Nf7 skz2UFEUAifuUIcYvBqSXXw9zsUGAHesk+hJaMoJrGHSv8OULGG5Q2eiTxb6qddWWD9W 1CjIaW39E2+D6K41db9LEz2nPWEYBtdNkFWKQc29g3Zesjl18AvsZSmLHSyrRHx0w8qn wD1KxVpoL6+PnlescoX2Sdy580ws1bqqG6H8Cq7FIjI49YCeSHb3xCTGbD2mueL2Nsdj varu0TaA6su3PGQTN81oN5HQJJecM0VUrskbI8jDsuMfZp2IPYRT1WDC2TAr2ZHtE1WK Mg== Received: from dc5-exch02.marvell.com ([199.233.59.182]) by mx0b-0016f401.pphosted.com with ESMTP id 3bp0h3sjy4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Wed, 13 Oct 2021 12:22:48 -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.18; Wed, 13 Oct 2021 12:22:46 -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.18 via Frontend Transport; Wed, 13 Oct 2021 12:22:46 -0700 Received: from localhost.localdomain (unknown [10.28.36.185]) by maili.marvell.com (Postfix) with ESMTP id 0CBF63F7082; Wed, 13 Oct 2021 12:22:39 -0700 (PDT) From: Akhil Goyal To: CC: , , , , , , , , , , , , , , , , , , , , , , Akhil Goyal Date: Thu, 14 Oct 2021 00:52:17 +0530 Message-ID: <20211013192222.1582631-3-gakhil@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20211013192222.1582631-1-gakhil@marvell.com> References: <20210930145014.2476799-1-gakhil@marvell.com> <20211013192222.1582631-1-gakhil@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-GUID: 1h5pzZ1OIC-i3efTH-Wyo8uo5iqFkTcj X-Proofpoint-ORIG-GUID: 1h5pzZ1OIC-i3efTH-Wyo8uo5iqFkTcj X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.182.1,Aquarius:18.0.790,Hydra:6.0.425,FMLib:17.0.607.475 definitions=2021-10-13_07,2021-10-13_02,2020-04-07_01 Subject: [dpdk-dev] [PATCH v2 2/7] security: hide security session struct 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 Sender: "dev" rte_security_session struct is now hidden in the library. application can access the opaque data and fast_mdata using the set/get APIs introduced in this patch. Signed-off-by: Akhil Goyal --- lib/ipsec/rte_ipsec.h | 2 +- lib/ipsec/rte_ipsec_group.h | 5 +-- lib/ipsec/ses.c | 3 +- lib/security/rte_security.h | 54 ++++++++++++++++++++++++------ lib/security/rte_security_driver.h | 13 +++++++ 5 files changed, 63 insertions(+), 14 deletions(-) diff --git a/lib/ipsec/rte_ipsec.h b/lib/ipsec/rte_ipsec.h index dd60d95915..50d8e5098d 100644 --- a/lib/ipsec/rte_ipsec.h +++ b/lib/ipsec/rte_ipsec.h @@ -70,7 +70,7 @@ struct rte_ipsec_session { uint8_t dev_id; } crypto; struct { - struct rte_security_session *ses; + void *ses; struct rte_security_ctx *ctx; uint32_t ol_flags; } security; diff --git a/lib/ipsec/rte_ipsec_group.h b/lib/ipsec/rte_ipsec_group.h index ea3bdfad95..0cc5fedbf1 100644 --- a/lib/ipsec/rte_ipsec_group.h +++ b/lib/ipsec/rte_ipsec_group.h @@ -44,12 +44,13 @@ struct rte_ipsec_group { static inline struct rte_ipsec_session * rte_ipsec_ses_from_crypto(const struct rte_crypto_op *cop) { - const struct rte_security_session *ss; + void *ss; const struct rte_cryptodev_sym_session *cs; if (cop->sess_type == RTE_CRYPTO_OP_SECURITY_SESSION) { ss = cop->sym[0].sec_session; - return (void *)(uintptr_t)ss->opaque_data; + return (void *)(uintptr_t) + rte_security_session_opaque_data_get(ss); } else if (cop->sess_type == RTE_CRYPTO_OP_WITH_SESSION) { cs = cop->sym[0].session; return (void *)(uintptr_t)cs->opaque_data; diff --git a/lib/ipsec/ses.c b/lib/ipsec/ses.c index 3d51ac4986..b12114269f 100644 --- a/lib/ipsec/ses.c +++ b/lib/ipsec/ses.c @@ -47,7 +47,8 @@ rte_ipsec_session_prepare(struct rte_ipsec_session *ss) if (ss->type == RTE_SECURITY_ACTION_TYPE_NONE) ss->crypto.ses->opaque_data = (uintptr_t)ss; else - ss->security.ses->opaque_data = (uintptr_t)ss; + rte_security_session_opaque_data_set(ss->security.ses, + (uintptr_t)ss); return 0; } diff --git a/lib/security/rte_security.h b/lib/security/rte_security.h index 2c8e78c4c7..51fe1abb00 100644 --- a/lib/security/rte_security.h +++ b/lib/security/rte_security.h @@ -490,14 +490,47 @@ struct rte_security_session_conf { /**< Application specific userdata to be saved with session */ }; -struct rte_security_session { - uint64_t opaque_data; - /**< Opaque user defined data */ - uint64_t fast_mdata; - /**< Fast metadata to be used for inline path */ - __extension__ void *sess_private_data[0]; - /**< Private session material */ -}; +#define SESS_FAST_MDATA_OFF 1 +#define SESS_OPAQUE_DATA_OFF 2 +/** + * Get opaque data from session handle + */ +static inline uint64_t +rte_security_session_opaque_data_get(void *sess) +{ + return *((uint64_t *)sess - SESS_OPAQUE_DATA_OFF); +} + +/** + * Get fast mdata from session handle + */ +static inline uint64_t +rte_security_session_fast_mdata_get(void *sess) +{ + return *((uint64_t *)sess - SESS_FAST_MDATA_OFF); +} + +/** + * Set opaque data in session handle + */ +static inline void +rte_security_session_opaque_data_set(void *sess, uint64_t opaque) +{ + uint64_t *data; + data = (((uint64_t *)sess) - SESS_OPAQUE_DATA_OFF); + *data = opaque; +} + +/** + * Set fast mdata in session handle + */ +static inline void +rte_security_session_fast_mdata_set(void *sess, uint64_t fdata) +{ + uint64_t *data; + data = (((uint64_t *)sess) - SESS_FAST_MDATA_OFF); + *data = fdata; +} /** * Create security session as specified by the session configuration @@ -628,8 +661,9 @@ rte_security_set_pkt_metadata(struct rte_security_ctx *instance, { /* Fast Path */ if (instance->flags & RTE_SEC_CTX_F_FAST_SET_MDATA) { - *rte_security_dynfield(mb) = - (rte_security_dynfield_t)(sess); + uint64_t mdata = rte_security_session_fast_mdata_get(sess); + + *rte_security_dynfield(mb) = (rte_security_dynfield_t)(mdata); return 0; } diff --git a/lib/security/rte_security_driver.h b/lib/security/rte_security_driver.h index 5a177d72d7..13f2f9da32 100644 --- a/lib/security/rte_security_driver.h +++ b/lib/security/rte_security_driver.h @@ -19,6 +19,19 @@ extern "C" { #include "rte_security.h" +/** + * @internal + * Security session to be used by library for internal usage + */ +struct rte_security_session { + /** Opaque user defined data */ + uint64_t opaque_data; + /** Fast metadata to be used for inline path */ + uint64_t fast_mdata; + /** Private session material */ + __extension__ void *sess_private_data[0]; +}; + /** * Configure a security session on a device. * -- 2.25.1