[dpdk-stable] patch 'drivers/crypto: add missing OOP feature flag' has been queued to LTS release 18.11.10
Kevin Traynor
ktraynor at redhat.com
Thu Aug 20 17:33:11 CEST 2020
Hi,
FYI, your patch has been queued to LTS release 18.11.10
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/25/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.
Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/cb32f798b1221818aa2f97f64d3ef7106cfb580d
Thanks.
Kevin.
---
>From cb32f798b1221818aa2f97f64d3ef7106cfb580d Mon Sep 17 00:00:00 2001
From: Pablo de Lara <pablo.de.lara.guarch at intel.com>
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 <pablo.de.lara.guarch at intel.com>
---
doc/guides/cryptodevs/features/kasumi.ini | 3 ++-
doc/guides/cryptodevs/features/snow3g.ini | 3 ++-
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, 8 insertions(+), 2 deletions(-)
diff --git a/doc/guides/cryptodevs/features/kasumi.ini b/doc/guides/cryptodevs/features/kasumi.ini
index f3d061009b..a6235288b6 100644
--- a/doc/guides/cryptodevs/features/kasumi.ini
+++ b/doc/guides/cryptodevs/features/kasumi.ini
@@ -7,4 +7,5 @@
Symmetric crypto = Y
Sym operation chaining = Y
+OOP LB In LB Out = Y
;
@@ -27,3 +28,3 @@ KASUMI F9 = Y
; Supported Asymmetric algorithms of the 'kasumi' crypto driver.
;
-[Asymmetric]
\ No newline at end of file
+[Asymmetric]
diff --git a/doc/guides/cryptodevs/features/snow3g.ini b/doc/guides/cryptodevs/features/snow3g.ini
index ec2daf6c64..b5b478ad37 100644
--- a/doc/guides/cryptodevs/features/snow3g.ini
+++ b/doc/guides/cryptodevs/features/snow3g.ini
@@ -7,4 +7,5 @@
Symmetric crypto = Y
Sym operation chaining = Y
+OOP LB In LB Out = Y
;
@@ -27,3 +28,3 @@ SNOW3G UIA2 = Y
; Supported Asymmetric algorithms of the 'snow3g' crypto driver.
;
-[Asymmetric]
\ No newline at end of file
+[Asymmetric]
diff --git a/doc/guides/cryptodevs/features/zuc.ini b/doc/guides/cryptodevs/features/zuc.ini
index 9b6a4287e8..29cc258aae 100644
--- a/doc/guides/cryptodevs/features/zuc.ini
+++ b/doc/guides/cryptodevs/features/zuc.ini
@@ -7,4 +7,5 @@
Symmetric crypto = Y
Sym operation chaining = Y
+OOP LB In LB Out = Y
;
diff --git a/drivers/crypto/kasumi/rte_kasumi_pmd.c b/drivers/crypto/kasumi/rte_kasumi_pmd.c
index 2d33f14e76..7a406573f6 100644
--- a/drivers/crypto/kasumi/rte_kasumi_pmd.c
+++ b/drivers/crypto/kasumi/rte_kasumi_pmd.c
@@ -556,4 +556,5 @@ 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;
diff --git a/drivers/crypto/snow3g/rte_snow3g_pmd.c b/drivers/crypto/snow3g/rte_snow3g_pmd.c
index aa3277ff57..a080b0db5f 100644
--- a/drivers/crypto/snow3g/rte_snow3g_pmd.c
+++ b/drivers/crypto/snow3g/rte_snow3g_pmd.c
@@ -552,4 +552,5 @@ 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;
diff --git a/drivers/crypto/zuc/rte_zuc_pmd.c b/drivers/crypto/zuc/rte_zuc_pmd.c
index 64a0d7a812..efc304342c 100644
--- a/drivers/crypto/zuc/rte_zuc_pmd.c
+++ b/drivers/crypto/zuc/rte_zuc_pmd.c
@@ -475,4 +475,5 @@ 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;
--
2.26.2
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2020-08-20 16:26:16.112944341 +0100
+++ 0006-drivers-crypto-add-missing-OOP-feature-flag.patch 2020-08-20 16:26:15.760323743 +0100
@@ -1 +1 @@
-From cd346367f898d619edf53f13628d6e539dbcab40 Mon Sep 17 00:00:00 2001
+From cb32f798b1221818aa2f97f64d3ef7106cfb580d Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cd346367f898d619edf53f13628d6e539dbcab40 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -14,2 +15,2 @@
- doc/guides/cryptodevs/features/kasumi.ini | 1 +
- doc/guides/cryptodevs/features/snow3g.ini | 1 +
+ doc/guides/cryptodevs/features/kasumi.ini | 3 ++-
+ doc/guides/cryptodevs/features/snow3g.ini | 3 ++-
@@ -17,4 +18,4 @@
- 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, 8 insertions(+), 2 deletions(-)
@@ -23 +24 @@
-index 8380a57655..fbdb47e89f 100644
+index f3d061009b..a6235288b6 100644
@@ -26,3 +27,3 @@
-@@ -9,4 +9,5 @@ Sym operation chaining = Y
- Symmetric sessionless = Y
- Non-Byte aligned data = Y
+@@ -7,4 +7,5 @@
+ Symmetric crypto = Y
+ Sym operation chaining = Y
@@ -31,0 +33,6 @@
+@@ -27,3 +28,3 @@ KASUMI F9 = Y
+ ; Supported Asymmetric algorithms of the 'kasumi' crypto driver.
+ ;
+-[Asymmetric]
+\ No newline at end of file
++[Asymmetric]
@@ -33 +40 @@
-index b2caefe3a2..14ac7e4b6d 100644
+index ec2daf6c64..b5b478ad37 100644
@@ -36,3 +43,3 @@
-@@ -9,4 +9,5 @@ Sym operation chaining = Y
- Symmetric sessionless = Y
- Non-Byte aligned data = Y
+@@ -7,4 +7,5 @@
+ Symmetric crypto = Y
+ Sym operation chaining = Y
@@ -41,0 +49,6 @@
+@@ -27,3 +28,3 @@ SNOW3G UIA2 = Y
+ ; Supported Asymmetric algorithms of the 'snow3g' crypto driver.
+ ;
+-[Asymmetric]
+\ No newline at end of file
++[Asymmetric]
@@ -43 +56 @@
-index 21d074f9b2..1c53454a6c 100644
+index 9b6a4287e8..29cc258aae 100644
@@ -46,3 +59,3 @@
-@@ -9,4 +9,5 @@ Sym operation chaining = Y
- Symmetric sessionless = Y
- Non-Byte aligned data = Y
+@@ -7,4 +7,5 @@
+ Symmetric crypto = Y
+ Sym operation chaining = Y
@@ -53 +66 @@
-index c3f0dfc2f2..5ff1b5c562 100644
+index 2d33f14e76..7a406573f6 100644
@@ -56 +69,2 @@
-@@ -552,5 +552,6 @@ cryptodev_kasumi_create(const char *name,
+@@ -556,4 +556,5 @@ cryptodev_kasumi_create(const char *name,
+ dev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |
@@ -58,4 +72,2 @@
- 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;
@@ -63 +74,0 @@
- mgr = alloc_mb_mgr(0);
@@ -65 +76 @@
-index 558e01e706..962868e1fc 100644
+index aa3277ff57..a080b0db5f 100644
@@ -68 +79,2 @@
-@@ -564,5 +564,6 @@ cryptodev_snow3g_create(const char *name,
+@@ -552,4 +552,5 @@ cryptodev_snow3g_create(const char *name,
+ dev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |
@@ -70,4 +82,2 @@
- 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;
@@ -75 +84,0 @@
- mgr = alloc_mb_mgr(0);
@@ -77 +86 @@
-index 20cb5a1600..a9ff318281 100644
+index 64a0d7a812..efc304342c 100644
@@ -80 +89,2 @@
-@@ -481,5 +481,6 @@ cryptodev_zuc_create(const char *name,
+@@ -475,4 +475,5 @@ cryptodev_zuc_create(const char *name,
+ dev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |
@@ -82,4 +92,2 @@
- 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;
@@ -87 +94,0 @@
- mb_mgr = alloc_mb_mgr(0);
More information about the stable
mailing list