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 24D11431D5 for ; Sun, 22 Oct 2023 16:28:14 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1A9D3402D8; Sun, 22 Oct 2023 16:28:14 +0200 (CEST) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2064.outbound.protection.outlook.com [40.107.237.64]) by mails.dpdk.org (Postfix) with ESMTP id 2C6ED402C5 for ; Sun, 22 Oct 2023 16:28:13 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=EZh5KF9BNwyIqIsMoKxcKQvoyTHd8GiZpm/y1MNPYpdLQsR4obuvUQfQZSrWFw4AEf+BOdf1zlpYIJPTtSzEaFQWmh0906/oviNQszdoE87MX0QaI7WADzg/lG/GPe46zCifTqmcikP+a5bMqMWprmsQc9rz7rrvGAr1uXXeBGEnoBz+YUR4gyEWnRSSw4u2Y8+BL7gD7V8Bk8YEW5mo1RuHAUlMjB//KPu8q8G8ysZZN/CQn3+0tfDuYiKGX4ujInD+VBdQO9xisvAJozlzrNSHqZvUaLdspnHDy2NKsDW9ht33BhP+xuH2HwBst9WhWovqmOxe2v3MQme0jmfFeQ== 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=vpdBXXR6VKCwqwC77bN20r9ALnpbmC2JHvUwoG8s1wg=; b=YmsUmbhTnu8+L5nMVEfq7YoBbTG229yLQcEf7Tq/Gkm/HX+9RqVk4JtkwFk3sjIrd8OA1orof4GnCkiDW0ePatVpurNXp/6XXSvj++jNIvgapfIQtOteidLZVf12gc5Rx2rXmzPdqVfP4+R+Sc0y5PGDfbZwnASDnB8WEZ7VfTxSFp431LPe3RJG2i5FlEtd/kVtbGKCrX1cq7OgGzsCMtTwKIF4oxOWNpkO868aEFsY6dWNp+FxZyYnwoeIXweOxFGfOKSfyOUDfy243i77iVG4NxQM9NGPWiep4A9skcr6oral7JC4mvgq0BGuF7nUbwi6uk33ycH6pcfI9GPTrQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=intel.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=vpdBXXR6VKCwqwC77bN20r9ALnpbmC2JHvUwoG8s1wg=; b=rNRAaQqUMkR8WpR/r/+4UP8PybJ0urv7Kx7rMibyC2WIZsUkLO0gEXnceA17iOExOXHbEs4lTfbb4zhXObp6Nc5khWeBfSQSO2ZHH43F3VUyjUZV0OTZqjIx37p1c854TEp/MABJiG+Uxv9Gpc4spukqOCltuSWa4Zhw6bd+gfFH0VG8Ey3oEAk14SjIxOcEa2jpFi5S/D2zvUmDDBWhiuqxD8XAHIlJFRdoRrIT0BAHCpzu+dN2WxbNnDek7FfThFoIpCVwZv3J2gsZnCYwhH0lqg11F+uog2bN1Kp/MybWKfXuScewVhB7FU/QG47mdj+TaxTMul3lLBYzGoikTg== Received: from BYAPR01CA0033.prod.exchangelabs.com (2603:10b6:a02:80::46) by SJ1PR12MB6337.namprd12.prod.outlook.com (2603:10b6:a03:456::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6907.26; Sun, 22 Oct 2023 14:28:10 +0000 Received: from CO1PEPF000044F2.namprd05.prod.outlook.com (2603:10b6:a02:80:cafe::33) by BYAPR01CA0033.outlook.office365.com (2603:10b6:a02:80::46) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6886.36 via Frontend Transport; Sun, 22 Oct 2023 14:28:10 +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 CO1PEPF000044F2.mail.protection.outlook.com (10.167.241.72) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6933.15 via Frontend Transport; Sun, 22 Oct 2023 14:28:10 +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.41; Sun, 22 Oct 2023 07:27:59 -0700 Received: from nvidia.com (10.126.231.35) 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.41; Sun, 22 Oct 2023 07:27:58 -0700 From: Xueming Li To: Ganapati Kundapura CC: dpdk stable Subject: patch 'eventdev/crypto: fix circular buffer full case' has been queued to stable release 22.11.4 Date: Sun, 22 Oct 2023 22:21:25 +0800 Message-ID: <20231022142250.10324-57-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231022142250.10324-1-xuemingl@nvidia.com> References: <20231022142250.10324-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: CO1PEPF000044F2:EE_|SJ1PR12MB6337:EE_ X-MS-Office365-Filtering-Correlation-Id: dc2dbb4d-6f98-4f2b-c638-08dbd30b1e30 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 4DKESbDA9+MykITJKdRgfXEAcuOBKXtP1AYOt60OEQWBBWzHYkkLGrizblGgsVOqLBmFsrleQ4KifRKddQzWYnhuSq++t63ZZePOZfdx0AJZzClSL93Lsa6up+ku20MMKFPS/nWmBXEv4Ki+261nxGl5+pa1nhgv2UaP+s1gqV8fND+A6ZfaLYo3L4CV8qhB620dOF/j/pXjpw7LrWU0OCP2mVRGim0C94m95ACcX5axKSTi2gtUZJc2NPLbT9OdFhLxCV7Dm4y/+rGHPPXIq5NOu3lvR20oX8CLsmY6OYPJfXr7lydyPbChjkJhK8wsu80nNngujZgGvxjmoczDvfLYydp5E3keibOld7iglCsWn/c9CTIXOvzezlGDCGjdCpoE+8t7yZyGIetfqiRmrJr+TIJ2za0dF7gD1pRwjSR9vfMrwRr/m+p8DARCSlOH8034knk22SLKpWEpAJ1wye78NDjAO0uXuN1fXdrz05cvYb3zivCkhPxUsBBjslY3w8NPs1hyRaVEeHH9H1VdzuMaLNAgNJj/VAbZwlK87dUym9P1G1eciq/yzdjJfNGIud1DU9h0qyLYlK/dXoQuDGZOEgHQcDJbGvJ3wRoepSZGFynQke6lY/B/UFGm6v7cNcILFZjpSzvwmifO+YW0tQ8GcUUVegxNJ6kjb/3Ny2YheUO3vHIFWyqdelNV+iZxSzdlTs3OVfBYnWA9UDEmvUlPSt2CD9U4IU8cEvZniSaJWnt4tbCO7tytVupbxj+1GNbqXjWhvPQVVJ4hVcu1sY2nip/NumR9NCRMm12skQw= 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:(13230031)(4636009)(346002)(376002)(136003)(396003)(39860400002)(230922051799003)(186009)(64100799003)(1800799009)(82310400011)(451199024)(46966006)(40470700004)(36840700001)(40460700003)(2906002)(55016003)(53546011)(6666004)(7696005)(1076003)(26005)(316002)(2616005)(70586007)(70206006)(86362001)(478600001)(966005)(83380400001)(47076005)(36860700001)(336012)(82740400003)(356005)(426003)(7636003)(16526019)(6286002)(5660300002)(40480700001)(41300700001)(8936002)(8676002)(4326008)(36756003)(6916009)(4001150100001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Oct 2023 14:28:10.6889 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: dc2dbb4d-6f98-4f2b-c638-08dbd30b1e30 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: CO1PEPF000044F2.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: SJ1PR12MB6337 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 11/15/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/commit/?h=22.11-staging&id=ba2ec17a2f57a88e89d12d88a9fc4ca0a4084ae3 Thanks. Xueming Li --- >From ba2ec17a2f57a88e89d12d88a9fc4ca0a4084ae3 Mon Sep 17 00:00:00 2001 From: Ganapati Kundapura Date: Thu, 3 Aug 2023 03:32:29 -0500 Subject: [PATCH] eventdev/crypto: fix circular buffer full case Cc: Xueming Li [ upstream commit 6c3c888656fcb0ec419d751f90c0c2a18b5b709a ] crypto ops from the circular buffer are not getting flushed to crypto dev when crypto dev becomes busy and circular buffer gets full. Fix it by flushing ops from circular buffer when circular buffer is full instead of returning without flushing. Fixes: 2ae84b39ae7b ("eventdev/crypto: store operations in circular buffer") Signed-off-by: Ganapati Kundapura --- lib/eventdev/rte_event_crypto_adapter.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/lib/eventdev/rte_event_crypto_adapter.c b/lib/eventdev/rte_event_crypto_adapter.c index 4e1dbefb8e..ea50e405a8 100644 --- a/lib/eventdev/rte_event_crypto_adapter.c +++ b/lib/eventdev/rte_event_crypto_adapter.c @@ -240,9 +240,18 @@ eca_circular_buffer_flush_to_cdev(struct crypto_ops_circular_buffer *bufp, n = *tailp - *headp; else if (*tailp < *headp) n = bufp->size - *headp; - else { - *nb_ops_flushed = 0; - return 0; /* buffer empty */ + else { /* head == tail case */ + /* when head == tail, + * circ buff is either full(tail pointer roll over) or empty + */ + if (bufp->count != 0) { + /* circ buffer is full */ + n = bufp->count; + } else { + /* circ buffer is empty */ + *nb_ops_flushed = 0; + return 0; /* buffer empty */ + } } *nb_ops_flushed = rte_cryptodev_enqueue_burst(cdev_id, qp_id, -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-10-22 22:17:36.470556900 +0800 +++ 0056-eventdev-crypto-fix-circular-buffer-full-case.patch 2023-10-22 22:17:34.266723700 +0800 @@ -1 +1 @@ -From 6c3c888656fcb0ec419d751f90c0c2a18b5b709a Mon Sep 17 00:00:00 2001 +From ba2ec17a2f57a88e89d12d88a9fc4ca0a4084ae3 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 6c3c888656fcb0ec419d751f90c0c2a18b5b709a ] @@ -14 +16,0 @@ -Cc: stable@dpdk.org @@ -22 +24 @@ -index 52a28e52d6..1b435c9f0e 100644 +index 4e1dbefb8e..ea50e405a8 100644 @@ -25 +27 @@ -@@ -248,9 +248,18 @@ eca_circular_buffer_flush_to_cdev(struct crypto_ops_circular_buffer *bufp, +@@ -240,9 +240,18 @@ eca_circular_buffer_flush_to_cdev(struct crypto_ops_circular_buffer *bufp,