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 1596BA0A0E for ; Mon, 10 May 2021 18:21:19 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 806C14110B; Mon, 10 May 2021 18:21:18 +0200 (CEST) Received: from NAM11-BN8-obe.outbound.protection.outlook.com (mail-bn8nam11on2081.outbound.protection.outlook.com [40.107.236.81]) by mails.dpdk.org (Postfix) with ESMTP id E3C224003E for ; Mon, 10 May 2021 18:21:17 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=HyU1LNE91gXaAr//boe76qWIJhLlJKsAQKMXqBt+HpyP6HkME777HBxXSilH6l3MU4f+q0Z8RjfUEL2tEgvau1SZUT0EoSZjk43yyxUOMd+xRjrfbhxaK/88N/97xKrYDF5JlTuNuMGqgKsLka/hR0Dv3sfzWm2VS9ZrUEogM7rQMPpWJQHH4MUUUd8pMoEBCaawA6D7lhoXYfBixCpQ3n6ocJR/8GmwyRmkGgeFSB38XlIt4xqz4cPjXGdz136EzPdam0pPUOlt0hxWzLJ3xDrFA8/7yUtlYYXpdzuHXN+I2AiIFr9fUEHLC4wEHj9DCPhABJteWbd8keUNCGiLKA== 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=BviBKpIelHFmTm40gWyykLLeQwD6sF8EHnpeIeBrCQk=; b=HseVS+9I215NjSgy7LyHTc2uxwU4eAff6bO9OCX+H0SxaidUs5qoqSgUBiwNGrRFl82DTzCbbLW4Npl4sGNHi4JbkbXBImKiUp1JOLurDEsuzFMNQDt8SBGfGKK+7Ua+Z7EweJkT4GTVxzIy1cmlPau3XPLPvaGySqqZLludgQusJbk96kB+ROBjqAc4IMlLsiKRlmuaDct3JfVHSESszSS+3Zci9Xss31+d06FE5a2eT1D11VsX8g60y+Ug0o1qrDcq1Xi+9fV+8LyNHTFvFr2XEtLd2jcGp2o6fC9AU6KzwFwaDYZqIw7PerjjTVO6OUyQopI1blIpRHmgkaeteQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.112.34) smtp.rcpttodomain=intel.com 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=BviBKpIelHFmTm40gWyykLLeQwD6sF8EHnpeIeBrCQk=; b=QGjN64uPV1w3/knoKIy98ZVJyZdG0xiirq8LCTX9OZDcRQHx/juXnBiDdgprTpcqsVvAcIgWTIWJHFyKMfTC5HMzt6XAZtJFaplTNkswskpSJZ+HLOx8irIf6x/ZK9G+40BU3O22Ndtxw+kvou9Q79A60ilm9uU43OvhHlWi8zyvEZLZcnUdF3f0B8yA3VPYhoVZ7+O8P14qFenjfssFVEWOZasfPmdWH6AsRJFbrpDe97PMYvr0kdLbZMy0Dhb4o35P0EkWzc8D60Oc01BST61o9S0F7Ax949wj0JwEvTaaohpt1iLRO/1cHQJgDMas2tRE8y7Og8Jf27iJV/wQpw== Received: from BN9PR03CA0134.namprd03.prod.outlook.com (2603:10b6:408:fe::19) by DM6PR12MB3482.namprd12.prod.outlook.com (2603:10b6:5:3d::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25; Mon, 10 May 2021 16:21:16 +0000 Received: from BN8NAM11FT059.eop-nam11.prod.protection.outlook.com (2603:10b6:408:fe:cafe::f1) by BN9PR03CA0134.outlook.office365.com (2603:10b6:408:fe::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:21:16 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.112.34) smtp.mailfrom=nvidia.com; intel.com; dkim=none (message not signed) header.d=none;intel.com; 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 BN8NAM11FT059.mail.protection.outlook.com (10.13.177.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.4108.25 via Frontend Transport; Mon, 10 May 2021 16:21:16 +0000 Received: from nvidia.com (172.20.145.6) by HQMAIL107.nvidia.com (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Mon, 10 May 2021 16:20:26 +0000 From: Xueming Li To: Arek Kusztal CC: Luca Boccassi , Declan Doherty , dpdk stable Date: Tue, 11 May 2021 00:02:04 +0800 Message-ID: <20210510160258.30982-175-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210510160258.30982-1-xuemingl@nvidia.com> References: <20210510160258.30982-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [172.20.145.6] X-ClientProxiedBy: HQMAIL111.nvidia.com (172.20.187.18) To HQMAIL107.nvidia.com (172.20.187.13) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 8a4118bd-8752-4776-c2c3-08d913cfa32c X-MS-TrafficTypeDiagnostic: DM6PR12MB3482: X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:10000; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: eydfsEKBHE1fNiYAPfxsDxC5MO3/3XGPWbSDFsu3flC8u0Lv6QbwuX0xgyW2G2Hm3Z32T1mwcYILPKjO2lY7mFE7njwv3sTa9TU1udLB54M0Tkn/4Hhh+5mDZTvynQu6X+J+eS+2tPfW7yVdz4UGjPT7ZQSJKLSs4u814LiVRZvo85MTjhLgQDPF/EolmhEoxxZLGqgWaURg8VyIC2/ZDd0apX8loXiqhmeXpEg0Eb0mxO4I+5W+pdOOPUm3XsNvWZCbVzvRo001sZquTPXgA3AG1ZDIiPvQGjHXgD9bN8+A1aboyeE4IVRxN+hP0TCXTcNA4vDp4EotNcxZzINnzfzsyq+JgmriKxlfwicebXnSmfwOTMHkHXmICpTiTVV01hqr71cFxVENbqW5GFFJvSpSIUoJqfExbvB0+OSF5FjdIcjTpz3xSMTMN93z0KlTnfp7dqc+Rao9qn8IszJGkeRG4+Ae0qfgd4FV6+T3u8zu+SwUnutDKobyVPvgSXfS9mJcoTv1eqsI/E/rQ4ZpaRgF/XAEjLsmomMCX43hVK4VHCUUj0eypqnM9tpQFT7bKVy3TgzUNxGR2/8WhN0t8o/5s7NsOKHs1xB1SVTDDigs9c8jkPH9EQk4SnwbRqy7ZM1u34LJUFQ4TPz2dTB8cpsroe9Eig7/jZzOF1CXGMvHOKdsJUJ/36UeVO8NbDZkHSxmAn+WRaiBa0pe38WrJs5ke2F/eZdF87i6JMkQ6og= 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)(396003)(346002)(136003)(376002)(39860400002)(36840700001)(46966006)(82740400003)(16526019)(186003)(54906003)(47076005)(7696005)(36756003)(5660300002)(6286002)(86362001)(966005)(6666004)(316002)(26005)(478600001)(36906005)(8676002)(70206006)(70586007)(2906002)(8936002)(6916009)(426003)(36860700001)(53546011)(55016002)(356005)(7636003)(83380400001)(1076003)(82310400003)(4326008)(2616005)(336012); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 10 May 2021 16:21:16.4544 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 8a4118bd-8752-4776-c2c3-08d913cfa32c 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: BN8NAM11FT059.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3482 Subject: [dpdk-stable] patch 'crypto/qat: fix offset for out-of-place scatter-gather' 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 05/12/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/acbb986965b95c99b805836b2f2ec0faf20576f4 Thanks. Xueming Li --- >From acbb986965b95c99b805836b2f2ec0faf20576f4 Mon Sep 17 00:00:00 2001 From: Arek Kusztal Date: Thu, 18 Mar 2021 13:16:17 +0000 Subject: [PATCH] crypto/qat: fix offset for out-of-place scatter-gather Cc: Luca Boccassi [ upstream commit 935da450b414610a3aa2855fb9bb0c6f105e59ba ] This commit fixes problem with to small offset when both offsets (auth, cipher) are non zero in digest encrypt case, when using out-of-place and sgl. Fixes: 40002f6c2a24 ("crypto/qat: extend support for digest-encrypted auth-cipher") Signed-off-by: Arek Kusztal Acked-by: Declan Doherty --- drivers/crypto/qat/qat_sym.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/crypto/qat/qat_sym.c b/drivers/crypto/qat/qat_sym.c index 4b7676deb8..a6cd33be37 100644 --- a/drivers/crypto/qat/qat_sym.c +++ b/drivers/crypto/qat/qat_sym.c @@ -162,6 +162,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg, uint8_t do_sgl = 0; uint8_t in_place = 1; int alignment_adjustment = 0; + int oop_shift = 0; struct rte_crypto_op *op = (struct rte_crypto_op *)in_op; struct qat_sym_op_cookie *cookie = (struct qat_sym_op_cookie *)op_cookie; @@ -472,6 +473,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg, rte_pktmbuf_iova_offset(op->sym->m_src, min_ofs); dst_buf_start = rte_pktmbuf_iova_offset(op->sym->m_dst, min_ofs); + oop_shift = min_ofs; } else { /* In-place operation @@ -532,7 +534,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg, /* First find the end of the data */ if (do_sgl) { uint32_t remaining_off = auth_param->auth_off + - auth_param->auth_len + alignment_adjustment; + auth_param->auth_len + alignment_adjustment + oop_shift; struct rte_mbuf *sgl_buf = (in_place ? op->sym->m_src : op->sym->m_dst); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-10 23:59:31.117792300 +0800 +++ 0176-crypto-qat-fix-offset-for-out-of-place-scatter-gathe.patch 2021-05-10 23:59:26.610000000 +0800 @@ -1 +1 @@ -From 935da450b414610a3aa2855fb9bb0c6f105e59ba Mon Sep 17 00:00:00 2001 +From acbb986965b95c99b805836b2f2ec0faf20576f4 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Luca Boccassi + +[ upstream commit 935da450b414610a3aa2855fb9bb0c6f105e59ba ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -20 +22 @@ -index 2c0f5cd925..a1f5676c04 100644 +index 4b7676deb8..a6cd33be37 100644 @@ -23 +25 @@ -@@ -228,6 +228,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg, +@@ -162,6 +162,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg, @@ -31 +33 @@ -@@ -538,6 +539,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg, +@@ -472,6 +473,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg, @@ -39 +41 @@ -@@ -598,7 +600,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg, +@@ -532,7 +534,7 @@ qat_sym_build_request(void *in_op, uint8_t *out_msg,