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 30033428F8 for ; Sun, 9 Apr 2023 17:27:21 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 20CF342BD9; Sun, 9 Apr 2023 17:27:21 +0200 (CEST) Received: from NAM10-MW2-obe.outbound.protection.outlook.com (mail-mw2nam10on2052.outbound.protection.outlook.com [40.107.94.52]) by mails.dpdk.org (Postfix) with ESMTP id 2A68E4067E for ; Sun, 9 Apr 2023 17:27:20 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=WeGNcOPhruVI5upNHa3mczqJ3dDo6LwaUxS4nBRqKa813flwJUi0I0utD86KYUTF1eO7WQlC6QEdfJgWr1kBOFcHBFRmlFv1JyRsdmG/TZUsvJSPxhPJzE/8NxThSjjUl1XtQlhBg4SZo2Jm6vLhMWA2j3FlpkF20nqAHSRQBI0TCuUFqJKN1qa34HV4DKbHsYRV096rW2OMMCouIBYbJrVUkAIwKpBP4s+KFtp1Jukua1KjXH1kbYrnj+dKHmvJwSYhcecXEsJr5mZCBOyVU/NLBVrByaZ5/urAnEMZ9NaD9Hq0NKM87TEgdBjWqPkEZsd8h8aCPjuw0KGIM4fMZw== 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:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=Oij5FqbzLwvRoI64+isWQG7Azwcgt8xJRPuMFohohZs=; b=Q4XUrubL5VIO4jdVvW0SowIX9tDel+EtyF73W1WF+b5cj5udigpcLJM1O9JCPkXY0Qna0BLnS+TEpp/cHK0CPZnpGS5YQ3S+zzelsG5VIQWQg2dvsZztFpfmyUaXHyV4ZadoTB4lg8nCFFw6PzGfEJ3AqHQPEIl5ObNobsC3o55LbMi3bovHxnLOXhFXngdNkjPNnpUfNdv7ZtVhGi020Cy3l1FLwnj4g6UnSKwWqEA6KIFDq+rDyD+dQZrTDhmZ5HPhb3MAMaZsjYowkqy89J7bWEiFt/2LuNr4zu/ntq70rQPX/aDOR5D/vjGj4aEauTzOpx4cVG7KCX7/R6tVKQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=marvell.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=Oij5FqbzLwvRoI64+isWQG7Azwcgt8xJRPuMFohohZs=; b=GS3Mp3wa7zavZF/RZQAHN8hKReDZCUoXBykGLWCLy/Bt8vB6FscCimWJiWMi2FmFPN4Lu60j/dB5QkInuvynzIzWM3nDZAnGcLdyAspgry3AiQssyjf4yJchiTBEF+JoFCbouW1EJcL2XyJlMca8Fg5UR5UPqDD2FH8cfiVRPp2olABWzqnRZ4fi0HbqgdmlXrep9W1No7VuHiyRMcCoHHroeEjeKzJOmjYx44n69xjpNtG03eIt9aROYwpjV6wwqQeJZ0NrGZAMKsMOC52skMXebCmxM664cf+wGuFazAO2yXreemr/n3qMKQoBUtlDv2RMFfBp0+Um8JkFwd1hRw== Received: from DS7PR05CA0005.namprd05.prod.outlook.com (2603:10b6:5:3b9::10) by SA1PR12MB7366.namprd12.prod.outlook.com (2603:10b6:806:2b3::8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6277.35; Sun, 9 Apr 2023 15:27:18 +0000 Received: from DM6NAM11FT050.eop-nam11.prod.protection.outlook.com (2603:10b6:5:3b9:cafe::f0) by DS7PR05CA0005.outlook.office365.com (2603:10b6:5:3b9::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.25 via Frontend Transport; Sun, 9 Apr 2023 15:27:18 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by DM6NAM11FT050.mail.protection.outlook.com (10.13.173.111) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6298.25 via Frontend Transport; Sun, 9 Apr 2023 15:27:17 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.5; Sun, 9 Apr 2023 08:27:08 -0700 Received: from nvidia.com (10.126.230.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 9 Apr 2023 08:27:07 -0700 From: Xueming Li To: Akhil Goyal CC: Kai Ji , dpdk stable Subject: patch 'examples/ipsec-secgw: fix auth IV length' has been queued to stable release 22.11.2 Date: Sun, 9 Apr 2023 23:23:27 +0800 Message-ID: <20230409152529.5308-20-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230409152529.5308-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230409152529.5308-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.37] X-ClientProxiedBy: rnnvmail203.nvidia.com (10.129.68.9) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: DM6NAM11FT050:EE_|SA1PR12MB7366:EE_ X-MS-Office365-Filtering-Correlation-Id: 6b83937c-d6c1-4850-d834-08db390ee743 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: Qivb9OO20V0mh7qjLpkTgzi4SCbwRus3+A6yj1dpGvYEZ49p4qMt4oa/lKSLD7ejrgUnWwPZblQp4GJndDsgy97j3VMg/21DtVbWnQingNhEAP0oNLp1dWYtoPRHO8ZLde0lj8I1lHWe5598Q3vniAgxby9wQZsE6AFQ+9Dz7Xi514wm1xWuMJc2AfvvL6fOM3lVcNnCcsoeOVljXHN26w/qMum6GHXkWu7dw3hLwM17kk4UZHqCnAA3GlBsOZ35A2CQrPi8k95j9SnDKhPNnCfZ9emeY8NkCWZ5QSNMty6kJ/psmtvNQDefxVeP+pkC0NbAIILgBmgbSJOqcJsWZE9NDtD4mwnN5OZBTd2echMI2msDCN7GjXlgnZ1govTTaMvZUPbwya0SFNcH4/HzO/DTuXyaCCCQvKw1BDez91SaxrDtkuiE6lqZbEouiet+2SSLzNgg2vt+nkCNiXjFvUFKfDcFTJwc0tgP+zj6ZFxjI1bzvL0WwLj3WNDkO3KM6mSN/tF10o5tBxwgpvJpdqeSPwv1ACkSnFRdi3Wo+riN5eqHYdqQL/MREALIOrVyTfAF53EnyiQZtSbx+vNMkLInhaTyug4PyyOo7uU8fb2rdh8xy1umPkPDjFOwR6M+69bGIOfB5kCG0Lhq35WbDqrEdjn2VM5gjZuM3z5t0/UkdV0cR3VtDikgX7AeiymsHnC36G6MR27++ATSxPpZS4dOMudYKi5h6yGM3iUYXo5iCiXGmS8iRLbCiD0Pb41Rb3dWILkgezd17yDtWsRk4pTGF80WfwqKpaw1vjjT/4LY/2NF6XAt95JOwBfyc3bbyXcP+ZMH8Q57OOa+eQNIpw== X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230028)(4636009)(136003)(39860400002)(396003)(346002)(376002)(451199021)(36840700001)(46966006)(40470700004)(36860700001)(54906003)(2616005)(47076005)(478600001)(966005)(26005)(1076003)(6666004)(7696005)(82740400003)(7636003)(41300700001)(356005)(316002)(4326008)(6916009)(53546011)(186003)(6286002)(16526019)(336012)(83380400001)(426003)(70586007)(70206006)(2906002)(5660300002)(36756003)(82310400005)(40460700003)(86362001)(40480700001)(55016003)(8936002)(8676002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 09 Apr 2023 15:27:17.3959 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 6b83937c-d6c1-4850-d834-08db390ee743 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: DM6NAM11FT050.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA1PR12MB7366 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/11/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging/commit/2bf416240dcf596528ab3c25289de66fc58a7b70 Thanks. Xueming Li --- >From 2bf416240dcf596528ab3c25289de66fc58a7b70 Mon Sep 17 00:00:00 2001 From: Akhil Goyal Date: Thu, 16 Feb 2023 19:54:40 +0530 Subject: [PATCH] examples/ipsec-secgw: fix auth IV length Cc: Xueming Li [ upstream commit 56af18587ef8beace28de1054643752922f7a696 ] Currently, cipher IV length is getting used to set auth xform IV length. Auth IV is needed for AES-GMAC case, and in all other cases, auth IV should be 0. Used a separate auth IV length to separate out cipher and auth cases. Fixes: 9413c3901f31 ("examples/ipsec-secgw: support additional algorithms") Signed-off-by: Akhil Goyal Acked-by: Kai Ji --- examples/ipsec-secgw/sa.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/examples/ipsec-secgw/sa.c b/examples/ipsec-secgw/sa.c index 7da9444a7b..001762bea9 100644 --- a/examples/ipsec-secgw/sa.c +++ b/examples/ipsec-secgw/sa.c @@ -1247,6 +1247,7 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[], struct ipsec_sa *sa; uint32_t i, idx; uint16_t iv_length, aad_length; + uint16_t auth_iv_length = 0; int inline_status; int32_t rc; struct rte_ipsec_session *ips; @@ -1340,7 +1341,7 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[], /* AES_GMAC uses salt like AEAD algorithms */ if (sa->auth_algo == RTE_CRYPTO_AUTH_AES_GMAC) - iv_length = 12; + auth_iv_length = 12; if (inbound) { sa_ctx->xf[idx].b.type = RTE_CRYPTO_SYM_XFORM_CIPHER; @@ -1364,7 +1365,7 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[], sa_ctx->xf[idx].a.auth.op = RTE_CRYPTO_AUTH_OP_VERIFY; sa_ctx->xf[idx].a.auth.iv.offset = IV_OFFSET; - sa_ctx->xf[idx].a.auth.iv.length = iv_length; + sa_ctx->xf[idx].a.auth.iv.length = auth_iv_length; } else { /* outbound */ sa_ctx->xf[idx].a.type = RTE_CRYPTO_SYM_XFORM_CIPHER; @@ -1388,7 +1389,7 @@ sa_add_rules(struct sa_ctx *sa_ctx, const struct ipsec_sa entries[], sa_ctx->xf[idx].b.auth.op = RTE_CRYPTO_AUTH_OP_GENERATE; sa_ctx->xf[idx].b.auth.iv.offset = IV_OFFSET; - sa_ctx->xf[idx].b.auth.iv.length = iv_length; + sa_ctx->xf[idx].b.auth.iv.length = auth_iv_length; } -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-04-09 21:45:39.319196300 +0800 +++ 0019-examples-ipsec-secgw-fix-auth-IV-length.patch 2023-04-09 21:45:38.599042200 +0800 @@ -1 +1 @@ -From 56af18587ef8beace28de1054643752922f7a696 Mon Sep 17 00:00:00 2001 +From 2bf416240dcf596528ab3c25289de66fc58a7b70 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 56af18587ef8beace28de1054643752922f7a696 ] @@ -12 +14,0 @@ -Cc: stable@dpdk.org