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 33E24A0351 for ; Thu, 6 Aug 2020 11:59:23 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 2AF9D1C127; Thu, 6 Aug 2020 11:59:23 +0200 (CEST) Received: from mail-wm1-f66.google.com (mail-wm1-f66.google.com [209.85.128.66]) by dpdk.org (Postfix) with ESMTP id 7577F1C18E for ; Thu, 6 Aug 2020 11:59:22 +0200 (CEST) Received: by mail-wm1-f66.google.com with SMTP id f18so6212850wmc.0 for ; Thu, 06 Aug 2020 02:59:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=osFz580EcLl+Pg3LqC63mo2wO4pp49WhlL8IHC0SoV0=; b=IX3Rx9XFcHzwNgbux7XHgGY7tZSlMLGqfflgUez9QVgsK2SQtHYhVnWXEhf31VgLhE 4Y50TG/P7ZX2gyus8dA1WvSISmvbQkKJpN16abl7ZdMtL/HQ/2JsHdk8f/fQx2xo2KhH fR60KqiFE2Mnj7w/Qz+Gk3oa7azCLdFVThVPmAkR/Imd03eoiRqA+EsVp4Xrf9+Wz1CJ yMwNPseMVfsdmTv/TjNs/fgvwylag8tCunVsLw9nwT2tOkjPZozQqWl6bWUfkUz0sZTw 09jfdaGBXYRfrz8TlqlNKSZawDRnxQjF6CCa4JKi4+Z4gIgmtk8nrhHr9wkahf9HpIZa RfCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=osFz580EcLl+Pg3LqC63mo2wO4pp49WhlL8IHC0SoV0=; b=YkjpCZcKYvTeGuwEWR4FS8wuAouLA/91qCONUbTewE2pQQ+rUxukERSpZehjtoOUla dkz0N27FpGwQEN/J1JGzDqePw8it6sg+UNATaSoU24jXDrdZhQKJ0dOm+pMsNwl7MqkY LoaCU/iHcBNlEeeSvZom4dgtCFdM6cAcM0oMmbCJS2Ph/11MSYQ1v7jUM9xkW5aaPu9Q t9Wd24Q9gdBJ905cY4XPfckhckYaQwcIT20EsQtC/gUXnzzRfAIgyzbmnAfG1+bGFPIa 3Hri3N0s8sdeexLBeWKYTes1gmpw1CF9EnteePA6LqvmTb58rgieJiEWW3Va0CG0wj0A kzcQ== X-Gm-Message-State: AOAM533pHOxF3WBJ4msgf/Z8X03/V6zGcmPZ/G4HuHf4m7cKcipD4F3C CFMiRItTmfXyptFKa7jkeBevciDC4xKjUQ== X-Google-Smtp-Source: ABdhPJw6ys+SUezt8Nbj81K1bxDD2Sv/DC5ecv1fG99lNGN1sN0F6tT3l+1i4mwqNlm62j5TQsEqIQ== X-Received: by 2002:a1c:1f8b:: with SMTP id f133mr7155545wmf.65.1596707962222; Thu, 06 Aug 2020 02:59:22 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id e16sm5856737wrx.30.2020.08.06.02.59.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 06 Aug 2020 02:59:21 -0700 (PDT) From: luca.boccassi@gmail.com To: Jecky Pei Cc: Ferruh Yigit , dpdk stable Date: Thu, 6 Aug 2020 10:54:03 +0100 Message-Id: <20200806095411.774624-35-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200806095411.774624-1-luca.boccassi@gmail.com> References: <20200724120030.1863487-1-luca.boccassi@gmail.com> <20200806095411.774624-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/kni: set packet input port in Rx' has been queued to stable release 19.11.4 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 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 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 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 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@dpdk.org - Signed-off-by: Jecky Pei Reviewed-by: Ferruh Yigit --- @@ -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 {