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 0266FA0C3F for ; Sat, 12 Jun 2021 01:13:41 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id F0E0F4003F; Sat, 12 Jun 2021 01:13:40 +0200 (CEST) Received: from NAM12-MW2-obe.outbound.protection.outlook.com (mail-mw2nam12on2054.outbound.protection.outlook.com [40.107.244.54]) by mails.dpdk.org (Postfix) with ESMTP id 3B1D340E64 for ; Sat, 12 Jun 2021 01:13:40 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=GphG9AE+XUDEpLPrWVkQH46ONP7tkKol+ATyOoGktZgLIZx1kCc4zQqnRrPHHkAge6a8cMPM/8Vi0keUYbT9Uy8ge6lo4gLKwJ+i4EBqlCOfgUlpZ8rd9z4hCFgOv5WDYXUuREwImM9vYfmEmv8PptPdq9GefgelFU02EBd6zyUj7EXDQcMIde2jVyTrnlA2eJBzGMviXN4goR+Pm6EQcv46rzyCHUYniQcnyAkMgxFZcCd0qPlSyauroUufhzTcHaTdmfM239WcZ78plIgxmPKuPM8weKZBlnAA8AlcuUUPKA8ZFR2hZ1KnsfGy6INKXJ4Z9vEJFLjKUdoNzUtBZg== 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-SenderADCheck; bh=cpG7IOQvAWMqPFFTSJy4Rs6Vkjn2K1obFzI9tOhaiM8=; b=myH2a+ogyZQJY8whhYqsu7UM9JZN4byC7PnzrU5mrDWSZGX4hOqGlKWtQrhHfJBK/YrZg6J81GvcYvzq/Kh84kraylO+I7jkX8wpSETvZxqkJxhbszMj0xLW4pC586SwT3iuyp0OTcvh1k+ckmn8yrtHUiKwfkWzZUT3EFnZ8z4rhNsUGyWZN+WCZ4cAhbETtDmI0F5GKNGp2GANd3xepxso5a/MW5J6TdNmIOevApGbr8VdVMG17O6KcMioh4GzJq+0si/78c94cNSJ53itu+eAS0Xgyyq4uk+toLAt+2CdaBRj3Y/zCnsqPXonvpGLs1AH4uYIo4CmK+zd7wOjqA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=none sp=none 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=cpG7IOQvAWMqPFFTSJy4Rs6Vkjn2K1obFzI9tOhaiM8=; b=EYJg144XkmlRTxBN3WzaeoCBpzEqQLlZFWdre10eM1BIjP4KhFJzoIToLi8x2iV/ZEEy7irnOBUCaoSh0cjZ8Ch6dRbFHlB/MKbc5HLxE60ypqSD6wZBKLXog8bqfb7cF9+5oia18cqeBQNOjc2onwyhLeS9L0A+w/g6TwcUeb7tMgYHdADZXFlFKRJrxh7KQQbdiJ1INmAZTIG3SLj10VB9u6RCtKWf3g6SvFQpDq4JDnbqWwIkampQ+jmdIgCsd02d9iS4BEBWpLE5j+nF7HmsZt3G9bPzsmzk/52sKFeyYys5UYYNtmQLJqASPdsgmnrW5CwGwZsV2gk2E7imQw== Received: from CO1PR15CA0111.namprd15.prod.outlook.com (2603:10b6:101:21::31) by DM5PR12MB1802.namprd12.prod.outlook.com (2603:10b6:3:109::11) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.21; Fri, 11 Jun 2021 23:13:38 +0000 Received: from CO1NAM11FT018.eop-nam11.prod.protection.outlook.com (2603:10b6:101:21:cafe::e0) by CO1PR15CA0111.outlook.office365.com (2603:10b6:101:21::31) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4219.22 via Frontend Transport; Fri, 11 Jun 2021 23:13:38 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; dpdk.org; dkim=none (message not signed) header.d=none;dpdk.org; dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.112.34 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.112.34; helo=mail.nvidia.com; Received: from mail.nvidia.com (216.228.112.34) by CO1NAM11FT018.mail.protection.outlook.com (10.13.175.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4219.21 via Frontend Transport; Fri, 11 Jun 2021 23:13:38 +0000 Received: from nvidia.com (172.20.187.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Fri, 11 Jun 2021 23:13:37 +0000 From: Xueming Li To: Kai Ji CC: Luca Boccassi , dpdk stable Date: Sat, 12 Jun 2021 07:03:08 +0800 Message-ID: <20210611230433.8208-94-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210611230433.8208-1-xuemingl@nvidia.com> References: <20210510160258.30982-229-xuemingl@nvidia.com> <20210611230433.8208-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.187.6] X-ClientProxiedBy: HQMAIL105.nvidia.com (172.20.187.12) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8862b22e-085d-4a0b-26f3-08d92d2e8bab X-MS-TrafficTypeDiagnostic: DM5PR12MB1802: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:9508; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: wLPi9DmzUOcS39zRF18PGNRaNyxlalfYPlHhxD8Laj77I2ckhEU4TSpOX049ffHNyXLGZbRzh68X+EFAqAnhynbxLtbUSLdRueYaN037KGcYcXI4zUo2ndLKDsJCETPJL+o39MuH+K86ckMEc8BcDcUC/b2d6Den7yW2v0OjTF1GiK8I65KgKRZ5NAmS97LwV8TeEPA0MBUZ8OE2Tw8I1C7i4a1TDNPh6TnPqG147Gn4Olyw+dhaap8/nnX6VpVgvVBhTKKdTyl3ZP02XbAdAeaVFgWxjXxjjzmDaSlnPA2zd8nfxYAgyvVs6TEgiyz+ctyE/01SwpxjMO3mKBRdlZ6lhx8NsgxjBo/0WqSS2hf8Xcr+cRIOi6/Ydnf3Bo5tLn7YP37YM7kpf5rHB3qbkSHCO2vsDtA8Y/Wu32FOuSni2B8AX26JMhM46R1/luk335veLs2XU8TUOfZDXrUFyyR6Bbop2cFzKHRzjt/xH+QTB6PFExXHpuUi9T+YTuG+JV8L9LmfW0RWD9f82fgva/d2Rak2NIaJwJjnkBhEauttiRx0LvTDaoluYIHDxsp1iv6XmTMuMVWik1HYOXhfqnESxrL5U4RUaNR1N3aNkpX0EUrLZmkAYUvDFEdBvv4c/kgrqwInLkSfSMZYmxBIblvAYuefd7YFVO++8HC/OOWWrxvy6X+luRQ5NrXEQszTNkjRImEAp7ICciZNAJ4KsU7NTaxScg3DyY/ONqsTykrvRQ9ba6JYeYP92MQ4zI0SMQB2pfpkbr/NitOPO17zcZ+NqSLQfRJ2zyRDKulSQC5qfvrbeFWDSTi1SrwvixWm X-Forefront-Antispam-Report: CIP:216.228.112.34; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:schybrid03.nvidia.com; CAT:NONE; SFS:(4636009)(376002)(39860400002)(396003)(346002)(136003)(36840700001)(46966006)(82740400003)(6286002)(6916009)(426003)(54906003)(966005)(1076003)(8676002)(82310400003)(336012)(6666004)(478600001)(8936002)(36756003)(356005)(5660300002)(53546011)(4326008)(26005)(86362001)(36860700001)(186003)(2906002)(70206006)(70586007)(36906005)(16526019)(47076005)(2616005)(55016002)(316002)(7636003)(7696005); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Jun 2021 23:13:38.1922 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8862b22e-085d-4a0b-26f3-08d92d2e8bab X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.112.34]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT018.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR12MB1802 Subject: [dpdk-stable] patch 'test/crypto: copy offset data to OOP destination buffer' has been queued to stable release 20.11.2 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 Sender: "stable" Hi, FYI, your patch has been queued to stable release 20.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 06/14/21. 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://github.com/steevenlee/dpdk This queued commit can be viewed at: https://github.com/steevenlee/dpdk/commit/07d17061abb9f5e2caa0402738abca1dc1b99a84 Thanks. Xueming Li --- >From 07d17061abb9f5e2caa0402738abca1dc1b99a84 Mon Sep 17 00:00:00 2001 From: Kai Ji Date: Wed, 5 May 2021 15:45:13 +0100 Subject: [PATCH] test/crypto: copy offset data to OOP destination buffer Cc: Luca Boccassi [ upstream commit e19deb5af6edab846197dbd4f3cbbb2b83b3784f ] Copy over the offset data required for auth in out-of-place op when auth offset and cipher offset are not aligned. Fixes: e847fc512817 ("test/crypto: add encrypted digest case for AES-CTR-CMAC") Signed-off-by: Kai Ji --- app/test/test_cryptodev.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/app/test/test_cryptodev.c b/app/test/test_cryptodev.c index 093324ce73..56b385bdf1 100644 --- a/app/test/test_cryptodev.c +++ b/app/test/test_cryptodev.c @@ -2630,6 +2630,21 @@ create_wireless_algo_auth_cipher_operation( iv_ptr += cipher_iv_len; rte_memcpy(iv_ptr, auth_iv, auth_iv_len); + /* Only copy over the offset data needed from src to dst in OOP, + * if the auth and cipher offsets are not aligned + */ + if (op_mode == OUT_OF_PLACE) { + if (cipher_offset > auth_offset) + rte_memcpy( + rte_pktmbuf_mtod_offset( + sym_op->m_dst, + uint8_t *, auth_offset >> 3), + rte_pktmbuf_mtod_offset( + sym_op->m_src, + uint8_t *, auth_offset >> 3), + ((cipher_offset >> 3) - (auth_offset >> 3))); + } + if (cipher_algo == RTE_CRYPTO_CIPHER_SNOW3G_UEA2 || cipher_algo == RTE_CRYPTO_CIPHER_KASUMI_F8 || cipher_algo == RTE_CRYPTO_CIPHER_ZUC_EEA3) { -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-06-12 06:53:59.040165100 +0800 +++ 0094-test-crypto-copy-offset-data-to-OOP-destination-buff.patch 2021-06-12 06:53:56.440000000 +0800 @@ -1 +1 @@ -From e19deb5af6edab846197dbd4f3cbbb2b83b3784f Mon Sep 17 00:00:00 2001 +From 07d17061abb9f5e2caa0402738abca1dc1b99a84 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit e19deb5af6edab846197dbd4f3cbbb2b83b3784f ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -18 +20 @@ -index a677a21e36..2bd4ff96cb 100644 +index 093324ce73..56b385bdf1 100644 @@ -21 +23 @@ -@@ -2629,6 +2629,21 @@ create_wireless_algo_auth_cipher_operation( +@@ -2630,6 +2630,21 @@ create_wireless_algo_auth_cipher_operation(