[dpdk-stable] patch 'drivers/crypto: add missing OOP feature flag' has been queued to stable release 19.11.4
luca.boccassi at gmail.com
luca.boccassi at gmail.com
Fri Jul 24 13:58:50 CEST 2020
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 <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 | 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 <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")
-Cc: stable at dpdk.org
Signed-off-by: Pablo de Lara <pablo.de.lara.guarch at intel.com>
---
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
More information about the stable
mailing list