[dpdk-stable] patch 'examples/ipsec-secgw: fix use of ethdev internal struct' has been queued to LTS release 18.11.3

Kevin Traynor ktraynor at redhat.com
Tue Aug 27 11:30:28 CEST 2019


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 at 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 at intel.com>
Reviewed-by: Bruce Richardson <bruce.richardson at intel.com>
Acked-by: Nelio Laranjeiro <nelio.laranjeiro at 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 at 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)


More information about the stable mailing list