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 C306DA04B5 for ; Tue, 3 Dec 2019 19:29:23 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BAA1837AF; Tue, 3 Dec 2019 19:29:23 +0100 (CET) Received: from us-smtp-1.mimecast.com (us-smtp-delivery-1.mimecast.com [207.211.31.120]) by dpdk.org (Postfix) with ESMTP id 268A137AF for ; Tue, 3 Dec 2019 19:29:22 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1575397761; 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=u4y9PshZQara7xJR/zSCNl2jFsOln8oFyoZlX2nqYzw=; b=dosFvoP+3LIIy4Rrrv1sCdaducLCjRzhxjBTGON5AfyKLcGVZwiRLb3lzYCK+BlbZiORGw y8YsQrRgUaUeeC5r0PQeKsT+BcZWeTdX7fY6RTGk9uohLkBSodOtvvRddh9GNuhkScsESP eUL6rbI6NbTf/0rbI9lAYdzOvSWnvXY= 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-419-gvjJMjQEN-WSCG2w4tHzoA-1; Tue, 03 Dec 2019 13:29:17 -0500 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E990E477; Tue, 3 Dec 2019 18:29:15 +0000 (UTC) Received: from rh.redhat.com (ovpn-117-10.ams2.redhat.com [10.36.117.10]) by smtp.corp.redhat.com (Postfix) with ESMTP id 7EFEE5C554; Tue, 3 Dec 2019 18:29:14 +0000 (UTC) From: Kevin Traynor To: Marcin Smoczynski Cc: Mariusz Drost , Konstantin Ananyev , Keith Wiles , dpdk stable Date: Tue, 3 Dec 2019 18:27:09 +0000 Message-Id: <20191203182714.17297-60-ktraynor@redhat.com> In-Reply-To: <20191203182714.17297-1-ktraynor@redhat.com> References: <20191203182714.17297-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-MC-Unique: gvjJMjQEN-WSCG2w4tHzoA-1 X-Mimecast-Spam-Score: 0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: quoted-printable Subject: [dpdk-stable] patch 'net/tap: fix blocked Rx packets' has been queued to LTS release 18.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 LTS release 18.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 12/10/19. 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 rebasi= ng (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/c67950b05fa9104ae2= 855cd1a7531a76dbdde508 Thanks. Kevin. --- >From c67950b05fa9104ae2855cd1a7531a76dbdde508 Mon Sep 17 00:00:00 2001 From: Marcin Smoczynski Date: Mon, 23 Sep 2019 15:22:47 +0200 Subject: [PATCH] net/tap: fix blocked Rx packets [ upstream commit d070c3413164e3f8f7fa4c4325d7df50a8275f39 ] When OS sends more packets than are being read with a single 'rte_eth_rx_burst' call, rx packets are getting stucked in the tap pmd and are unable to receive, because trigger_seen is getting updated and consecutive calls are not getting any packets. Do not update trigger_seen unless less than a max number of packets were received allowing next call to receive the rest. Remove unnecessary compiler barrier. Fixes: a0d8e807d9de ("net/tap: add Rx trigger") Signed-off-by: Marcin Smoczynski Tested-by: Mariusz Drost Tested-by: Konstantin Ananyev Reviewed-by: Keith Wiles --- drivers/net/tap/rte_eth_tap.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/drivers/net/tap/rte_eth_tap.c b/drivers/net/tap/rte_eth_tap.c index 37bd25011..775619331 100644 --- a/drivers/net/tap/rte_eth_tap.c +++ b/drivers/net/tap/rte_eth_tap.c @@ -356,8 +356,6 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint1= 6_t nb_pkts) =09if (trigger =3D=3D rxq->trigger_seen) =09=09return 0; -=09if (trigger) -=09=09rxq->trigger_seen =3D trigger; + =09process_private =3D rte_eth_devices[rxq->in_port].process_private; -=09rte_compiler_barrier(); =09for (num_rx =3D 0; num_rx < nb_pkts; ) { =09=09struct rte_mbuf *mbuf =3D rxq->pool; @@ -436,4 +434,7 @@ end: =09rxq->stats.ibytes +=3D num_rx_bytes; =20 +=09if (trigger && num_rx < nb_pkts) +=09=09rxq->trigger_seen =3D trigger; + =09return num_rx; } --=20 2.21.0 --- Diff of the applied patch vs upstream commit (please double-check if non-= empty: --- --- -=092019-12-03 17:29:55.219294926 +0000 +++ 0060-net-tap-fix-blocked-Rx-packets.patch=092019-12-03 17:29:51.7937490= 58 +0000 @@ -1 +1 @@ -From d070c3413164e3f8f7fa4c4325d7df50a8275f39 Mon Sep 17 00:00:00 2001 +From c67950b05fa9104ae2855cd1a7531a76dbdde508 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit d070c3413164e3f8f7fa4c4325d7df50a8275f39 ] + @@ -17 +18,0 @@ -Cc: stable@dpdk.org @@ -28 +29 @@ -index 922371c29..a13d8d50d 100644 +index 37bd25011..775619331 100644 @@ -31 +32 @@ -@@ -354,8 +354,6 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint= 16_t nb_pkts) +@@ -356,8 +356,6 @@ pmd_rx_burst(void *queue, struct rte_mbuf **bufs, uint= 16_t nb_pkts) @@ -41 +42 @@ -@@ -434,4 +432,7 @@ end: +@@ -436,4 +434,7 @@ end: