From patchwork Thu Jun 14 11:03:03 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tomasz Jozwiak X-Patchwork-Id: 41114 X-Patchwork-Delegate: pablo.de.lara.guarch@intel.com Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 1CBE31E3BC; Thu, 14 Jun 2018 13:03:21 +0200 (CEST) Received: from mga17.intel.com (mga17.intel.com [192.55.52.151]) by dpdk.org (Postfix) with ESMTP id 344C91E34B for ; Thu, 14 Jun 2018 13:03:17 +0200 (CEST) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga002.jf.intel.com ([10.7.209.21]) by fmsmga107.fm.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 14 Jun 2018 04:03:16 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.51,222,1526367600"; d="scan'208";a="66939747" Received: from tjozwiax-mobl.ger.corp.intel.com (HELO tojo-VirtualBox.MobicaPL.local) ([10.103.104.42]) by orsmga002.jf.intel.com with ESMTP; 14 Jun 2018 04:03:15 -0700 From: Tomasz Jozwiak To: fiona.trahe@intel.com, tomaszx.jozwiak@intel.com, dev@dpdk.org Date: Thu, 14 Jun 2018 13:03:03 +0200 Message-Id: <1528974186-13370-3-git-send-email-tomaszx.jozwiak@intel.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1528974186-13370-1-git-send-email-tomaszx.jozwiak@intel.com> References: <1526038308-12043-1-git-send-email-fiona.trahe@intel.com> <1528974186-13370-1-git-send-email-tomaszx.jozwiak@intel.com> Subject: [dpdk-dev] [PATCH v2 2/5] crypto/qat: move to dynamic logging for non-dp trace X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" For all trace not on the data-path move to dynamic logging. Signed-off-by: Tomasz Jozwiak Signed-off-by: Fiona Trahe --- config/common_base | 1 - drivers/crypto/qat/Makefile | 1 + drivers/crypto/qat/meson.build | 1 + drivers/crypto/qat/qat_logs.c | 17 +++++++++++++++++ drivers/crypto/qat/qat_logs.h | 12 ++++-------- 5 files changed, 23 insertions(+), 9 deletions(-) create mode 100644 drivers/crypto/qat/qat_logs.c diff --git a/config/common_base b/config/common_base index 0e6f2fb..7a9b26e 100644 --- a/config/common_base +++ b/config/common_base @@ -488,7 +488,6 @@ CONFIG_RTE_DPAA_SEC_PMD_MAX_NB_SESSIONS=2048 CONFIG_RTE_LIBRTE_PMD_QAT=n CONFIG_RTE_LIBRTE_PMD_QAT_DEBUG_TX=n CONFIG_RTE_LIBRTE_PMD_QAT_DEBUG_RX=n -CONFIG_RTE_LIBRTE_PMD_QAT_DEBUG_DRIVER=n # # Max. number of QuickAssist devices, which can be detected and attached # diff --git a/drivers/crypto/qat/Makefile b/drivers/crypto/qat/Makefile index d467683..ef4a567 100644 --- a/drivers/crypto/qat/Makefile +++ b/drivers/crypto/qat/Makefile @@ -26,6 +26,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += qat_device.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += qat_qp.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += qat_sym_session.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += qat_common.c +SRCS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += qat_logs.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += qat_sym_pmd.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += qat_asym_pmd.c SRCS-$(CONFIG_RTE_LIBRTE_PMD_QAT) += qat_comp_pmd.c diff --git a/drivers/crypto/qat/meson.build b/drivers/crypto/qat/meson.build index e22e08f..bcab16e 100644 --- a/drivers/crypto/qat/meson.build +++ b/drivers/crypto/qat/meson.build @@ -8,6 +8,7 @@ endif sources = files('qat_common.c', 'qat_qp.c', 'qat_device.c', + 'qat_logs.c', 'qat_sym_pmd.c', 'qat_sym.c', 'qat_sym_session.c', 'qat_asym_pmd.c', 'qat_comp_pmd.c') diff --git a/drivers/crypto/qat/qat_logs.c b/drivers/crypto/qat/qat_logs.c new file mode 100644 index 0000000..fc8d9a7 --- /dev/null +++ b/drivers/crypto/qat/qat_logs.c @@ -0,0 +1,17 @@ +/* SPDX-License-Identifier: BSD-3-Clause + * Copyright(c) 2018 Intel Corporation + */ + +#include + +int qat_gen_logtype; + +RTE_INIT(qat_pci_init_log); +static void +qat_pci_init_log(void) +{ + /* Non-data-path logging for pci device and all services */ + qat_gen_logtype = rte_log_register("pmd.qat_general"); + if (qat_gen_logtype >= 0) + rte_log_set_level(qat_gen_logtype, RTE_LOG_NOTICE); +} diff --git a/drivers/crypto/qat/qat_logs.h b/drivers/crypto/qat/qat_logs.h index e6f8a01..b00a06b 100644 --- a/drivers/crypto/qat/qat_logs.h +++ b/drivers/crypto/qat/qat_logs.h @@ -5,14 +5,10 @@ #ifndef _QAT_LOGS_H_ #define _QAT_LOGS_H_ -#ifdef RTE_LIBRTE_PMD_QAT_DEBUG_DRIVER -#define PMD_DRV_LOG_RAW(level, fmt, args...) \ - RTE_LOG(level, PMD, "%s(): " fmt, __func__, ## args) -#else -#define PMD_DRV_LOG_RAW(level, fmt, args...) do { } while (0) -#endif +extern int qat_gen_logtype; -#define PMD_DRV_LOG(level, fmt, args...) \ - PMD_DRV_LOG_RAW(level, fmt "\n", ## args) +#define PMD_DRV_LOG(level, fmt, args...) \ + rte_log(RTE_LOG_ ## level, qat_gen_logtype, \ + "%s(): " fmt "\n", __func__, ## args) #endif /* _QAT_LOGS_H_ */