Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/42687/?format=api
{ "id": 42687, "url": "http://patches.dpdk.org/api/patches/42687/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20180710003623.1463-14-pablo.de.lara.guarch@intel.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<20180710003623.1463-14-pablo.de.lara.guarch@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180710003623.1463-14-pablo.de.lara.guarch@intel.com", "date": "2018-07-10T00:36:20", "name": "[v6,13/16] cryptodev: replace mbuf scatter gather flag", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "c40facab7ddfe72a8aa57a7007f0d88034cb5223", "submitter": { "id": 9, "url": "http://patches.dpdk.org/api/people/9/?format=api", "name": "De Lara Guarch, Pablo", "email": "pablo.de.lara.guarch@intel.com" }, "delegate": { "id": 22, "url": "http://patches.dpdk.org/api/users/22/?format=api", "username": "pdelarag", "first_name": "Pablo", "last_name": "de Lara Guarch", "email": "pablo.de.lara.guarch@intel.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/20180710003623.1463-14-pablo.de.lara.guarch@intel.com/mbox/", "series": [ { "id": 486, "url": "http://patches.dpdk.org/api/series/486/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=486", "date": "2018-07-10T00:36:07", "name": "Cryptodev API changes", "version": 6, "mbox": "http://patches.dpdk.org/series/486/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/42687/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/42687/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@dpdk.org", "Delivered-To": "patchwork@dpdk.org", "Received": [ "from [92.243.14.124] (localhost [127.0.0.1])\n\tby dpdk.org (Postfix) with ESMTP id 3B6281B468;\n\tTue, 10 Jul 2018 10:42:40 +0200 (CEST)", "from mga04.intel.com (mga04.intel.com [192.55.52.120])\n\tby dpdk.org (Postfix) with ESMTP id BC6061B3AE\n\tfor <dev@dpdk.org>; Tue, 10 Jul 2018 10:42:38 +0200 (CEST)", "from orsmga007.jf.intel.com ([10.7.209.58])\n\tby fmsmga104.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t10 Jul 2018 01:42:38 -0700", "from silpixa00399466.ir.intel.com (HELO\n\tsilpixa00399466.ger.corp.intel.com) ([10.237.223.220])\n\tby orsmga007.jf.intel.com with ESMTP; 10 Jul 2018 01:42:35 -0700" ], "X-Amp-Result": "SKIPPED(no attachment in message)", "X-Amp-File-Uploaded": "False", "X-ExtLoop1": "1", "X-IronPort-AV": "E=Sophos;i=\"5.51,333,1526367600\"; d=\"scan'208\";a=\"55358920\"", "From": "Pablo de Lara <pablo.de.lara.guarch@intel.com>", "To": "declan.doherty@intel.com, akhil.goyal@nxp.com,\n\tshally.verma@caviumnetworks.com, ravi1.kumar@amd.com,\n\tjerin.jacob@caviumnetworks.com, roy.fan.zhang@intel.com,\n\tfiona.trahe@intel.com, tdu@semihalf.com, jianjay.zhou@huawei.com", "Cc": "dev@dpdk.org,\n\tPablo de Lara <pablo.de.lara.guarch@intel.com>", "Date": "Tue, 10 Jul 2018 01:36:20 +0100", "Message-Id": "<20180710003623.1463-14-pablo.de.lara.guarch@intel.com>", "X-Mailer": "git-send-email 2.14.4", "In-Reply-To": "<20180710003623.1463-1-pablo.de.lara.guarch@intel.com>", "References": "<20180608220234.10170-1-pablo.de.lara.guarch@intel.com>\n\t<20180710003623.1463-1-pablo.de.lara.guarch@intel.com>", "Subject": "[dpdk-dev] [PATCH v6 13/16] cryptodev: replace mbuf scatter gather\n\tflag", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.15", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n\t<mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n\t<mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org", "Sender": "\"dev\" <dev-bounces@dpdk.org>" }, "content": "The current mbuf scatter gatter feature flag is\ntoo ambiguous, as it is not clear if input and/or output\nbuffers can be scatter gather mbufs or not, plus\nif in-place and/or out-of-place is supported.\n\nTherefore, five new flags will replace this flag:\n- RTE_CRYPTODEV_FF_IN_PLACE_SGL\n- RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT\n- RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT\n- RTE_CRYPTODEV_FF_OOP_LB_IN_SGL_OUT\n- RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT\n\nSigned-off-by: Pablo de Lara <pablo.de.lara.guarch@intel.com>\nAcked-by: Akhil Goyal <akhil.goyal@nxp.com>\n---\n doc/guides/cryptodevs/features/aesni_gcm.ini | 3 +-\n doc/guides/cryptodevs/features/default.ini | 6 +++-\n doc/guides/cryptodevs/features/dpaa2_sec.ini | 6 +++-\n doc/guides/cryptodevs/features/dpaa_sec.ini | 6 +++-\n doc/guides/cryptodevs/features/null.ini | 2 +-\n doc/guides/cryptodevs/features/openssl.ini | 3 +-\n doc/guides/cryptodevs/features/qat.ini | 6 +++-\n doc/guides/cryptodevs/overview.rst | 33 ++++++++++++++-----\n doc/guides/rel_notes/deprecation.rst | 2 --\n doc/guides/rel_notes/release_18_08.rst | 8 +++++\n drivers/crypto/aesni_gcm/aesni_gcm_pmd.c | 3 +-\n drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c | 6 +++-\n drivers/crypto/dpaa_sec/dpaa_sec.c | 6 +++-\n drivers/crypto/null/null_crypto_pmd.c | 2 +-\n drivers/crypto/openssl/rte_openssl_pmd.c | 3 +-\n drivers/crypto/qat/qat_sym_pmd.c | 6 +++-\n lib/librte_cryptodev/rte_cryptodev.c | 12 +++++--\n lib/librte_cryptodev/rte_cryptodev.h | 49 +++++++++++++++++++---------\n test/test/test_cryptodev.c | 31 +++++++++++++-----\n test/test/test_cryptodev_blockcipher.c | 21 +++++++++---\n 20 files changed, 161 insertions(+), 53 deletions(-)", "diff": "diff --git a/doc/guides/cryptodevs/features/aesni_gcm.ini b/doc/guides/cryptodevs/features/aesni_gcm.ini\nindex 920b6b6ac..b9e9c9060 100644\n--- a/doc/guides/cryptodevs/features/aesni_gcm.ini\n+++ b/doc/guides/cryptodevs/features/aesni_gcm.ini\n@@ -10,7 +10,8 @@ CPU AESNI = Y\n CPU SSE = Y\n CPU AVX = Y\n CPU AVX2 = Y\n-Mbuf scatter gather = Y\n+OOP SGL In LB Out = Y\n+OOP LB In LB Out = Y\n ;\n ; Supported crypto algorithms of the 'aesni_gcm' crypto driver.\n ;\ndiff --git a/doc/guides/cryptodevs/features/default.ini b/doc/guides/cryptodevs/features/default.ini\nindex 42783887a..92a7ccf36 100644\n--- a/doc/guides/cryptodevs/features/default.ini\n+++ b/doc/guides/cryptodevs/features/default.ini\n@@ -18,7 +18,11 @@ CPU AVX512 =\n CPU AESNI =\n CPU NEON =\n CPU ARM CE =\n-Mbuf scatter gather =\n+In Place SGL =\n+OOP SGL In SGL Out =\n+OOP SGL In LB Out =\n+OOP LB In SGL Out =\n+OOP LB In LB Out =\n \n ;\n ; Supported crypto algorithms of a default crypto driver.\ndiff --git a/doc/guides/cryptodevs/features/dpaa2_sec.ini b/doc/guides/cryptodevs/features/dpaa2_sec.ini\nindex 68c9960d8..69700df40 100644\n--- a/doc/guides/cryptodevs/features/dpaa2_sec.ini\n+++ b/doc/guides/cryptodevs/features/dpaa2_sec.ini\n@@ -8,7 +8,11 @@ Symmetric crypto = Y\n Sym operation chaining = Y\n HW Accelerated = Y\n Protocol offload = Y\n-Mbuf scatter gather = Y\n+In Place SGL = Y\n+OOP SGL In SGL Out = Y\n+OOP SGL In LB Out = Y\n+OOP LB In SGL Out = Y\n+OOP LB In LB Out = Y\n \n ;\n ; Supported crypto algorithms of the 'dpaa2_sec' crypto driver.\ndiff --git a/doc/guides/cryptodevs/features/dpaa_sec.ini b/doc/guides/cryptodevs/features/dpaa_sec.ini\nindex 260fae728..937b621c0 100644\n--- a/doc/guides/cryptodevs/features/dpaa_sec.ini\n+++ b/doc/guides/cryptodevs/features/dpaa_sec.ini\n@@ -8,7 +8,11 @@ Symmetric crypto = Y\n Sym operation chaining = Y\n HW Accelerated = Y\n Protocol offload = Y\n-Mbuf scatter gather = Y\n+In Place SGL = Y\n+OOP SGL In SGL Out = Y\n+OOP SGL In LB Out = Y\n+OOP LB In SGL Out = Y\n+OOP LB In LB Out = Y\n \n ;\n ; Supported crypto algorithms of the 'dpaa_sec' crypto driver.\ndiff --git a/doc/guides/cryptodevs/features/null.ini b/doc/guides/cryptodevs/features/null.ini\nindex a9e172da8..ecf5779ac 100644\n--- a/doc/guides/cryptodevs/features/null.ini\n+++ b/doc/guides/cryptodevs/features/null.ini\n@@ -6,7 +6,7 @@\n [Features]\n Symmetric crypto = Y\n Sym operation chaining = Y\n-Mbuf scatter gather = Y\n+In Place SGL = Y\n \n ;\n ; Supported crypto algorithms of the 'null' crypto driver.\ndiff --git a/doc/guides/cryptodevs/features/openssl.ini b/doc/guides/cryptodevs/features/openssl.ini\nindex 691565865..626ec1be2 100644\n--- a/doc/guides/cryptodevs/features/openssl.ini\n+++ b/doc/guides/cryptodevs/features/openssl.ini\n@@ -6,7 +6,8 @@\n [Features]\n Symmetric crypto = Y\n Sym operation chaining = Y\n-Mbuf scatter gather = Y\n+OOP SGL In LB Out = Y\n+OOP LB In LB Out = Y\n \n ;\n ; Supported crypto algorithms of the 'openssl' crypto driver.\ndiff --git a/doc/guides/cryptodevs/features/qat.ini b/doc/guides/cryptodevs/features/qat.ini\nindex 51ed5967f..29d865e07 100644\n--- a/doc/guides/cryptodevs/features/qat.ini\n+++ b/doc/guides/cryptodevs/features/qat.ini\n@@ -7,7 +7,11 @@\n Symmetric crypto = Y\n Sym operation chaining = Y\n HW Accelerated = Y\n-Mbuf scatter gather = Y\n+In Place SGL = Y\n+OOP SGL In SGL Out = Y\n+OOP SGL In LB Out = Y\n+OOP LB In SGL Out = Y\n+OOP LB In LB Out = Y\n \n ;\n ; Supported crypto algorithms of the 'qat' crypto driver.\ndiff --git a/doc/guides/cryptodevs/overview.rst b/doc/guides/cryptodevs/overview.rst\nindex 493cd5f55..3f776f078 100644\n--- a/doc/guides/cryptodevs/overview.rst\n+++ b/doc/guides/cryptodevs/overview.rst\n@@ -11,14 +11,31 @@ Supported Feature Flags\n \n .. include:: overview_feature_table.txt\n \n-Note, the mbuf scatter gather feature (aka chained mbufs, scatter-gather-lists\n-or SGLs) indicate all following combinations are supported unless otherwise called\n-out in the Limitations section of each PMD.\n-\n-* In place operation, input buffer as multiple segments, same buffer used for output\n-* Out of place operation, input buffer as single segment and output as multiple segments\n-* Out of place operation, input buffer as multiple segments and output as single segment\n-* Out of place operation, input buffer as multiple segments and output as multiple segments\n+.. Note::\n+\n+ - \"In Place SGL\" feature flag stands for \"In place Scatter-gather list\",\n+ which means that an input buffer can consist of multiple segments,\n+ being the operation in-place (input address = output address).\n+\n+ - \"OOP SGL In SGL Out\" feature flag stands for\n+ \"Out-of-place Scatter-gather list Input, Scatter-gater list Output\",\n+ which means pmd supports different scatter-gather styled input and output buffers\n+ (i.e. both can consists of multiple segments).\n+\n+ - \"OOP SGL In LB Out\" feature flag stands for\n+ \"Out-of-place Scatter-gather list Input, Linear Buffers Output\",\n+ which means PMD supports input from scatter-gathered styled buffers,\n+ outputting linear buffers (i.e. single segment).\n+\n+ - \"OOP LB In SGL Out\" feature flag stands for\n+ \"Out-of-place Linear Buffers Input, Scatter-gather list Output\",\n+ which means PMD supports input from linear buffer, outputting\n+ scatter-gathered styled buffers.\n+\n+ - \"OOP LB In LB Out\" feature flag stands for\n+ \"Out-of-place Linear Buffers Input, Scatter-gather list Output\",\n+ which means that Out-of-place operation is supported,\n+ with linear input and output buffers.\n \n \n Supported Cipher Algorithms\ndiff --git a/doc/guides/rel_notes/deprecation.rst b/doc/guides/rel_notes/deprecation.rst\nindex 9a73b1d8e..62d635b74 100644\n--- a/doc/guides/rel_notes/deprecation.rst\n+++ b/doc/guides/rel_notes/deprecation.rst\n@@ -105,5 +105,3 @@ Deprecation Notices\n ``rte_cryptodev_queue_pair_dettach_sym_session()`` will be deprecated from\n 18.05 and removed in 18.08, as there are no drivers doing anything useful\n with them.\n- - Some feature flags such as ``RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER`` are ambiguous,\n- so some will be replaced by more explicit flags.\ndiff --git a/doc/guides/rel_notes/release_18_08.rst b/doc/guides/rel_notes/release_18_08.rst\nindex 1eb622d97..9d8b0457b 100644\n--- a/doc/guides/rel_notes/release_18_08.rst\n+++ b/doc/guides/rel_notes/release_18_08.rst\n@@ -78,6 +78,14 @@ API Changes\n - ``rte_cryptodev_get_private_session_size`` is replaced with\n ``rte_cryptodev_sym_get_private_session_size``\n \n+* cryptodev: Feature flag ``RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER`` is\n+ replaced with the following more explicit flags:\n+ - ``RTE_CRYPTODEV_FF_IN_PLACE_SGL``\n+ - ``RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT``\n+ - ``RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT``\n+ - ``RTE_CRYPTODEV_FF_OOP_LB_IN_SGL_OUT``\n+ - ``RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT``\n+\n * compressdev: Feature flag ``RTE_COMP_FF_MBUF_SCATTER_GATHER`` is\n replaced with the following more explicit flags:\n - ``RTE_COMP_FF_OOP_SGL_IN_SGL_OUT``\ndiff --git a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c\nindex 88307e0e7..456ab9512 100644\n--- a/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c\n+++ b/drivers/crypto/aesni_gcm/aesni_gcm_pmd.c\n@@ -492,7 +492,8 @@ aesni_gcm_create(const char *name,\n \tdev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |\n \t\t\tRTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |\n \t\t\tRTE_CRYPTODEV_FF_CPU_AESNI |\n-\t\t\tRTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER;\n+\t\t\tRTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT |\n+\t\t\tRTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT;\n \n \tswitch (vector_mode) {\n \tcase RTE_AESNI_GCM_SSE:\ndiff --git a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c\nindex 1b1c30d85..51c786154 100644\n--- a/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c\n+++ b/drivers/crypto/dpaa2_sec/dpaa2_sec_dpseci.c\n@@ -2762,7 +2762,11 @@ dpaa2_sec_dev_init(struct rte_cryptodev *cryptodev)\n \t\t\tRTE_CRYPTODEV_FF_HW_ACCELERATED |\n \t\t\tRTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |\n \t\t\tRTE_CRYPTODEV_FF_SECURITY |\n-\t\t\tRTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER;\n+\t\t\tRTE_CRYPTODEV_FF_IN_PLACE_SGL |\n+\t\t\tRTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT |\n+\t\t\tRTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT |\n+\t\t\tRTE_CRYPTODEV_FF_OOP_LB_IN_SGL_OUT |\n+\t\t\tRTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT;\n \n \tinternals = cryptodev->data->dev_private;\n \ndiff --git a/drivers/crypto/dpaa_sec/dpaa_sec.c b/drivers/crypto/dpaa_sec/dpaa_sec.c\nindex b96552c57..69965cd87 100644\n--- a/drivers/crypto/dpaa_sec/dpaa_sec.c\n+++ b/drivers/crypto/dpaa_sec/dpaa_sec.c\n@@ -2271,7 +2271,11 @@ dpaa_sec_dev_init(struct rte_cryptodev *cryptodev)\n \t\t\tRTE_CRYPTODEV_FF_HW_ACCELERATED |\n \t\t\tRTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |\n \t\t\tRTE_CRYPTODEV_FF_SECURITY |\n-\t\t\tRTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER;\n+\t\t\tRTE_CRYPTODEV_FF_IN_PLACE_SGL |\n+\t\t\tRTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT |\n+\t\t\tRTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT |\n+\t\t\tRTE_CRYPTODEV_FF_OOP_LB_IN_SGL_OUT |\n+\t\t\tRTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT;\n \n \tinternals = cryptodev->data->dev_private;\n \tinternals->max_nb_queue_pairs = RTE_DPAA_MAX_NB_SEC_QPS;\ndiff --git a/drivers/crypto/null/null_crypto_pmd.c b/drivers/crypto/null/null_crypto_pmd.c\nindex 07276833b..3d7caf1f1 100644\n--- a/drivers/crypto/null/null_crypto_pmd.c\n+++ b/drivers/crypto/null/null_crypto_pmd.c\n@@ -176,7 +176,7 @@ cryptodev_null_create(const char *name,\n \n \tdev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |\n \t\t\tRTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |\n-\t\t\tRTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER;\n+\t\t\tRTE_CRYPTODEV_FF_IN_PLACE_SGL;\n \n \tinternals = dev->data->dev_private;\n \ndiff --git a/drivers/crypto/openssl/rte_openssl_pmd.c b/drivers/crypto/openssl/rte_openssl_pmd.c\nindex 1ccab4ab5..2cbe9401f 100644\n--- a/drivers/crypto/openssl/rte_openssl_pmd.c\n+++ b/drivers/crypto/openssl/rte_openssl_pmd.c\n@@ -1660,7 +1660,8 @@ cryptodev_openssl_create(const char *name,\n \tdev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |\n \t\t\tRTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |\n \t\t\tRTE_CRYPTODEV_FF_CPU_AESNI |\n-\t\t\tRTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER;\n+\t\t\tRTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT |\n+\t\t\tRTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT;\n \n \t/* Set vector instructions mode supported */\n \tinternals = dev->data->dev_private;\ndiff --git a/drivers/crypto/qat/qat_sym_pmd.c b/drivers/crypto/qat/qat_sym_pmd.c\nindex ee8633b85..c9fc1a805 100644\n--- a/drivers/crypto/qat/qat_sym_pmd.c\n+++ b/drivers/crypto/qat/qat_sym_pmd.c\n@@ -274,7 +274,11 @@ qat_sym_dev_create(struct qat_pci_device *qat_pci_dev)\n \tcryptodev->feature_flags = RTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO |\n \t\t\tRTE_CRYPTODEV_FF_HW_ACCELERATED |\n \t\t\tRTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING |\n-\t\t\tRTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER;\n+\t\t\tRTE_CRYPTODEV_FF_IN_PLACE_SGL |\n+\t\t\tRTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT |\n+\t\t\tRTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT |\n+\t\t\tRTE_CRYPTODEV_FF_OOP_LB_IN_SGL_OUT |\n+\t\t\tRTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT;\n \n \tinternals = cryptodev->data->dev_private;\n \tinternals->qat_dev = qat_pci_dev;\ndiff --git a/lib/librte_cryptodev/rte_cryptodev.c b/lib/librte_cryptodev/rte_cryptodev.c\nindex 381330f3d..754509c9c 100644\n--- a/lib/librte_cryptodev/rte_cryptodev.c\n+++ b/lib/librte_cryptodev/rte_cryptodev.c\n@@ -361,8 +361,16 @@ rte_cryptodev_get_feature_name(uint64_t flag)\n \t\treturn \"CPU_AESNI\";\n \tcase RTE_CRYPTODEV_FF_HW_ACCELERATED:\n \t\treturn \"HW_ACCELERATED\";\n-\tcase RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER:\n-\t\treturn \"MBUF_SCATTER_GATHER\";\n+\tcase RTE_CRYPTODEV_FF_IN_PLACE_SGL:\n+\t\treturn \"IN_PLACE_SGL\";\n+\tcase RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT:\n+\t\treturn \"OOP_SGL_IN_SGL_OUT\";\n+\tcase RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT:\n+\t\treturn \"OOP_SGL_IN_LB_OUT\";\n+\tcase RTE_CRYPTODEV_FF_OOP_LB_IN_SGL_OUT:\n+\t\treturn \"OOP_LB_IN_SGL_OUT\";\n+\tcase RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT:\n+\t\treturn \"OOP_LB_IN_LB_OUT\";\n \tcase RTE_CRYPTODEV_FF_CPU_NEON:\n \t\treturn \"CPU_NEON\";\n \tcase RTE_CRYPTODEV_FF_CPU_ARM_CE:\ndiff --git a/lib/librte_cryptodev/rte_cryptodev.h b/lib/librte_cryptodev/rte_cryptodev.h\nindex cc219c722..49e9cba11 100644\n--- a/lib/librte_cryptodev/rte_cryptodev.h\n+++ b/lib/librte_cryptodev/rte_cryptodev.h\n@@ -292,31 +292,50 @@ rte_cryptodev_get_aead_algo_enum(enum rte_crypto_aead_algorithm *algo_enum,\n *\n * Keep these flags synchronised with rte_cryptodev_get_feature_name()\n */\n-#define\tRTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO\t(1ULL << 0)\n+#define\tRTE_CRYPTODEV_FF_SYMMETRIC_CRYPTO\t\t(1ULL << 0)\n /**< Symmetric crypto operations are supported */\n-#define\tRTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO\t(1ULL << 1)\n+#define\tRTE_CRYPTODEV_FF_ASYMMETRIC_CRYPTO\t\t(1ULL << 1)\n /**< Asymmetric crypto operations are supported */\n-#define\tRTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING\t(1ULL << 2)\n+#define\tRTE_CRYPTODEV_FF_SYM_OPERATION_CHAINING\t\t(1ULL << 2)\n /**< Chaining symmetric crypto operations are supported */\n-#define\tRTE_CRYPTODEV_FF_CPU_SSE\t\t(1ULL << 3)\n+#define\tRTE_CRYPTODEV_FF_CPU_SSE\t\t\t(1ULL << 3)\n /**< Utilises CPU SIMD SSE instructions */\n-#define\tRTE_CRYPTODEV_FF_CPU_AVX\t\t(1ULL << 4)\n+#define\tRTE_CRYPTODEV_FF_CPU_AVX\t\t\t(1ULL << 4)\n /**< Utilises CPU SIMD AVX instructions */\n-#define\tRTE_CRYPTODEV_FF_CPU_AVX2\t\t(1ULL << 5)\n+#define\tRTE_CRYPTODEV_FF_CPU_AVX2\t\t\t(1ULL << 5)\n /**< Utilises CPU SIMD AVX2 instructions */\n-#define\tRTE_CRYPTODEV_FF_CPU_AESNI\t\t(1ULL << 6)\n+#define\tRTE_CRYPTODEV_FF_CPU_AESNI\t\t\t(1ULL << 6)\n /**< Utilises CPU AES-NI instructions */\n-#define\tRTE_CRYPTODEV_FF_HW_ACCELERATED\t\t(1ULL << 7)\n-/**< Operations are off-loaded to an external hardware accelerator */\n-#define\tRTE_CRYPTODEV_FF_CPU_AVX512\t\t(1ULL << 8)\n+#define\tRTE_CRYPTODEV_FF_HW_ACCELERATED\t\t\t(1ULL << 7)\n+/**< Operations are off-loaded to an\n+ * external hardware accelerator\n+ */\n+#define\tRTE_CRYPTODEV_FF_CPU_AVX512\t\t\t(1ULL << 8)\n /**< Utilises CPU SIMD AVX512 instructions */\n-#define\tRTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER\t(1ULL << 9)\n-/**< Scatter-gather mbufs are supported */\n-#define\tRTE_CRYPTODEV_FF_CPU_NEON\t\t(1ULL << 10)\n+#define\tRTE_CRYPTODEV_FF_IN_PLACE_SGL\t\t\t(1ULL << 9)\n+/**< In-place Scatter-gather (SGL) buffers, with multiple segments,\n+ * are supported\n+ */\n+#define RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT\t\t(1ULL << 10)\n+/**< Out-of-place Scatter-gather (SGL) buffers are\n+ * supported in input and output\n+ */\n+#define RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT\t\t(1ULL << 11)\n+/**< Out-of-place Scatter-gather (SGL) buffers are supported\n+ * in input, combined with linear buffers (LB), with a\n+ * single segment in output\n+ */\n+#define RTE_CRYPTODEV_FF_OOP_LB_IN_SGL_OUT\t\t(1ULL << 12)\n+/**< Out-of-place Scatter-gather (SGL) buffers are supported\n+ * in output, combined with linear buffers (LB) in input\n+ */\n+#define RTE_CRYPTODEV_FF_OOP_LB_IN_LB_OUT\t\t(1ULL << 13)\n+/**< Out-of-place linear buffers (LB) are supported in input and output */\n+#define\tRTE_CRYPTODEV_FF_CPU_NEON\t\t\t(1ULL << 14)\n /**< Utilises CPU NEON instructions */\n-#define\tRTE_CRYPTODEV_FF_CPU_ARM_CE\t\t(1ULL << 11)\n+#define\tRTE_CRYPTODEV_FF_CPU_ARM_CE\t\t\t(1ULL << 15)\n /**< Utilises ARM CPU Cryptographic Extensions */\n-#define\tRTE_CRYPTODEV_FF_SECURITY\t\t(1ULL << 12)\n+#define\tRTE_CRYPTODEV_FF_SECURITY\t\t\t(1ULL << 16)\n /**< Support Security Protocol Processing */\n \n \ndiff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c\nindex 877dc1658..b759e0811 100644\n--- a/test/test/test_cryptodev.c\n+++ b/test/test/test_cryptodev.c\n@@ -3160,8 +3160,11 @@ test_kasumi_encryption_sgl(const struct kasumi_test_data *tdata)\n \tstruct rte_cryptodev_info dev_info;\n \n \trte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);\n-\tif (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER)) {\n-\t\tprintf(\"Device doesn't support scatter-gather. \"\n+\n+\tuint64_t feat_flags = dev_info.feature_flags;\n+\n+\tif (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {\n+\t\tprintf(\"Device doesn't support in-place scatter-gather. \"\n \t\t\t\t\"Test Skipped.\\n\");\n \t\treturn 0;\n \t}\n@@ -3308,8 +3311,11 @@ test_kasumi_encryption_oop_sgl(const struct kasumi_test_data *tdata)\n \tstruct rte_cryptodev_info dev_info;\n \n \trte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);\n-\tif (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER)) {\n-\t\tprintf(\"Device doesn't support scatter-gather. \"\n+\n+\tuint64_t feat_flags = dev_info.feature_flags;\n+\tif (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {\n+\t\tprintf(\"Device doesn't support out-of-place scatter-gather \"\n+\t\t\t\t\"in both input and output mbufs. \"\n \t\t\t\t\"Test Skipped.\\n\");\n \t\treturn 0;\n \t}\n@@ -3659,8 +3665,12 @@ test_snow3g_encryption_oop_sgl(const struct snow3g_test_data *tdata)\n \tstruct rte_cryptodev_info dev_info;\n \n \trte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);\n-\tif (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER)) {\n-\t\tprintf(\"Device doesn't support scatter-gather. \"\n+\n+\tuint64_t feat_flags = dev_info.feature_flags;\n+\n+\tif (!(feat_flags & RTE_CRYPTODEV_FF_OOP_SGL_IN_SGL_OUT)) {\n+\t\tprintf(\"Device doesn't support out-of-place scatter-gather \"\n+\t\t\t\t\"in both input and output mbufs. \"\n \t\t\t\t\"Test Skipped.\\n\");\n \t\treturn 0;\n \t}\n@@ -4493,10 +4503,13 @@ test_zuc_encryption_sgl(const struct wireless_test_data *tdata)\n \t\treturn -ENOTSUP;\n \n \trte_cryptodev_info_get(ts_params->valid_devs[0], &dev_info);\n-\tif (!(dev_info.feature_flags & RTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER)) {\n-\t\tprintf(\"Device doesn't support scatter-gather. \"\n+\n+\tuint64_t feat_flags = dev_info.feature_flags;\n+\n+\tif (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {\n+\t\tprintf(\"Device doesn't support in-place scatter-gather. \"\n \t\t\t\t\"Test Skipped.\\n\");\n-\t\treturn -ENOTSUP;\n+\t\treturn 0;\n \t}\n \n \tplaintext_len = ceil_byte_length(tdata->plaintext.len);\ndiff --git a/test/test/test_cryptodev_blockcipher.c b/test/test/test_cryptodev_blockcipher.c\nindex 256a7daa2..828f7b525 100644\n--- a/test/test/test_cryptodev_blockcipher.c\n+++ b/test/test/test_cryptodev_blockcipher.c\n@@ -77,12 +77,25 @@ test_blockcipher_one_case(const struct blockcipher_test_case *t,\n \n \tif (t->feature_mask & BLOCKCIPHER_TEST_FEATURE_SG) {\n \t\trte_cryptodev_info_get(dev_id, &dev_info);\n-\t\tif (!(dev_info.feature_flags &\n-\t\t\t\tRTE_CRYPTODEV_FF_MBUF_SCATTER_GATHER)) {\n-\t\t\tprintf(\"Device doesn't support scatter-gather. \"\n+\t\tuint64_t feat_flags = dev_info.feature_flags;\n+\t\tuint64_t oop_flag = RTE_CRYPTODEV_FF_OOP_SGL_IN_LB_OUT;\n+\n+\t\tif (t->feature_mask && BLOCKCIPHER_TEST_FEATURE_OOP) {\n+\t\t\tif (!(feat_flags & oop_flag)) {\n+\t\t\t\tprintf(\"Device doesn't support out-of-place \"\n+\t\t\t\t\t\"scatter-gather in input mbuf. \"\n+\t\t\t\t\t\"Test Skipped.\\n\");\n+\t\t\t\treturn 0;\n+\t\t\t}\n+\t\t} else {\n+\t\t\tif (!(feat_flags & RTE_CRYPTODEV_FF_IN_PLACE_SGL)) {\n+\t\t\t\tprintf(\"Device doesn't support in-place \"\n+\t\t\t\t\t\"scatter-gather mbufs. \"\n \t\t\t\t\t\"Test Skipped.\\n\");\n-\t\t\treturn 0;\n+\t\t\t\treturn 0;\n+\t\t\t}\n \t\t}\n+\n \t\tnb_segs = 3;\n \t}\n \n", "prefixes": [ "v6", "13/16" ] }