patches for DPDK stable branches
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: Marcin Zapolski <marcinx.a.zapolski@intel.com>
Cc: Bruce Richardson <bruce.richardson@intel.com>,
	Nelio Laranjeiro <nelio.laranjeiro@6wind.com>,
	dpdk stable <stable@dpdk.org>
Subject: [dpdk-stable] patch 'examples/ipsec-secgw: fix use of ethdev internal struct' has been queued to LTS release 18.11.3
Date: Tue, 27 Aug 2019 10:30:28 +0100	[thread overview]
Message-ID: <20190827093032.20423-51-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/ac595561fac708dff1b4302ca24f1a3853117c46

Thanks.

Kevin Traynor

---
From ac595561fac708dff1b4302ca24f1a3853117c46 Mon Sep 17 00:00:00 2001
From: Marcin Zapolski <marcinx.a.zapolski@intel.com>
Date: Wed, 17 Jul 2019 09:58:06 +0200
Subject: [PATCH] examples/ipsec-secgw: fix use of ethdev internal struct

[ upstream commit 0109baf1964ca047646d49708263b2f6cbd63571 ]

Modify ipsec-secgw example app to use rte_eth_dev_info_get instead of
rte_eth_dev.
Apps should not be using internal DPDK data structures directly.

Fixes: a4677f78368b ("examples/ipsec-secgw: add target queues in flow actions")

Signed-off-by: Marcin Zapolski <marcinx.a.zapolski@intel.com>
Reviewed-by: Bruce Richardson <bruce.richardson@intel.com>
Acked-by: Nelio Laranjeiro <nelio.laranjeiro@6wind.com>
---
 examples/ipsec-secgw/ipsec.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/examples/ipsec-secgw/ipsec.c b/examples/ipsec-secgw/ipsec.c
index 72a29bcb1..ebac08e91 100644
--- a/examples/ipsec-secgw/ipsec.c
+++ b/examples/ipsec-secgw/ipsec.c
@@ -187,5 +187,5 @@ create_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa)
 					.rss_key_len = 40,
 				};
-				struct rte_eth_dev *eth_dev;
+				struct rte_eth_dev_info dev_info;
 				uint16_t queue[RTE_MAX_QUEUES_PER_PORT];
 				struct rte_flow_action_rss action_rss;
@@ -193,15 +193,14 @@ create_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa)
 				unsigned int j;
 
+				rte_eth_dev_info_get(sa->portid, &dev_info);
 				sa->action[2].type = RTE_FLOW_ACTION_TYPE_END;
 				/* Try RSS. */
 				sa->action[1].type = RTE_FLOW_ACTION_TYPE_RSS;
 				sa->action[1].conf = &action_rss;
-				eth_dev = ctx->device;
 				rte_eth_dev_rss_hash_conf_get(sa->portid,
 							      &rss_conf);
 				for (i = 0, j = 0;
-				     i < eth_dev->data->nb_rx_queues; ++i)
-					if (eth_dev->data->rx_queues[i])
-						queue[j++] = i;
+				     i < dev_info.nb_rx_queues; ++i)
+					queue[j++] = i;
 				action_rss = (struct rte_flow_action_rss){
 					.types = rss_conf.rss_hf,
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2019-08-27 09:40:13.699004061 +0100
+++ 0051-examples-ipsec-secgw-fix-use-of-ethdev-internal-stru.patch	2019-08-27 09:40:10.960143417 +0100
@@ -1 +1 @@
-From 0109baf1964ca047646d49708263b2f6cbd63571 Mon Sep 17 00:00:00 2001
+From ac595561fac708dff1b4302ca24f1a3853117c46 Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit 0109baf1964ca047646d49708263b2f6cbd63571 ]
+
@@ -11 +12,0 @@
-Cc: stable@dpdk.org
@@ -21 +22 @@
-index d1cbdc38d..f8fc49bac 100644
+index 72a29bcb1..ebac08e91 100644
@@ -24 +25 @@
-@@ -190,5 +190,5 @@ create_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa)
+@@ -187,5 +187,5 @@ create_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa)
@@ -31 +32 @@
-@@ -196,15 +196,14 @@ create_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa)
+@@ -193,15 +193,14 @@ create_session(struct ipsec_ctx *ipsec_ctx, struct ipsec_sa *sa)

  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 ` [dpdk-stable] patch 'examples: fix use of ethdev internal device array' " Kevin Traynor
2019-08-27  9:30 ` Kevin Traynor [this message]
2019-08-27  9:30 ` [dpdk-stable] patch 'examples/ip_frag: " 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-51-ktraynor@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=bruce.richardson@intel.com \
    --cc=marcinx.a.zapolski@intel.com \
    --cc=nelio.laranjeiro@6wind.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).