Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/43025/?format=api
{ "id": 43025, "url": "http://patches.dpdk.org/api/patches/43025/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/20180713022825.33106-3-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": "<20180713022825.33106-3-pablo.de.lara.guarch@intel.com>", "list_archive_url": "https://inbox.dpdk.org/dev/20180713022825.33106-3-pablo.de.lara.guarch@intel.com", "date": "2018-07-13T02:28:11", "name": "[v7,02/16] compress/qat: add makefiles for PMD", "commit_ref": null, "pull_url": null, "state": "accepted", "archived": true, "hash": "a8df5a460dea046fee861525bff64fe0fb066656", "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/20180713022825.33106-3-pablo.de.lara.guarch@intel.com/mbox/", "series": [ { "id": 561, "url": "http://patches.dpdk.org/api/series/561/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=561", "date": "2018-07-13T02:28:09", "name": "compress/qat: add compression PMD", "version": 7, "mbox": "http://patches.dpdk.org/series/561/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/43025/comments/", "check": "success", "checks": "http://patches.dpdk.org/api/patches/43025/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 2B39B5587;\n\tFri, 13 Jul 2018 12:34:15 +0200 (CEST)", "from mga02.intel.com (mga02.intel.com [134.134.136.20])\n\tby dpdk.org (Postfix) with ESMTP id DD4D44CA1\n\tfor <dev@dpdk.org>; Fri, 13 Jul 2018 12:34:07 +0200 (CEST)", "from orsmga004.jf.intel.com ([10.7.209.38])\n\tby orsmga101.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384;\n\t13 Jul 2018 03:34:07 -0700", "from silpixa00399466.ir.intel.com (HELO\n\tsilpixa00399466.ger.corp.intel.com) ([10.237.223.220])\n\tby orsmga004.jf.intel.com with ESMTP; 13 Jul 2018 03:34:06 -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,347,1526367600\"; d=\"scan'208\";a=\"215718173\"", "From": "Pablo de Lara <pablo.de.lara.guarch@intel.com>", "To": "fiona.trahe@intel.com, tomaszx.jozwiak@intel.com, john.griffin@intel.com,\n\tdeepak.k.jain@intel.com", "Cc": "dev@dpdk.org", "Date": "Fri, 13 Jul 2018 03:28:11 +0100", "Message-Id": "<20180713022825.33106-3-pablo.de.lara.guarch@intel.com>", "X-Mailer": "git-send-email 2.14.4", "In-Reply-To": "<20180713022825.33106-1-pablo.de.lara.guarch@intel.com>", "References": "<1531411499-13156-1-git-send-email-fiona.trahe@intel.com>\n\t<20180713022825.33106-1-pablo.de.lara.guarch@intel.com>", "Subject": "[dpdk-dev] [PATCH v7 02/16] compress/qat: add makefiles for PMD", "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": "From: Fiona Trahe <fiona.trahe@intel.com>\n\nAdd Makefiles, directory and empty source files for compression PMD.\nHandle cases for building either symmetric crypto PMD\nor compression PMD or both and the common files both depend on.\n\nSigned-off-by: Fiona Trahe <fiona.trahe@intel.com>\nSigned-off-by: Tomasz Jozwiak <tomaszx.jozwiak@intel.com>\n---\n MAINTAINERS | 4 +++\n config/common_base | 3 +-\n drivers/common/qat/Makefile | 60 +++++++++++++++++++++++--------------\n drivers/compress/qat/qat_comp.c | 5 ++++\n drivers/compress/qat/qat_comp.h | 14 +++++++++\n drivers/compress/qat/qat_comp_pmd.c | 5 ++++\n drivers/compress/qat/qat_comp_pmd.h | 15 ++++++++++\n mk/rte.app.mk | 8 ++++-\n test/test/test_cryptodev.c | 6 ++--\n 9 files changed, 93 insertions(+), 27 deletions(-)\n create mode 100644 drivers/compress/qat/qat_comp.c\n create mode 100644 drivers/compress/qat/qat_comp.h\n create mode 100644 drivers/compress/qat/qat_comp_pmd.c\n create mode 100644 drivers/compress/qat/qat_comp_pmd.h", "diff": "diff --git a/MAINTAINERS b/MAINTAINERS\nindex 4d508dead..412fd778f 100644\n--- a/MAINTAINERS\n+++ b/MAINTAINERS\n@@ -853,6 +853,10 @@ F: drivers/compress/isal/\n F: doc/guides/compressdevs/isal.rst\n F: doc/guides/compressdevs/features/isal.ini\n \n+Intel QuickAssist\n+M: Fiona Trahe <fiona.trahe@intel.com>\n+F: drivers/compress/qat/\n+F: drivers/common/qat/\n \n Eventdev Drivers\n ----------------\ndiff --git a/config/common_base b/config/common_base\nindex c305a7725..8b539af65 100644\n--- a/config/common_base\n+++ b/config/common_base\n@@ -480,7 +480,8 @@ CONFIG_RTE_LIBRTE_DPAA_MAX_CRYPTODEV=4\n #\n # Compile PMD for QuickAssist based devices\n #\n-CONFIG_RTE_LIBRTE_PMD_QAT=n\n+CONFIG_RTE_LIBRTE_PMD_QAT=y\n+CONFIG_RTE_LIBRTE_PMD_QAT_SYM=n\n #\n # Max. number of QuickAssist devices, which can be detected and attached\n #\ndiff --git a/drivers/common/qat/Makefile b/drivers/common/qat/Makefile\nindex 02e83f9f0..2a4c99bc1 100644\n--- a/drivers/common/qat/Makefile\n+++ b/drivers/common/qat/Makefile\n@@ -3,48 +3,64 @@\n \n include $(RTE_SDK)/mk/rte.vars.mk\n \n-# library name\n-LIB = librte_pmd_qat.a\n-\n-# library version\n-LIBABIVER := 1\n-\n-# build flags\n-CFLAGS += $(WERROR_FLAGS)\n-CFLAGS += -O3\n-\n # build directories\n QAT_CRYPTO_DIR := $(RTE_SDK)/drivers/crypto/qat\n-VPATH=$(QAT_CRYPTO_DIR)\n+QAT_COMPRESS_DIR := $(RTE_SDK)/drivers/compress/qat\n+VPATH=$(QAT_CRYPTO_DIR):$(QAT_COMPRESS_DIR)\n \n # external library include paths\n CFLAGS += -I$(SRCDIR)/qat_adf\n CFLAGS += -I$(SRCDIR)\n CFLAGS += -I$(QAT_CRYPTO_DIR)\n+CFLAGS += -I$(QAT_COMPRESS_DIR)\n \n-# library common source files\n-SRCS-y += qat_device.c\n-SRCS-y += qat_common.c\n-SRCS-y += qat_logs.c\n-SRCS-y += qat_qp.c\n+\n+ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y)\n+\tCFLAGS += -DALLOW_EXPERIMENTAL_API\n+\tLDLIBS += -lrte_compressdev\n+\tSRCS-y += qat_comp.c\n+\tSRCS-y += qat_comp_pmd.c\n+\tbuild_qat = yes\n+endif\n \n # library symmetric crypto source files\n ifeq ($(CONFIG_RTE_LIBRTE_CRYPTODEV),y)\n+ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT_SYM),y)\n \tLDLIBS += -lrte_cryptodev\n \tLDLIBS += -lcrypto\n \tCFLAGS += -DBUILD_QAT_SYM\n \tSRCS-y += qat_sym.c\n \tSRCS-y += qat_sym_session.c\n \tSRCS-y += qat_sym_pmd.c\n+\tbuild_qat = yes\n+endif\n endif\n \n-LDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool\n-LDLIBS += -lrte_pci -lrte_bus_pci\n+ifdef build_qat\n \n-# export include files\n-SYMLINK-y-include +=\n+\t# library name\n+\tLIB = librte_pmd_qat.a\n \n-# versioning export map\n-EXPORT_MAP := ../../crypto/qat/rte_pmd_qat_version.map\n+\t# library version\n+\tLIBABIVER := 1\n+\t# build flags\n+\tCFLAGS += $(WERROR_FLAGS)\n+\tCFLAGS += -O3\n+\n+\t# library common source files\n+\tSRCS-y += qat_device.c\n+\tSRCS-y += qat_common.c\n+\tSRCS-y += qat_logs.c\n+\tSRCS-y += qat_qp.c\n+\n+\tLDLIBS += -lrte_eal -lrte_mbuf -lrte_mempool\n+\tLDLIBS += -lrte_pci -lrte_bus_pci\n+\n+\t# export include files\n+\tSYMLINK-y-include +=\n+\n+\t# versioning export map\n+\tEXPORT_MAP := ../../crypto/qat/rte_pmd_qat_version.map\n+endif\n \n include $(RTE_SDK)/mk/rte.lib.mk\ndiff --git a/drivers/compress/qat/qat_comp.c b/drivers/compress/qat/qat_comp.c\nnew file mode 100644\nindex 000000000..caa115806\n--- /dev/null\n+++ b/drivers/compress/qat/qat_comp.c\n@@ -0,0 +1,5 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2018 Intel Corporation\n+ */\n+\n+#include \"qat_comp.h\"\ndiff --git a/drivers/compress/qat/qat_comp.h b/drivers/compress/qat/qat_comp.h\nnew file mode 100644\nindex 000000000..89c475ee6\n--- /dev/null\n+++ b/drivers/compress/qat/qat_comp.h\n@@ -0,0 +1,14 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2015-2018 Intel Corporation\n+ */\n+\n+#ifndef _QAT_COMP_H_\n+#define _QAT_COMP_H_\n+\n+#ifdef RTE_LIBRTE_COMPRESSDEV\n+\n+#include <rte_compressdev.h>\n+#include <rte_compressdev_pmd.h>\n+\n+#endif\n+#endif\ndiff --git a/drivers/compress/qat/qat_comp_pmd.c b/drivers/compress/qat/qat_comp_pmd.c\nnew file mode 100644\nindex 000000000..fb035d1ee\n--- /dev/null\n+++ b/drivers/compress/qat/qat_comp_pmd.c\n@@ -0,0 +1,5 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2015-2018 Intel Corporation\n+ */\n+\n+#include \"qat_comp_pmd.h\"\ndiff --git a/drivers/compress/qat/qat_comp_pmd.h b/drivers/compress/qat/qat_comp_pmd.h\nnew file mode 100644\nindex 000000000..9b5b54394\n--- /dev/null\n+++ b/drivers/compress/qat/qat_comp_pmd.h\n@@ -0,0 +1,15 @@\n+/* SPDX-License-Identifier: BSD-3-Clause\n+ * Copyright(c) 2015-2018 Intel Corporation\n+ */\n+\n+#ifndef _QAT_COMP_PMD_H_\n+#define _QAT_COMP_PMD_H_\n+\n+#ifdef RTE_LIBRTE_COMPRESSDEV\n+\n+#include <rte_compressdev.h>\n+#include <rte_compressdev_pmd.h>\n+\n+\n+#endif\n+#endif /* _QAT_COMP_PMD_H_ */\ndiff --git a/mk/rte.app.mk b/mk/rte.app.mk\nindex 7bcf6308d..9be45b68d 100644\n--- a/mk/rte.app.mk\n+++ b/mk/rte.app.mk\n@@ -190,7 +190,9 @@ _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_AESNI_GCM) += -lIPSec_MB\n _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_CCP) += -lrte_pmd_ccp -lcrypto\n _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_OPENSSL) += -lrte_pmd_openssl -lcrypto\n _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_NULL_CRYPTO) += -lrte_pmd_null_crypto\n-_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += -lrte_pmd_qat -lcrypto\n+ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT),y)\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT_SYM) += -lrte_pmd_qat -lcrypto\n+endif # CONFIG_RTE_LIBRTE_PMD_QAT\n _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += -lrte_pmd_snow3g\n _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_SNOW3G) += -L$(LIBSSO_SNOW3G_PATH)/build -lsso_snow3g\n _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_KASUMI) += -lrte_pmd_kasumi\n@@ -213,6 +215,10 @@ endif # CONFIG_RTE_LIBRTE_CRYPTODEV\n ifeq ($(CONFIG_RTE_LIBRTE_COMPRESSDEV),y)\n _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += -lrte_pmd_isal_comp\n _LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_ISAL) += -lisal\n+# Link QAT driver if it has not been linked yet\n+ifeq ($(CONFIG_RTE_LIBRTE_PMD_QAT_SYM),n)\n+_LDLIBS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += -lrte_pmd_qat\n+endif # CONFIG_RTE_LIBRTE_PMD_QAT_SYM\n endif # CONFIG_RTE_LIBRTE_COMPRESSDEV\n \n ifeq ($(CONFIG_RTE_LIBRTE_EVENTDEV),y)\ndiff --git a/test/test/test_cryptodev.c b/test/test/test_cryptodev.c\nindex b759e0811..cbbdb1518 100644\n--- a/test/test/test_cryptodev.c\n+++ b/test/test/test_cryptodev.c\n@@ -9938,9 +9938,9 @@ test_cryptodev_qat(void /*argv __rte_unused, int argc __rte_unused*/)\n \t\t\tRTE_STR(CRYPTODEV_NAME_QAT_SYM_PMD));\n \n \tif (gbl_driver_id == -1) {\n-\t\tRTE_LOG(ERR, USER1, \"QAT PMD must be loaded. Check if \"\n-\t\t\t\t\"CONFIG_RTE_LIBRTE_PMD_QAT is enabled \"\n-\t\t\t\t\"in config file to run this testsuite.\\n\");\n+\t\tRTE_LOG(ERR, USER1, \"QAT PMD must be loaded. Check that both \"\n+\t\t\"CONFIG_RTE_LIBRTE_PMD_QAT and CONFIG_RTE_LIBRTE_PMD_QAT_SYM \"\n+\t\t\"are enabled in config file to run this testsuite.\\n\");\n \t\treturn TEST_SKIPPED;\n \t}\n \n", "prefixes": [ "v7", "02/16" ] }