From b2d19c8d88544005de63e8ed7984133c47a38bf4 Mon Sep 17 00:00:00 2001 From: Tomasz Jozwiak Date: Thu, 14 Jun 2018 13:03:03 +0200 Subject: [PATCH] crypto/qat: move to dynamic logging for non-dp trace 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 844b027404..b900767894 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 d467683fd5..ef4a5672d9 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 e22e08fba6..bcab16e920 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 0000000000..fc8d9a7f0e --- /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 e6f8a014c4..b00a06bf20 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_ */ -- 2.20.1