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 C491AA0540 for ; Thu, 7 Jul 2022 09:55:52 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C0390410D3; Thu, 7 Jul 2022 09:55:52 +0200 (CEST) Received: from smtp-relay-internal-0.canonical.com (smtp-relay-internal-0.canonical.com [185.125.188.122]) by mails.dpdk.org (Postfix) with ESMTP id B3EE24282D for ; Thu, 7 Jul 2022 09:55:51 +0200 (CEST) Received: from mail-ed1-f70.google.com (mail-ed1-f70.google.com [209.85.208.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-0.canonical.com (Postfix) with ESMTPS id 1458A3F6F8 for ; Thu, 7 Jul 2022 07:55:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=canonical.com; s=20210705; t=1657180551; bh=9zundQ3ruAMSfva/LoyIzzgA71NPYeg64HLZ+ZzB4KY=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=gK0DL4EOS6q1C2XMnv5X9wo5u9xs5U5G5gxsGOTDbVW/AJw6XNvQvSAgAdBcQHe0y mRV/aeHb5YFfKF2zPw6vx/V/K7q0EZXjkqB23Ph3PW29qdryteYXitbxV5/de0jcUj Yn6OzEH3GYnjaa2cB967XE+AZbuYQJACqyv2IHbWrGMQtQ6izyQf/GAh7IB4W3FYZV T+2nxf6JTvWLv/FTqo1FoUlPGJEqkLC34+MHJ3Ekd/a71n6RPcIbUw8seeFVFe6mD2 JMpS12lv33xoxXHKFvV7RaosSBbvWY5D5dwUBOeqS+NSYltP+ovQKOiC1B/0X3YeGZ 6BgFEgs7CfNew== Received: by mail-ed1-f70.google.com with SMTP id f13-20020a0564021e8d00b00437a2acb543so13309890edf.7 for ; Thu, 07 Jul 2022 00:55:51 -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=9zundQ3ruAMSfva/LoyIzzgA71NPYeg64HLZ+ZzB4KY=; b=1GYIjH8C8T7IL+WK67ZvwaOHMfVkAMX3ENWuN42igpikb0ADl1hllJfNzbkAZhjxDF TsLAkbP62izNIy7BpW6YZ6pX/SMSF+E36gfRL9NIvo8iUmk+lVFn9IDnLJdKHK0dj7Ba 5fyPScPzenkRw7OC7SyZ6PW8W9HB4Kts0CGivwaoEUS/+68pLkULVlaaKNfpSYiLQei4 R6Oczo4oqMN78uVNP1TVeqtwjRGTYKpm93itXOQW+WRPxQmdYNXY+0UztjLv9JA1zgPS baDbN+91lIsdHHdSu9iYpmWvUM25vdS1Jki7X852fUHYMUg0EC+21qbb5WxKsHCqn59P Q8Uw== X-Gm-Message-State: AJIora9733E6X4GSDK4Sip6+bl34yB9ii5RrZJ2ox3RGuxxsYIURrtGX MCU6m/gCdpWVQOr4KpNvFkvM3xjM9vp4OUqljGQWROcB7Q/puRP2H42stcf94w75Vvfl6joxcYW QbTjMS1KeEQmdcaTKjFFMdwIP X-Received: by 2002:a17:907:9494:b0:722:f3d2:ef96 with SMTP id dm20-20020a170907949400b00722f3d2ef96mr44496273ejc.705.1657180550693; Thu, 07 Jul 2022 00:55:50 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tVmfdAt/GVfdWHXOYoH7B9uJxw15op61Fccnc5ImDhMGF7B1Ls/kQn/ACcAsvA/LeqSkhEOQ== X-Received: by 2002:a17:907:9494:b0:722:f3d2:ef96 with SMTP id dm20-20020a170907949400b00722f3d2ef96mr44496260ejc.705.1657180550506; Thu, 07 Jul 2022 00:55:50 -0700 (PDT) Received: from Keschdeichel.fritz.box ([2a02:6d40:3a4f:7b00:c19b:938e:7c97:afe2]) by smtp.gmail.com with ESMTPSA id c12-20020a170906d18c00b00727c6da69besm11731855ejz.38.2022.07.07.00.55.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 07 Jul 2022 00:55:49 -0700 (PDT) From: christian.ehrhardt@canonical.com To: Vanshika Shukla Cc: Akhil Goyal , dpdk stable Subject: patch 'crypto/dpaa_sec: fix secondary process probing' has been queued to stable release 19.11.13 Date: Thu, 7 Jul 2022 09:54:05 +0200 Message-Id: <20220707075522.194223-10-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/cf5c06e209b699b1971b4378f66d16f522474231 Thanks. Christian Ehrhardt --- >From cf5c06e209b699b1971b4378f66d16f522474231 Mon Sep 17 00:00:00 2001 From: Vanshika Shukla Date: Thu, 28 Apr 2022 17:17:27 +0530 Subject: [PATCH] crypto/dpaa_sec: fix secondary process probing [ upstream commit 96ec64f12db163b47c4a69613c7e7347919ff54f ] DPAA hardware supports non-i/o performing secondary applications only. So we do not have to probe crypto devices in secondary applications. Fixes: c3e85bdcc6e6 ("crypto/dpaa_sec: add crypto driver for NXP DPAA platform") Signed-off-by: Vanshika Shukla Acked-by: Akhil Goyal --- drivers/crypto/dpaa_sec/dpaa_sec.c | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c index 1a4a296ae2..95dd58bfb3 100644 --- a/drivers/crypto/dpaa_sec/dpaa_sec.c +++ b/drivers/crypto/dpaa_sec/dpaa_sec.c @@ -3424,23 +3424,24 @@ cryptodev_dpaa_sec_probe(struct rte_dpaa_driver *dpaa_drv __rte_unused, int retval; + if (rte_eal_process_type() != RTE_PROC_PRIMARY) + return 0; + snprintf(cryptodev_name, sizeof(cryptodev_name), "%s", dpaa_dev->name); cryptodev = rte_cryptodev_pmd_allocate(cryptodev_name, rte_socket_id()); if (cryptodev == NULL) return -ENOMEM; - if (rte_eal_process_type() == RTE_PROC_PRIMARY) { - cryptodev->data->dev_private = rte_zmalloc_socket( - "cryptodev private structure", - sizeof(struct dpaa_sec_dev_private), - RTE_CACHE_LINE_SIZE, - rte_socket_id()); + cryptodev->data->dev_private = rte_zmalloc_socket( + "cryptodev private structure", + sizeof(struct dpaa_sec_dev_private), + RTE_CACHE_LINE_SIZE, + rte_socket_id()); - if (cryptodev->data->dev_private == NULL) - rte_panic("Cannot allocate memzone for private " - "device data"); - } + if (cryptodev->data->dev_private == NULL) + rte_panic("Cannot allocate memzone for private " + "device data"); dpaa_dev->crypto_dev = cryptodev; cryptodev->device = &dpaa_dev->device; @@ -3478,8 +3479,7 @@ cryptodev_dpaa_sec_probe(struct rte_dpaa_driver *dpaa_drv __rte_unused, return 0; /* In case of error, cleanup is done */ - if (rte_eal_process_type() == RTE_PROC_PRIMARY) - rte_free(cryptodev->data->dev_private); + rte_free(cryptodev->data->dev_private); rte_cryptodev_pmd_release_device(cryptodev); -- 2.37.0 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-07-07 09:54:11.630620949 +0200 +++ 0010-crypto-dpaa_sec-fix-secondary-process-probing.patch 2022-07-07 09:54:10.797823580 +0200 @@ -1 +1 @@ -From 96ec64f12db163b47c4a69613c7e7347919ff54f Mon Sep 17 00:00:00 2001 +From cf5c06e209b699b1971b4378f66d16f522474231 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 96ec64f12db163b47c4a69613c7e7347919ff54f ] + @@ -11 +12,0 @@ -Cc: stable@dpdk.org @@ -20 +21 @@ -index 23a94d7e41..6f2b4baf57 100644 +index 1a4a296ae2..95dd58bfb3 100644 @@ -23 +24 @@ -@@ -3766,23 +3766,24 @@ cryptodev_dpaa_sec_probe(struct rte_dpaa_driver *dpaa_drv __rte_unused, +@@ -3424,23 +3424,24 @@ cryptodev_dpaa_sec_probe(struct rte_dpaa_driver *dpaa_drv __rte_unused, @@ -58,3 +59,3 @@ -@@ -3824,8 +3825,7 @@ cryptodev_dpaa_sec_probe(struct rte_dpaa_driver *dpaa_drv __rte_unused, - retval = -ENXIO; - out: +@@ -3478,8 +3479,7 @@ cryptodev_dpaa_sec_probe(struct rte_dpaa_driver *dpaa_drv __rte_unused, + return 0; +