From 78402e16ec08db79a2e380466ff41dd939541265 Mon Sep 17 00:00:00 2001 From: Andrew Rybchenko Date: Thu, 12 Sep 2019 17:42:12 +0100 Subject: [PATCH] ethdev: remove redundant device info cleanup before get rte_eth_dev_info_get() always fills in device information memory with zeros on entry. Fixes: b6719879855d ("ethdev: avoid getting uninitialized info for bad port") Cc: stable@dpdk.org Signed-off-by: Andrew Rybchenko Reviewed-by: Ferruh Yigit --- app/test-pmd/cmdline.c | 4 ---- app/test-pmd/config.c | 2 -- examples/ethtool/lib/rte_ethtool.c | 2 -- examples/kni/main.c | 1 - 4 files changed, 9 deletions(-) diff --git a/app/test-pmd/cmdline.c b/app/test-pmd/cmdline.c index b6bc34b4d2..e4dda93a49 100644 --- a/app/test-pmd/cmdline.c +++ b/app/test-pmd/cmdline.c @@ -2319,7 +2319,6 @@ cmd_config_rss_hash_key_parsed(void *parsed_result, uint8_t hash_key_size; uint32_t key_len; - memset(&dev_info, 0, sizeof(dev_info)); rte_eth_dev_info_get(res->port_id, &dev_info); if (dev_info.hash_key_size > 0 && dev_info.hash_key_size <= sizeof(hash_key)) @@ -2852,7 +2851,6 @@ cmd_set_rss_reta_parsed(void *parsed_result, struct rte_eth_rss_reta_entry64 reta_conf[8]; struct cmd_config_rss_reta *res = parsed_result; - memset(&dev_info, 0, sizeof(dev_info)); rte_eth_dev_info_get(res->port_id, &dev_info); if (dev_info.reta_size == 0) { printf("Redirection table size is 0 which is " @@ -2972,7 +2970,6 @@ cmd_showport_reta_parsed(void *parsed_result, struct rte_eth_dev_info dev_info; uint16_t max_reta_size; - memset(&dev_info, 0, sizeof(dev_info)); rte_eth_dev_info_get(res->port_id, &dev_info); max_reta_size = RTE_MIN(dev_info.reta_size, ETH_RSS_RETA_SIZE_512); if (res->size == 0 || res->size > max_reta_size) { @@ -11091,7 +11088,6 @@ cmd_flow_director_filter_parsed(void *parsed_result, else if (!strncmp(res->pf_vf, "vf", 2)) { struct rte_eth_dev_info dev_info; - memset(&dev_info, 0, sizeof(dev_info)); rte_eth_dev_info_get(res->port_id, &dev_info); errno = 0; vf_id = strtoul(res->pf_vf + 2, &end, 10); diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c index 1a5a5c13c0..523b3d3761 100644 --- a/app/test-pmd/config.c +++ b/app/test-pmd/config.c @@ -478,7 +478,6 @@ port_infos_display(portid_t port_id) } port = &ports[port_id]; rte_eth_link_get_nowait(port_id, &link); - memset(&dev_info, 0, sizeof(dev_info)); rte_eth_dev_info_get(port_id, &dev_info); printf("\n%s Infos for port %-2d %s\n", info_border, port_id, info_border); @@ -1623,7 +1622,6 @@ ring_rx_descriptor_display(const struct rte_memzone *ring_mz, #ifndef RTE_LIBRTE_I40E_16BYTE_RX_DESC struct rte_eth_dev_info dev_info; - memset(&dev_info, 0, sizeof(dev_info)); rte_eth_dev_info_get(port_id, &dev_info); if (strstr(dev_info.driver_name, "i40e") != NULL) { /* 32 bytes RX descriptor, i40e only */ diff --git a/examples/ethtool/lib/rte_ethtool.c b/examples/ethtool/lib/rte_ethtool.c index 571c4e5aa5..fd1692daae 100644 --- a/examples/ethtool/lib/rte_ethtool.c +++ b/examples/ethtool/lib/rte_ethtool.c @@ -41,7 +41,6 @@ rte_ethtool_get_drvinfo(uint16_t port_id, struct ethtool_drvinfo *drvinfo) printf("Insufficient fw version buffer size, " "the minimum size should be %d\n", ret); - memset(&dev_info, 0, sizeof(dev_info)); rte_eth_dev_info_get(port_id, &dev_info); strlcpy(drvinfo->driver, dev_info.driver_name, @@ -372,7 +371,6 @@ rte_ethtool_net_set_rx_mode(uint16_t port_id) struct rte_eth_dev_info dev_info; uint16_t vf; - memset(&dev_info, 0, sizeof(dev_info)); rte_eth_dev_info_get(port_id, &dev_info); num_vfs = dev_info.max_vfs; diff --git a/examples/kni/main.c b/examples/kni/main.c index 4710d71769..17f695ea99 100644 --- a/examples/kni/main.c +++ b/examples/kni/main.c @@ -898,7 +898,6 @@ kni_alloc(uint16_t port_id) struct rte_kni_ops ops; struct rte_eth_dev_info dev_info; - memset(&dev_info, 0, sizeof(dev_info)); rte_eth_dev_info_get(port_id, &dev_info); /* Get the interface default mac address */ -- 2.20.1