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 C6B9CA0540 for ; Thu, 7 Jul 2022 09:58:21 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 66CFB41147; Thu, 7 Jul 2022 09:58:21 +0200 (CEST) Received: from smtp-relay-internal-1.canonical.com (smtp-relay-internal-1.canonical.com [185.125.188.123]) by mails.dpdk.org (Postfix) with ESMTP id CA0EF406B4 for ; Thu, 7 Jul 2022 09:58:19 +0200 (CEST) Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 992B140274 for ; Thu, 7 Jul 2022 07:58:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180699; bh=76j1D6K+PN6BZOqgqSLo8yVYwLsJfHRS/x8wZzrNiYU=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=csS5pi9G+XDIBZgMyWOG/rLhCg6br3yQCYHrk2KrjqSh7orBq/NAbCGVFEmqySBHr 8Dm7SzdIziERGWh75wLhWiStLIYl39Ory2QXql37inZV68Fj7+Ujfj0KHV/Gz+EPgI yaodtlJxTPV6ChKWsNX9bE/kEQnVzdTGsJUWIGZC6hsFvlA194CiM3nPU6351GST7z 60mbQoEZpfqRpJJHSDQnekDq1UTrKWSk2CIGJNDAlS9dnwoZeT5sYDsuVTD+0DR/h6 q44feqqxSCe3Qro0V3BodARUyMm+xo5Cg969UHIKYyXLnr04qqUQNuE0reQdVpRRBx xUS7LWRD9gsgg== Received: by mail-ej1-f70.google.com with SMTP id qa41-20020a17090786a900b00722f313a60eso4406714ejc.13 for ; Thu, 07 Jul 2022 00:58:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=76j1D6K+PN6BZOqgqSLo8yVYwLsJfHRS/x8wZzrNiYU=; b=dWO1KMr9tLM0l5tKYZyKaoR8t39+d7THNjERRx+y863A4hoLTLFHMWM4bDUOWaTuVU AqTDhlEy86lheQh2nJc8tcIsqN6wH8DMkuMRrP50AQRc4gv4ErMAVG6wG9l2ri1cgwaZ R6OZlrpTlKRzL3aocF9Yjbd4k9x0XT/UwNS8NWkm1BKYkkdv5GiTpT/8tnZcKwAE1Dd+ PENPaJdvcegjQ7GJZgNgIRZwgubT28bnl1d7HqkTAPXy0HRv3VO9rBrZmnwvN3MdCb5z 3bHR5CedtdXrvODu2lwcojUACscEf6D5FVRxWIbK2hz61vs9Fqw1FzRARQX4Do6XjKRc Hm2g== X-Gm-Message-State: AJIora8WzUoKH7aL0vqOrVieFUDR5Wnm1Ywt74twzYIiUOCWzfOHcoZ9 Uxsj1ddyq4P99KigWkJFrf00E738EMCZUckKiL6eVGeRuR53XTfj3s4cDriXGp1W5oBlowO8FBH WUPX3w0hee7ay1kWHRbid+DAV X-Received: by 2002:a05:6402:452:b0:434:a373:f9f8 with SMTP id p18-20020a056402045200b00434a373f9f8mr60406352edw.290.1657180699239; Thu, 07 Jul 2022 00:58:19 -0700 (PDT) X-Google-Smtp-Source: AGRyM1vdj2LgafjZepjIS+VIvq9IZQbvSqhTxHMcaPRLSO2YuLtalZZmTx6CkFTQsck8wRFjsGDmOw== X-Received: by 2002:a05:6402:452:b0:434:a373:f9f8 with SMTP id p18-20020a056402045200b00434a373f9f8mr60406336edw.290.1657180699062; Thu, 07 Jul 2022 00:58:19 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id kv10-20020a17090778ca00b006f3ef214ddesm547277ejc.68.2022.07.07.00.58.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:58:18 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Jakub Wysocki Cc: Fan Zhang , dpdk stable Subject: patch 'crypto/scheduler: fix queue pair in scheduler failover' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:54:53 +0200 Message-Id: <20220707075522.194223-58-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220707075522.194223-1-christian.ehrhardt@canonical.com> References: <20220707075522.194223-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 19.11.13 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/09/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/ae21e9dac01ee87a672e5648811b108a8bdd32f6 Thanks. Christian Ehrhardt --- >From ae21e9dac01ee87a672e5648811b108a8bdd32f6 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 [ 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 3a023b8ad3..b355fa04fd 100644 --- a/drivers/crypto/scheduler/scheduler_failover.c +++ b/drivers/crypto/scheduler/scheduler_failover.c @@ -156,6 +156,9 @@ scheduler_start(struct rte_cryptodev *dev) ((struct scheduler_qp_ctx *) dev->data->queue_pairs[i])->private_qp_ctx; + sched_ctx->slaves[PRIMARY_SLAVE_IDX].qp_id = i; + sched_ctx->slaves[SECONDARY_SLAVE_IDX].qp_id = i; + rte_memcpy(&qp_ctx->primary_slave, &sched_ctx->slaves[PRIMARY_SLAVE_IDX], sizeof(struct scheduler_slave)); -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:13.598545021 +0200 +++ 0058-crypto-scheduler-fix-queue-pair-in-scheduler-failove.patch 2022-07-07 09:54:10.953824544 +0200 @@ -1 +1 @@ -From b302708673017b560644b954ed78ef6cdba1aa2d Mon Sep 17 00:00:00 2001 +From ae21e9dac01ee87a672e5648811b108a8bdd32f6 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit b302708673017b560644b954ed78ef6cdba1aa2d ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 5023577ef8..2a0e29fa72 100644 +index 3a023b8ad3..b355fa04fd 100644 @@ -22 +23 @@ -@@ -157,6 +157,9 @@ scheduler_start(struct rte_cryptodev *dev) +@@ -156,6 +156,9 @@ scheduler_start(struct rte_cryptodev *dev) @@ -26,2 +27,2 @@ -+ sched_ctx->workers[PRIMARY_WORKER_IDX].qp_id = i; -+ sched_ctx->workers[SECONDARY_WORKER_IDX].qp_id = i; ++ sched_ctx->slaves[PRIMARY_SLAVE_IDX].qp_id = i; ++ sched_ctx->slaves[SECONDARY_SLAVE_IDX].qp_id = i; @@ -29,3 +30,3 @@ - rte_memcpy(&qp_ctx->primary_worker, - &sched_ctx->workers[PRIMARY_WORKER_IDX], - sizeof(struct scheduler_worker)); + rte_memcpy(&qp_ctx->primary_slave, + &sched_ctx->slaves[PRIMARY_SLAVE_IDX], + sizeof(struct scheduler_slave));