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 E29FAA04DD for ; Wed, 28 Oct 2020 11:55:06 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D7265CA62; Wed, 28 Oct 2020 11:55:05 +0100 (CET) Received: from mail-wr1-f65.google.com (mail-wr1-f65.google.com [209.85.221.65]) by dpdk.org (Postfix) with ESMTP id 6DBCBCA83 for ; Wed, 28 Oct 2020 11:55:04 +0100 (CET) Received: by mail-wr1-f65.google.com with SMTP id s9so5167286wro.8 for ; Wed, 28 Oct 2020 03:55:04 -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=uohylZ+bpYVway6LMWJq+6CKJ0eZBaj6svBYQw0f53g=; b=os8/Yx0t8TOKARbf4Sn/hSKeP+qw9CiDWEzIaTEfNpueBFjZ4JGKWIq5UywajtmYLM EipwrDDWWGbmjeJ8O2izeIm03m7xvNAPBFSqfSdnmgpcReqMFzoKcOYYop828MLWoW5k jxScyb4vPXI0gMPjkqopECQ/mwCrJ2KcVXk8JONSVfzhPVcHZ+JW7xh57S7LGzLEyLYy k9uBbhv5+E1OAeNTmroQPMLkyE9HpR2YIj+sS6sYr4MDE3hiZDyjLIB1veWyGLYZ48wp Dtfuq146JrvVPHeZxqNqnx5BhUwRsJ2BqaB5nr6RQZc66pCkFXbe6tzeL2VYnRJMUzv6 ThhA== 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=uohylZ+bpYVway6LMWJq+6CKJ0eZBaj6svBYQw0f53g=; b=uDqZWPQJnDC3XSs8IJBeID4ozoYQmiUdhgcP43fxG9VIuBYOm527KVMuFcn42RyJAS vgUfC5gw9wgYgZI1HUGMU7Qyik21EHEQ476CauoA+WGZk5KlBcq90p75pEx29GJIJttJ Dxkhi/StCuGMPJRcnCT8TbA8hlH3eO0iqCVXsEROLB9fNLF0MVhVZZ9aEd0W3SHaXIjT S3JLtLlmh6ofrtl8cEl3SHRCaMQOKkNAOIyxJk6ZMLR7zpSLF4p70Zk8DYIZnxkFHaOx KpvfFEWExQzgO2n8jFnLXYdE2OkFu7zeJBlzUCTWGNznQyq5QGH4pXKTaXjMcIijpun8 Ie7w== X-Gm-Message-State: AOAM530LJpHc4sKXFgNauIq7OZnN6VBcA62Ud0nM6Q8yaPAwE17NwgjW nxfvqsm9yooIdcqg5d3/ylsNBnVLnqs9+0up X-Google-Smtp-Source: ABdhPJzr9jXx3uO84HHKikysP1f4su43T77fVOE1BjCIs1/HmQFtuVvnROO6sd/IF+w44BhOy0yvcQ== X-Received: by 2002:a5d:6a86:: with SMTP id s6mr8187918wru.344.1603882503142; Wed, 28 Oct 2020 03:55:03 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id t6sm7171169wre.30.2020.10.28.03.55.02 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Oct 2020 03:55:02 -0700 (PDT) From: luca.boccassi@gmail.com To: Ferruh Yigit Cc: Muthurajan Jayakumar , dpdk stable Date: Wed, 28 Oct 2020 10:45:26 +0000 Message-Id: <20201028104606.3504127-167-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201028104606.3504127-1-luca.boccassi@gmail.com> References: <20201028104606.3504127-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/pcap: fix input only Rx' has been queued to stable release 19.11.6 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.6 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 10/30/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 4189755e31b57644393e33f306c7676bafa672b6 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Thu, 8 Oct 2020 12:34:25 +0100 Subject: [PATCH] net/pcap: fix input only Rx [ upstream commit 113a461e82d3abe450da1daa21deebdea218532b ] When input only Rx interface argument 'rx_iface_in' provided, current code assigns 'eth_null_rx' burst function by mistake and no packet received as a result. Like in following usage no packets received from physical interface: "--vdev net_pcap0,rx_iface_in=eth0,tx_iface=eth0" Fixing the burst function assignment when 'rx_iface_in' argument is used Fixes: f14a94591504 ("net/pcap: remove Rx queue argument necessity") Reported-by: Muthurajan Jayakumar Signed-off-by: Ferruh Yigit --- drivers/net/pcap/rte_eth_pcap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c index aa7ef6fdbc..6fb26c8c9d 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c @@ -1398,7 +1398,8 @@ pmd_pcap_probe(struct rte_vdev_device *dev) devargs_all.is_rx_pcap = rte_kvargs_count(kvlist, ETH_PCAP_RX_PCAP_ARG) ? 1 : 0; devargs_all.is_rx_iface = - rte_kvargs_count(kvlist, ETH_PCAP_RX_IFACE_ARG) ? 1 : 0; + (rte_kvargs_count(kvlist, ETH_PCAP_RX_IFACE_ARG) + + rte_kvargs_count(kvlist, ETH_PCAP_RX_IFACE_IN_ARG)) ? 1 : 0; pcaps.num_of_queue = 0; devargs_all.is_tx_pcap = -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-10-28 10:35:16.911486178 +0000 +++ 0167-net-pcap-fix-input-only-Rx.patch 2020-10-28 10:35:11.772833968 +0000 @@ -1,8 +1,10 @@ -From 113a461e82d3abe450da1daa21deebdea218532b Mon Sep 17 00:00:00 2001 +From 4189755e31b57644393e33f306c7676bafa672b6 Mon Sep 17 00:00:00 2001 From: Ferruh Yigit Date: Thu, 8 Oct 2020 12:34:25 +0100 Subject: [PATCH] net/pcap: fix input only Rx +[ upstream commit 113a461e82d3abe450da1daa21deebdea218532b ] + When input only Rx interface argument 'rx_iface_in' provided, current code assigns 'eth_null_rx' burst function by mistake and no packet received as a result. @@ -12,7 +14,6 @@ Fixing the burst function assignment when 'rx_iface_in' argument is used Fixes: f14a94591504 ("net/pcap: remove Rx queue argument necessity") -Cc: stable@dpdk.org Reported-by: Muthurajan Jayakumar Signed-off-by: Ferruh Yigit @@ -21,10 +22,10 @@ 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/pcap/rte_eth_pcap.c b/drivers/net/pcap/rte_eth_pcap.c -index da4988064a..057aa9dbfc 100644 +index aa7ef6fdbc..6fb26c8c9d 100644 --- a/drivers/net/pcap/rte_eth_pcap.c +++ b/drivers/net/pcap/rte_eth_pcap.c -@@ -1416,7 +1416,8 @@ pmd_pcap_probe(struct rte_vdev_device *dev) +@@ -1398,7 +1398,8 @@ pmd_pcap_probe(struct rte_vdev_device *dev) devargs_all.is_rx_pcap = rte_kvargs_count(kvlist, ETH_PCAP_RX_PCAP_ARG) ? 1 : 0; devargs_all.is_rx_iface =