From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 2B56BA0524 for ; Fri, 5 Feb 2021 12:38:31 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 23A314067B; Fri, 5 Feb 2021 12:38:31 +0100 (CET) Received: from mail-wr1-f53.google.com (mail-wr1-f53.google.com [209.85.221.53]) by mails.dpdk.org (Postfix) with ESMTP id 77934188A55 for ; Fri, 5 Feb 2021 12:38:30 +0100 (CET) Received: by mail-wr1-f53.google.com with SMTP id z6so7284009wrq.10 for ; Fri, 05 Feb 2021 03:38:30 -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=QAydvgqnWsbA7MVtCH8D6VG2XnUCM1nk818aELxb/tY=; b=VL3JP9YAYbFJrk+R7svMGJVRnPaVkjRikAX3WwMDU7Jtt6sfkhnRyuSca0VPCT8k/M A/S5J54vMejKWrd96d8VPcKJ788+AGfXjwl6dmIB22tuqoHqmVqgePU9FqiKhksGzgFP AnPQE7xfuVOnh8om4Zoy5U5gwJWwy7uGxupCOMZOy1HkXFH/qPjRgTHnPfU+4ATFoI+1 HMimIlCPEsPIhrTXRNPzs0AVD9UVIKpjCFxUvjgeXdO7JCEM+6XqvjKDfXufCL4OIfZo F+2ihRFu1c/8Kd9sfnD8Gp2MuKUlU+Fs3hB8wrvv/fr3KKuFV97NHgQqmASyLmjVLKCr wHog== 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=QAydvgqnWsbA7MVtCH8D6VG2XnUCM1nk818aELxb/tY=; b=klRwixxRb4c6h/GbUR9icxl/jJu3DSylD+sp45cs73l/oHPT4sXLWcPMLw9aLiGKFG kn7YwJg26ZaCZzCYLAhorTwXoN1RzYsbW8WVPuv3JVM/syDteLux80D+imRWAISQzRao PR6RAiBXjS/bGDw7xqR2MyWMGzIQNJqDeMRnl3xv6Qkz4UgIN1QNwDAH4nPN9myDDAVu g88bfVRo3ABkYLILyyGo7Z0Y3B2Z+LJPJ67PkHQndSFrHmqrLzgYNCr70GkdYdxquHcR /hZjylPDLu0Fk0R7qNlM6I5trmi7MlN3s6CDnHGr3H/mv4o1D2GXx8yOiivP9Xyv3d4z z3jA== X-Gm-Message-State: AOAM530ItTm5Ck/Mf+YExMdhXR65WQDMfq/GPINFbbOnvJg5c9BN6zLL UhwKKnFER/4L6/Q5Ch3Kv4o= X-Google-Smtp-Source: ABdhPJz8EvtW2VwJulfkrPWtnUPlb0vT6DRb6N0Ofn/u0LtXG4WBf4d+9keq15vY7r/B3ZQY1VhMXA== X-Received: by 2002:adf:e50e:: with SMTP id j14mr4690203wrm.162.1612525110309; Fri, 05 Feb 2021 03:38:30 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id 2sm7647469wmn.10.2021.02.05.03.38.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Feb 2021 03:38:29 -0800 (PST) From: luca.boccassi@gmail.com To: Maxime Coquelin Cc: Chenbo Xia , dpdk stable Date: Fri, 5 Feb 2021 11:18:55 +0000 Message-Id: <20210205111920.1272063-249-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20210205111920.1272063-1-luca.boccassi@gmail.com> References: <20210205111920.1272063-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/virtio: fix getting old status on reconnect' has been queued to stable release 20.11.1 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 20.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/07/21. 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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/ae38535b10e71956a4185bcde0234a600aa516e7 Thanks. Luca Boccassi --- >From ae38535b10e71956a4185bcde0234a600aa516e7 Mon Sep 17 00:00:00 2001 From: Maxime Coquelin Date: Tue, 26 Jan 2021 11:15:58 +0100 Subject: [PATCH] net/virtio: fix getting old status on reconnect [ upstream commit 721dbeb329fe3a26ec95e93f1877ec3f7184eaae ] This patch fixes getting reset status from the restarted vhost-user backend in case of reconnection, instead of the status at the time of the disconnection. This issue was not spotted earlier because Vhost-user protocol status feature was disabled in server mode. Fixes: 47235f16505f ("net/virtio-user: set status on socket reconnect") Signed-off-by: Maxime Coquelin Reviewed-by: Chenbo Xia --- drivers/net/virtio/virtio_user_ethdev.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/net/virtio/virtio_user_ethdev.c b/drivers/net/virtio/virtio_user_ethdev.c index 40345193e6..78998427cc 100644 --- a/drivers/net/virtio/virtio_user_ethdev.c +++ b/drivers/net/virtio/virtio_user_ethdev.c @@ -77,7 +77,7 @@ virtio_user_server_reconnect(struct virtio_user_dev *dev) return -1; dev->vhostfd = connectfd; - old_status = vtpci_get_status(hw); + old_status = dev->status; vtpci_reset(hw); -- 2.29.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2021-02-05 11:18:40.157191168 +0000 +++ 0249-net-virtio-fix-getting-old-status-on-reconnect.patch 2021-02-05 11:18:29.262699793 +0000 @@ -1 +1 @@ -From 721dbeb329fe3a26ec95e93f1877ec3f7184eaae Mon Sep 17 00:00:00 2001 +From ae38535b10e71956a4185bcde0234a600aa516e7 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 721dbeb329fe3a26ec95e93f1877ec3f7184eaae ] + @@ -14 +15,0 @@ -Cc: stable@dpdk.org @@ -23 +24 @@ -index 308275b70e..2b8fdd0c10 100644 +index 40345193e6..78998427cc 100644