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 52F37A051C for ; Tue, 11 Feb 2020 12:42:22 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 488C31C02A; Tue, 11 Feb 2020 12:42:22 +0100 (CET) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id A65E81C012 for ; Tue, 11 Feb 2020 12:42:20 +0100 (CET) Received: by mail-wr1-f66.google.com with SMTP id z7so11901268wrl.13 for ; Tue, 11 Feb 2020 03:42:20 -0800 (PST) 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=7D4+GZWZXC5XOV2Mv4OhxBH53prm3BRR2vcgeUmkrfo=; b=izr73beYCg+U14wzEpZRimVWhU+HiWgfitD4h12etyScpChjUdk11iCpMuTRcNIapP wQ6AqtbJvI1zw8edJ52d870yu+S/4ZicqJwWbBM2l90yaisp97h4If/Ft3Ly7qL9kC49 TfAy+32Lu6HaJ3MNekyF6suDQVsk7nQFcMgY2hHua9fpYAqe9B7/5FICjFblnVR93MR4 XxxO0QNFvLgdaG32LEu9Sc7j1JmRaymofdb9CqtKQV05PVzK2WE7lfxR9MdpLFKbLdoS 86uyAtOuL/ppYy4FDAOYfReVoVciTdiW5/Py+tkoRBRODP4GdLZf8bS6E/eIXhSQalsg J7pA== 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=7D4+GZWZXC5XOV2Mv4OhxBH53prm3BRR2vcgeUmkrfo=; b=oNFEvLzoKRFdYuuHeY2ANWUTHt0DqlVP1qMGWoLUrpfDLlvtnFfhDuxXVqxf9tKTYE z9DYtBXPJ8F9wjKizaMMv5m32dj6gK3TLkR9cH4xxQfi4ZgLV9iazX/T/ka9ImMIZbH9 H+fBU3+AOJRBEieMW4qCGtm74xwWcgy9O1sO/TJdB2YZdTa3JIYAZgGR3oxxPhZlEFtn RhibJlj6PRWygXVWUNR4WMFWWL3nK8jHRNTLVQwPh3N1nb0sy/OS9UMwrSVtiuEujkJJ wiO4YrKTvpPUmc+hU5Fa6e+CKVvzl2xvUR12/cMbNi0HL6WuLlDQcUXZ900+u3vNOe/c J3Sw== X-Gm-Message-State: APjAAAVbKxfxBnzgmxAlzaxl+f1qwuuxEf7kH7cqwcoO7/umy1eLoN5e o//hHN6Hkww1RFOHK5lx13A= X-Google-Smtp-Source: APXvYqxWKvhYRrd8mMi7sqObw9iujBGLxwxnQzDFT4hA7Ypp0f1TN50n39GwFNKtYcOoM24ZSu29bQ== X-Received: by 2002:adf:b64b:: with SMTP id i11mr8724012wre.58.1581421340433; Tue, 11 Feb 2020 03:42:20 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id q124sm5993811wme.2.2020.02.11.03.42.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:42:19 -0800 (PST) From: luca.boccassi@gmail.com To: Tiwei Bie Cc: Maxime Coquelin , dpdk stable Date: Tue, 11 Feb 2020 11:22:01 +0000 Message-Id: <20200211112216.3929-175-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200211112216.3929-1-luca.boccassi@gmail.com> References: <20200211112216.3929-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/virtio-user: do not reset virtqueues for split ring' has been queued to stable release 19.11.1 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.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/13/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 cde00e7bac4a17d2991f16d008b46a4be00a4295 Mon Sep 17 00:00:00 2001 From: Tiwei Bie Date: Wed, 5 Feb 2020 10:11:08 +0800 Subject: [PATCH] net/virtio-user: do not reset virtqueues for split ring [ upstream commit 92771257316f04157a863885979397731e755096 ] Add missing braces to avoid resetting virtqueues unconditionally during reconnection. Fixes: 6ebbf4109f35 ("net/virtio-user: fix packed ring server mode") Signed-off-by: Tiwei Bie Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtio_user_ethdev.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c index f3b35d1bdd..e61af40683 100644 --- a/drivers/net/virtio/virtio_user_ethdev.c +++ b/drivers/net/virtio/virtio_user_ethdev.c @@ -89,10 +89,11 @@ virtio_user_server_reconnect(struct virtio_user_dev *dev) dev->features &= dev->device_features; /* For packed ring, resetting queues is required in reconnection. */ - if (vtpci_packed_queue(hw)) + if (vtpci_packed_queue(hw)) { PMD_INIT_LOG(NOTICE, "Packets on the fly will be dropped" " when packed ring reconnecting."); virtio_user_reset_queues_packed(eth_dev); + } ret = virtio_user_start_device(dev); if (ret < 0) -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:44.659429112 +0000 +++ 0175-net-virtio-user-do-not-reset-virtqueues-for-split-ri.patch 2020-02-11 11:17:38.820009200 +0000 @@ -1,13 +1,14 @@ -From 92771257316f04157a863885979397731e755096 Mon Sep 17 00:00:00 2001 +From cde00e7bac4a17d2991f16d008b46a4be00a4295 Mon Sep 17 00:00:00 2001 From: Tiwei Bie Date: Wed, 5 Feb 2020 10:11:08 +0800 Subject: [PATCH] net/virtio-user: do not reset virtqueues for split ring +[ upstream commit 92771257316f04157a863885979397731e755096 ] + Add missing braces to avoid resetting virtqueues unconditionally during reconnection. Fixes: 6ebbf4109f35 ("net/virtio-user: fix packed ring server mode") -Cc: stable@dpdk.org Signed-off-by: Tiwei Bie Reviewed-by: Maxime Coquelin