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 B9E17A00C5 for ; Wed, 20 Jul 2022 10:22:43 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 94FBA4282D; Wed, 20 Jul 2022 10:22:43 +0200 (CEST) Received: from NAM10-BN7-obe.outbound.protection.outlook.com (mail-bn7nam10on2050.outbound.protection.outlook.com [40.107.92.50]) by mails.dpdk.org (Postfix) with ESMTP id 7D18E4003C for ; Wed, 20 Jul 2022 10:22:42 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=is3BS+0uzxIIbSemQIAZd4t4iaPcFC0TplrmXgJImG/JVRSnPiVv+zy2xr1KxGolFYQKWj75tIoHSIH6DikUGwFMaZnmfc3n57MWqix3GCJO9uS4u5gRHR8D4gc+3aMYK3KYJiesQvrFdJIvruRu4GaHU6TjukPp8wdA2sZmAXIqQXq3aJZ4EzJR6u5RIfD3EQUSsnRmSqaWq3Chi3jx4O++WjQETWY0XNcEGMRGeXehQtpczOaaQKsCKy3zTw2OpZBIwwHJFeAyq9TOWD/iMMUItJmVhy2pXs4N9/6gCikdUTb55imHc7npc4zakKsHhSSgV28Brl0x0Nc4mT9AeA== 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=FH/6uLFoe4KzBrmQ5XyH+rlaOyLprnYi56mk/7ISN0Q=; b=bWOO/NJ3BasHzFuJUYEjIygqetukDoyTEDx7C/8I7qKKIbHvodZbei//exh8PBg0qxKq5ORW7qoJmLbXQDWEp7DxCVikYpRWEoUJzQPkSIAbCTWXOlx1CsqWSLz2T7UryIIPvKP+pmr0IWrn72/YanwW4rL3cvVblqFPD80sL3iora51Est9UoJkicq799dIQgKPxx4brFTULlGi6Om5Y9G9eAIvQfzM+Q1Td1UOaejzc+xs5SScZTRYzGUi+2iwHr0bqFyLz30jKu/+w7vETWYmGqY8In4tSGqpsd9v13HUUtFJCaFTnGK78IughKKWiD7zZXd7u9XemFb/Ypvhqw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 12.22.5.235) smtp.rcpttodomain=dpdk.org 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=FH/6uLFoe4KzBrmQ5XyH+rlaOyLprnYi56mk/7ISN0Q=; b=T81+5krTDYQqvhVSQJhjlPt3HjWdp2PkNv6okyRaiKN/SYyouuKFwCxhJB14m8PBeCAMoxzoBaFNA/hTA/rPoqbWClK1117/U+4/QbvUrRwZC2NtsyLxGO31eZ1rkA7iC+Js3c1/Jg1iTsf5nhrnjuiFhVE2pJfEa1eoiZzL/RVEGmd8wVOv+Lz3E/smWLR8N21+vupFaP/GRVGWloNVrDvZRDwq3HSo24l0E5u33BeOia7ztB/gEIUpL++XaXn7294Df96fiQzXRUCOT4eEu/wfQVE/56aViuJGgX/E/G7gTv9XOmXJi3xbkK4KUvrLIlfD4TobxcnccYOtKbtUJg== Received: from BN9P223CA0008.NAMP223.PROD.OUTLOOK.COM (2603:10b6:408:10b::13) by DM6PR12MB3676.namprd12.prod.outlook.com (2603:10b6:5:1c7::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5438.14; Wed, 20 Jul 2022 08:22:40 +0000 Received: from BN8NAM11FT036.eop-nam11.prod.protection.outlook.com (2603:10b6:408:10b:cafe::2e) by BN9P223CA0008.outlook.office365.com (2603:10b6:408:10b::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5458.18 via Frontend Transport; Wed, 20 Jul 2022 08:22:40 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 12.22.5.235) 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 12.22.5.235 as permitted sender) receiver=protection.outlook.com; client-ip=12.22.5.235; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (12.22.5.235) by BN8NAM11FT036.mail.protection.outlook.com (10.13.177.168) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384) id 15.20.5458.17 via Frontend Transport; Wed, 20 Jul 2022 08:22:40 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by DRHQMAIL107.nvidia.com (10.27.9.16) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Wed, 20 Jul 2022 08:22:40 +0000 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.26; Wed, 20 Jul 2022 01:22:38 -0700 From: Xueming Li To: Jakub Wysocki CC: , Fan Zhang , dpdk stable Subject: patch 'crypto/scheduler: fix queue pair in scheduler failover' has been queued to stable release 20.11.6 Date: Wed, 20 Jul 2022 11:20:39 +0300 Message-ID: <20220720082132.3954126-10-xuemingl@nvidia.com> X-Mailer: git-send-email 2.27.0 In-Reply-To: <20220720082132.3954126-1-xuemingl@nvidia.com> References: <20220621080301.2315720-1-xuemingl@nvidia.com> <20220720082132.3954126-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: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 2f298eb9-ba36-45fa-be57-08da6a290346 X-MS-TrafficTypeDiagnostic: DM6PR12MB3676:EE_ X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: =?us-ascii?Q?tGKSi7TY2TZXzDTE3b/9At620z22L8Zu4ibwzFrypq65AVXNiwzdzgkojB6N?= =?us-ascii?Q?vle39d6GurCY8Ji/jdqxRE8HPWXSDCmB3xVJKgJ5B92sPG3vgipVUfjKHiQy?= =?us-ascii?Q?bM5YM8q345ANceWfbEjzaC8axh60KQ7btXxythcoTln//yDMagKY+RrnreZF?= =?us-ascii?Q?xg2wvG1om1IOm1zRB85xLUsTvwhfXd71KyiyDME5CFn4FShTxt94XyrNB68D?= =?us-ascii?Q?VUAQDm46NDalYAdr4w5ZVRwZCnGHR/zljR5x/vwnIdA8XGgfTJ0D9AmkAdcm?= =?us-ascii?Q?N1ubuCD35FfQz3O6JrzbsvoN6p/etiyfmMhjVMzvKuixoXAullR7tu5T4Dxi?= =?us-ascii?Q?eSr+yl8KYS6IG+xTZTTqrpnDVfc+UNJoqY9QMKPWuw5dPA3wsy4P80dLFMbD?= =?us-ascii?Q?5bZuUSpy1AENq8X6ny8QTIM/X61vJopem6vUXzF9SHi3KfQpzXgCsSkmj1/s?= =?us-ascii?Q?xRdqpaUMPvlk7afe8Fz2eQhjV5u2VVo1mdmwd4g3HS40M3e3SoBwe4HDNIOd?= =?us-ascii?Q?zhcfRWavaUoReLahK4cHJZitXTh3JKQagnoVOnh/v8K27rC6bwBTXU1WtdQI?= =?us-ascii?Q?v1tad4gRCevThM0SsnUhHKikq13GP3Z4k2+BD5jLBIzM64U+RXzIHik2gG21?= =?us-ascii?Q?wfw4VPI1YsmqCyIeSpP7xS/cSm/aqSFIUW9JdaVnOTJVxMalvnusetrmFk5K?= =?us-ascii?Q?t9Rsi5oMmF1QUXtR5M5X/4N9KEBsjQtUn2jgWR1m+Y5m1G5EwAQmMzBqYXtu?= =?us-ascii?Q?hD456WehMhRaPDD0r9rIo4GKdVJJcfI6vYpoQ4Ui9mADIeC6W+Fl98q99gyt?= =?us-ascii?Q?v1ZLaxUd3b0XHJf2PI7UR+QRAdS8Lud3UAUdRAhHT5xhriFKXNiriPoWEkSi?= =?us-ascii?Q?vWj8xN/WsnUq/NIL9/xxwrAw9PAvgSXDM+xTz0BK+UuRPQ3z8eb5u2HuuZM9?= =?us-ascii?Q?5qKFQdG139Uo2phQEpeYAw=3D=3D?= X-Forefront-Antispam-Report: CIP:12.22.5.235; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:InfoNoRecords; CAT:NONE; SFS:(13230016)(4636009)(346002)(39860400002)(376002)(136003)(396003)(40470700004)(46966006)(36840700001)(8936002)(5660300002)(4326008)(6286002)(6916009)(2906002)(86362001)(70586007)(40480700001)(82310400005)(316002)(54906003)(8676002)(40460700003)(36756003)(26005)(70206006)(55016003)(7696005)(426003)(41300700001)(53546011)(966005)(186003)(356005)(16526019)(1076003)(478600001)(2616005)(47076005)(82740400003)(81166007)(36860700001)(336012)(36900700001); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2022 08:22:40.5799 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 2f298eb9-ba36-45fa-be57-08da6a290346 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[12.22.5.235]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BN8NAM11FT036.eop-nam11.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM6PR12MB3676 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 20.11.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 07/22/22. 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/cb03983da4a412584a0527d5891d6071319aae33 Thanks. Xueming Li --- >From cb03983da4a412584a0527d5891d6071319aae33 Mon Sep 17 00:00:00 2001 From: Jakub Wysocki Date: Wed, 15 Jun 2022 14:13:49 +0100 Subject: [PATCH] crypto/scheduler: fix queue pair in scheduler failover Cc: Xueming Li [ upstream commit b302708673017b560644b954ed78ef6cdba1aa2d ] This commit fixes wrong qp_id value in cryptodev scheduler in failover mode. Fixes: 37f075dad1e9 ("crypto/scheduler: add fail-over scheduling mode") Signed-off-by: Jakub Wysocki Acked-by: Fan Zhang --- drivers/crypto/scheduler/scheduler_failover.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/crypto/scheduler/scheduler_failover.c b/drivers/crypto/scheduler/scheduler_failover.c index 844312dd1b..7c82bc5464 100644 --- a/drivers/crypto/scheduler/scheduler_failover.c +++ b/drivers/crypto/scheduler/scheduler_failover.c @@ -157,6 +157,9 @@ scheduler_start(struct rte_cryptodev *dev) ((struct scheduler_qp_ctx *) dev->data->queue_pairs[i])->private_qp_ctx; + sched_ctx->workers[PRIMARY_WORKER_IDX].qp_id = i; + sched_ctx->workers[SECONDARY_WORKER_IDX].qp_id = i; + rte_memcpy(&qp_ctx->primary_worker, &sched_ctx->workers[PRIMARY_WORKER_IDX], sizeof(struct scheduler_worker)); -- 2.35.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-20 15:00:59.263219255 +0800 +++ 0010-crypto-scheduler-fix-queue-pair-in-scheduler-failove.patch 2022-07-20 15:00:58.661000577 +0800 @@ -1 +1 @@ -From b302708673017b560644b954ed78ef6cdba1aa2d Mon Sep 17 00:00:00 2001 +From cb03983da4a412584a0527d5891d6071319aae33 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit b302708673017b560644b954ed78ef6cdba1aa2d ] @@ -10 +12,0 @@ -Cc: stable@dpdk.org @@ -19 +21 @@ -index 5023577ef8..2a0e29fa72 100644 +index 844312dd1b..7c82bc5464 100644