DPDK patches and discussions
 help / color / mirror / Atom feed
From: Adrien Mazarguil <adrien.mazarguil@6wind.com>
To: Gaetan Rivet <gaetan.rivet@6wind.com>
Cc: Ferruh Yigit <ferruh.yigit@intel.com>,
	David Marchand <david.marchand@redhat.com>,
	dev@dpdk.org, stable@dpdk.org
Subject: [dpdk-dev] [PATCH v3] net/failsafe: fix source port ID in Rx packets
Date: Thu, 18 Apr 2019 19:20:55 +0200	[thread overview]
Message-ID: <20190418171859.11624-1-adrien.mazarguil@6wind.com> (raw)
Message-ID: <20190418172055.MHSOkNe1DQKqqDar3WyHskJIzveg21MDNTJcvzhD7Xs@z> (raw)
In-Reply-To: <20190418152229.13554-1-adrien.mazarguil@6wind.com>

When passed to the application, Rx packets retain the port ID value
originally set by slave devices. Unfortunately these IDs have no meaning to
applications, which are typically unaware of their existence.

This confuses those caring about the source port field in mbufs (m->port)
which experience issues ranging from traffic drop to crashes.

Fixes: a46f8d584eb8 ("net/failsafe: add fail-safe PMD")
Cc: stable@dpdk.org

Signed-off-by: Adrien Mazarguil <adrien.mazarguil@6wind.com>
Reviewed-by: David Marchand <david.marchand@redhat.com>
Acked-by: Gaetan Rivet <gaetan.rivet@6wind.com>
--
v3 changes:

Removed unnecessary reference to slavery ("slave" device) for political
correctness.

Also kept *-by lines as in v2.

v2 changes:

Modified "rxq->priv->dev->data->port_id" (v18.11-style) to
"rxq->priv->data->port_id" (since v19.05) and checked compilation against
master this time.

Given the limited scope of that change, reviewed-by/acked-by lines were
kept.
---
 drivers/net/failsafe/failsafe_rxtx.c | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/drivers/net/failsafe/failsafe_rxtx.c b/drivers/net/failsafe/failsafe_rxtx.c
index 231c83291..fee08fa23 100644
--- a/drivers/net/failsafe/failsafe_rxtx.c
+++ b/drivers/net/failsafe/failsafe_rxtx.c
@@ -61,6 +61,21 @@ failsafe_set_burst_fn(struct rte_eth_dev *dev, int force_safe)
 	rte_wmb();
 }
 
+/*
+ * Override source port in Rx packets.
+ *
+ * Make Rx packets originate from this PMD instance instead of one of its
+ * sub-devices. This is mandatory to avoid breaking applications.
+ */
+static void
+failsafe_rx_set_port(struct rte_mbuf **rx_pkts, uint16_t nb_pkts, uint16_t port)
+{
+	unsigned int i;
+
+	for (i = 0; i != nb_pkts; ++i)
+		rx_pkts[i]->port = port;
+}
+
 uint16_t
 failsafe_rx_burst(void *queue,
 		  struct rte_mbuf **rx_pkts,
@@ -87,6 +102,9 @@ failsafe_rx_burst(void *queue,
 		sdev = sdev->next;
 	} while (nb_rx == 0 && sdev != rxq->sdev);
 	rxq->sdev = sdev;
+	if (nb_rx)
+		failsafe_rx_set_port(rx_pkts, nb_rx,
+				     rxq->priv->data->port_id);
 	return nb_rx;
 }
 
@@ -112,6 +130,9 @@ failsafe_rx_burst_fast(void *queue,
 		sdev = sdev->next;
 	} while (nb_rx == 0 && sdev != rxq->sdev);
 	rxq->sdev = sdev;
+	if (nb_rx)
+		failsafe_rx_set_port(rx_pkts, nb_rx,
+				     rxq->priv->data->port_id);
 	return nb_rx;
 }
 
-- 
2.11.0

  parent reply	other threads:[~2019-04-18 17:21 UTC|newest]

Thread overview: 32+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-04-18 13:11 [dpdk-dev] [PATCH] " Adrien Mazarguil
2019-04-18 13:11 ` Adrien Mazarguil
2019-04-18 14:06 ` David Marchand
2019-04-18 14:06   ` David Marchand
2019-04-19  8:08   ` Adrien Mazarguil
2019-04-19  8:08     ` Adrien Mazarguil
2019-04-18 14:08 ` Gaëtan Rivet
2019-04-18 14:08   ` Gaëtan Rivet
2019-04-18 14:42 ` Ferruh Yigit
2019-04-18 14:42   ` Ferruh Yigit
2019-04-18 15:08   ` Adrien Mazarguil
2019-04-18 15:08     ` Adrien Mazarguil
2019-04-18 15:32 ` [dpdk-dev] [PATCH v2] " Adrien Mazarguil
2019-04-18 15:32   ` Adrien Mazarguil
2019-04-18 15:39   ` Thomas Monjalon
2019-04-18 15:39     ` Thomas Monjalon
2019-04-18 15:51     ` Thomas Monjalon
2019-04-18 15:51       ` Thomas Monjalon
2019-04-18 16:46       ` Adrien Mazarguil
2019-04-18 16:46         ` Adrien Mazarguil
2019-04-18 16:54         ` Thomas Monjalon
2019-04-18 16:54           ` Thomas Monjalon
2019-04-18 17:09           ` Adrien Mazarguil
2019-04-18 17:09             ` Adrien Mazarguil
2019-04-18 17:43             ` Thomas Monjalon
2019-04-18 17:43               ` Thomas Monjalon
2019-04-18 15:51     ` Gaëtan Rivet
2019-04-18 15:51       ` Gaëtan Rivet
2019-04-18 17:20   ` Adrien Mazarguil [this message]
2019-04-18 17:20     ` [dpdk-dev] [PATCH v3] " Adrien Mazarguil
2019-04-18 18:51     ` Ferruh Yigit
2019-04-18 18:51       ` Ferruh Yigit

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=20190418171859.11624-1-adrien.mazarguil@6wind.com \
    --to=adrien.mazarguil@6wind.com \
    --cc=david.marchand@redhat.com \
    --cc=dev@dpdk.org \
    --cc=ferruh.yigit@intel.com \
    --cc=gaetan.rivet@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).