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 36758A04B1 for ; Fri, 28 Aug 2020 12:14:37 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2D1A2A3; Fri, 28 Aug 2020 12:14:37 +0200 (CEST) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [205.139.110.120]) by dpdk.org (Postfix) with ESMTP id 75CFF1C11B for ; Fri, 28 Aug 2020 12:14:35 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598609675; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=w0OpNqL68U0DdCCF0c/CooiNvNRQhuN2i4+Cp8pLJ6Y=; b=R0CXjBCHZkENsr89JLkX2ojgGDobqCZKVz45F+1Ap4gY50VJmm82N0CWAdT6s41H1Ik2Yt FzQ0aHZUZL18807ETbXXidPsJp4cuyzULPJP4S8hD9a8+p61qgFkXmbidNLJy4IV7vkmk4 TaL0IRRe/VkmSdIXAaaMC0hnJi/pDLI= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-422-oVK4AFjCMzuqGlNVSyYO7Q-1; Fri, 28 Aug 2020 06:14:32 -0400 X-MC-Unique: oVK4AFjCMzuqGlNVSyYO7Q-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 24C59189E617; Fri, 28 Aug 2020 10:14:31 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.20]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D82819D7C; Fri, 28 Aug 2020 10:14:30 +0000 (UTC) From: Kevin Traynor To: Jecky Pei Cc: Ferruh Yigit , dpdk stable Date: Fri, 28 Aug 2020 11:13:01 +0100 Message-Id: <20200828101308.223767-35-ktraynor@redhat.com> In-Reply-To: <20200828101308.223767-1-ktraynor@redhat.com> References: <20200828101308.223767-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=ktraynor@redhat.com X-Mimecast-Spam-Score: 0.001 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/kni: set packet input port in Rx' has been queued to LTS release 18.11.10 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.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 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 Reviewed-by: Ferruh Yigit --- 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@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,