From b797b049b50656afb709718a6f75751b49cd515e Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Wed, 7 Apr 2021 19:00:34 -0700 Subject: [PATCH] net/netvsc: fix log format The PMD_DRV_LOG macro in netvsc (like other drivers) adds a newline to the log message as part of the macro expansion; therefore the message should not have its own newline. In a couple places, log messages were split across source lines which can make looking them up in the source tree harder. Fixes: a2a23a794b3a ("net/netvsc: support VF device hot add/remove") Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger Acked-by: Long Li --- drivers/net/netvsc/hn_ethdev.c | 25 ++++++++++++------------ drivers/net/netvsc/hn_vf.c | 35 +++++++++++++++++----------------- 2 files changed, 30 insertions(+), 30 deletions(-) diff --git a/drivers/net/netvsc/hn_ethdev.c b/drivers/net/netvsc/hn_ethdev.c index 04904b1514..51e950413c 100644 --- a/drivers/net/netvsc/hn_ethdev.c +++ b/drivers/net/netvsc/hn_ethdev.c @@ -564,7 +564,7 @@ static void netvsc_hotplug_retry(void *args) struct rte_ether_addr eth_addr; int s; - PMD_DRV_LOG(DEBUG, "%s: retry count %d\n", + PMD_DRV_LOG(DEBUG, "%s: retry count %d", __func__, hv->eal_hot_plug_retry); if (hv->eal_hot_plug_retry++ > NETVSC_MAX_HOTADD_RETRY) @@ -574,7 +574,7 @@ static void netvsc_hotplug_retry(void *args) di = opendir(buf); if (!di) { PMD_DRV_LOG(DEBUG, "%s: can't open directory %s, " - "retrying in 1 second\n", __func__, buf); + "retrying in 1 second", __func__, buf); goto retry; } @@ -586,7 +586,7 @@ static void netvsc_hotplug_retry(void *args) /* trying to get mac address if this is a network device*/ s = socket(PF_INET, SOCK_DGRAM, IPPROTO_IP); if (s == -1) { - PMD_DRV_LOG(ERR, "Failed to create socket errno %d\n", + PMD_DRV_LOG(ERR, "Failed to create socket errno %d", errno); break; } @@ -594,8 +594,9 @@ static void netvsc_hotplug_retry(void *args) ret = ioctl(s, SIOCGIFHWADDR, &req); close(s); if (ret == -1) { - PMD_DRV_LOG(ERR, "Failed to send SIOCGIFHWADDR for " - "device %s\n", dir->d_name); + PMD_DRV_LOG(ERR, + "Failed to send SIOCGIFHWADDR for device %s", + dir->d_name); break; } if (req.ifr_hwaddr.sa_family != ARPHRD_ETHER) { @@ -606,14 +607,14 @@ static void netvsc_hotplug_retry(void *args) RTE_DIM(eth_addr.addr_bytes)); if (rte_is_same_ether_addr(ð_addr, dev->data->mac_addrs)) { - PMD_DRV_LOG(NOTICE, "Found matching MAC address, " - "adding device %s network name %s\n", + PMD_DRV_LOG(NOTICE, + "Found matching MAC address, adding device %s network name %s", d->name, dir->d_name); ret = rte_eal_hotplug_add(d->bus->name, d->name, d->args); if (ret) { PMD_DRV_LOG(ERR, - "Failed to add PCI device %s\n", + "Failed to add PCI device %s", d->name); break; } @@ -638,7 +639,7 @@ netvsc_hotadd_callback(const char *device_name, enum rte_dev_event_type type, struct rte_devargs *d = &hv->devargs; int ret; - PMD_DRV_LOG(INFO, "Device notification type=%d device_name=%s\n", + PMD_DRV_LOG(INFO, "Device notification type=%d device_name=%s", type, device_name); switch (type) { @@ -650,7 +651,7 @@ netvsc_hotadd_callback(const char *device_name, enum rte_dev_event_type type, ret = rte_devargs_parse(d, device_name); if (ret) { PMD_DRV_LOG(ERR, - "devargs parsing failed ret=%d\n", ret); + "devargs parsing failed ret=%d", ret); return; } @@ -961,7 +962,7 @@ hn_dev_start(struct rte_eth_dev *dev) error = rte_dev_event_callback_register(NULL, netvsc_hotadd_callback, hv); if (error) { - PMD_DRV_LOG(ERR, "failed to register device event callback\n"); + PMD_DRV_LOG(ERR, "failed to register device event callback"); return error; } @@ -1240,7 +1241,7 @@ static int eth_hn_probe(struct rte_vmbus_driver *drv __rte_unused, ret = rte_dev_event_monitor_start(); if (ret) { - PMD_DRV_LOG(ERR, "Failed to start device event monitoring\n"); + PMD_DRV_LOG(ERR, "Failed to start device event monitoring"); return ret; } diff --git a/drivers/net/netvsc/hn_vf.c b/drivers/net/netvsc/hn_vf.c index 2dc7abe354..75192e6319 100644 --- a/drivers/net/netvsc/hn_vf.c +++ b/drivers/net/netvsc/hn_vf.c @@ -69,7 +69,7 @@ static int hn_vf_attach(struct rte_eth_dev *dev, struct hn_data *hv) return port; } - PMD_DRV_LOG(NOTICE, "found matching VF port %d\n", port); + PMD_DRV_LOG(NOTICE, "found matching VF port %d", port); ret = rte_eth_dev_owner_get(port, &owner); if (ret < 0) { PMD_DRV_LOG(ERR, "Can not find owner for port %d", port); @@ -106,13 +106,13 @@ static void hn_remove_delayed(void *args) /* Tell VSP to switch data path to synthentic */ hn_vf_remove(hv); - PMD_DRV_LOG(NOTICE, "Start to remove port %d\n", port_id); + PMD_DRV_LOG(NOTICE, "Start to remove port %d", port_id); rte_rwlock_write_lock(&hv->vf_lock); /* Give back ownership */ ret = rte_eth_dev_owner_unset(port_id, hv->owner.id); if (ret) - PMD_DRV_LOG(ERR, "rte_eth_dev_owner_unset failed ret=%d\n", + PMD_DRV_LOG(ERR, "rte_eth_dev_owner_unset failed ret=%d", ret); hv->vf_ctx.vf_attached = false; @@ -120,18 +120,18 @@ static void hn_remove_delayed(void *args) hn_eth_rmv_event_callback, hv); if (ret) PMD_DRV_LOG(ERR, - "rte_eth_dev_callback_unregister failed ret=%d\n", + "rte_eth_dev_callback_unregister failed ret=%d", ret); /* Detach and release port_id from system */ ret = rte_eth_dev_stop(port_id); if (ret) - PMD_DRV_LOG(ERR, "rte_eth_dev_stop failed port_id=%u ret=%d\n", + PMD_DRV_LOG(ERR, "rte_eth_dev_stop failed port_id=%u ret=%d", port_id, ret); ret = rte_eth_dev_close(port_id); if (ret) - PMD_DRV_LOG(ERR, "rte_eth_dev_close failed port_id=%u ret=%d\n", + PMD_DRV_LOG(ERR, "rte_eth_dev_close failed port_id=%u ret=%d", port_id, ret); ret = rte_dev_remove(dev); @@ -146,7 +146,7 @@ int hn_eth_rmv_event_callback(uint16_t port_id, { struct hn_data *hv = cb_arg; - PMD_DRV_LOG(NOTICE, "Removing VF portid %d\n", port_id); + PMD_DRV_LOG(NOTICE, "Removing VF portid %d", port_id); rte_eal_alarm_set(1, hn_remove_delayed, hv); return 0; @@ -163,7 +163,7 @@ static int hn_setup_vf_queues(int port, struct rte_eth_dev *dev) ret = rte_eth_tx_queue_info_get(dev->data->port_id, i, &txinfo); if (ret) { PMD_DRV_LOG(ERR, - "rte_eth_tx_queue_info_get failed ret=%d\n", + "rte_eth_tx_queue_info_get failed ret=%d", ret); return ret; } @@ -172,7 +172,7 @@ static int hn_setup_vf_queues(int port, struct rte_eth_dev *dev) &txinfo.conf); if (ret) { PMD_DRV_LOG(ERR, - "rte_eth_tx_queue_setup failed ret=%d\n", + "rte_eth_tx_queue_setup failed ret=%d", ret); return ret; } @@ -182,7 +182,7 @@ static int hn_setup_vf_queues(int port, struct rte_eth_dev *dev) ret = rte_eth_rx_queue_info_get(dev->data->port_id, i, &rxinfo); if (ret) { PMD_DRV_LOG(ERR, - "rte_eth_rx_queue_info_get failed ret=%d\n", + "rte_eth_rx_queue_info_get failed ret=%d", ret); return ret; } @@ -193,7 +193,7 @@ static int hn_setup_vf_queues(int port, struct rte_eth_dev *dev) &rxinfo.conf, rx_queue->mb_pool); if (ret) { PMD_DRV_LOG(ERR, - "rte_eth_rx_queue_setup failed ret=%d\n", + "rte_eth_rx_queue_setup failed ret=%d", ret); return ret; } @@ -244,10 +244,10 @@ int hn_vf_add(struct rte_eth_dev *dev, struct hn_data *hv) goto exit; } - PMD_DRV_LOG(NOTICE, "configuring VF port %d\n", port); + PMD_DRV_LOG(NOTICE, "configuring VF port %d", port); ret = hn_vf_configure(dev, &dev->data->dev_conf); if (ret) { - PMD_DRV_LOG(ERR, "Failed to configure VF port %d\n", + PMD_DRV_LOG(ERR, "Failed to configure VF port %d", port); goto exit; } @@ -255,15 +255,15 @@ int hn_vf_add(struct rte_eth_dev *dev, struct hn_data *hv) ret = hn_setup_vf_queues(port, dev); if (ret) { PMD_DRV_LOG(ERR, - "Failed to configure VF queues port %d\n", + "Failed to configure VF queues port %d", port); goto exit; } - PMD_DRV_LOG(NOTICE, "Starting VF port %d\n", port); + PMD_DRV_LOG(NOTICE, "Starting VF port %d", port); ret = rte_eth_dev_start(port); if (ret) { - PMD_DRV_LOG(ERR, "rte_eth_dev_start failed ret=%d\n", + PMD_DRV_LOG(ERR, "rte_eth_dev_start failed ret=%d", ret); goto exit; } @@ -414,8 +414,7 @@ int hn_vf_configure(struct rte_eth_dev *dev, hv); if (ret) { PMD_DRV_LOG(ERR, - "Registering callback failed for " - "vf port %d ret %d\n", + "Registering callback failed for vf port %d ret %d", hv->vf_ctx.vf_port, ret); return ret; } -- 2.20.1