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 A90D6A0A02 for ; Mon, 17 May 2021 18:14:41 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id A06B5410F1; Mon, 17 May 2021 18:14:41 +0200 (CEST) Received: from youngberry.canonical.com (youngberry.canonical.com [91.189.89.112]) by mails.dpdk.org (Postfix) with ESMTP id 614BF410E2 for ; Mon, 17 May 2021 18:14:40 +0200 (CEST) Received: from 2.general.paelzer.uk.vpn ([10.172.196.173] helo=Keschdeichel.fritz.box) by youngberry.canonical.com with esmtpsa (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 (Exim 4.93) (envelope-from ) id 1lift9-000853-AR; Mon, 17 May 2021 16:14:39 +0000 From: Christian Ehrhardt To: Apeksha Gupta Cc: Akhil Goyal , dpdk stable Date: Mon, 17 May 2021 18:08:54 +0200 Message-Id: <20210517161039.3132619-105-christian.ehrhardt@canonical.com> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> References: <20210517161039.3132619-1-christian.ehrhardt@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'examples/l2fwd-crypto: skip masked devices' has been queued to stable release 19.11.9 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 19.11.9 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/19/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/cpaelzer/dpdk-stable-queue This queued commit can be viewed at: https://github.com/cpaelzer/dpdk-stable-queue/commit/a76754ea482f702d0f875d99cb99cd7f4fe0eee2 Thanks. Christian Ehrhardt --- >From a76754ea482f702d0f875d99cb99cd7f4fe0eee2 Mon Sep 17 00:00:00 2001 From: Apeksha Gupta Date: Fri, 9 Apr 2021 18:39:14 +0530 Subject: [PATCH] examples/l2fwd-crypto: skip masked devices [ upstream commit 58266cc91efbf45e24fee3a15e23816da6941501 ] The devices which are masked by cryptodev mask should not be initialized and skipped while traversing the device list. Fixes: 6ae3fb9df66e ("examples/l2fwd-crypto: fix session mempool size") Signed-off-by: Apeksha Gupta Acked-by: Akhil Goyal --- examples/l2fwd-crypto/main.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/examples/l2fwd-crypto/main.c b/examples/l2fwd-crypto/main.c index 827da9b3e3..26e0e5c824 100644 --- a/examples/l2fwd-crypto/main.c +++ b/examples/l2fwd-crypto/main.c @@ -2254,6 +2254,12 @@ initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports, if (enabled_cdevs[cdev_id] == 0) continue; + if (check_cryptodev_mask(options, cdev_id) < 0) + continue; + + if (check_capabilities(options, cdev_id) < 0) + continue; + retval = rte_cryptodev_socket_id(cdev_id); if (retval < 0) { -- 2.31.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-05-17 17:40:33.559097017 +0200 +++ 0105-examples-l2fwd-crypto-skip-masked-devices.patch 2021-05-17 17:40:29.307810548 +0200 @@ -1 +1 @@ -From 58266cc91efbf45e24fee3a15e23816da6941501 Mon Sep 17 00:00:00 2001 +From a76754ea482f702d0f875d99cb99cd7f4fe0eee2 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 58266cc91efbf45e24fee3a15e23816da6941501 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -19 +20 @@ -index 0ee3e1470a..1016ceb841 100644 +index 827da9b3e3..26e0e5c824 100644 @@ -22 +23 @@ -@@ -2251,6 +2251,12 @@ initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports, +@@ -2254,6 +2254,12 @@ initialize_cryptodevs(struct l2fwd_crypto_options *options, unsigned nb_ports,