[dpdk-stable] patch 'ethdev: remove redundant device info cleanup before get' has been queued to LTS release 18.11.6
Kevin Traynor
ktraynor at redhat.com
Tue Dec 3 19:26:10 CET 2019
Hi,
FYI, your patch has been queued to LTS release 18.11.6
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 12/10/19. So please
shout if anyone has objections.
Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.
Queued patches are on a temporary branch at:
https://github.com/kevintraynor/dpdk-stable-queue
This queued commit can be viewed at:
https://github.com/kevintraynor/dpdk-stable-queue/commit/7c955e08169b43ff6afca1b254f29b3231bba601
Thanks.
Kevin.
---
>From 7c955e08169b43ff6afca1b254f29b3231bba601 Mon Sep 17 00:00:00 2001
From: Andrew Rybchenko <arybchenko at solarflare.com>
Date: Thu, 12 Sep 2019 17:42:12 +0100
Subject: [PATCH] ethdev: remove redundant device info cleanup before get
[ upstream commit 78402e16ec08db79a2e380466ff41dd939541265 ]
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")
Signed-off-by: Andrew Rybchenko <arybchenko at solarflare.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
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 fe9792643..f7f590b92 100644
--- a/app/test-pmd/cmdline.c
+++ b/app/test-pmd/cmdline.c
@@ -2252,5 +2252,4 @@ cmd_config_rss_hash_key_parsed(void *parsed_result,
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 &&
@@ -2785,5 +2784,4 @@ cmd_set_rss_reta_parsed(void *parsed_result,
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) {
@@ -2905,5 +2903,4 @@ cmd_showport_reta_parsed(void *parsed_result,
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);
@@ -10932,5 +10929,4 @@ cmd_flow_director_filter_parsed(void *parsed_result,
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;
diff --git a/app/test-pmd/config.c b/app/test-pmd/config.c
index 4870b9004..1f61e4c2d 100644
--- a/app/test-pmd/config.c
+++ b/app/test-pmd/config.c
@@ -407,5 +407,4 @@ 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",
@@ -1545,5 +1544,4 @@ ring_rx_descriptor_display(const struct rte_memzone *ring_mz,
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) {
diff --git a/examples/ethtool/lib/rte_ethtool.c b/examples/ethtool/lib/rte_ethtool.c
index e6a2e88c7..63344376c 100644
--- a/examples/ethtool/lib/rte_ethtool.c
+++ b/examples/ethtool/lib/rte_ethtool.c
@@ -41,5 +41,4 @@ rte_ethtool_get_drvinfo(uint16_t port_id, struct ethtool_drvinfo *drvinfo)
"the minimum size should be %d\n", ret);
- memset(&dev_info, 0, sizeof(dev_info));
rte_eth_dev_info_get(port_id, &dev_info);
@@ -373,5 +372,4 @@ rte_ethtool_net_set_rx_mode(uint16_t port_id)
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 a58774a33..5dff7d3b5 100644
--- a/examples/kni/main.c
+++ b/examples/kni/main.c
@@ -901,5 +901,4 @@ kni_alloc(uint16_t port_id)
const struct rte_bus *bus = NULL;
- memset(&dev_info, 0, sizeof(dev_info));
rte_eth_dev_info_get(port_id, &dev_info);
--
2.21.0
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-12-03 17:29:51.848811423 +0000
+++ 0001-ethdev-remove-redundant-device-info-cleanup-before-g.patch 2019-12-03 17:29:51.673751557 +0000
@@ -1 +1 @@
-From 78402e16ec08db79a2e380466ff41dd939541265 Mon Sep 17 00:00:00 2001
+From 7c955e08169b43ff6afca1b254f29b3231bba601 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 78402e16ec08db79a2e380466ff41dd939541265 ]
+
@@ -10 +11,0 @@
-Cc: stable at dpdk.org
@@ -22 +23 @@
-index b6bc34b4d..e4dda93a4 100644
+index fe9792643..f7f590b92 100644
@@ -25 +26 @@
-@@ -2320,5 +2320,4 @@ cmd_config_rss_hash_key_parsed(void *parsed_result,
+@@ -2252,5 +2252,4 @@ cmd_config_rss_hash_key_parsed(void *parsed_result,
@@ -31 +32 @@
-@@ -2853,5 +2852,4 @@ cmd_set_rss_reta_parsed(void *parsed_result,
+@@ -2785,5 +2784,4 @@ cmd_set_rss_reta_parsed(void *parsed_result,
@@ -37 +38 @@
-@@ -2973,5 +2971,4 @@ cmd_showport_reta_parsed(void *parsed_result,
+@@ -2905,5 +2903,4 @@ cmd_showport_reta_parsed(void *parsed_result,
@@ -43 +44 @@
-@@ -11092,5 +11089,4 @@ cmd_flow_director_filter_parsed(void *parsed_result,
+@@ -10932,5 +10929,4 @@ cmd_flow_director_filter_parsed(void *parsed_result,
@@ -50 +51 @@
-index 1a5a5c13c..523b3d376 100644
+index 4870b9004..1f61e4c2d 100644
@@ -53 +54 @@
-@@ -479,5 +479,4 @@ port_infos_display(portid_t port_id)
+@@ -407,5 +407,4 @@ port_infos_display(portid_t port_id)
@@ -59 +60 @@
-@@ -1624,5 +1623,4 @@ ring_rx_descriptor_display(const struct rte_memzone *ring_mz,
+@@ -1545,5 +1544,4 @@ ring_rx_descriptor_display(const struct rte_memzone *ring_mz,
@@ -66 +67 @@
-index 571c4e5aa..fd1692daa 100644
+index e6a2e88c7..63344376c 100644
@@ -69 +70 @@
-@@ -42,5 +42,4 @@ rte_ethtool_get_drvinfo(uint16_t port_id, struct ethtool_drvinfo *drvinfo)
+@@ -41,5 +41,4 @@ rte_ethtool_get_drvinfo(uint16_t port_id, struct ethtool_drvinfo *drvinfo)
@@ -82 +83 @@
-index 4710d7176..17f695ea9 100644
+index a58774a33..5dff7d3b5 100644
@@ -85,2 +86,2 @@
-@@ -899,5 +899,4 @@ kni_alloc(uint16_t port_id)
- struct rte_eth_dev_info dev_info;
+@@ -901,5 +901,4 @@ kni_alloc(uint16_t port_id)
+ const struct rte_bus *bus = NULL;
More information about the stable
mailing list