[dpdk-stable] patch 'net/kni: set packet input port in Rx' has been queued to LTS release 18.11.10

[Kevin Traynor]

Hi,

FYI, your patch has been queued to LTS release 18.11.10

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/02/20. 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/15f7abe6a5ad64fc533cbf5ddd058b515ecdd27c

Thanks.

Kevin.

---
>From 15f7abe6a5ad64fc533cbf5ddd058b515ecdd27c Mon Sep 17 00:00:00 2001
From: Jecky Pei <jpei at sonicwall.com>
Date: Fri, 24 Jul 2020 16:10:28 +0100
Subject: [PATCH] net/kni: set packet input port in Rx

[ upstream commit cb4a65de31eabcedaca09ba53f06944b87e281fc ]

Store port_id in pmd_internals when eth kni device is created.
Then set packet port of rte_mbuf in function eth_kni_rx.

Signed-off-by: Jecky Pei <jpei at sonicwall.com>
Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
---
 drivers/net/kni/rte_eth_kni.c | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c
index 9879985ec0..28c88c7655 100644
--- a/drivers/net/kni/rte_eth_kni.c
+++ b/drivers/net/kni/rte_eth_kni.c
@@ -46,4 +46,5 @@ struct pmd_queue {
 struct pmd_internals {
 	struct rte_kni *kni;
+	uint16_t port_id;
 	int is_kni_started;
 
@@ -77,6 +78,9 @@ eth_kni_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
 	struct rte_kni *kni = kni_q->internals->kni;
 	uint16_t nb_pkts;
+	int i;
 
 	nb_pkts = rte_kni_rx_burst(kni, bufs, nb_bufs);
+	for (i = 0; i < nb_pkts; i++)
+		bufs[i]->port = kni_q->internals->port_id;
 
 	kni_q->rx.pkts += nb_pkts;
@@ -353,4 +357,5 @@ eth_kni_create(struct rte_vdev_device *vdev,
 
 	internals = eth_dev->data->dev_private;
+	internals->port_id = eth_dev->data->port_id;
 	data = eth_dev->data;
 	data->nb_rx_queues = 1;
-- 
2.26.2

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-28 11:03:26.760156527 +0100
+++ 0035-net-kni-set-packet-input-port-in-Rx.patch	2020-08-28 11:03:25.986955936 +0100
@@ -1 +1 @@
-From cb4a65de31eabcedaca09ba53f06944b87e281fc Mon Sep 17 00:00:00 2001
+From 15f7abe6a5ad64fc533cbf5ddd058b515ecdd27c Mon Sep 17 00:00:00 2001
@@ -5,0 +6,2 @@
+[ upstream commit cb4a65de31eabcedaca09ba53f06944b87e281fc ]
+
@@ -9,2 +10,0 @@
-Cc: stable at dpdk.org
-
@@ -18 +18 @@
-index cde98f0bb2..831fe96c96 100644
+index 9879985ec0..28c88c7655 100644
@@ -21 +21 @@
-@@ -48,4 +48,5 @@ struct pmd_queue {
+@@ -46,4 +46,5 @@ struct pmd_queue {
@@ -27 +27 @@
-@@ -79,6 +80,9 @@ eth_kni_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
+@@ -77,6 +78,9 @@ eth_kni_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
@@ -37 +37 @@
-@@ -373,4 +377,5 @@ eth_kni_create(struct rte_vdev_device *vdev,
+@@ -353,4 +357,5 @@ eth_kni_create(struct rte_vdev_device *vdev,