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 618524625C for ; Tue, 18 Feb 2025 13:38:16 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5C0CA402A0; Tue, 18 Feb 2025 13:38:16 +0100 (CET) Received: from NAM10-DM6-obe.outbound.protection.outlook.com (mail-dm6nam10on2042.outbound.protection.outlook.com [40.107.93.42]) by mails.dpdk.org (Postfix) with ESMTP id 299AA402E9 for ; Tue, 18 Feb 2025 13:38:15 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector10001; d=microsoft.com; cv=none; b=qf22U13+DTEh/OFb0mdKth8S0Cppb+UmCF+t6/6FFESa74nVCq6TH/I95yYf3DD/+uaKTiDFhnpAdcqfPq7yQQMNcfmZSI/8Va3SCGxk/aCwI5M2hn7ChhLr+S7D5839PdDwuQKrHS7wqePcpodDDUiRjhl5gnghiM8I2PPQlHXHzDFnrhn9o9XOPU4+F3z+V//qukjAF6z/uZdzCR1TM2oqlliwB8fTt7C0fltpLXzc2Cwvo9Hz7B4wyVRvG5E6W7awyZ18+SUqvgQsjzp2k7hxzZy1qSPxA3FATatlxLutTVWi2ppb1v+PrkUs6VD43/eVSb5vpS2BYxh/g6FxVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector10001; 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=qm0ddmdd/qWjQlMG6Ew9Xa0xL+qcN+dl0LzULy9KlIA=; b=K4vBOJK+De4PP19lW9s4HpDp2DcGSt2DtmihtFOpnght9depIj+QZ9jv+OXmGrWEQbspBQxVEUxH8dGos7/POsjY6dimWkSLT5RWVhqb67n8ituRK320beyMzUXJny7gjCTrFfLII7g/zJDlbQTPtp+IPUnzIQc60P0Pgn64cdnj6JwGQdXP1gIjirwzBAbZi1yAKS+eRGcf9JDAQ8VEeC5/38Cd5jKhqhqXkvBaYZFA9gNyMiypm+yt7mF/1lNn8KaDxXFzKlORrfn+SGxuB93uI/KWp2ykjcfA9wlXv1Jyhx4lJBzVPbz527Zbv7ydo+AmZnShjNsRMwlHlGprEw== 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 (0) 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=qm0ddmdd/qWjQlMG6Ew9Xa0xL+qcN+dl0LzULy9KlIA=; b=NRN05tFJpHtHsC5XeB9mNpXpqPsGfmTXEKJV8wwNSCjz1qcm7mx6CEJVbpPM4BReA0brd1OSqZFZMTiBQQLUPg5EJrOFJ7Z+mdczCHdLsjtUPH0BGMTeMM3cugy85kEFXnZEhb66GkFlzLCCX5AItbACaPGZm5TCD6Du/pKRX7KxHt+9qA77a/JLHcYDVhuaKZ1z0KcQ+QEqbHUbsR7NSwyHOMAP1ueeyO/gC3r23ZBqCdakfWYwe0aWVu0Bx4EogrsaZ6DStrBZ/USAe7+H27rmCZShOcxykjti/qSwKxOuSrO/7qgEtnzpzEM1f65lTCJeAE+Lvgy+NnsVh53eBQ== Received: from MW4P220CA0019.NAMP220.PROD.OUTLOOK.COM (2603:10b6:303:115::24) by CYYPR12MB8752.namprd12.prod.outlook.com (2603:10b6:930:b9::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8445.18; Tue, 18 Feb 2025 12:38:11 +0000 Received: from MWH0EPF000989EC.namprd02.prod.outlook.com (2603:10b6:303:115:cafe::51) by MW4P220CA0019.outlook.office365.com (2603:10b6:303:115::24) with Microsoft SMTP Server (version=TLS1_3, cipher=TLS_AES_256_GCM_SHA384) id 15.20.8398.28 via Frontend Transport; Tue, 18 Feb 2025 12:38:11 +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 MWH0EPF000989EC.mail.protection.outlook.com (10.167.241.139) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.8466.11 via Frontend Transport; Tue, 18 Feb 2025 12:38:11 +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.1544.4; Tue, 18 Feb 2025 04:37:56 -0800 Received: from nvidia.com (10.126.230.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.1544.14; Tue, 18 Feb 2025 04:37:54 -0800 From: Xueming Li To: Gowrishankar Muthukrishnan CC: , Akhil Goyal , dpdk stable Subject: patch 'crypto/virtio: fix data queues iteration' has been queued to stable release 23.11.4 Date: Tue, 18 Feb 2025 20:34:18 +0800 Message-ID: <20250218123523.36836-24-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20250218123523.36836-1-xuemingl@nvidia.com> References: <20250218123523.36836-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.230.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: MWH0EPF000989EC:EE_|CYYPR12MB8752:EE_ X-MS-Office365-Filtering-Correlation-Id: 222f86cd-7d4e-4c2f-efd4-08dd50191ae8 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; ARA:13230040|376014|1800799024|82310400026|36860700013|13003099007|7053199007; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?UczuUu5Zx59VrEWipTp96LAYWhIRzPi/V6CchB23Q8rVMjcoMUr6fRYctUR/?= =?us-ascii?Q?AxzMqNn9qxCh5i40guP0iSqLCY/AowlZDPzpYk+ZGRKXJopbLTJa7o3z5SrR?= =?us-ascii?Q?ZGGxtwtH5amVcsIDEy84MTgMktblA1QXixU4UEleJ8pmrEPII5gvL7i7OL3Q?= =?us-ascii?Q?4+95DkanATxWCfvEtkfsQrPprzePM9DtGK1aMlU9onOcL8ffK1aPKKGUVzKu?= =?us-ascii?Q?b5D0tXCGkG+00J5oYofd+AZLzlp5vCRpyB1V8Hx+S5NH8JvgWSe03GPudmyD?= =?us-ascii?Q?BLjzrcbWCOqh71ExxlwW8iUoWLIDVvtQ0AnI6ox3m1PVIavoos+2rZ+KU7Zd?= =?us-ascii?Q?S1If1LXWWYS3sKAG/hIIelAEWFyZZYCAxXGOuvv/877ihdnVatgg22vdotVb?= =?us-ascii?Q?aojIEy6aNQGaD7EUYVsAIjf/HbqX1M/Xhi6b94JrizP7Fc7v/eWqIKG9OkUR?= =?us-ascii?Q?L4VyfpYuRE7zAqmKj7a60LoCA1zp+7s7ZzmAeewM1cstw1WGTSmupGEe4xUL?= =?us-ascii?Q?JvxMjxFQRMkqY3gSkXO5xGrRnGyfZNOOrNKspNYZbTu2CS2lxel9b9DtQHgv?= =?us-ascii?Q?DFzNx+ls2fkMvQY2CQ0k7o9UGIdbByttXnntG8OjsKP1WKTYjc45m+DPoZ7Y?= =?us-ascii?Q?qEQJCKcpYHbtdEiDrqhJyiunE+Bwu9QIZdqrziu5OnrtM2KqECUPGYQyNMGu?= =?us-ascii?Q?CVCmStTceQUiZBoUb9ceZiBXX6DjmtKiOe/yOJQLsWl9OrjFBbd+w9v9dZ5L?= =?us-ascii?Q?WWGFt/D3h76qG6Ajanxv0SC/UVOfY9NEWC6BDrihqGWlSbXkz5zv7xq+Q08q?= =?us-ascii?Q?rt4ObVbq8CIntwlTUFUz765fQLjdrDWLaC7m5sbT4wSgg/f+ENzGdB84OQuZ?= =?us-ascii?Q?OWo1a0qr/RfKVyea11GTwHHC5hixvSVLWTbe7L6FXK0ufXLwKdXa2dlGg+ZC?= =?us-ascii?Q?34J0Zi3pDEYoKSyRYaxT+SJheFXt1eQ8zBtBQF4pZD9cfsj5Q4Ae/4Iwz9y+?= =?us-ascii?Q?2kSshhpRaYwgT8WuWnH3cAMnw7+xcMv/h/T2W8AwTlS/weseWepcdxBQcORi?= =?us-ascii?Q?2iQgESgZV8srHLvI9vQmmD61TT4JtEZBMXO/rLj1HLej8jvKcdHSFwcQvR2o?= =?us-ascii?Q?3JU52y9efQwFylK5ln/Smzar7fQ/SP5jCJg21plXiErDOb08CHvdCqajEy8H?= =?us-ascii?Q?6v3uAPbO+pyhyAq+ewuzBHmFv9EQ999hyCc09vc7yziLcuIQ2Y4X0lwFwpI7?= =?us-ascii?Q?kHRZpbvgbw+XaHQbOyTdNgtI+Y04nQ1iyNbCstcFeKm8ptrImIJjXYdPtodp?= =?us-ascii?Q?6gIbO/5Y8cvu+O+xuKtQsergJxanJeHIzzEdPB271SuYz4uEwunq5NjSr6TS?= =?us-ascii?Q?c2Gu73n2oleukB5toOKv8N2zpMmYpcruKjidHFNuNH4rCcDSMfCkCUgC1Ub7?= =?us-ascii?Q?ATCk6e+LQE8ib4rMteT3hN2K6Sh24SvAfw4BgoGlcg9WEJFNRm2CuHzFpx63?= =?us-ascii?Q?AShCPgwIWTBvl6I=3D?= 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:(13230040)(376014)(1800799024)(82310400026)(36860700013)(13003099007)(7053199007); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Feb 2025 12:38:11.1418 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 222f86cd-7d4e-4c2f-efd4-08dd50191ae8 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: MWH0EPF000989EC.namprd02.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CYYPR12MB8752 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 23.11.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. 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=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=4ab8b71371eb81a32a1ba7beb3ec4fd4c70400c5 Thanks. Xueming Li --- >From 4ab8b71371eb81a32a1ba7beb3ec4fd4c70400c5 Mon Sep 17 00:00:00 2001 From: Gowrishankar Muthukrishnan Date: Tue, 7 Jan 2025 23:06:02 +0530 Subject: [PATCH] crypto/virtio: fix data queues iteration Cc: Xueming Li [ upstream commit e27ff6e63a8d6202149d5b458ad3d78711806dfc ] Fix dataqueues iteration using nb_queue_pairs info available in device data instead of max dataqueues as dataqueue count might have been changed in device configuration. Fixes: 6f0175ff53e0 ("crypto/virtio: support basic PMD ops") Signed-off-by: Gowrishankar Muthukrishnan Acked-by: Akhil Goyal --- drivers/crypto/virtio/virtio_cryptodev.c | 3 +-- drivers/crypto/virtio/virtio_rxtx.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/drivers/crypto/virtio/virtio_cryptodev.c b/drivers/crypto/virtio/virtio_cryptodev.c index 0c3af3e3b0..332e109876 100644 --- a/drivers/crypto/virtio/virtio_cryptodev.c +++ b/drivers/crypto/virtio/virtio_cryptodev.c @@ -849,9 +849,8 @@ static void virtio_crypto_dev_free_mbufs(struct rte_cryptodev *dev) { uint32_t i; - struct virtio_crypto_hw *hw = dev->data->dev_private; - for (i = 0; i < hw->max_dataqueues; i++) { + for (i = 0; i < dev->data->nb_queue_pairs; i++) { VIRTIO_CRYPTO_INIT_LOG_DBG("Before freeing dataq[%d] used " "and unused buf", i); VIRTQUEUE_DUMP((struct virtqueue *) diff --git a/drivers/crypto/virtio/virtio_rxtx.c b/drivers/crypto/virtio/virtio_rxtx.c index 48b5f4ebbb..d02486661f 100644 --- a/drivers/crypto/virtio/virtio_rxtx.c +++ b/drivers/crypto/virtio/virtio_rxtx.c @@ -419,12 +419,11 @@ virtio_crypto_dataq_start(struct rte_cryptodev *dev) * - Setup vring structure for data queues */ uint16_t i; - struct virtio_crypto_hw *hw = dev->data->dev_private; PMD_INIT_FUNC_TRACE(); /* Start data vring. */ - for (i = 0; i < hw->max_dataqueues; i++) { + for (i = 0; i < dev->data->nb_queue_pairs; i++) { virtio_crypto_vring_start(dev->data->queue_pairs[i]); VIRTQUEUE_DUMP((struct virtqueue *)dev->data->queue_pairs[i]); } -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2025-02-18 19:39:01.565292086 +0800 +++ 0023-crypto-virtio-fix-data-queues-iteration.patch 2025-02-18 19:39:00.478244073 +0800 @@ -1 +1 @@ -From e27ff6e63a8d6202149d5b458ad3d78711806dfc Mon Sep 17 00:00:00 2001 +From 4ab8b71371eb81a32a1ba7beb3ec4fd4c70400c5 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit e27ff6e63a8d6202149d5b458ad3d78711806dfc ] @@ -11 +13,0 @@ -Cc: stable@dpdk.org @@ -21 +23 @@ -index 98415af123..b4a6fae9e0 100644 +index 0c3af3e3b0..332e109876 100644 @@ -24 +26 @@ -@@ -848,9 +848,8 @@ static void +@@ -849,9 +849,8 @@ static void