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

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.4

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 08/08/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.

Thanks.

Luca Boccassi

---
>From 3aacf8cfaff13d8a65b684951056b68750c27dd8 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 d88cb1778..c3345f5cb 100644
--- a/drivers/net/kni/rte_eth_kni.c
+++ b/drivers/net/kni/rte_eth_kni.c
@@ -47,6 +47,7 @@ struct pmd_queue {
 
 struct pmd_internals {
 	struct rte_kni *kni;
+	uint16_t port_id;
 	int is_kni_started;
 
 	pthread_t thread;
@@ -78,8 +79,11 @@ eth_kni_rx(void *q, struct rte_mbuf **bufs, uint16_t nb_bufs)
 	struct pmd_queue *kni_q = q;
 	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;
 
@@ -372,6 +376,7 @@ eth_kni_create(struct rte_vdev_device *vdev,
 		return NULL;
 
 	internals = eth_dev->data->dev_private;
+	internals->port_id = eth_dev->data->port_id;
 	data = eth_dev->data;
 	data->nb_rx_queues = 1;
 	data->nb_tx_queues = 1;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-08-06 10:53:17.161701555 +0100
+++ 0035-net-kni-set-packet-input-port-in-Rx.patch	2020-08-06 10:53:15.828597956 +0100
@@ -1,13 +1,13 @@
-From cb4a65de31eabcedaca09ba53f06944b87e281fc Mon Sep 17 00:00:00 2001
+From 3aacf8cfaff13d8a65b684951056b68750c27dd8 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.
 
-Cc: stable at dpdk.org
-
 Signed-off-by: Jecky Pei <jpei at sonicwall.com>
 Reviewed-by: Ferruh Yigit <ferruh.yigit at intel.com>
 ---
@@ -15,7 +15,7 @@
  1 file changed, 5 insertions(+)
 
 diff --git a/drivers/net/kni/rte_eth_kni.c b/drivers/net/kni/rte_eth_kni.c
-index cde98f0bb..831fe96c9 100644
+index d88cb1778..c3345f5cb 100644
 --- a/drivers/net/kni/rte_eth_kni.c
 +++ b/drivers/net/kni/rte_eth_kni.c
 @@ -47,6 +47,7 @@ struct pmd_queue {