From: Kevin Traynor <ktraynor@redhat.com>
To: Marcin Zapolski <marcinx.a.zapolski@intel.com>
Cc: dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'examples: fix use of ethdev internal device array' has been queued to LTS release 18.11.3
Date: Tue, 27 Aug 2019 10:30:27 +0100 [thread overview]
Message-ID: <20190827093032.20423-50-ktraynor@redhat.com> (raw)
In-Reply-To: <20190827093032.20423-1-ktraynor@redhat.com>
Hi,
FYI, your patch has been queued to LTS release 18.11.3
Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 09/03/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/6a734ed87214cd1018864f7ce006a1f2b13f956f
Thanks.
Kevin Traynor
---
From 6a734ed87214cd1018864f7ce006a1f2b13f956f Mon Sep 17 00:00:00 2001
From: Marcin Zapolski <marcinx.a.zapolski@intel.com>
Date: Wed, 17 Jul 2019 09:58:04 +0200
Subject: [PATCH] examples: fix use of ethdev internal device array
[ upstream commit 5c5c1f99a923986b5b2d2d34e874ca14ffabbcb0 ]
Modify l3fwd and related example apps to use locally defined port_conf
instead of global rte_eth_devices which is not a part of public API.
Apps should not be using internal DPDK data structures directly.
Fixes: 1ef9600b2d20 ("examples/l3fwd: convert to ethdev offloads API")
Fixes: ba8c103d2455 ("examples/l3fwd-acl: convert to new ethdev offloads API")
Fixes: 40df1d7a695d ("examples/l3fwd-power: convert to new ethdev offloads API")
Fixes: 43fc038262b8 ("examples/l3fwd-vf: convert to new ethdev offloads API")
Fixes: 373149c631fe ("examples/performance-thread: convert to new offloads API")
Signed-off-by: Marcin Zapolski <marcinx.a.zapolski@intel.com>
---
examples/l3fwd-acl/main.c | 6 +-----
examples/l3fwd-power/main.c | 6 +-----
examples/l3fwd-vf/main.c | 7 +------
examples/l3fwd/main.c | 6 +-----
examples/performance-thread/l3fwd-thread/main.c | 6 +-----
5 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/examples/l3fwd-acl/main.c b/examples/l3fwd-acl/main.c
index a322ce4f2..8ed0c07ec 100644
--- a/examples/l3fwd-acl/main.c
+++ b/examples/l3fwd-acl/main.c
@@ -2019,12 +2019,8 @@ main(int argc, char **argv)
/* init RX queues */
for (queue = 0; queue < qconf->n_rx_queue; ++queue) {
- struct rte_eth_dev *dev;
- struct rte_eth_conf *conf;
struct rte_eth_rxconf rxq_conf;
portid = qconf->rx_queue_list[queue].port_id;
queueid = qconf->rx_queue_list[queue].queue_id;
- dev = &rte_eth_devices[portid];
- conf = &dev->data->dev_conf;
if (numa_on)
@@ -2039,5 +2035,5 @@ main(int argc, char **argv)
rte_eth_dev_info_get(portid, &dev_info);
rxq_conf = dev_info.default_rxconf;
- rxq_conf.offloads = conf->rxmode.offloads;
+ rxq_conf.offloads = port_conf.rxmode.offloads;
ret = rte_eth_rx_queue_setup(portid, queueid, nb_rxd,
socketid, &rxq_conf,
diff --git a/examples/l3fwd-power/main.c b/examples/l3fwd-power/main.c
index 9c7b31564..3421de8ec 100644
--- a/examples/l3fwd-power/main.c
+++ b/examples/l3fwd-power/main.c
@@ -2119,11 +2119,7 @@ main(int argc, char **argv)
for(queue = 0; queue < qconf->n_rx_queue; ++queue) {
struct rte_eth_rxconf rxq_conf;
- struct rte_eth_dev *dev;
- struct rte_eth_conf *conf;
portid = qconf->rx_queue_list[queue].port_id;
queueid = qconf->rx_queue_list[queue].queue_id;
- dev = &rte_eth_devices[portid];
- conf = &dev->data->dev_conf;
if (numa_on)
@@ -2138,5 +2134,5 @@ main(int argc, char **argv)
rte_eth_dev_info_get(portid, &dev_info);
rxq_conf = dev_info.default_rxconf;
- rxq_conf.offloads = conf->rxmode.offloads;
+ rxq_conf.offloads = port_conf.rxmode.offloads;
ret = rte_eth_rx_queue_setup(portid, queueid, nb_rxd,
socketid, &rxq_conf,
diff --git a/examples/l3fwd-vf/main.c b/examples/l3fwd-vf/main.c
index 036f86854..ce052544f 100644
--- a/examples/l3fwd-vf/main.c
+++ b/examples/l3fwd-vf/main.c
@@ -1023,11 +1023,6 @@ main(int argc, char **argv)
/* init RX queues */
for(queue = 0; queue < qconf->n_rx_queue; ++queue) {
- struct rte_eth_dev *dev;
- struct rte_eth_conf *conf;
-
portid = qconf->rx_queue_list[queue].port_id;
queueid = qconf->rx_queue_list[queue].queue_id;
- dev = &rte_eth_devices[portid];
- conf = &dev->data->dev_conf;
if (numa_on)
@@ -1041,5 +1036,5 @@ main(int argc, char **argv)
rte_eth_dev_info_get(portid, &dev_info);
rxq_conf = dev_info.default_rxconf;
- rxq_conf.offloads = conf->rxmode.offloads;
+ rxq_conf.offloads = port_conf.rxmode.offloads;
ret = rte_eth_rx_queue_setup(portid, queueid, nb_rxd,
socketid, &rxq_conf,
diff --git a/examples/l3fwd/main.c b/examples/l3fwd/main.c
index e4b99efe0..71a67f422 100644
--- a/examples/l3fwd/main.c
+++ b/examples/l3fwd/main.c
@@ -946,12 +946,8 @@ main(int argc, char **argv)
/* init RX queues */
for(queue = 0; queue < qconf->n_rx_queue; ++queue) {
- struct rte_eth_dev *dev;
- struct rte_eth_conf *conf;
struct rte_eth_rxconf rxq_conf;
portid = qconf->rx_queue_list[queue].port_id;
queueid = qconf->rx_queue_list[queue].queue_id;
- dev = &rte_eth_devices[portid];
- conf = &dev->data->dev_conf;
if (numa_on)
@@ -966,5 +962,5 @@ main(int argc, char **argv)
rte_eth_dev_info_get(portid, &dev_info);
rxq_conf = dev_info.default_rxconf;
- rxq_conf.offloads = conf->rxmode.offloads;
+ rxq_conf.offloads = port_conf.rxmode.offloads;
ret = rte_eth_rx_queue_setup(portid, queueid, nb_rxd,
socketid,
diff --git a/examples/performance-thread/l3fwd-thread/main.c b/examples/performance-thread/l3fwd-thread/main.c
index 4f8747bc3..8ddcfa2f4 100644
--- a/examples/performance-thread/l3fwd-thread/main.c
+++ b/examples/performance-thread/l3fwd-thread/main.c
@@ -3635,12 +3635,8 @@ main(int argc, char **argv)
/* init RX queues */
for (queue = 0; queue < rx_thread[i].n_rx_queue; ++queue) {
- struct rte_eth_dev *dev;
- struct rte_eth_conf *conf;
struct rte_eth_rxconf rxq_conf;
portid = rx_thread[i].rx_queue_list[queue].port_id;
queueid = rx_thread[i].rx_queue_list[queue].queue_id;
- dev = &rte_eth_devices[portid];
- conf = &dev->data->dev_conf;
if (numa_on)
@@ -3654,5 +3650,5 @@ main(int argc, char **argv)
rte_eth_dev_info_get(portid, &dev_info);
rxq_conf = dev_info.default_rxconf;
- rxq_conf.offloads = conf->rxmode.offloads;
+ rxq_conf.offloads = port_conf.rxmode.offloads;
ret = rte_eth_rx_queue_setup(portid, queueid, nb_rxd,
socketid,
--
2.20.1
---
Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- - 2019-08-27 09:40:13.634769662 +0100
+++ 0050-examples-fix-use-of-ethdev-internal-device-array.patch 2019-08-27 09:40:10.959143441 +0100
@@ -1 +1 @@
-From 5c5c1f99a923986b5b2d2d34e874ca14ffabbcb0 Mon Sep 17 00:00:00 2001
+From 6a734ed87214cd1018864f7ce006a1f2b13f956f Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 5c5c1f99a923986b5b2d2d34e874ca14ffabbcb0 ]
+
@@ -15 +16,0 @@
-Cc: stable@dpdk.org
@@ -27 +28 @@
-index 09b7c3850..0c44df767 100644
+index a322ce4f2..8ed0c07ec 100644
@@ -30 +31 @@
-@@ -2023,12 +2023,8 @@ main(int argc, char **argv)
+@@ -2019,12 +2019,8 @@ main(int argc, char **argv)
@@ -43 +44 @@
-@@ -2043,5 +2039,5 @@ main(int argc, char **argv)
+@@ -2039,5 +2035,5 @@ main(int argc, char **argv)
@@ -51 +52 @@
-index cbe8f8e3f..fd8d9528f 100644
+index 9c7b31564..3421de8ec 100644
@@ -54 +55 @@
-@@ -2386,11 +2386,7 @@ main(int argc, char **argv)
+@@ -2119,11 +2119,7 @@ main(int argc, char **argv)
@@ -66 +67 @@
-@@ -2405,5 +2401,5 @@ main(int argc, char **argv)
+@@ -2138,5 +2134,5 @@ main(int argc, char **argv)
@@ -74 +75 @@
-index 1432f8969..572e74cf5 100644
+index 036f86854..ce052544f 100644
@@ -97 +98 @@
-index 570693b32..3800bad19 100644
+index e4b99efe0..71a67f422 100644
@@ -100 +101 @@
-@@ -972,12 +972,8 @@ main(int argc, char **argv)
+@@ -946,12 +946,8 @@ main(int argc, char **argv)
@@ -113 +114 @@
-@@ -992,5 +988,5 @@ main(int argc, char **argv)
+@@ -966,5 +962,5 @@ main(int argc, char **argv)
@@ -118,2 +119,2 @@
- if (!per_port_pool)
- ret = rte_eth_rx_queue_setup(portid, queueid,
+ ret = rte_eth_rx_queue_setup(portid, queueid, nb_rxd,
+ socketid,
@@ -121 +122 @@
-index dd468958a..0121c71cb 100644
+index 4f8747bc3..8ddcfa2f4 100644
@@ -124 +125 @@
-@@ -3646,12 +3646,8 @@ main(int argc, char **argv)
+@@ -3635,12 +3635,8 @@ main(int argc, char **argv)
@@ -137 +138 @@
-@@ -3665,5 +3661,5 @@ main(int argc, char **argv)
+@@ -3654,5 +3650,5 @@ main(int argc, char **argv)
next prev parent reply other threads:[~2019-08-27 9:31 UTC|newest]
Thread overview: 56+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-08-27 9:29 [dpdk-stable] patch 'test/hash: fix data reset on new run' " Kevin Traynor
2019-08-27 9:29 ` [dpdk-stable] patch 'mem: fix typo in API description' " Kevin Traynor
2019-08-27 9:29 ` [dpdk-stable] patch 'kni: abort when IOVA is not PA' " Kevin Traynor
2019-08-27 9:29 ` [dpdk-stable] patch 'doc: fix build with latest meson' " Kevin Traynor
2019-08-27 9:29 ` [dpdk-stable] patch 'ethdev: avoid error on PCI unplug of closed port' " Kevin Traynor
2019-08-27 9:29 ` [dpdk-stable] patch 'net/sfc: ensure that device is closed on removal' " Kevin Traynor
2019-08-27 9:29 ` [dpdk-stable] patch 'net: define IPv4 IHL and VHL' " Kevin Traynor
2019-08-27 9:29 ` [dpdk-stable] patch 'app/testpmd: fix MPLS IPv4 encapsulation fields' " Kevin Traynor
2019-08-27 9:29 ` [dpdk-stable] patch 'net/netvsc: fix definition of offload values' " Kevin Traynor
2019-08-27 9:29 ` [dpdk-stable] patch 'net/i40e: fix crash when TxQ/RxQ set to 0 in VF' " Kevin Traynor
2019-08-27 9:29 ` [dpdk-stable] patch 'net/mlx5: fix crash on null operation' " Kevin Traynor
2019-08-27 9:29 ` [dpdk-stable] patch 'net/mlx5: fix condition for link update fallback' " Kevin Traynor
2019-08-27 9:29 ` [dpdk-stable] patch 'net/mlx5: check memory allocation in flow creation' " Kevin Traynor
2019-08-27 9:29 ` [dpdk-stable] patch 'app/testpmd: fix parsing RSS queue rule' " Kevin Traynor
2019-08-27 9:29 ` [dpdk-stable] patch 'app/testpmd: fix queue offload configuration' " Kevin Traynor
2019-08-27 9:29 ` [dpdk-stable] patch 'compress/isal: fix use after free' " Kevin Traynor
2019-08-27 9:29 ` [dpdk-stable] patch 'doc: cleanup test removal in armv8 and openssl guides' " Kevin Traynor
2019-08-27 9:29 ` [dpdk-stable] patch 'crypto/mvsam: fix typo in comment' " Kevin Traynor
2019-08-27 9:29 ` [dpdk-stable] patch 'doc: fix triplicated typo in prog guides' " Kevin Traynor
2019-08-27 9:29 ` [dpdk-stable] patch 'doc: fix grammar " Kevin Traynor
2019-08-27 9:29 ` [dpdk-stable] patch 'drivers: fix typo in NXP comments' " Kevin Traynor
2019-08-27 9:29 ` [dpdk-stable] patch 'crypto/qat: set message field to zero in sym SGL case' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'app/crypto-perf: fix CSV format' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'crypto/openssl: fix usage of non constant time memcmp' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'doc: clarify data plane error handling in compressdev' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'crypto/virtio: check PCI config read' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'app/crypto-perf: fix display once detection' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'app/crypto-perf: check lcore job failure' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'net/ixgbe: fix IP type for crypto session' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'eal: fix typo in comments' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'examples/ipsec-secgw: fix error sign' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'eventdev: " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'event/sw: " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'event/opdl: " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'hash: use ordered loads only if signature matches' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'doc: fix a grammar mistake in rawdev guide' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'doc: fix link about bifurcated model in Linux " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'net/i40e: fix unexpected skip FDIR setup' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'net/fm10k: fix descriptor filling in vector Tx' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'doc: fix PDF build' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'flow_classify: fix out-of-bounds access' " Kevin Traynor
2019-08-27 13:52 ` Iremonger, Bernard
2019-08-27 9:30 ` [dpdk-stable] patch 'examples/power: fix FreeBSD meson lib dependency' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'eal/freebsd: fix config creation' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'kni: fix copy_from_user failure handling' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'kni: fix style' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'kni: fix kernel crash with multi-segments' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'examples/power: fix strcpy buffer overrun' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'test/distributor: fix flush with worker shutdown' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'distributor: fix check of workers number' " Kevin Traynor
2019-08-27 9:30 ` Kevin Traynor [this message]
2019-08-27 9:30 ` [dpdk-stable] patch 'examples/ipsec-secgw: fix use of ethdev internal struct' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'examples/ip_frag: fix use of ethdev internal device array' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'examples/ip_frag: fix unknown ethernet type' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'examples/tep_term: remove duplicate definitions' " Kevin Traynor
2019-08-27 9:30 ` [dpdk-stable] patch 'examples/performance-thread: init timer subsystem' " Kevin Traynor
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190827093032.20423-50-ktraynor@redhat.com \
--to=ktraynor@redhat.com \
--cc=marcinx.a.zapolski@intel.com \
--cc=stable@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).