From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id B2FF1A0518 for ; Fri, 24 Jul 2020 14:06:51 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id AC80D1C0C6; Fri, 24 Jul 2020 14:06:51 +0200 (CEST) Received: from mail-wr1-f54.google.com (mail-wr1-f54.google.com [209.85.221.54]) by dpdk.org (Postfix) with ESMTP id 9604F1C124 for ; Fri, 24 Jul 2020 14:06:50 +0200 (CEST) Received: by mail-wr1-f54.google.com with SMTP id a15so8076618wrh.10 for ; Fri, 24 Jul 2020 05:06:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8Jo0HB5pUPUS6c/cGVzfQ+BXiT4KcU4Igg5MmW9f9xo=; b=rLM+alaJw4mPdVLSFe38Yuf4vpde9Zyba7rgIC724ie0P7jCSkwznpKfJimHZVLxCq I++LxCLQhWiuIAJESsGszM3duKgrdH7FxIrJkM0W9UbvR0uC1Fpeop4yafO1eXPx1T2P rRmlUCc63EY4PSpHylKhxc9JMJ2MADOKWcqlm/oM8E+zidIm2gDBrNr6/SSG+5NAS9XW XkCEpe9ivClEta1SugwOgKMs6PmeLxUP6NhHhXo/uhDlDpsosMGm0UV0zjyagl4L88nU YJHlOBJISRBWUtsYoe5NHTu0Ga6+TZ4BNBBg3tRyUe3BRzpYffkueUgC+vPV69uk5nRd XrJQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8Jo0HB5pUPUS6c/cGVzfQ+BXiT4KcU4Igg5MmW9f9xo=; b=OeqLR484MzTil87pYjenZH2CrsC/uJFAcmA2/5y6pz6RTN7RAzI9VeiO2Q6PQ4wmvE Aqds4pzeS7LPse4tkwH9gIFGVYIur+jcpjsMPssVMecdPRWkVsB1HTd/AYWRZouXIav3 //aN8fwjAFjTB8hP38EwQhyGZ5ttzS1GyxswkxirRVBPTHDn7BkMDxKMRxIRonEp3ISs 3sqwon7qQ2xdPvTx3moO0eqeaGr8SudfYoqX8HzaT0ectKrZ4V8yrX0J1DID9ocF7Luh /P0YodLuqPCeRZO2F8v8yluzphjjzP0aoZ8WpcoEk4B5TCe0gRG1+K/fAkUtnv2j3g3z c4kA== X-Gm-Message-State: AOAM533mJJfvGGVWZeO1xOb4fR7CjKnRbfJyWb+mp0wzXDmXvW2ZJSHC hyQW83clfplLMCCGHqz3tpw= X-Google-Smtp-Source: ABdhPJwJbQJkEXpzGLqpDKLCD22QFvfV9HlagzRI4cIxFDZojuMA23pSSzlzt8kfqqbdy0xw1Qx4hw== X-Received: by 2002:a5d:664a:: with SMTP id f10mr8376168wrw.300.1595592410292; Fri, 24 Jul 2020 05:06:50 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 78sm7281137wma.31.2020.07.24.05.06.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 24 Jul 2020 05:06:49 -0700 (PDT) From: luca.boccassi@gmail.com To: Pablo de Lara Cc: dpdk stable Date: Fri, 24 Jul 2020 12:58:50 +0100 Message-Id: <20200724120030.1863487-92-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200724120030.1863487-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'drivers/crypto: add missing OOP feature flag' has been queued to stable release 19.11.4 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 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.4 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/26/20. 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. Thanks. Luca Boccassi --- >From b4c9242d0552f5a8bbd88adb45e7d1ae548d5d5a Mon Sep 17 00:00:00 2001 From: Pablo de Lara Date: Thu, 4 Jun 2020 08:51:12 +0000 Subject: [PATCH] drivers/crypto: add missing OOP feature flag [ upstream commit cd346367f898d619edf53f13628d6e539dbcab40 ] ZUC, SNOW3G and KASUMI PMDs support Out-of-place operations, but their feature flags did not reflect this. Fixes: 2717246ecd7d ("cryptodev: replace mbuf scatter gather flag") Signed-off-by: Pablo de Lara --- doc/guides/cryptodevs/features/kasumi.ini | 1 + doc/guides/cryptodevs/features/snow3g.ini | 1 + doc/guides/cryptodevs/features/zuc.ini | 1 + drivers/crypto/kasumi/rte_kasumi_pmd.c | 1 + drivers/crypto/snow3g/rte_snow3g_pmd.c | 1 + drivers/crypto/zuc/rte_zuc_pmd.c | 1 + 6 files changed, 6 insertions(+) diff --git a/doc/guides/cryptodevs/features/kasumi.ini b/doc/guides/cryptodevs/features/kasumi.ini index f3d061009..7ee866e8f 100644 --- a/doc/guides/cryptodevs/features/kasumi.ini +++ b/doc/guides/cryptodevs/features/kasumi.ini @@ -6,6 +6,7 @@ [Features] Symmetric crypto = Y Sym operation chaining = Y +OOP LB In LB Out = Y ; ; Supported crypto algorithms of the 'kasumi' crypto driver. diff --git a/doc/guides/cryptodevs/features/snow3g.ini b/doc/guides/cryptodevs/features/snow3g.ini index ec2daf6c6..c4a1a8448 100644 --- a/doc/guides/cryptodevs/features/snow3g.ini +++ b/doc/guides/cryptodevs/features/snow3g.ini @@ -6,6 +6,7 @@ [Features] Symmetric crypto = Y Sym operation chaining = Y +OOP LB In LB Out = Y ; ; Supported crypto algorithms of the 'snow3g' crypto driver. diff --git a/doc/guides/cryptodevs/features/zuc.ini b/doc/guides/cryptodevs/features/zuc.ini index 9b6a4287e..29cc258aa 100644 --- a/doc/guides/cryptodevs/features/zuc.ini +++ b/doc/guides/cryptodevs/features/zuc.ini @@ -6,6 +6,7 @@ [Features] Symmetric crypto = Y Sym operation chaining = Y +OOP LB In LB Out = Y ; ; Supported crypto algorithms of the 'zuc' crypto driver. diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd.c b/drivers/crypto/kasumi/rte_kasumi_pmd.c index c87dca5f4..dd85928c5 100644 --- a/drivers/crypto/kasumi/rte_kasumi_pmd.c +++ b/drivers/crypto/kasumi/rte_kasumi_pmd.c @@ -557,6 +557,7 @@ cryptodev_kasumi_create(const char *name, dev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO | RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING | + RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT | cpu_flags; internals = dev->data->dev_private; diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c b/drivers/crypto/snow3g/rte_snow3g_pmd.c index 2b1b90b01..32d94c5ab 100644 --- a/drivers/crypto/snow3g/rte_snow3g_pmd.c +++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c @@ -568,6 +568,7 @@ cryptodev_snow3g_create(const char *name, dev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO | RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING | + RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT | cpu_flags; internals = dev->data->dev_private; diff --git a/drivers/crypto/zuc/rte_zuc_pmd.c b/drivers/crypto/zuc/rte_zuc_pmd.c index 265aabaeb..bc02d9d4a 100644 --- a/drivers/crypto/zuc/rte_zuc_pmd.c +++ b/drivers/crypto/zuc/rte_zuc_pmd.c @@ -476,6 +476,7 @@ cryptodev_zuc_create(const char *name, dev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO | RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING | + RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT | cpu_flags; internals = dev->data->dev_private; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-07-24 12:53:52.089927483 +0100 +++ 0092-drivers-crypto-add-missing-OOP-feature-flag.patch 2020-07-24 12:53:48.315006981 +0100 @@ -1,102 +1,97 @@ -From cd346367f898d619edf53f13628d6e539dbcab40 Mon Sep 17 00:00:00 2001 +From b4c9242d0552f5a8bbd88adb45e7d1ae548d5d5a Mon Sep 17 00:00:00 2001 From: Pablo de Lara Date: Thu, 4 Jun 2020 08:51:12 +0000 Subject: [PATCH] drivers/crypto: add missing OOP feature flag +[ upstream commit cd346367f898d619edf53f13628d6e539dbcab40 ] + ZUC, SNOW3G and KASUMI PMDs support Out-of-place operations, but their feature flags did not reflect this. Fixes: 2717246ecd7d ("cryptodev: replace mbuf scatter gather flag") -Cc: stable@dpdk.org Signed-off-by: Pablo de Lara --- doc/guides/cryptodevs/features/kasumi.ini | 1 + doc/guides/cryptodevs/features/snow3g.ini | 1 + doc/guides/cryptodevs/features/zuc.ini | 1 + - drivers/crypto/kasumi/rte_kasumi_pmd.c | 3 ++- - drivers/crypto/snow3g/rte_snow3g_pmd.c | 3 ++- - drivers/crypto/zuc/rte_zuc_pmd.c | 3 ++- - 6 files changed, 9 insertions(+), 3 deletions(-) + drivers/crypto/kasumi/rte_kasumi_pmd.c | 1 + + drivers/crypto/snow3g/rte_snow3g_pmd.c | 1 + + drivers/crypto/zuc/rte_zuc_pmd.c | 1 + + 6 files changed, 6 insertions(+) diff --git a/doc/guides/cryptodevs/features/kasumi.ini b/doc/guides/cryptodevs/features/kasumi.ini -index 8380a5765..fbdb47e89 100644 +index f3d061009..7ee866e8f 100644 --- a/doc/guides/cryptodevs/features/kasumi.ini +++ b/doc/guides/cryptodevs/features/kasumi.ini -@@ -8,6 +8,7 @@ Symmetric crypto = Y +@@ -6,6 +6,7 @@ + [Features] + Symmetric crypto = Y Sym operation chaining = Y - Symmetric sessionless = Y - Non-Byte aligned data = Y +OOP LB In LB Out = Y ; ; Supported crypto algorithms of the 'kasumi' crypto driver. diff --git a/doc/guides/cryptodevs/features/snow3g.ini b/doc/guides/cryptodevs/features/snow3g.ini -index b2caefe3a..14ac7e4b6 100644 +index ec2daf6c6..c4a1a8448 100644 --- a/doc/guides/cryptodevs/features/snow3g.ini +++ b/doc/guides/cryptodevs/features/snow3g.ini -@@ -8,6 +8,7 @@ Symmetric crypto = Y +@@ -6,6 +6,7 @@ + [Features] + Symmetric crypto = Y Sym operation chaining = Y - Symmetric sessionless = Y - Non-Byte aligned data = Y +OOP LB In LB Out = Y ; ; Supported crypto algorithms of the 'snow3g' crypto driver. diff --git a/doc/guides/cryptodevs/features/zuc.ini b/doc/guides/cryptodevs/features/zuc.ini -index 21d074f9b..1c53454a6 100644 +index 9b6a4287e..29cc258aa 100644 --- a/doc/guides/cryptodevs/features/zuc.ini +++ b/doc/guides/cryptodevs/features/zuc.ini -@@ -8,6 +8,7 @@ Symmetric crypto = Y +@@ -6,6 +6,7 @@ + [Features] + Symmetric crypto = Y Sym operation chaining = Y - Symmetric sessionless = Y - Non-Byte aligned data = Y +OOP LB In LB Out = Y ; ; Supported crypto algorithms of the 'zuc' crypto driver. diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd.c b/drivers/crypto/kasumi/rte_kasumi_pmd.c -index c3f0dfc2f..5ff1b5c56 100644 +index c87dca5f4..dd85928c5 100644 --- a/drivers/crypto/kasumi/rte_kasumi_pmd.c +++ b/drivers/crypto/kasumi/rte_kasumi_pmd.c -@@ -551,7 +551,8 @@ cryptodev_kasumi_create(const char *name, +@@ -557,6 +557,7 @@ cryptodev_kasumi_create(const char *name, + dev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO | RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING | - RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA | -- RTE_CRYPTODEV_FF_SYM_SESSIONLESS; -+ RTE_CRYPTODEV_FF_SYM_SESSIONLESS | -+ RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT; ++ RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT | + cpu_flags; - mgr = alloc_mb_mgr(0); - if (mgr == NULL) + internals = dev->data->dev_private; diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c b/drivers/crypto/snow3g/rte_snow3g_pmd.c -index 558e01e70..962868e1f 100644 +index 2b1b90b01..32d94c5ab 100644 --- a/drivers/crypto/snow3g/rte_snow3g_pmd.c +++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c -@@ -563,7 +563,8 @@ cryptodev_snow3g_create(const char *name, +@@ -568,6 +568,7 @@ cryptodev_snow3g_create(const char *name, + dev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO | RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING | - RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA | -- RTE_CRYPTODEV_FF_SYM_SESSIONLESS; -+ RTE_CRYPTODEV_FF_SYM_SESSIONLESS | -+ RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT; ++ RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT | + cpu_flags; - mgr = alloc_mb_mgr(0); - if (mgr == NULL) + internals = dev->data->dev_private; diff --git a/drivers/crypto/zuc/rte_zuc_pmd.c b/drivers/crypto/zuc/rte_zuc_pmd.c -index 20cb5a160..a9ff31828 100644 +index 265aabaeb..bc02d9d4a 100644 --- a/drivers/crypto/zuc/rte_zuc_pmd.c +++ b/drivers/crypto/zuc/rte_zuc_pmd.c -@@ -480,7 +480,8 @@ cryptodev_zuc_create(const char *name, +@@ -476,6 +476,7 @@ cryptodev_zuc_create(const char *name, + dev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO | RTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING | - RTE_CRYPTODEV_FF_NON_BYTE_ALIGNED_DATA | -- RTE_CRYPTODEV_FF_SYM_SESSIONLESS; -+ RTE_CRYPTODEV_FF_SYM_SESSIONLESS | -+ RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT; ++ RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT | + cpu_flags; - mb_mgr = alloc_mb_mgr(0); - if (mb_mgr == NULL) + internals = dev->data->dev_private; -- 2.20.1