From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 3DC7BA0613 for ; Tue, 27 Aug 2019 11:31:59 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 35E3354AE; Tue, 27 Aug 2019 11:31:59 +0200 (CEST) Received: from mx1.redhat.com (mx1.redhat.com [209.132.183.28]) by dpdk.org (Postfix) with ESMTP id E6F9854AE for ; Tue, 27 Aug 2019 11:31:57 +0200 (CEST) Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 646D78BA2D4; Tue, 27 Aug 2019 09:31:57 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-48.ams2.redhat.com [10.36.117.48]) by smtp.corp.redhat.com (Postfix) with ESMTP id 26FD75C1B2; Tue, 27 Aug 2019 09:31:55 +0000 (UTC) From: Kevin Traynor To: Marcin Zapolski Cc: Bruce Richardson , Nelio Laranjeiro , dpdk stable Date: Tue, 27 Aug 2019 10:30:28 +0100 Message-Id: <20190827093032.20423-51-ktraynor@redhat.com> In-Reply-To: <20190827093032.20423-1-ktraynor@redhat.com> References: <20190827093032.20423-1-ktraynor@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.6.2 (mx1.redhat.com [10.5.110.68]); Tue, 27 Aug 2019 09:31:57 +0000 (UTC) Subject: [dpdk-stable] patch 'examples/ipsec-secgw: fix use of ethdev internal struct' has been queued to LTS release 18.11.3 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" 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 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 Reviewed-by: Bruce Richardson Acked-by: Nelio Laranjeiro --- 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)