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 DA618A0093 for ; Thu, 28 May 2020 18:25:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id D22DD1D996; Thu, 28 May 2020 18:25:39 +0200 (CEST) Received: from us-smtp-delivery-1.mimecast.com (us-smtp-1.mimecast.com [207.211.31.81]) by dpdk.org (Postfix) with ESMTP id AED611DC18 for ; Thu, 28 May 2020 18:25:38 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1590683138; 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=gkub8Qrs8BPg+hd2oNRRj8hqDcNyOWfQy9AUp/kUUVo=; b=DVXDKygjIjfbl1PWJXy1igp0/v5Qz6UZow9Zlhpe6JfohCGer05rKUhxgEQuJE2Q7gpxSD 2dPqFHlNG7uF3wV54e1EgXoi+0Dc/jtzC8U162cntEv6C4mZcGqKLfUu7dge4bsS72PuXO oCX5xIuYJCn/aBk9bj4NpUmc+dPeG6c= 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-501-6DyFjsi5NdOfnYeUFovNIw-1; Thu, 28 May 2020 12:25:35 -0400 X-MC-Unique: 6DyFjsi5NdOfnYeUFovNIw-1 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 0FF3E872FE1; Thu, 28 May 2020 16:25:34 +0000 (UTC) Received: from rh.redhat.com (unknown [10.33.36.235]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5702860E1C; Thu, 28 May 2020 16:25:33 +0000 (UTC) From: Kevin Traynor To: Stephen Hemminger Cc: dpdk stable Date: Thu, 28 May 2020 17:22:47 +0100 Message-Id: <20200528162322.7863-60-ktraynor@redhat.com> In-Reply-To: <20200528162322.7863-1-ktraynor@redhat.com> References: <20200528162322.7863-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/netvsc: avoid possible live lock' has been queued to LTS release 18.11.9 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.9 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 06/03/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/f6a58bb9a8c7bc2ce1ebf9c9ef6ad615eb8861b0 Thanks. Kevin. --- >From f6a58bb9a8c7bc2ce1ebf9c9ef6ad615eb8861b0 Mon Sep 17 00:00:00 2001 From: Stephen Hemminger Date: Tue, 31 Mar 2020 10:14:04 -0700 Subject: [PATCH] net/netvsc: avoid possible live lock [ upstream commit 36274f287103d2f4a372a99dff2c4f47eeb75633 ] Since the ring buffer with host is shared for both transmit completions and receive packets, it is possible that transmitter could get starved if receive ring gets full. Better to process all outstanding events which frees up transmit buffer slots, even if means dropping some packets. Fixes: 7e6c82430702 ("net/netvsc: avoid over filling Rx descriptor ring") Signed-off-by: Stephen Hemminger --- drivers/net/netvsc/hn_rxtx.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/drivers/net/netvsc/hn_rxtx.c b/drivers/net/netvsc/hn_rxtx.c index caed452540..b526b490b2 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -1017,7 +1017,4 @@ retry: if (tx_limit && tx_done >= tx_limit) break; - - if (rxq->rx_ring && rte_ring_full(rxq->rx_ring)) - break; } -- 2.21.3 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-28 17:13:02.217419207 +0100 +++ 0060-net-netvsc-avoid-possible-live-lock.patch 2020-05-28 17:12:59.136555608 +0100 @@ -1 +1 @@ -From 36274f287103d2f4a372a99dff2c4f47eeb75633 Mon Sep 17 00:00:00 2001 +From f6a58bb9a8c7bc2ce1ebf9c9ef6ad615eb8861b0 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 36274f287103d2f4a372a99dff2c4f47eeb75633 ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -22 +23 @@ -index cbdfcc628b..19f00a0528 100644 +index caed452540..b526b490b2 100644 @@ -25 +26 @@ -@@ -1033,7 +1033,4 @@ retry: +@@ -1017,7 +1017,4 @@ retry: