[dpdk-dev] [PATCH v2 3/3] drivers: align log names

[Min Hu (Connor)]

Acked-by: Min Hu (Connor) <humin29 at huawei.com>

在 2021/4/5 18:03, Thomas Monjalon 写道:
> The log levels are configured by using the name of the logs.
> Some drivers are aligned to follow a common log name standard:
> 	pmd.class.driver[.sub]
> Some "common" drivers skip the "class" part:
> 	pmd.driver.sub
> 
> Two drivers have exceptions to be clarified:
> 	pmd.vdpa.ifcvf instead of pmd.vdpa.ifc
> 	pmd.afu.ipn3ke instead of pmd.net.ipn3ke
> 
> Signed-off-by: Thomas Monjalon <thomas at monjalon.net>
> Acked-by: Bruce Richardson <bruce.richardson at intel.com>
> Acked-by: Rosen Xu <rosen.xu at intel.com>
> Acked-by: Xiao Wang <xiao.w.wang at intel.com>
> Acked-by: Hemant Agrawal <hemant.agrawal at nxp.com>
> Acked-by: Ajit Khaparde <ajit.khaparde at broadcom.com>
> ---
>   doc/guides/cryptodevs/qat.rst             | 10 +++++-----
>   drivers/common/qat/qat_logs.c             |  4 ++--
>   drivers/crypto/bcmfs/bcmfs_logs.c         |  4 ++--
>   drivers/net/af_packet/rte_eth_af_packet.c |  2 +-
>   drivers/net/bonding/rte_eth_bond_pmd.c    |  2 +-
>   drivers/raw/ifpga/ifpga_rawdev.c          |  2 +-
>   drivers/raw/ioat/ioat_rawdev.c            |  2 +-
>   drivers/raw/skeleton/skeleton_rawdev.c    |  2 +-
>   drivers/vdpa/ifc/ifcvf_vdpa.c             |  2 +-
>   9 files changed, 15 insertions(+), 15 deletions(-)
> 
> diff --git a/doc/guides/cryptodevs/qat.rst b/doc/guides/cryptodevs/qat.rst
> index cf16f03503..224b22b3f7 100644
> --- a/doc/guides/cryptodevs/qat.rst
> +++ b/doc/guides/cryptodevs/qat.rst
> @@ -659,15 +659,15 @@ Debugging
>   
>   There are 2 sets of trace available via the dynamic logging feature:
>   
> -* pmd.qat_dp exposes trace on the data-path.
> -* pmd.qat_general exposes all other trace.
> +* pmd.qat.dp exposes trace on the data-path.
> +* pmd.qat.general exposes all other trace.
>   
>   pmd.qat exposes both sets of traces.
>   They can be enabled using the log-level option (where 8=maximum log level) on
>   the process cmdline, e.g. using any of the following::
>   
> -    --log-level="pmd.qat_general,8"
> -    --log-level="pmd.qat_dp,8"
> +    --log-level="pmd.qat.general,8"
> +    --log-level="pmd.qat.dp,8"
>       --log-level="pmd.qat,8"
>   
>   .. Note::
> @@ -678,4 +678,4 @@ the process cmdline, e.g. using any of the following::
>       Also the dynamic global log level overrides both sets of trace, so e.g. no
>       QAT trace would display in this case::
>   
> -	--log-level="7" --log-level="pmd.qat_general,8"
> +	--log-level="7" --log-level="pmd.qat.general,8"
> diff --git a/drivers/common/qat/qat_logs.c b/drivers/common/qat/qat_logs.c
> index fa48be53c3..adbe163cd9 100644
> --- a/drivers/common/qat/qat_logs.c
> +++ b/drivers/common/qat/qat_logs.c
> @@ -17,5 +17,5 @@ qat_hexdump_log(uint32_t level, uint32_t logtype, const char *title,
>   	return 0;
>   }
>   
> -RTE_LOG_REGISTER(qat_gen_logtype, pmd.qat_general, NOTICE);
> -RTE_LOG_REGISTER(qat_dp_logtype, pmd.qat_dp, NOTICE);
> +RTE_LOG_REGISTER(qat_gen_logtype, pmd.qat.general, NOTICE);
> +RTE_LOG_REGISTER(qat_dp_logtype, pmd.qat.dp, NOTICE);
> diff --git a/drivers/crypto/bcmfs/bcmfs_logs.c b/drivers/crypto/bcmfs/bcmfs_logs.c
> index 701da9ecf3..9faf12f238 100644
> --- a/drivers/crypto/bcmfs/bcmfs_logs.c
> +++ b/drivers/crypto/bcmfs/bcmfs_logs.c
> @@ -21,5 +21,5 @@ bcmfs_hexdump_log(uint32_t level, uint32_t logtype, const char *title,
>   	return 0;
>   }
>   
> -RTE_LOG_REGISTER(bcmfs_conf_logtype, pmd.bcmfs_config, NOTICE)
> -RTE_LOG_REGISTER(bcmfs_dp_logtype, pmd.bcmfs_fp, NOTICE)
> +RTE_LOG_REGISTER(bcmfs_conf_logtype, pmd.crypto.bcmfs.config, NOTICE)
> +RTE_LOG_REGISTER(bcmfs_dp_logtype, pmd.crypto.bcmfs.fp, NOTICE)
> diff --git a/drivers/net/af_packet/rte_eth_af_packet.c b/drivers/net/af_packet/rte_eth_af_packet.c
> index bfe5a0a451..a04f7c773a 100644
> --- a/drivers/net/af_packet/rte_eth_af_packet.c
> +++ b/drivers/net/af_packet/rte_eth_af_packet.c
> @@ -97,7 +97,7 @@ static struct rte_eth_link pmd_link = {
>   	.link_autoneg = ETH_LINK_FIXED,
>   };
>   
> -RTE_LOG_REGISTER(af_packet_logtype, pmd.net.packet, NOTICE);
> +RTE_LOG_REGISTER(af_packet_logtype, pmd.net.af_packet, NOTICE);
>   
>   #define PMD_LOG(level, fmt, args...) \
>   	rte_log(RTE_LOG_ ## level, af_packet_logtype, \
> diff --git a/drivers/net/bonding/rte_eth_bond_pmd.c b/drivers/net/bonding/rte_eth_bond_pmd.c
> index 24e3cf3c2e..2e9cea5b8e 100644
> --- a/drivers/net/bonding/rte_eth_bond_pmd.c
> +++ b/drivers/net/bonding/rte_eth_bond_pmd.c
> @@ -3775,4 +3775,4 @@ RTE_PMD_REGISTER_PARAM_STRING(net_bonding,
>   	"up_delay=<int> "
>   	"down_delay=<int>");
>   
> -RTE_LOG_REGISTER(bond_logtype, pmd.net.bond, NOTICE);
> +RTE_LOG_REGISTER(bond_logtype, pmd.net.bonding, NOTICE);
> diff --git a/drivers/raw/ifpga/ifpga_rawdev.c b/drivers/raw/ifpga/ifpga_rawdev.c
> index 05d79bfcc2..d9a46ef915 100644
> --- a/drivers/raw/ifpga/ifpga_rawdev.c
> +++ b/drivers/raw/ifpga/ifpga_rawdev.c
> @@ -1611,7 +1611,7 @@ static struct rte_pci_driver rte_ifpga_rawdev_pmd = {
>   RTE_PMD_REGISTER_PCI(ifpga_rawdev_pci_driver, rte_ifpga_rawdev_pmd);
>   RTE_PMD_REGISTER_PCI_TABLE(ifpga_rawdev_pci_driver, rte_ifpga_rawdev_pmd);
>   RTE_PMD_REGISTER_KMOD_DEP(ifpga_rawdev_pci_driver, "* igb_uio | uio_pci_generic | vfio-pci");
> -RTE_LOG_REGISTER(ifpga_rawdev_logtype, driver.raw.init, NOTICE);
> +RTE_LOG_REGISTER(ifpga_rawdev_logtype, pmd.raw.ifpga, NOTICE);
>   
>   static const char * const valid_args[] = {
>   #define IFPGA_ARG_NAME         "ifpga"
> diff --git a/drivers/raw/ioat/ioat_rawdev.c b/drivers/raw/ioat/ioat_rawdev.c
> index a95854d5ac..15af07017c 100644
> --- a/drivers/raw/ioat/ioat_rawdev.c
> +++ b/drivers/raw/ioat/ioat_rawdev.c
> @@ -28,7 +28,7 @@ static struct rte_pci_driver ioat_pmd_drv;
>   #define IOAT_DEVICE_ID_BDXF	0x6f2F
>   #define IOAT_DEVICE_ID_ICX	0x0b00
>   
> -RTE_LOG_REGISTER(ioat_pmd_logtype, rawdev.ioat, INFO);
> +RTE_LOG_REGISTER(ioat_pmd_logtype, pmd.raw.ioat, INFO);
>   
>   #define DESC_SZ sizeof(struct rte_ioat_generic_hw_desc)
>   #define COMPLETION_SZ sizeof(__m128i)
> diff --git a/drivers/raw/skeleton/skeleton_rawdev.c b/drivers/raw/skeleton/skeleton_rawdev.c
> index aa3beaad18..8896f0c9c5 100644
> --- a/drivers/raw/skeleton/skeleton_rawdev.c
> +++ b/drivers/raw/skeleton/skeleton_rawdev.c
> @@ -768,4 +768,4 @@ static struct rte_vdev_driver skeleton_pmd_drv = {
>   };
>   
>   RTE_PMD_REGISTER_VDEV(SKELETON_PMD_RAWDEV_NAME, skeleton_pmd_drv);
> -RTE_LOG_REGISTER(skeleton_pmd_logtype, rawdev.skeleton, INFO);
> +RTE_LOG_REGISTER(skeleton_pmd_logtype, pmd.raw.skeleton, INFO);
> diff --git a/drivers/vdpa/ifc/ifcvf_vdpa.c b/drivers/vdpa/ifc/ifcvf_vdpa.c
> index 39237aecf7..7a06f97429 100644
> --- a/drivers/vdpa/ifc/ifcvf_vdpa.c
> +++ b/drivers/vdpa/ifc/ifcvf_vdpa.c
> @@ -26,7 +26,7 @@
>   
>   #include "base/ifcvf.h"
>   
> -RTE_LOG_REGISTER(ifcvf_vdpa_logtype, pmd.net.ifcvf_vdpa, NOTICE);
> +RTE_LOG_REGISTER(ifcvf_vdpa_logtype, pmd.vdpa.ifcvf, NOTICE);
>   #define DRV_LOG(level, fmt, args...) \
>   	rte_log(RTE_LOG_ ## level, ifcvf_vdpa_logtype, \
>   		"IFCVF %s(): " fmt "\n", __func__, ##args)
>