From patchwork Tue Sep 7 08:56:01 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 98154 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 CA58CA0C46; Tue, 7 Sep 2021 10:56:35 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9970B41134; Tue, 7 Sep 2021 10:56:31 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150043.outbound.protection.outlook.com [40.107.15.43]) by mails.dpdk.org (Postfix) with ESMTP id 48469410EB; Tue, 7 Sep 2021 10:56:30 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JYubM5hjPbFvgKRQfrEVsE06AM4Q6148soJz9RJKaQ5ON5U5siq/lh8HmlX4I5XyfV51aCtX51XQJ9+Pz3XTC3N4uX+jX99axVxBlHetO3/fI2oUfz97vH+0G4J/WioLQqCRk39PZKmgsVN4DrdPnI6e2IH6tD64TL9uuB5XSXa/XPk5IvihGEwa6ORR42a0KjV/XKmuo3K7Td6gz2kjPh3KOZsoJvQYZhw0pyW3H9Ds1vdE5ucBkia83qyaezCS9tMXxLovRK+zkFBGSFVUKnzuwwsy5DiStCsNh3hdm4ZZpJJp4Fg2ZpK8I6p7yMECkiXa1Hf1VQBiWxaaMU7J2Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=F5JhijWtwz5QU6tHosnZDKAravUDY169JdzOjxtWMpQ=; b=jzLZ/vrRuJYbp1W/V9AmFwGqhpR7VMwoTKrachmfcNEnuUiNwfayejmTKWKGyoQ5DlyFVt3XCbxrYKiIj8EoVip5XKEb8FwG/NeHB8vHoxDJ49m2KQPY2xVUNaeYHfjPdoYxxEhrYTld4FZUEMkLXDSy/M91kqy4jcNK7iIpadEjDfnLs1JFe7Pho158Be2pwLqO7YIYrF610v0wyoNVELQY1XGxlLzw3a80UiepY9LzQZ+KR6V8/KPjbuJyX6MOymF0fmpq/VyE0J1nA09CVW9dIPK/R1MRbyzQX/YqPRBGeRZPCCeT8Sm9wkjI+uSItCENcV2XAMEwWY7FekXugQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=F5JhijWtwz5QU6tHosnZDKAravUDY169JdzOjxtWMpQ=; b=l0O2371jCmKP9XhY7k3obuuMeoacG9KMs7LCg63VDaXgaHx3JKPfnVywlpgpHLT6HACXHRoN6fYBDAFKimdl98mI8p+YdVHlzvIHk4tyeR8CmVB01CQrLQyIcKCiYCdC2paRKUx8JL33z85pd0yegfaYzATVN9xaa4s143lD0So= Authentication-Results: marvell.com; dkim=none (message not signed) header.d=none;marvell.com; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB6960.eurprd04.prod.outlook.com (2603:10a6:803:12d::10) by VE1PR04MB7262.eurprd04.prod.outlook.com (2603:10a6:800:1ab::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Tue, 7 Sep 2021 08:56:28 +0000 Received: from VI1PR04MB6960.eurprd04.prod.outlook.com ([fe80::d496:fcce:f667:7aa7]) by VI1PR04MB6960.eurprd04.prod.outlook.com ([fe80::d496:fcce:f667:7aa7%7]) with mapi id 15.20.4478.025; Tue, 7 Sep 2021 08:56:28 +0000 From: Gagandeep Singh To: gakhil@marvell.com, dev@dpdk.org Cc: thomas@monjalon.net, Gagandeep Singh , stable@dpdk.org Date: Tue, 7 Sep 2021 14:26:01 +0530 Message-Id: <20210907085605.3010882-2-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210907085605.3010882-1-g.singh@nxp.com> References: <20210826112315.1375237-1-g.singh@nxp.com> <20210907085605.3010882-1-g.singh@nxp.com> X-ClientProxiedBy: SG2PR04CA0133.apcprd04.prod.outlook.com (2603:1096:3:16::17) To VI1PR04MB6960.eurprd04.prod.outlook.com (2603:10a6:803:12d::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from lsv03457.swis.in-blr01.nxp.com (14.142.151.118) by SG2PR04CA0133.apcprd04.prod.outlook.com (2603:1096:3:16::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Tue, 7 Sep 2021 08:56:25 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6fbc0e80-141b-45b9-c7b1-08d971dd60ae X-MS-TrafficTypeDiagnostic: VE1PR04MB7262: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:747; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: qPj2JVPtWyECr4HXP7xy9N3rEN7vKrf+8UgtbKM+nY1ERMqZEs4pkryt2sQgN+sePjJRQu3ATHND7zWxgpUWtsbIZyiGuNCBlN8O4/h7daYaHUsO2VjTsuOWo5IBFNcQuUS8NW/G8xLUQKWLWTG6uvkLScFf6XMp14cj1eMyRWO8++tsweH7+nOgKaRBHlDgzaQelL//631pm32Da7/eUKGBIERpSCaG+8NflgFiTZX/2G2PT8p8oNoU0Gq24SJfjQK5hHMAK67eD4mIkLxgcj32Cal3EZf5BBJ9UlgrsDN7gcfPzP2IZc9p0W0ABRvfJqfXnCvEFoLpcMNiu1srzlpFnK+wFpto14Z4x6XXoPLNJOt+n5gWzoWwC2KAM8wycaPLm/rma1IGQ3dHv5xUuCkuwbBmeZA+kR+BGVK3U8SYNr1aXa1kfg7PbClxJ/E0Qxj3qS/JIHll1lBJpN0ikJfeKATCDWRz83SavEs8eHFXCnHV2LvgZqw9S+EA6NARQhBoj5hQ4lUacc5WitcAQ7nRVX9P/KQ6l29+rl/P+kIMU8wCSamnwKQd3F5C47B6Km04WoJBzgOXkdInpzHzyr1ta2cDaqZJ2zhl+OHkOd/ZuQR+2osP8G1Yc270B9dVeLH2O/07ehws0YikrNZRFhzzsbEiKKWnoAo7G+yXeNsEimT4+mU2/P/edlD9AETTQIDW3mV/hEBzVfdPKTh9E6fbnIWH1yMKGk/g/gk1g3E= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB6960.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(366004)(39860400002)(136003)(376002)(396003)(1076003)(1006002)(36756003)(55236004)(66556008)(66476007)(4326008)(38100700002)(6666004)(8676002)(52116002)(7696005)(8936002)(66946007)(38350700002)(5660300002)(478600001)(26005)(956004)(2616005)(6486002)(316002)(83380400001)(86362001)(2906002)(186003)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: 1nOEjGx18NbpLpd4WqwCe0NZNvLLZTNUz0PsjNunPrWcIb1363tEnuFlwBS9OPB8XFEfK+1Ekm053Mzk8lP+cv7FVV4gCG5B9l4ZruFafpV21PjyAbZqknOf5vQ2td+AhwbTwBHaTAu4fZCu8NeR6DCec7mJpdTaGlJsNRl4wDQiodNBPxyyC6sk+5NdxPsVN8SxaS7J43KgZwJe4DYfnSNgdtmxsJDvcxUz4JkAoXpSwhHPY+AfaRR9x3asx/GfhkdfggDdLv281pMQN3VxP5aOh1mW8NDEDd836wLcrz0Pam/XHVioodldbfwGse+56ExLZ9XeDXYO6YF9bTL+TrV+LW2nnplVcvJafP1HTRh0M3cwGN5ZXqji4kNxAS1DEfvflaSeZXpFsjdC4Qy9kboKGT9Ks4iDpTrjsXqdb7QR1gHukMUaaOdF+BGLhIXwFbIYSQ8ph/4GuT8FvgOPCbLENgcId4iaUD1UBS2JVPQZDDDswY9r9Rtj36MfgaS4m0mSmzkhDLSU3+8uztfWN382zF36sI3T1k+l1Uo32VC1dT+0g5SKRtHKgjwawPMaRfqy9k4MHjhJDI+npm5VUYErm0st3nb9dyJXFpBhnVpYnuSoyKPUHHHXgQf+zCI95YDInM0fYIhPOGmeqLgPpUUplt+MN0bjGBsr7SUIh+QkhYEfnLVrB2YDDOdMKyzJWW5OIfd0aJ1ZNI+bFbuE84eXxmT5yaPgsFcPOv0r6gVvPzFlPW2pjvV5Ke4Zf5z4iFwpCbApsr2vNFhzujlvn2+GnbOtCZ9fiMuH0seHiUVIGRiHJ9X+Uh5anz/PHR+ja9FTbwk9FcGRsqxDWLcXQVm1ibob/NR/F4fbS8vI86lxnd28wk5o7+AsOjJut6UyV6uo8h2jYouqPFMWV9HE49DgPxHhBCF2cqcaaep/6RsFCC69+pfDQ8FIPS8METsH8jzwyd1DKbmxhp2Cjc6A47r1CI1ze0WVW/ei3NJiSbaTsr8fsKfbimA0UHsh0nXgWKH17zq1cqJIPHbADMWc8fcrp0PGWu7K8v/kpWpXL5F6q6cW/aG6s1c2a2KO13s7kcGsKWyf0ZFh/QObCI+eCkQPUmprlQIGjPEE7CyQQ9pERMh2HnQM2BjWaoRyprffme+vd8CgxqJZ2Wm/r9+oHTc7PazQxKj3qPQfq2hetpso4uGZKAkwIjw6hRXlU53h9In1OpczxW4jt2QyFxdCtfje/Xt6Rcqq130pkG9ppGPN7vJFcfvwXtC8OZ2pRWnha/uuRNRRYJq2H7l5eNS4XP94GrIqSOVu5FRyczpDASnTSIL8FB3eidIRyXJ/uXBD X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6fbc0e80-141b-45b9-c7b1-08d971dd60ae X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB6960.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 08:56:27.9875 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: KCwt1M4tR7NAiImky04W13ELfc4i3B+G2VVmK60MeASWL32GkhVET2lCOLeC08BV X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7262 Subject: [dpdk-dev] [PATCH v2 1/5] common/dpaax: fix IV value for shortMAC-I for SNOW algo 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" The logic was incorecly doing conditional swap. It need to be bit swap always. Fixes: 73a24060cd70 ("crypto/dpaa2_sec: add sample PDCP descriptor APIs") Cc: stable@dpdk.org Signed-off-by: Gagandeep Singh --- drivers/common/dpaax/caamflib/desc/pdcp.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/common/dpaax/caamflib/desc/pdcp.h b/drivers/common/dpaax/caamflib/desc/pdcp.h index 659e289a45..041c66cfba 100644 --- a/drivers/common/dpaax/caamflib/desc/pdcp.h +++ b/drivers/common/dpaax/caamflib/desc/pdcp.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause or GPL-2.0+ * Copyright 2008-2013 Freescale Semiconductor, Inc. - * Copyright 2019-2020 NXP + * Copyright 2019-2021 NXP */ #ifndef __DESC_PDCP_H__ @@ -3710,9 +3710,10 @@ cnstr_shdsc_pdcp_short_mac(uint32_t *descbuf, break; case PDCP_AUTH_TYPE_SNOW: + /* IV calculation based on 3GPP specs. 36331, section:5.3.7.4 */ iv[0] = 0xFFFFFFFF; - iv[1] = swap ? swab32(0x04000000) : 0x04000000; - iv[2] = swap ? swab32(0xF8000000) : 0xF8000000; + iv[1] = swab32(0x04000000); + iv[2] = swab32(0xF8000000); KEY(p, KEY2, authdata->key_enc_flags, authdata->key, authdata->keylen, INLINE_KEY(authdata)); From patchwork Tue Sep 7 08:56:02 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 98155 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 3265BA0C46; Tue, 7 Sep 2021 10:56:42 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F28D04113F; Tue, 7 Sep 2021 10:56:32 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150053.outbound.protection.outlook.com [40.107.15.53]) by mails.dpdk.org (Postfix) with ESMTP id C78D441137 for ; Tue, 7 Sep 2021 10:56:31 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=iSt3cFXzjzWYZlqs2XNKXmBKfVgJ8eg3MpLxlWXUK1bv1chDbPtbEQPf6ZmLP71aut8sJ0QzoD1NsV93eIOQILQP8a9E4kz+6XI51g7KOZQPUptYM9J/BiUrQt6/WWwil55QaAcPyFkxjMhIE5FCER9X4e5bPh5YhRZHhDY8JF2Rz3TIyYaDOIt+fu8XOKOwcjGQZTk16fM6D8jx8SlxtlL9lnoCYUNR2c2iJbs23qgLHZ3evBahC48T+UMd8STViIeJipbp4je6g9Fmw3J9nOBb2y1ZgGYBpg1Q5VaJs5y3Il2UqzCVp8E1YfQhp++5L7Gk5q5vZ+UpgVH81T11kQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=L9uLLzFO01yg0QykHKRGZM5mbXXa8fWquHYn8P2K998=; b=fc4xZHRQrijhbvMmzHMJuWHqEAYsJza66P87F4eGn2QWpTyRWcUi/C1qW/dwNsuFGDTIxGswYEkzYu2lcf4lM+Y+mQSYePCVg2PLZoiXnI02eAcHLxz0fgPHUoCpZ+X2S1mV5rtKN89/KTxFv0dI7YjvhK1AL7BItjSu0aQRlIiejoSCPlUbP5HlHap3CeRF+GC8hIgk4qdjN35nILFmRw9iu07ToiCd2G1MmdRX/CndkvCaJ2WXGEpkb62POXQii4ip5i1VlBwdv5hLZrWLlu2+HvtSQ+CFkwrDsfDecA3r9JRgW6Z2dBO07XeymYNH05CQUp1Sg5DvzA8IMQlHow== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=L9uLLzFO01yg0QykHKRGZM5mbXXa8fWquHYn8P2K998=; b=jJZoizwJsuZaVJk0b4ZdbGqhUSCxuBMGfoLszbZMsWXkzd0WCr1PSrKzA5YrEV7BKzOaKJ6OWq+w+5dHo9vYRD9+3aIvG5pgDDfBz3Wah1aaPj4G6SNcfEZDT3E+smltaKJCpSO1UCWmqxT1uatc93XjSb8k1pvN2OETKMlo1E0= Authentication-Results: marvell.com; dkim=none (message not signed) header.d=none;marvell.com; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB6960.eurprd04.prod.outlook.com (2603:10a6:803:12d::10) by VE1PR04MB7262.eurprd04.prod.outlook.com (2603:10a6:800:1ab::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Tue, 7 Sep 2021 08:56:30 +0000 Received: from VI1PR04MB6960.eurprd04.prod.outlook.com ([fe80::d496:fcce:f667:7aa7]) by VI1PR04MB6960.eurprd04.prod.outlook.com ([fe80::d496:fcce:f667:7aa7%7]) with mapi id 15.20.4478.025; Tue, 7 Sep 2021 08:56:30 +0000 From: Gagandeep Singh To: gakhil@marvell.com, dev@dpdk.org Cc: thomas@monjalon.net, Hemant Agrawal , Gagandeep Singh Date: Tue, 7 Sep 2021 14:26:02 +0530 Message-Id: <20210907085605.3010882-3-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210907085605.3010882-1-g.singh@nxp.com> References: <20210826112315.1375237-1-g.singh@nxp.com> <20210907085605.3010882-1-g.singh@nxp.com> X-ClientProxiedBy: SG2PR04CA0133.apcprd04.prod.outlook.com (2603:1096:3:16::17) To VI1PR04MB6960.eurprd04.prod.outlook.com (2603:10a6:803:12d::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from lsv03457.swis.in-blr01.nxp.com (14.142.151.118) by SG2PR04CA0133.apcprd04.prod.outlook.com (2603:1096:3:16::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Tue, 7 Sep 2021 08:56:28 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: e8b5176e-a184-4597-0cbe-08d971dd623c X-MS-TrafficTypeDiagnostic: VE1PR04MB7262: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:7691; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: /+aH/eFLummlryAH1ARHmQalubEtv+SObx8FOVXCpz2NduQvAqa08bSz9Ts0Eb3xRBanuVo4NkpmiMFxHlQjrtubtY92oh7kbLaCfb3dEHo0LMs/BOPjqSMiR9J0+zx0sVdf7ENG5d9uWCATZHU+8UGBSt+sB9+xM5UZoSUTft1T17ZbvkNPxll1LdUxtCEZFkIGWcGZpd6OkXbJVVCS1+Jur8rpm/KHwaN8lq5ubxYzxWDWx1PPAkSZqnZdQG0V4gmnLya0MG0l2Th6dgQU7JP51pSCnLBA2DUXO94Y5IY9Y3ULb+KSdYBQI1pD8Tt51RhMkEFWPV6TtfN+d9YSciwoVsEC3pB1BvwbJ3aZ5FkpoBiqwwpXk+yDsqE4lkOKWegNv4XxdghlYhgAkVeyQAyz72BdwTQjl+po5JQmTXOwBNLkBl4zo/FEsW4mMiT4MTZXGzhSl1bTvY9t3YraLLeVRhNplrinr0G4ieqGbGmxvfMbdN7Hp8rF4+aORu0NEXT97JVUIrrnWwgykxaJIJhAPf1+RzzqWgJx5NLgOG+0D4UCOsZYLFUMB/9Es5U7Df9894yNKrMU7ZowFjFaPg3PZMX3jnADdwwPwH9YxiUEwTfFdwNE3HmsCU+hoOSitrTwJgPA1ZVNEaotJLmLhHWatkxdZicAcHieQRQWo9fZQYKH3MgGE3WB9oIWifeamdmOVz1cwP55NMvIOLU+gWGAnwNozkwjLlOoMIuFJBk= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB6960.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(366004)(39860400002)(136003)(376002)(396003)(1076003)(1006002)(36756003)(55236004)(66556008)(66476007)(4326008)(38100700002)(6666004)(8676002)(52116002)(7696005)(8936002)(66946007)(38350700002)(54906003)(5660300002)(478600001)(26005)(956004)(2616005)(6486002)(316002)(83380400001)(86362001)(2906002)(15650500001)(186003)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: WKSOJP1h6n1E2d4DzqfPXi9+VFqHntwQu7Uix7HBpXjaXORwFLBuXD6bTJuVBirav1xjeJ49ELCcf97UXi2QMq/sCu9flESIF6z/2QB6x+rFg64LP4CaUax413h8wNabyzQYr9eeVDBOgi125Wbd1LlY9xPJoYVtZcvXlYmmPElSem/uO3zG3WrB7cV9P41qIPgEvQNVA551Wt22bR60xoGKMfjXAuxB5Q2G284lusSpAkg4221zJCbXnBgc+en1iCOdRDe1cc2gw9NaIWuHlIo+mfbYf9r/PalC64nIkN97hZscFRWgmmI6XiNRx8MaC/bEtJKO9+8rXFemQR4dbSO2QrLpToq446wCIiZj090nOYwQWCDuk82FsbBu6kXmx+DlkGoDXzA+O3zFvQJD69koglcf6ot4Jok3EP1qMm72CLGIN808Ett0F3Y2xR8BF8OL1oTvbyNkz7lAsLivPf2MQ8aBPx5l0Ov/1oHJlCuk1i3UUs+/qjSbnyC9SnlU2RAHumoHbweForfWp2oGpW87wsnmWbIS29zvrd0xbiqgGgVL1yBedcPUBBf+9tz8khy/Nb3NP03Lz8iS80u7UhdP0DN/b3B61dXHag+FXpvJMqjm44LX0L60OLWoNa40cB3PgnA8tz5MPiuQYx00TNdLYeoA8M73ldbAYwjuecXDjiThvP7GhsdjjQMxx8VLD2bGqF3GFx/z6vhMBMPA706yea4WjkLl/m5Rz1mHHYk1eb5EQZxDifREcXKCWM6DpibcOaqbd6gVwqsH4atuRWsbHMWckrGqrfShsfwj1gEqFeEru3kkMtwJ9y8w7AbxTbkLwsbJkzfTV7VLYnxvBQ4DWZLeKBlQZd2O7o+Pi2lSRKCB2tCrZreaW3PimFfL33KGyRrfD4fPjKByj8TyKIwruLawV/SpbXJO+q0TMOy7UPUh6cM71dgGB4foln5RR0YIvzZuSHiM2ICULZ6pMATSKKIgidhqG7eDHkUsH0CI1uWdGp7W+8E+97dBLh0evFw7lq0F8/PHr2970CWCpv6tFldcJwJOmmOknyiQ4bf8f8BVgMyUK/3TlCeda/HwOrc/Nm6RcLDKbS7OATe80haomYWcnhTELPE4xXkTG3or8UMloAn3tKnY/66thi+VeMFIHC+dze5Gp2ooOxscjsZb52miG2ne94neESotK4JWvZzIPU7yGfWM+PPvCHoL4hVCK2FAuaGdfHoRM3zuWVgBN7EVvKwSMhsl2I+qyXbfJ5QAZrSfPxOL3DZRYI6o8Ox95omF0lnT71L0SRhvQ5yygAlqxnVhsz/YL8JeDYxaANF1dGt0HiFp29S6POMF X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: e8b5176e-a184-4597-0cbe-08d971dd623c X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB6960.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 08:56:30.4248 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: I2HCCj/0OnrwqU/U+h8wltuGL5M70GLYIJhbEhrWjNj5QTZgCr2JytzgTVXlMb+S X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7262 Subject: [dpdk-dev] [PATCH v2 2/5] security: support PDCP short MAC-I 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" From: Hemant Agrawal This patch add support to handle PDCP short MAC-I domain along with standard control and data domains as it has to be treated as special case with PDCP protocol offload support. ShortMAC-I is the 16 least significant bits of calculated MAC-I. Usually when a RRC message is exchanged between UE and eNodeB it is integrity & ciphered protected. MAC-I = f(key, varShortMAC-I, count, bearer, direction). Here varShortMAC-I is prepared by using (current cellId, pci of source cell and C-RNTI of old cell). Other parameters like count, bearer and direction set to all 1. Signed-off-by: Gagandeep Singh Signed-off-by: Hemant Agrawal --- app/test-crypto-perf/cperf_options_parsing.c | 8 ++++++- doc/guides/prog_guide/rte_security.rst | 11 ++++++++- doc/guides/tools/cryptoperf.rst | 4 ++-- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 25 ++++++++++---------- lib/security/rte_security.h | 1 + 5 files changed, 33 insertions(+), 16 deletions(-) diff --git a/app/test-crypto-perf/cperf_options_parsing.c b/app/test-crypto-perf/cperf_options_parsing.c index e84f56cfaa..0348972c85 100644 --- a/app/test-crypto-perf/cperf_options_parsing.c +++ b/app/test-crypto-perf/cperf_options_parsing.c @@ -662,7 +662,8 @@ parse_pdcp_sn_sz(struct cperf_options *opts, const char *arg) const char *cperf_pdcp_domain_strs[] = { [RTE_SECURITY_PDCP_MODE_CONTROL] = "control", - [RTE_SECURITY_PDCP_MODE_DATA] = "data" + [RTE_SECURITY_PDCP_MODE_DATA] = "data", + [RTE_SECURITY_PDCP_MODE_SHORT_MAC] = "short_mac" }; static int @@ -677,6 +678,11 @@ parse_pdcp_domain(struct cperf_options *opts, const char *arg) cperf_pdcp_domain_strs [RTE_SECURITY_PDCP_MODE_DATA], RTE_SECURITY_PDCP_MODE_DATA + }, + { + cperf_pdcp_domain_strs + [RTE_SECURITY_PDCP_MODE_SHORT_MAC], + RTE_SECURITY_PDCP_MODE_SHORT_MAC } }; diff --git a/doc/guides/prog_guide/rte_security.rst b/doc/guides/prog_guide/rte_security.rst index f72bc8a78f..ad92c16868 100644 --- a/doc/guides/prog_guide/rte_security.rst +++ b/doc/guides/prog_guide/rte_security.rst @@ -1,5 +1,5 @@ .. SPDX-License-Identifier: BSD-3-Clause - Copyright 2017,2020 NXP + Copyright 2017,2020-2021 NXP @@ -408,6 +408,15 @@ PMD which supports the IPsec and PDCP protocol. }, .crypto_capabilities = pmd_capabilities }, + { /* PDCP Lookaside Protocol offload short MAC-I */ + .action = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL, + .protocol = RTE_SECURITY_PROTOCOL_PDCP, + .pdcp = { + .domain = RTE_SECURITY_PDCP_MODE_SHORT_MAC, + .capa_flags = 0 + }, + .crypto_capabilities = pmd_capabilities + }, { .action = RTE_SECURITY_ACTION_TYPE_NONE } diff --git a/doc/guides/tools/cryptoperf.rst b/doc/guides/tools/cryptoperf.rst index be3109054d..d3963f23e3 100644 --- a/doc/guides/tools/cryptoperf.rst +++ b/doc/guides/tools/cryptoperf.rst @@ -316,9 +316,9 @@ The following are the application command-line options: Set PDCP sequence number size(n) in bits. Valid values of n will be 5/7/12/15/18. -* ``--pdcp-domain `` +* ``--pdcp-domain `` - Set PDCP domain to specify Control/user plane. + Set PDCP domain to specify short_mac/control/user plane. * ``--docsis-hdr-sz `` diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 1ccead3641..4438486a8b 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -3102,7 +3102,7 @@ dpaa2_sec_set_pdcp_session(struct rte_cryptodev *dev, struct rte_security_pdcp_xform *pdcp_xform = &conf->pdcp; struct rte_crypto_sym_xform *xform = conf->crypto_xform; struct rte_crypto_auth_xform *auth_xform = NULL; - struct rte_crypto_cipher_xform *cipher_xform; + struct rte_crypto_cipher_xform *cipher_xform = NULL; dpaa2_sec_session *session = (dpaa2_sec_session *)sess; struct ctxt_priv *priv; struct dpaa2_sec_dev_private *dev_priv = dev->data->dev_private; @@ -3134,18 +3134,18 @@ dpaa2_sec_set_pdcp_session(struct rte_cryptodev *dev, flc = &priv->flc_desc[0].flc; /* find xfrm types */ - if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER && xform->next == NULL) { - cipher_xform = &xform->cipher; - } else if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER && - xform->next->type == RTE_CRYPTO_SYM_XFORM_AUTH) { - session->ext_params.aead_ctxt.auth_cipher_text = true; + if (xform->type == RTE_CRYPTO_SYM_XFORM_CIPHER) { cipher_xform = &xform->cipher; - auth_xform = &xform->next->auth; - } else if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH && - xform->next->type == RTE_CRYPTO_SYM_XFORM_CIPHER) { - session->ext_params.aead_ctxt.auth_cipher_text = false; - cipher_xform = &xform->next->cipher; + if (xform->next != NULL) { + session->ext_params.aead_ctxt.auth_cipher_text = true; + auth_xform = &xform->next->auth; + } + } else if (xform->type == RTE_CRYPTO_SYM_XFORM_AUTH) { auth_xform = &xform->auth; + if (xform->next != NULL) { + session->ext_params.aead_ctxt.auth_cipher_text = false; + cipher_xform = &xform->next->cipher; + } } else { DPAA2_SEC_ERR("Invalid crypto type"); return -EINVAL; @@ -3184,7 +3184,8 @@ dpaa2_sec_set_pdcp_session(struct rte_cryptodev *dev, session->pdcp.hfn_threshold = pdcp_xform->hfn_threshold; session->pdcp.hfn_ovd = pdcp_xform->hfn_ovrd; /* hfv ovd offset location is stored in iv.offset value*/ - session->pdcp.hfn_ovd_offset = cipher_xform->iv.offset; + if (cipher_xform) + session->pdcp.hfn_ovd_offset = cipher_xform->iv.offset; cipherdata.key = (size_t)session->cipher_key.data; cipherdata.keylen = session->cipher_key.length; diff --git a/lib/security/rte_security.h b/lib/security/rte_security.h index 88d31de0a6..2e136d7929 100644 --- a/lib/security/rte_security.h +++ b/lib/security/rte_security.h @@ -233,6 +233,7 @@ struct rte_security_macsec_xform { enum rte_security_pdcp_domain { RTE_SECURITY_PDCP_MODE_CONTROL, /**< PDCP control plane */ RTE_SECURITY_PDCP_MODE_DATA, /**< PDCP data plane */ + RTE_SECURITY_PDCP_MODE_SHORT_MAC, /**< PDCP short mac */ }; /** PDCP Frame direction */ From patchwork Tue Sep 7 08:56:03 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 98156 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 C0497A0C46; Tue, 7 Sep 2021 10:56:48 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id D637B41130; Tue, 7 Sep 2021 10:56:36 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150078.outbound.protection.outlook.com [40.107.15.78]) by mails.dpdk.org (Postfix) with ESMTP id E25B741147 for ; Tue, 7 Sep 2021 10:56:34 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Cy0EZjfKZkPiYiRwBVeP0lxQGv7Ga67PF1/wk15W3BstveUUfaR4O3InfQQFZWpGu+sxndu4qjTzT/G5t6PluI96tptd8rW3GujFks1J14OJ3LkMyqin3Axk6iFDIRlYRtwpC2crEe3JB+6K3TW4etyrSP7wBYLvF2mdJoLum04PiRXx6BfTGHDyKK+eu6QmM/1ScVA798N++JNa/cQqZzBVAtL5taRY+FdF8Ka7THUNoeClqV72UUD9VZFggTTQJwSNptZDc2QeQkprnfXodyECxJlcUYWE3AZ596XZqs0scyVk+GpwcXVMJic2vw9nSMkUAz1mVG4IPQL6q9wAAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=29/v26WJwlb+620bXtnZdmlRvzIc0ObvYWe+LyXoa0w=; b=DJRVW4whuIRD2ovA/BaUpu2HgDEgkGnQx1gTMJzu3fYzk2ftDF8CTyAG0FuZAKBDi9hRhBrSTse971tBNdkTFvTzUuYboA9z5Eo99K8L7Qf4u2NzDYlnbbeFJpi1p8wjTtC/7k2k6gJRFMS1UR9AlNOjMefzBpRLkGBk4gFozSG2uMVUrq8PbWnA3wLVsoi+BT9qoxQda2wNrR251TTs37RVqVMPXujrh/yYFXmOTdGEnU4iyNBarqTiHBYAXjQBwABtMk2cpfVY5qC5hP1b4d/0GrBvkoVqKzd3AuuZ6HYitM0Q6zMGNRLVdFTMETYPU7V/MSVvDjdJbsxZe/kPAw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=29/v26WJwlb+620bXtnZdmlRvzIc0ObvYWe+LyXoa0w=; b=FSGSo5qLAwLKjcb+KU2LTlYG/HwLOSirYkI4dAEuojAm7rweMXVkIxESBStrmZhyoxQyoZiH7BNRBeZx8MBi3Fs8AjOr4HsDP/kDE2/TJljNtTN1M6M+FKZIn0nHNSnsj++tXhq6abZGr8AGA2SoKkarRPicGkpJYN72doqHoRk= Authentication-Results: marvell.com; dkim=none (message not signed) header.d=none;marvell.com; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB6960.eurprd04.prod.outlook.com (2603:10a6:803:12d::10) by VE1PR04MB7262.eurprd04.prod.outlook.com (2603:10a6:800:1ab::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Tue, 7 Sep 2021 08:56:32 +0000 Received: from VI1PR04MB6960.eurprd04.prod.outlook.com ([fe80::d496:fcce:f667:7aa7]) by VI1PR04MB6960.eurprd04.prod.outlook.com ([fe80::d496:fcce:f667:7aa7%7]) with mapi id 15.20.4478.025; Tue, 7 Sep 2021 08:56:32 +0000 From: Gagandeep Singh To: gakhil@marvell.com, dev@dpdk.org Cc: thomas@monjalon.net, Gagandeep Singh Date: Tue, 7 Sep 2021 14:26:03 +0530 Message-Id: <20210907085605.3010882-4-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210907085605.3010882-1-g.singh@nxp.com> References: <20210826112315.1375237-1-g.singh@nxp.com> <20210907085605.3010882-1-g.singh@nxp.com> X-ClientProxiedBy: SG2PR04CA0133.apcprd04.prod.outlook.com (2603:1096:3:16::17) To VI1PR04MB6960.eurprd04.prod.outlook.com (2603:10a6:803:12d::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from lsv03457.swis.in-blr01.nxp.com (14.142.151.118) by SG2PR04CA0133.apcprd04.prod.outlook.com (2603:1096:3:16::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Tue, 7 Sep 2021 08:56:30 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 34ed2cc8-596c-4a50-0ff5-08d971dd63ad X-MS-TrafficTypeDiagnostic: VE1PR04MB7262: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:321; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: yPrPA1n2lrcFs3aO9OJNHeG7GRlakFkJBoW0WwE+6hsbFFwyiSO+3O0Kq2V/Uwf+5vAHOdXelL9qlKkVDr4MvlpxznhoiOJVoTcjdG7hE8eFbYQW46ehTOSHxkD91S7lwjiDinBAtUTGUio/6sXl+ToYBdim0ImYr8pxRm7tFXgNhkGmCb3S9mM3TW3lJjvvlzPZypazIjJeDwneaNC96hLBeg7mBkrQE4x1nIgWtFsGHfCWg5RaEyjNSWpk6oXDrdsiO15IqSqockeizwSczeybC3gjBhG8NRhgWW7Ckn1cE4MpjFN+LaBVPqrfjAQaFy7LoFHgSrZA0w5092HOR9CZOW4W7WLDduu7PrXypOvXw1j1oKUXyLPrrbhEcbY8d7PRT8bI5GlS7UQwV/z8Hu8bZZTQJirDtu6B/TrsWNGsGAAh0sbOF38NbJaLnwZBZLiI1e80CA6qxqEPP2blgCzaISepWZUFfX6D0XTQED734NdLA415jyNtvtnerupH2aZHtrzUvHW1VoCjAjaob6NVEBZT73AU3g3bUBYAv4sN2xk8xQPl9AfFzIBbxot6P4llIdQ5MMmn7inPXFeQGYImJdSjh47g0OI7Rj4OFjKp53eye4/4l3ROmNXhzoVhUzkv6olayhFKJae0ApNSRbBEJYuzNsgiUivxMMVSxmMg3VG+xlcmxMAlZMLKF1GAAGiZRWXmKZZLs9JMx+xaWl46U7bRHFap37Ls6OJLAAM= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB6960.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(366004)(39860400002)(136003)(376002)(396003)(1076003)(1006002)(36756003)(55236004)(66556008)(66476007)(4326008)(38100700002)(6666004)(8676002)(52116002)(7696005)(8936002)(66946007)(38350700002)(5660300002)(478600001)(26005)(956004)(2616005)(6486002)(316002)(83380400001)(86362001)(2906002)(15650500001)(186003)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: TG/6yFRFGO4QcmTiFUg1WXO0/IY6xgR2zodL56pDDA0CANwfyJUGVWKgjsz4wZLogg/8xu0NjSQua1SQXyzAFmlofMZOkPmfKl8aZYuGcwroLcNKIrD3UEN7/Kbym6XZiXueSkguLY7bq1uP4RrXdsBJ1fRhnbjuWGsslc8of6vD77mzg7BBGk/gG3ptM9lWJr07dmKG3myl076UaDs4cA3IWrRiHinowBXgkWnl1V0FjVm2V2qQUCtT6c9NGmkTNpqTnquImYpIRZmZxyuKg6C5KmB2rP2OlkOZSoQV1LV0YNKru7zcFukTKXZuMrYFEXteGEv/QViopN9oVkVbJyXDOFKJiHs9BcMidvL7ndE3nDqi+VAPywphKRCE1b4lh0M6Gki2o1lBrxxFP4UQ8gme1o2aKhrGuIeoBmCbxCU6DgqJbFEVnHd4r9N3AUbQev0Yy/KWhAZZhX7nfHWkVF04DnecYXteVSKcMBps/PdldUXm2Jq4gWRdzaKTxbKTohBfdUEOw7EwCZ+ExtNYfqcNrN7Fuo4pkaMPbeL0t02vWWWly87F/4BJ2lev+TBzBtWWBO/Drszc1eJAwNFzawNjcIElfDG5gOexEpgbLfOvMRQF2znDm+ZYrrvd6XnwvCVqXNgZqaS8w4j2b/syMLjua9dghtiCbQ3xRWEM39+cE3IWd8x59crG3U7+x7TPzj0F1JRdcwdDw0EAaM9OMltSayMqdzBetcNL5Hoz9uUNFBKdhZqNEFzXAxux8FBLTFRVsXjntZA9oAFNyIrbL3MQKNZHtwFhXtEnxekEWJLmS5Q1O3zgZkOkazeTltiJd3Q4iDe/2/jvr5qSkKamTzHHPeocbaMcO6ZWFFjM+7XR/t1GHMviu7ggfGMTgnoM+7SOLAuoxlWqQ4zYhXfnYnfHZl1jZA3q4wIdt2x5dVyao8TzuwpyDbcTjCeiOwdu4cwqXS9AcZwYhpQL4QfsqWT0c3uAe7bkQQCVqRQKZ4JEvH2hM1p6xPIZ1+mtJQSubQ0oyY7NRcW6EtJAwMbjqbJV4DQC15rkgRjfK9NbEBelDqxYTil+aGcRpT2xCopcjBJdnqwpYZ737mnfQ3fa2mbsayXAE2TAu+bD495oXtf0OYMrqQ4ZFUmp1XIIMsbJF3AzDRXMV6wpGKgg+tz8iMbH06yOx50uKPYk5KCghyDdkhT49CbsD3a3SelKipFTQvtspXVZN3Zp7KmZy9Bi78lsY/ayseLAHarVimor+OXvzRPCSGR0sopdNLtSmdrh8MFDAcwIBh5bvl9IJXiFnt6y7IRtdJS6h15Wcrw/j/CjrRaUR4Ri5TXHtwz8/3PI X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 34ed2cc8-596c-4a50-0ff5-08d971dd63ad X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB6960.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 08:56:32.7436 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: wyTD81Ab9ZrTtHTt0x20ThFO0QUUp/6mADa0G4WR4wB/v3k7/FbJsblP75a5iK0Z X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7262 Subject: [dpdk-dev] [PATCH v2 3/5] test/crypto: add pdcp security short MAC-I support 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" This patch add support to test the pdcp short mac packets support in crypto. Signed-off-by: Gagandeep Singh --- app/test/test_cryptodev.c | 48 ++++++++ ...est_cryptodev_security_pdcp_test_vectors.h | 105 +++++++++++++++++- 2 files changed, 152 insertions(+), 1 deletion(-) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 9ad0b37473..86809de90b 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -8768,6 +8768,50 @@ test_PDCP_SDAP_PROTO_encap_all(void) return (all_err == TEST_SUCCESS) ? TEST_SUCCESS : TEST_FAILED; } +static int +test_PDCP_PROTO_short_mac(void) +{ + int i = 0, size = 0; + int err, all_err = TEST_SUCCESS; + const struct pdcp_short_mac_test *cur_test; + + size = RTE_DIM(list_pdcp_smac_tests); + + for (i = 0; i < size; i++) { + cur_test = &list_pdcp_smac_tests[i]; + err = test_pdcp_proto( + i, 0, RTE_CRYPTO_CIPHER_OP_ENCRYPT, + RTE_CRYPTO_AUTH_OP_GENERATE, cur_test->data_in, + cur_test->in_len, cur_test->data_out, + cur_test->in_len + ((cur_test->auth_key) ? 4 : 0), + RTE_CRYPTO_CIPHER_NULL, NULL, + 0, cur_test->param.auth_alg, + cur_test->auth_key, cur_test->param.auth_key_len, + 0, cur_test->param.domain, 0, 0, + 0, 0, 0); + if (err) { + printf("\t%d) %s: Short MAC test failed\n", + cur_test->test_idx, + cur_test->param.name); + err = TEST_FAILED; + } else { + printf("\t%d) %s: Short MAC test PASS\n", + cur_test->test_idx, + cur_test->param.name); + rte_hexdump(stdout, "MAC I", + cur_test->data_out + cur_test->in_len + 2, + 2); + err = TEST_SUCCESS; + } + all_err += err; + } + + printf("Success: %d, Failure: %d\n", size + all_err, -all_err); + + return (all_err == TEST_SUCCESS) ? TEST_SUCCESS : TEST_FAILED; + +} + static int test_PDCP_SDAP_PROTO_decap_all(void) { @@ -14039,6 +14083,8 @@ static struct unit_test_suite cryptodev_snow3g_testsuite = { TEST_CASE_ST(ut_setup, ut_teardown, test_snow3g_encryption_test_case_5), + TEST_CASE_ST(ut_setup, ut_teardown, + test_PDCP_PROTO_short_mac), TEST_CASE_ST(ut_setup, ut_teardown, test_snow3g_encryption_test_case_1_oop), TEST_CASE_ST(ut_setup, ut_teardown, @@ -14279,6 +14325,8 @@ static struct unit_test_suite cryptodev_kasumi_testsuite = { TEST_CASE_ST(ut_setup, ut_teardown, test_kasumi_decryption_test_case_1_oop), + TEST_CASE_ST(ut_setup, ut_teardown, + test_PDCP_PROTO_short_mac), TEST_CASE_ST(ut_setup, ut_teardown, test_kasumi_cipher_auth_test_case_1), diff --git a/app/test/test_cryptodev_security_pdcp_test_vectors.h b/app/test/test_cryptodev_security_pdcp_test_vectors.h index 703076479d..81fd6e606b 100644 --- a/app/test/test_cryptodev_security_pdcp_test_vectors.h +++ b/app/test/test_cryptodev_security_pdcp_test_vectors.h @@ -1,7 +1,7 @@ /* SPDX-License-Identifier: BSD-3-Clause * * Copyright (C) 2015-2016 Freescale Semiconductor,Inc. - * Copyright 2018-2019 NXP + * Copyright 2018-2021 NXP */ #ifndef SECURITY_PDCP_TEST_VECTOR_H_ @@ -28,6 +28,109 @@ struct pdcp_test_param { const char *name; }; +struct pdcp_short_mac_test { + uint32_t test_idx; + struct pdcp_short_mac_test_param { + enum rte_security_pdcp_domain domain; + enum rte_crypto_auth_algorithm auth_alg; + uint8_t auth_key_len; + const char *name; + } param; + const uint8_t *auth_key; + const uint8_t *data_in; + uint32_t in_len; + const uint8_t *data_out; +}; + +static const struct pdcp_short_mac_test list_pdcp_smac_tests[] = { + { + .test_idx = 1, + .param = {.name = "PDCP-SMAC SNOW3G UIA2", + .auth_alg = RTE_CRYPTO_AUTH_SNOW3G_UIA2, + .domain = RTE_SECURITY_PDCP_MODE_SHORT_MAC, + .auth_key_len = 16, + }, + .auth_key = (uint8_t[]){ 0x2b, 0xd6, 0x45, 0x9f, 0x82, 0xc5, + 0xb3, 0x00, 0x95, 0x2c, 0x49, 0x10, + 0x48, 0x81, 0xff, 0x48 }, + .data_in = (uint8_t[]){ 0x33, 0x32, 0x34, 0x62, 0x63, 0x39, + 0x38 }, + .in_len = 7, + .data_out = (uint8_t[]){ 0x33, 0x32, 0x34, 0x62, 0x63, 0x39, + 0x38, 0x56, 0xd2, 0x09, 0xae }, + }, + + { + .test_idx = 2, + .param = {.name = "PDCP-SMAC AES CMAC 1", + .auth_alg = RTE_CRYPTO_AUTH_AES_CMAC, + .domain = RTE_SECURITY_PDCP_MODE_SHORT_MAC, + .auth_key_len = 16, + }, + .auth_key = (uint8_t[]){ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x00, 0x00, 0x00 }, + .data_in = (uint8_t[]){ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00 }, + .in_len = 7, + .data_out = (uint8_t[]){ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x13, 0xf8, 0x4b, 0xea }, + }, + + { + .test_idx = 3, + .param = {.name = "PDCP-SMAC AES CMAC 2", + .auth_alg = RTE_CRYPTO_AUTH_AES_CMAC, + .domain = RTE_SECURITY_PDCP_MODE_SHORT_MAC, + .auth_key_len = 16, + }, + .auth_key = (uint8_t[]){ 0x16, 0xc1, 0x98, 0x14, 0x9a, 0x2c, + 0xf4, 0x12, 0x4f, 0xd4, 0x14, 0xec, + 0x72, 0x43, 0x29, 0x04 }, + .data_in = (uint8_t[]){ 0x00, 0xc0, 0x00, 0x00, 0x00, 0x05, + 0x09, 0xe4 }, + .in_len = 8, + .data_out = (uint8_t[]){ 0x00, 0xc0, 0x00, 0x00, 0x00, 0x05, + 0x09, 0xe4, 0xdd, 0xff, 0xde, 0xa9 }, + }, + + { + .test_idx = 4, + .param = {.name = "PDCP-SMAC AES CMAC 3", + .auth_alg = RTE_CRYPTO_AUTH_AES_CMAC, + .domain = RTE_SECURITY_PDCP_MODE_SHORT_MAC, + .auth_key_len = 16, + }, + .auth_key = (uint8_t[]){ 0xD3, 0xC5, 0xD5, 0x92, 0x32, 0x7F, + 0xB1, 0x1C, 0x40, 0x35, 0xC6, 0x68, + 0x0A, 0xF8, 0xC6, 0xD3 }, + .data_in = (uint8_t[]){ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00 }, + .in_len = 7, + .data_out = (uint8_t[]){ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, + 0x00, 0x23, 0xea, 0x95, 0xb0 }, + }, + + { + .test_idx = 5, + .param = {.name = "PDCP-SMAC NULL", + .auth_alg = RTE_CRYPTO_AUTH_NULL, + .domain = RTE_SECURITY_PDCP_MODE_SHORT_MAC, + .auth_key_len = 16, + }, + .auth_key = (uint8_t[]){ 0x2B, 0xD6, 0x45, 0x9F, 0x82, 0xC5, + 0xB3, 0x00, 0x95, 0x2C, 0x49, 0x10, + 0x48, 0x81, 0xFF, 0x48 + }, + .data_in = (uint8_t[]){ 0x33, 0x32, 0x34, 0x62, 0x63, 0x39, + 0x38 }, + .in_len = 7, + .data_out = (uint8_t[]){ 0x33, 0x32, 0x34, 0x62, 0x63, 0x39, + 0x38, 0x00, 0x00, 0x00, 0x00 }, + }, + +}; + static struct pdcp_test_param pdcp_test_params[] = { { .name = From patchwork Tue Sep 7 08:56:04 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 98157 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 F0429A0C46; Tue, 7 Sep 2021 10:56:53 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 002EE4114A; Tue, 7 Sep 2021 10:56:39 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150053.outbound.protection.outlook.com [40.107.15.53]) by mails.dpdk.org (Postfix) with ESMTP id 0683041149 for ; Tue, 7 Sep 2021 10:56:38 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=IJDzwDFLfigE+krAaKEDanvJra86ri/T1pasu0dTffXDSNFPkXKRjFsH5MY0bq2Q4hMm9lZhb1utT+m4E+IiTg5zwZZe9qWwZV+totuTZZ3awr5pB50BgbR1YXaHVKLjgoyRQditPvIj5ToEKaisRq4huWfB+VzEv/YO058o3jUOeJEJrFEo5hLl7KEqBj7WkvjYaV11/Kr4u2GK7FckOZpvHckUuMpLUEcvHTcqS2Qnr7xJ5BbVbsjwHtV3L3SyNd3VlEjV2oLr4ndTee+wsc+P7u8RQiPAMmKtt1MNX5sYf7TOKuc8kqxFcgSL6GbXmolfhrOO+fNgaLS/cmn3RQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=bf+FxnwSDXUTAq1+wCEWFfZrrKS50bK7u9pwzMU1HKo=; b=FCqfuepgcGZxyar75dPUpx4o5VDmkmpe33LRX3ZFzCMyyutcpF4NJ7UVxc3EvwTGGU9/yd/B1VWh8npzCVWbgzJW4Sxxme8dh5kvGczJ2PJ7VnbSdyx04PI41tYFk/EH7p39vmmYMV1QBxFd15G3Mfir87iNL8ck854rUnG/oqs5qNuRkzHi777ntJJYiRO0hEVMxcaAjlcP6BA45gtIEZD4Ka6NF34vGLvmoCTlbDWIBep1bsFCrNdsMdNGHErwVN7Vt7SXYABOclwYwmr++bSeZdATT/e0PBfVv78swT9YhAnHXQVVtmYtQ9Nqa9QwtUttEVbJRJeylGL5Vc4aMg== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=bf+FxnwSDXUTAq1+wCEWFfZrrKS50bK7u9pwzMU1HKo=; b=dS4tx0h5Si+kFrIl5ojBfOE9M5vhH2ZVEZ4JOjnI+8sV4Gx/l/OO2lL88zPR8c6Rqanoh+FcOZ9rtsi3Fi87SycoPjKHVgrwfWxghPtNisOR5Ppr07ZRype9EROMnWA/gcabJBDxC8pQ9YKvsOR/CpOMJsd1qgavEhn+OzyrysA= Authentication-Results: marvell.com; dkim=none (message not signed) header.d=none;marvell.com; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB6960.eurprd04.prod.outlook.com (2603:10a6:803:12d::10) by VE1PR04MB7262.eurprd04.prod.outlook.com (2603:10a6:800:1ab::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Tue, 7 Sep 2021 08:56:34 +0000 Received: from VI1PR04MB6960.eurprd04.prod.outlook.com ([fe80::d496:fcce:f667:7aa7]) by VI1PR04MB6960.eurprd04.prod.outlook.com ([fe80::d496:fcce:f667:7aa7%7]) with mapi id 15.20.4478.025; Tue, 7 Sep 2021 08:56:34 +0000 From: Gagandeep Singh To: gakhil@marvell.com, dev@dpdk.org Cc: thomas@monjalon.net, Gagandeep Singh Date: Tue, 7 Sep 2021 14:26:04 +0530 Message-Id: <20210907085605.3010882-5-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210907085605.3010882-1-g.singh@nxp.com> References: <20210826112315.1375237-1-g.singh@nxp.com> <20210907085605.3010882-1-g.singh@nxp.com> X-ClientProxiedBy: SG2PR04CA0133.apcprd04.prod.outlook.com (2603:1096:3:16::17) To VI1PR04MB6960.eurprd04.prod.outlook.com (2603:10a6:803:12d::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from lsv03457.swis.in-blr01.nxp.com (14.142.151.118) by SG2PR04CA0133.apcprd04.prod.outlook.com (2603:1096:3:16::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Tue, 7 Sep 2021 08:56:33 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: dc2f85b0-d9e4-48b3-dd5f-08d971dd64e5 X-MS-TrafficTypeDiagnostic: VE1PR04MB7262: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1060; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 3NBS0HyKyIDoibTutnAOGYpkKxakx6QjEHG8ty7zC4MqsI7gwtydhMXIzooA128o5qKVS4aHD5QJ5rgbF3TDffw05lsnFVUpameQqOwvWEE7Jh7/2JKL0T4OaOb54R93jTDC+5tcmaY8qMIJ/NUQfVXKx2H/brQYhG7ioFjPM8K7f6a+QnIyYYXccxzHUFG6sRJ+EF9hckY+Bt+Q6Y2b0ByfUebTweujhnfb1d8IsIBuAEB2c80x4EDT4KDOGOtrsNO7kw/XSjoxMXrG4DDl98BKCPmwwjSYpeLAZGwmjgAWfgNV1c/ESqUY29krcvHPZH1afU1D8RyP7+6+sD1lt6f+aBz/vzEGYnq6CErU7o730Vt7pR/ToLWcIB6rzMeQKi5oNNqnYmq6Hu+mIjCH7v8vPIe4iXsGN5aDa38yG2aGXCUXhDcYwDbNGIQY+t25qjZ2iThWMoCy0GCzdM/gw/PFfeDRMIM03dkPcMKEfznRP7bbNCIsXN8AbeMFCd3VbDAfu1oXH2t8OHW1ds4IpydbT/qTr8TiOsbzU1u1m5t3qIgLMxni7UbkPggwImTsb6csrCxS2rVRnJWrmpjGnaMLPb6T8I9ToYNK51nFpaoISyTrUj39lnexAgzNdZcSO+x+ynKLoUTlZxJAh/55vqLhjt9Mnu87wiqb9QpnuIBnDC5hRUnpgnSoxWcc1RKdnoLu6W3N3hsZbmiSofW+fv4rw3BsAeMmftKJKi7PgPA= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB6960.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(366004)(39860400002)(136003)(376002)(396003)(1076003)(1006002)(36756003)(55236004)(66556008)(66476007)(4326008)(38100700002)(6666004)(8676002)(52116002)(7696005)(8936002)(66946007)(38350700002)(5660300002)(478600001)(26005)(956004)(2616005)(6486002)(316002)(83380400001)(86362001)(2906002)(186003)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: RhCfAbvtvUyACt81yoibU9XchmwOvlXicGsUpV5qprSjgL99lAri1yb1ChgvqQK383FmRQumDscF3DIay/363e/l/SsNRLrqoieF8AJev1p3+Wwdcq32pFk1drLHwpVZQbzDPvO8HcIYphEIcAjBSQq1j04cIDWQzQJV+ZVrDyHd43LwJh+POp+hXTahYvOPSYVL+9/ne5+vm8vUbnJrYbr0hoK00eTvBKMfwlqu7cQn9OaANxEgcvYHqv+/bRKMkhf7s5rydD6jvNZoeqD89j+2a+LFur/Ov0u2j14rdlEYGuV09Ki1F5LyWPc3piP5zCEgTTykVNfbC0Q+dKzsmXv0D795l6TmfNo3sszQSuxor8pN8dba6TbEEddimVEKAKhwU3rpOyxDVpicGq25rqlxyJlvuiaBX+TkUFMyakADsOfEAe5v2SHXXjWrY9x5xbPsyjSZNMb04Oare9115jgpzrp0A7rrisialP2yIryYaYZauiwQS5+7ujGJZyF5TOI8fv02/YfTEo6E8fXZPGlZJC1ol03O+8gN63lcxv1S+s41IRetHG4lxY4GAWgBD3nJo/JTBs+L26hca13byWj9qD88fnMyqCTXTFkP6L0Q9paaRep4+Z+ipVSen5vQArjAIsWKUfn9yNlGSEnyP7i4W3QedZ/fbLePCWb6NNWNaSp24690MxjL9JJTq84FugdO+N9IwPQrsH9/ih2jCjXJWQcP9WgO+QXpcE883j0HLwLNWaWd0PRayUq0GEmUKUwaZdOa0hcZIfPiJjGnsbbbglBIvCQ2ii7lzFkDWiipcd44IJDEwfVR05VQNiJmAe9PeOTt+9Nlab5gieq3fyo2CLBfezXg+GhwubIl3gJ6/swr30mZmCOqg//9Fhyb8btvz/BtfqPS9xeGrs1fifeDMN+y+AqX3OQPmRZAiPXqJTfurLGiTZEPOvz5oksG2WhCBBYaW9ySa6+VD7BC7JvZnLwCzcAZj+JxUfYGV4wPiXCKmQ573bIIQ94O5uEgWhgHN50yddFwIjD5TRanYgZSspwAe04zgImpCJKPcTfxFKu0AoxnBI0uuIQj+ijMp2LIAunHbckaNowMJLIsScJdcUWwlgA+iN0B0OmxTo0Bt7f72lkyrsKFhUrevdm+z09At+EHILkoE/Lhee1dyoo+3Nm8FFZ0g2USPUsJ5mp5QM4ItC29br7js6dLGOtF/5hthR2fjeWaq8zCOGyKuy99oYBIoWAjmgt7oNiP8de7DJUkK7RNonVlkk2mqxrtbkNg3cwo8ZYM01eFNGcUqVs5I8AzfG0OwFFQwe57VcCT6T4xOxJptORx9OJ+4r/0 X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: dc2f85b0-d9e4-48b3-dd5f-08d971dd64e5 X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB6960.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 08:56:34.7856 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: AZ68QQ5s4DMc6UzuIYTQyuu5dFr7xm8e8UJ7zJcyW3TMKakfkp4sBCCij9rU9xtl X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7262 Subject: [dpdk-dev] [PATCH v2 4/5] crypto/dpaa2_sec: add PDCP short MAC-I support 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" This patch add PDCP short mac support in dpaa2_sec driver. Signed-off-by: Gagandeep Singh --- drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 4 ++++ drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h | 9 +++++++++ 2 files changed, 13 insertions(+) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c index 4438486a8b..0d3a7989cd 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c @@ -3291,6 +3291,10 @@ dpaa2_sec_set_pdcp_session(struct rte_cryptodev *dev, pdcp_xform->hfn_threshold, &cipherdata, &authdata, 0); + + } else if (pdcp_xform->domain == RTE_SECURITY_PDCP_MODE_SHORT_MAC) { + bufsize = cnstr_shdsc_pdcp_short_mac(priv->flc_desc[0].desc, + 1, swap, &authdata); } else { if (session->dir == DIR_ENC) { if (pdcp_xform->sdap_enabled) diff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h b/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h index 7dbc69f6cb..8dee0a4bda 100644 --- a/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h +++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_priv.h @@ -941,6 +941,15 @@ static const struct rte_security_capability dpaa2_sec_security_cap[] = { }, .crypto_capabilities = dpaa2_pdcp_capabilities }, + { /* PDCP Lookaside Protocol offload Short MAC */ + .action = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL, + .protocol = RTE_SECURITY_PROTOCOL_PDCP, + .pdcp = { + .domain = RTE_SECURITY_PDCP_MODE_SHORT_MAC, + .capa_flags = 0 + }, + .crypto_capabilities = dpaa2_pdcp_capabilities + }, { .action = RTE_SECURITY_ACTION_TYPE_NONE } From patchwork Tue Sep 7 08:56:05 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Gagandeep Singh X-Patchwork-Id: 98158 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 C90D0A0C46; Tue, 7 Sep 2021 10:56:58 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 18C9041152; Tue, 7 Sep 2021 10:56:40 +0200 (CEST) Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-eopbgr150053.outbound.protection.outlook.com [40.107.15.53]) by mails.dpdk.org (Postfix) with ESMTP id B68594114A for ; Tue, 7 Sep 2021 10:56:38 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HT2roq9UFR8uTTtYL0JMqmX0imqmmVB20HpdLLTlBYeNdnGLz5Nd5TRSdcZq1WkDGHbq8xvZD1cNoGo1VU9YFJOANvEOe22TSTH6i3nnnX9qka/eYXz08BHInsdL10AQaQs0fKqWcZwCrFkKdLymyHBVO3Q5AsVCxv3xrfkXMMii+RjktCEm8HBIH2waejQSDaZJydbMPWre7ejOXeh7kfOd/gmtY7PsiboYEzvLHVaJLTanYYfMgcPz4LcP3hzxQMzS8dy8AW++aBc/GSGMp4FGk9Oj09on0VDdtm8S3PpVg2K/L2VyYQ+QTuvh9CchrUTZPv6Asr7hIFeIwTtMfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=eEiq19Zl+ovhuKuMjbddbPmCjjLKHlkxa5FtScmvopY=; b=CE8MdCGQN7x1rDSCkk2J7gMshIO5buGstm3MDhdwTwaiXui7tKZoy2SVIEqTLiwf4eDIWjoeW9uhL+3zxcCcYL5DDKFv/jrX92mnsbMCRgsmxlfijAmdU9zyUGoArt6Y70PU0NwAE/0nwMaNVZX5kB7d4g1jCd7N56Y5knyg4lualXrnTKI1vwWRw+BHFJNL1CrlYpRpZpwLUDHPytBLfhGPWHG1IcbT0sw5Ppk0/Ii/SE03bPSLKxgtlkIfVR+zko9uJaji8ak81dr50kW2YWl4loeCWhIiDcnAesEu237q8ImEe9YcAO4vEb5j5/y5NMxVKJrvOmzqpRhJOJXC6w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=nxp.com; dmarc=pass action=none header.from=nxp.com; dkim=pass header.d=nxp.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nxp.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=eEiq19Zl+ovhuKuMjbddbPmCjjLKHlkxa5FtScmvopY=; b=OrGqm/5Roa2RTKDZr32AuGoV26bNr241my04zyeEWia5JjjcYNQFNog0WaB/bbGzIEL98kBzVnZ+uW81c0EmiuP8GWARNa4QN5A98O77lL/aP7FFkCXavmbmxajldA4ZUbegXthxeIu1VbiJd2nJ5ffvcASeqFVSm4IhcNKVDzE= Authentication-Results: marvell.com; dkim=none (message not signed) header.d=none;marvell.com; dmarc=none action=none header.from=nxp.com; Received: from VI1PR04MB6960.eurprd04.prod.outlook.com (2603:10a6:803:12d::10) by VE1PR04MB7262.eurprd04.prod.outlook.com (2603:10a6:800:1ab::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.21; Tue, 7 Sep 2021 08:56:36 +0000 Received: from VI1PR04MB6960.eurprd04.prod.outlook.com ([fe80::d496:fcce:f667:7aa7]) by VI1PR04MB6960.eurprd04.prod.outlook.com ([fe80::d496:fcce:f667:7aa7%7]) with mapi id 15.20.4478.025; Tue, 7 Sep 2021 08:56:36 +0000 From: Gagandeep Singh To: gakhil@marvell.com, dev@dpdk.org Cc: thomas@monjalon.net, Gagandeep Singh Date: Tue, 7 Sep 2021 14:26:05 +0530 Message-Id: <20210907085605.3010882-6-g.singh@nxp.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210907085605.3010882-1-g.singh@nxp.com> References: <20210826112315.1375237-1-g.singh@nxp.com> <20210907085605.3010882-1-g.singh@nxp.com> X-ClientProxiedBy: SG2PR04CA0133.apcprd04.prod.outlook.com (2603:1096:3:16::17) To VI1PR04MB6960.eurprd04.prod.outlook.com (2603:10a6:803:12d::10) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 Received: from lsv03457.swis.in-blr01.nxp.com (14.142.151.118) by SG2PR04CA0133.apcprd04.prod.outlook.com (2603:1096:3:16::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4478.19 via Frontend Transport; Tue, 7 Sep 2021 08:56:35 +0000 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 6847db0f-0e89-46a2-6d33-08d971dd661f X-MS-TrafficTypeDiagnostic: VE1PR04MB7262: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:1417; X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: bzUgtLSQWnedImVxgaoh50atk5waagFJDZCX2ZsdWywOwANN5hMtCwC8jjFfDAYOeJGLzVWNWROZhjaKk4eVfGO69QwdBrhwdvrjzuEc9xWVekHi5EmXnloK9JUnbAjc5zv62uMMzwl02SgWcBs4N2U46wZz7hGW1HIFUuTcj3FLccvzkKCm2NQe0pjY15+g06kzVpyC3BaYIUG+3rTXdtDBi+ek3u428OkCuqOw6CQ32ByDGcyAWXtk8guBJSsRovNCBMl/YCmIF+8ePtGM6J/YCfCC1VQQMt1gWMMdzrWwEfoiIz2iatlxc0qxN3geyesJgYumwMtAgxM+OJT4gV/tHYIR8mvhr+grHj1wFYA3M49al421v9keG4KC9JSv8GVj2uiRRXKJuttplj9Z7TvZu+xi7jq1uHkn3uWXgJrS0b/SjKhdmlZplCUYzRrQ3AFqRKdYeHnIMFL1BZZ83k12wULMA4ZjUjAFsjRSAM2lZLzxX9RVBYcCu/N4fNAEj2wNhJgWJIkZ/ORujDj++M2YNXdsYKxKQoGC9iOxkkYPADY24IS6HVGSdJOgdKG26Jo3HDBHvQwzFLzfo48eGttJA/Xjji4BQRZTcuqSLGrWbU4HfcDjOU4YkkmrbzHYJhzc23fjUD1cdwaJATVh71ZtGt4vWp5WAFvFJEvT06RM2I6FvU9BcDyTEcZjbevhr7nn+RIldf0xFml7gj8yBlph9O0rlK3XR/tpk8GQYEM= X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:VI1PR04MB6960.eurprd04.prod.outlook.com; PTR:; CAT:NONE; SFS:(4636009)(346002)(366004)(39860400002)(136003)(376002)(396003)(1076003)(1006002)(36756003)(55236004)(66556008)(66476007)(4326008)(38100700002)(6666004)(8676002)(52116002)(7696005)(8936002)(66946007)(38350700002)(5660300002)(478600001)(26005)(956004)(2616005)(6486002)(316002)(83380400001)(86362001)(2906002)(186003)(110426009); DIR:OUT; SFP:1101; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: eiHM7PWn3t2WOvpvXw1hMe3wPAdgQtYqZvRIDvtaXSRz7n6luEFfI1cskj+RPStQLbWbRbt5+8jTt9Gt50dRKEVVeJ0rfdA8KeY9689oQWOaBiqUm2vdpjtM9tYA1G1meHZ8njPvW1XlMJMn/z4D6vFLQgJ5lmBeouUS29Ortv7xmrkGcWvFgmSqSIErk3KfxaZbADi49BguaGSttQ6+AgnSMiVUoLGRCxSVRZTL/XJO6OuML419rloFnKeYbUmdiVjGI9GLRlGjYnyz1H5mre5CviOpAscYEcVe4v+xzwmmJ6RBTXBW3cBQw9+3Jiilm9yE2wiDWLD4tas8HpEFJJXpnhT0FFMa4dpR+nTUg1Wwa0BgDnTnjNV/uLW7EeKhLQq7JPqQp8++OihtyZLEaJeSFLz4iYbhXJQzKTD1xSHDXaiJGkwuPtnRgY1BxmH8nHjo7Zqn3FuLUxEojU7UwRykRBvKOG34+KScW7A6gwFXsupey3J4uJSwupvJL7Zr065ZqttHPrKjPom24DtFZAoRzH54v0wPpVZSlMqe9NXqYc1RgvZypHzdNOriQ0cwWDcBBokvsRiH6Gx7+bDSZDMyGRQxJWHVqI5laqGE7tsY3BdBlY8qetA3Cmd9WkWc4DadNEYQIWSD/Cfzi386egjzfCOqWWAX9scLUqFn8iJrxJRge0vyOWCqI/wlPn9sXljS+2YTqyzNsExLCywEHaRHJ0GaJa13CpDZqypeo9ClF3sfyRrgH2IlmrikBedADI3S1N+N4aWNFkKU5LVJRNXiSyJeJJrj3VrldaII5FGRXdyIX7m2DGFi4u2WUxSRgPv/EhgKFwxhNx/X40vrsivYRJ4EExNI9XQKP9ue3VS1GxVLP9zVBmrUzhusotWVkpcFrC9ynIEkjs7q5o5I1l1NpMZVoi5+bWZIm2lASUpZV/zVZDfIEnZFUPV+IleCXGLLGevKz6vVohj6mDknk5r5ddy5N/bvyA2kNnVQVVjiyPuE/zEbhKQ5mpaZ+4WrXJQqA0+3yazyZqhvC1rV06nUsHG5W2Dm6O0jVrgF2OBZTmcH/RdBy8KFiZQrOaN6XJGyG5JDH+wdF3RZHubkH12PIZgmWCqJ4YIJJTGjE8Yp83gRDRXkrHjA4WoVMGHRj168uq85bEqA9eoYsOokPzx9gNFFEiNezscTTuNEyBhiNRl810o90Y/yHReqSD43Wb/Si9j+qzqce/28nu6mieuYoyJjYg4p3G/tbNnpUc6B+2IFAjLEYcWelWvPve5xI2zxGTM/DpsgQ0cwMsrBJwxfR1zWICXaIv91VnH6M85K54tILigXNF7vQeWZ9z+s X-OriginatorOrg: nxp.com X-MS-Exchange-CrossTenant-Network-Message-Id: 6847db0f-0e89-46a2-6d33-08d971dd661f X-MS-Exchange-CrossTenant-AuthSource: VI1PR04MB6960.eurprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 07 Sep 2021 08:56:36.8545 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 686ea1d3-bc2b-4c6f-a92c-d99c5c301635 X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: JyPJZCL/1XSe9VOGQgJsb1SO1MT6ls1xRjLx6QCAd4oEodePDxHNzk0hvfnUtnSe X-MS-Exchange-Transport-CrossTenantHeadersStamped: VE1PR04MB7262 Subject: [dpdk-dev] [PATCH v2 5/5] crypto/dpaa_sec: add pdcp short MAC-I support 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" This patch add pdcp security short MAC-I support for dpaa_sec driver. Signed-off-by: Gagandeep Singh --- drivers/crypto/dpaa_sec/dpaa_sec.c | 3 +++ drivers/crypto/dpaa_sec/dpaa_sec.h | 11 ++++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 19d4684e24..59ac74f3d8 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -294,6 +294,9 @@ dpaa_sec_prep_pdcp_cdb(dpaa_sec_session *ses) ses->pdcp.hfn_threshold, &cipherdata, &authdata, 0); + } else if (ses->pdcp.domain == RTE_SECURITY_PDCP_MODE_SHORT_MAC) { + shared_desc_len = cnstr_shdsc_pdcp_short_mac(cdb->sh_desc, + 1, swap, &authdata); } else { if (ses->dir == DIR_ENC) { if (ses->pdcp.sdap_enabled) diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.h b/drivers/crypto/dpaa_sec/dpaa_sec.h index 368699678b..2ab9c69bb6 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.h +++ b/drivers/crypto/dpaa_sec/dpaa_sec.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: BSD-3-Clause * - * Copyright 2016-2020 NXP + * Copyright 2016-2021 NXP * */ @@ -769,6 +769,15 @@ static const struct rte_security_capability dpaa_sec_security_cap[] = { }, .crypto_capabilities = dpaa_pdcp_capabilities }, + { /* PDCP Lookaside Protocol offload Short MAC */ + .action = RTE_SECURITY_ACTION_TYPE_LOOKASIDE_PROTOCOL, + .protocol = RTE_SECURITY_PROTOCOL_PDCP, + .pdcp = { + .domain = RTE_SECURITY_PDCP_MODE_SHORT_MAC, + .capa_flags = 0 + }, + .crypto_capabilities = dpaa_pdcp_capabilities + }, { .action = RTE_SECURITY_ACTION_TYPE_NONE }