From patchwork Thu Mar 14 08:38:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vidya Sagar Velumuri X-Patchwork-Id: 138362 X-Patchwork-Delegate: gakhil@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 3F9B043CAE; Thu, 14 Mar 2024 09:40:18 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 97CD742E70; Thu, 14 Mar 2024 09:39:36 +0100 (CET) Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com [67.231.156.173]) by mails.dpdk.org (Postfix) with ESMTP id 9D73942E64 for ; Thu, 14 Mar 2024 09:39:34 +0100 (CET) Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.17.1.24/8.17.1.24) with ESMTP id 42DNgMND016200 for ; Thu, 14 Mar 2024 01:39: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=Ex6x3OH5QeRXgbvUxXDI2taKxed/0t6DqSggt22YnDM=; b=Ql6 jDzPoZEeFOPL0MwQDRLPzkZWCzAya7RjkQ3POD3CwlLEU/9K+ZVkH+84cs6M6deO jnB8PM8r3rkobdx/nPUYl3O88/xfzESvC7fG0b65GRk+hRh7DhPp/0wByet132G9 BvxUJFCkrVCXW7Lp6fcHi6i4VCfbfRKzYPPji43QEHz15RqYV0B1lUerB/hYiVuS jCUdo0DxgmUjlaU3UcqGHgGNE36ygqAZ3CV92dFDzgoXaOB82CgCDhOaU87N/GW0 SetkEPcD+kx4Q3568w4xiHAdkYqtqP3w5NpcW4jMIXmtTaBoiam7acmjxL/gM+PK tSdtOORqpnRlO+peyeg== Received: from dc5-exch05.marvell.com ([199.233.59.128]) by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3wucg2uwvt-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Thu, 14 Mar 2024 01:39:33 -0700 (PDT) Received: from DC5-EXCH02.marvell.com (10.69.176.39) by DC5-EXCH05.marvell.com (10.69.176.209) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.2.1258.12; Thu, 14 Mar 2024 01:39:32 -0700 Received: from DC5-EXCH05.marvell.com (10.69.176.209) by DC5-EXCH02.marvell.com (10.69.176.39) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Thu, 14 Mar 2024 01:39:32 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH05.marvell.com (10.69.176.209) with Microsoft SMTP Server id 15.2.1258.12 via Frontend Transport; Thu, 14 Mar 2024 01:39:32 -0700 Received: from localhost.localdomain (unknown [10.28.36.179]) by maili.marvell.com (Postfix) with ESMTP id 815085B692A; Thu, 14 Mar 2024 01:39:28 -0700 (PDT) From: Vidya Sagar Velumuri To: Nithin Dabilpuram , Kiran Kumar K , Sunil Kumar Kori , Satha Rao , Harman Kalra , Ankur Dwivedi , Anoob Joseph , Tejasree Kondoj CC: , , , , Subject: [PATCH 09/12] crypto/cnxk: update the context structure of tls Date: Thu, 14 Mar 2024 01:38:41 -0700 Message-ID: <20240314083844.3319506-10-vvelumuri@marvell.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20240314083844.3319506-1-vvelumuri@marvell.com> References: <20240314083844.3319506-1-vvelumuri@marvell.com> MIME-Version: 1.0 X-Proofpoint-ORIG-GUID: yXUh117dkpWmOv0Z5lPQPaGQ6sZKbluV X-Proofpoint-GUID: yXUh117dkpWmOv0Z5lPQPaGQ6sZKbluV X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.1011,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2024-03-14_07,2024-03-13_01,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 Keep the record context for TLS-1.3 in sync with microcode structure. Report error if optional padding is enabled for AEAD case in both TLS-1.2 and DTLS-1.2. Signed-off-by: Vidya Sagar Velumuri --- drivers/common/cnxk/roc_ie_ot_tls.h | 17 ++++++++++++----- drivers/crypto/cnxk/cn10k_tls.c | 4 ++-- 2 files changed, 14 insertions(+), 7 deletions(-) diff --git a/drivers/common/cnxk/roc_ie_ot_tls.h b/drivers/common/cnxk/roc_ie_ot_tls.h index b85d075e86..44850f7060 100644 --- a/drivers/common/cnxk/roc_ie_ot_tls.h +++ b/drivers/common/cnxk/roc_ie_ot_tls.h @@ -67,6 +67,16 @@ struct roc_ie_ot_tls_read_ctx_update_reg { uint64_t ar_winbits[ROC_IE_OT_TLS_AR_WINBITS_SZ]; }; +struct roc_ie_ot_tls_1_3_read_ctx_update_reg { + uint64_t rsvd0; + uint64_t ar_valid_mask; + uint64_t hard_life; + uint64_t soft_life; + uint64_t mib_octs; + uint64_t mib_pkts; + uint64_t rsvd1; +}; + union roc_ie_ot_tls_param2 { uint16_t u16; struct { @@ -136,11 +146,8 @@ struct roc_ie_ot_tls_read_sa { union { struct { - /* Word10 */ - uint64_t w10_rsvd6; - - /* Word11 - Word25 */ - struct roc_ie_ot_tls_read_ctx_update_reg ctx; + /* Word10 - Word16 */ + struct roc_ie_ot_tls_1_3_read_ctx_update_reg ctx; } tls_13; struct { diff --git a/drivers/crypto/cnxk/cn10k_tls.c b/drivers/crypto/cnxk/cn10k_tls.c index dea4e501f3..fbf45c464a 100644 --- a/drivers/crypto/cnxk/cn10k_tls.c +++ b/drivers/crypto/cnxk/cn10k_tls.c @@ -118,8 +118,8 @@ cnxk_tls_xform_verify(struct rte_security_tls_record_xform *tls_xform, if (crypto_xform->type == RTE_CRYPTO_SYM_XFORM_AEAD) { /* optional padding is not allowed in TLS-1.2 for AEAD */ - if ((tls_xform->ver == RTE_SECURITY_VERSION_TLS_1_2) && - (tls_xform->options.extra_padding_enable == 1)) + if ((tls_xform->options.extra_padding_enable == 1) && + (tls_xform->ver != RTE_SECURITY_VERSION_TLS_1_3)) return -EINVAL; return tls_xform_aead_verify(tls_xform, crypto_xform);