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 5ED8FA0093 for ; Tue, 19 May 2020 15:08:23 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 5706D1D685; Tue, 19 May 2020 15:08:23 +0200 (CEST) Received: from mail-wr1-f51.google.com (mail-wr1-f51.google.com [209.85.221.51]) by dpdk.org (Postfix) with ESMTP id B81761D692 for ; Tue, 19 May 2020 15:08:22 +0200 (CEST) Received: by mail-wr1-f51.google.com with SMTP id v12so15781064wrp.12 for ; Tue, 19 May 2020 06:08: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=/i7K3kkpdne2Tx20dPM3fKNBzdrWOfnkBwZ7QEHC3e4=; b=ea/kGm0a+HxY9Cexmn0FIZ66xHKS1FXuIbEI+N5nv6I0fSJ7uQV0Q8VonlOchaPBOS NloJmiEh9uALf+emoa/xs83zO9wvbVRJehQXfUDZdURAOpHnb+hLYChoAF8/cD0oizEu SL3uHd+Dn69vKTNHiSYDiq4uAPc7EH82V1u3T+iN2CWHL5jmVrWx0Z83mRcIGL90wY48 aa0q2WXG2/M8j7duMu4GiATU9ukk5LQCLrB88VTM8d/EVKEsC0T90MEFI1rKdr6tUfbI Hl5+xN8g+YAVPGyzMrxqxYUEYwg/IOVSLa7fmx79KIZ+a3t5HAXorUmwSnrwCAxs4YPY 0RzA== 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=/i7K3kkpdne2Tx20dPM3fKNBzdrWOfnkBwZ7QEHC3e4=; b=UjrWlWBikbaLwTZl1lqtF27MJ4MzZkfIj2Zpd6GYjakmwirGasU0G3w8/IIWH2LAZI mf1m9yG1I3YEsVN7/cFVfdiP9OKA8j3QTdBkT1SP9LkGAQsnDVF+5KVJIr2UZatko2/3 8X7s4RWk8bOSGRrmISGuNuz4a+MzSAnUtxPHhSm5BUUjt2B+BHvOz8KZ8E9I7TENV6xG VGrFN0JwNm0WMRkVcrK/bsM5wcPVzIMEAcs6gIkMgKciBhsqm6wlvkwVpI4+UkTtTuZm GNPntENE3tdyMg3fWWnIgAKvEzy1uTnHDFdlHxWvVPlPCp33qtOboqR7f/4a4yzxG+9x 6hJQ== X-Gm-Message-State: AOAM531a076miFzMqGBDTx7Mw+OURJ50qIDC0sYXT7qZlLPDfKBhfOr9 enWAjXU+5bU7qqibWA06fUk= X-Google-Smtp-Source: ABdhPJwV+/mwh+nouU0lW66HI6ktjYcIDPBcaGJPEFRRh4dIHe7cAW1vW6vor+lN0wL14LVfiyEj5g== X-Received: by 2002:adf:94c2:: with SMTP id 60mr25591830wrr.366.1589893702388; Tue, 19 May 2020 06:08:22 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id b18sm20586270wrn.82.2020.05.19.06.08.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 May 2020 06:08:21 -0700 (PDT) From: luca.boccassi@gmail.com To: Stephen Hemminger Cc: dpdk stable Date: Tue, 19 May 2020 14:03:03 +0100 Message-Id: <20200519130549.112823-48-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200519130549.112823-1-luca.boccassi@gmail.com> References: <20200519125804.104349-1-luca.boccassi@gmail.com> <20200519130549.112823-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/netvsc: avoid possible live lock' has been queued to stable release 19.11.3 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.3 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 05/21/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 4f880a2089d25f58ba93699b252334d6ef03b2f8 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 cbdfcc628b..19f00a0528 100644 --- a/drivers/net/netvsc/hn_rxtx.c +++ b/drivers/net/netvsc/hn_rxtx.c @@ -1032,9 +1032,6 @@ retry: if (tx_limit && tx_done >= tx_limit) break; - - if (rxq->rx_ring && rte_ring_full(rxq->rx_ring)) - break; } if (bytes_read > 0) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-19 14:04:46.488519011 +0100 +++ 0048-net-netvsc-avoid-possible-live-lock.patch 2020-05-19 14:04:44.184647792 +0100 @@ -1,8 +1,10 @@ -From 36274f287103d2f4a372a99dff2c4f47eeb75633 Mon Sep 17 00:00:00 2001 +From 4f880a2089d25f58ba93699b252334d6ef03b2f8 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. @@ -11,7 +13,6 @@ buffer slots, even if means dropping some packets. Fixes: 7e6c82430702 ("net/netvsc: avoid over filling Rx descriptor ring") -Cc: stable@dpdk.org Signed-off-by: Stephen Hemminger ---