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 6ECE6A0093 for ; Fri, 22 May 2020 11:41:23 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6672B1D966; Fri, 22 May 2020 11:41:23 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id E5AF71D971 for ; Fri, 22 May 2020 11:41:21 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id x14so4143356wrp.2 for ; Fri, 22 May 2020 02:41:21 -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=GdUy8jQHcCcotbn2eDI+5G8laIOngaduPB8ytm8dq6c=; b=AlXMjnNwzKPUExVDjKKxeQOz27+XYvu38AgWcqpiM0nDnCACQWWjrBbgr/zaofgw2B RG+7MB9Obmh9/KeCIl1TUg7wuKAAWgGrY87f5EOjJEjU/H9xfSZIujxTMlUtrpP7pxOK ySV33bPPHmg7MxwzMyRj3cKYtAcWMahAHTYKYp7MqcpiExGYkEdy6/afdRKhl/dcDIpX v1XvL6hDk/D+G9PSM2Dkr75P2Z9TBiBKmXBBmtdKz1ppa8qfcHEyKFdy+azwTdEJx7+C rVAiOdZTTdgrMGS7XRipz8ZsETru/ay3uiSciAAth6uh8e7nCH/IXuvQwLrT8hOcqOgv PUZQ== 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=GdUy8jQHcCcotbn2eDI+5G8laIOngaduPB8ytm8dq6c=; b=TVb+Tvv2w3k63N03RnuG0sg7aA8dspmiPiEpPHoJkE+I0S6DWp3KQXcM4GHhkkw9UT vy9LJbhIhWLfTScBq+Nm2nGnmc4/VPx2fgBYVENMEDveDy//rlPts7W2P68A4+ODbBXq vB1vzYP2p8zW7aag+nIwWNTyy39udNzFK7yiZen/dTAI73FMYHalXbDR4u+P6cqRd9fv 95FMqgWWS7sJUF1N5gN4GT8FozVNfIgKRNC7VqYvA30mLHFICyESB72qRgMa9Aj1ABN2 HH6Z3LBJwPA+tomx19Ka3980Eye3v7TviGiXhD3PZn55sEKzjBpUwTpTxA1LO5vu+Xnk ypMg== X-Gm-Message-State: AOAM531w4g/dVSLzp83nzzn10myICmkFeC0eR3smIG9Nf8JyjLNP4U3a ZcTllJWCwLvgK7DaFYR8JYU= X-Google-Smtp-Source: ABdhPJyW6eoIOPI+XvigKyp9YEOehyFZEkitsRHOIEsB7noauBkCfl11UJvf3fZWpQur6htc8XaW0A== X-Received: by 2002:adf:f30d:: with SMTP id i13mr1325462wro.146.1590140481629; Fri, 22 May 2020 02:41:21 -0700 (PDT) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id y3sm8851292wrm.64.2020.05.22.02.41.20 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 22 May 2020 02:41:21 -0700 (PDT) From: luca.boccassi@gmail.com To: Marvin Liu Cc: Xiao Wang , Maxime Coquelin , dpdk stable Date: Fri, 22 May 2020 10:39:59 +0100 Message-Id: <20200522094022.1025696-20-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200522094022.1025696-1-luca.boccassi@gmail.com> References: <20200519130549.112823-214-luca.boccassi@gmail.com> <20200522094022.1025696-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Subject: [dpdk-stable] patch 'net/virtio: fix unexpected event after reconnect' 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/24/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 f9630f56a4c7dc4781c94ab6782762eeb201d293 Mon Sep 17 00:00:00 2001 From: Marvin Liu Date: Fri, 15 May 2020 10:35:07 +0800 Subject: [PATCH] net/virtio: fix unexpected event after reconnect [ upstream commit f50560a54b8bd6b52d763213aee40f0164fb4099 ] Event notification should be disabled after virtqueue initialization and enabled by calling rte_eth_dev_rx_intr_enable later. When virtio user device reconnecting to vhost, virtqueue_disable_intr should be called to disable event notification. Fixes: 6ebbf4109f35 ("net/virtio-user: fix packed ring server mode") Signed-off-by: Marvin Liu Acked-by: Xiao Wang Reviewed-by: Maxime Coquelin --- drivers/net/virtio/virtqueue.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/net/virtio/virtqueue.c b/drivers/net/virtio/virtqueue.c index 0b4e3bf3e2..02c8b9fc54 100644 --- a/drivers/net/virtio/virtqueue.c +++ b/drivers/net/virtio/virtqueue.c @@ -174,6 +174,7 @@ virtqueue_rxvq_reset_packed(struct virtqueue *vq) vring_desc_init_packed(vq, size); + virtqueue_disable_intr(vq); return 0; } @@ -210,5 +211,6 @@ virtqueue_txvq_reset_packed(struct virtqueue *vq) vring_desc_init_packed(vq, size); + virtqueue_disable_intr(vq); return 0; } -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-05-22 10:37:39.988738322 +0100 +++ 0020-net-virtio-fix-unexpected-event-after-reconnect.patch 2020-05-22 10:37:39.108412355 +0100 @@ -1,15 +1,16 @@ -From f50560a54b8bd6b52d763213aee40f0164fb4099 Mon Sep 17 00:00:00 2001 +From f9630f56a4c7dc4781c94ab6782762eeb201d293 Mon Sep 17 00:00:00 2001 From: Marvin Liu Date: Fri, 15 May 2020 10:35:07 +0800 Subject: [PATCH] net/virtio: fix unexpected event after reconnect +[ upstream commit f50560a54b8bd6b52d763213aee40f0164fb4099 ] + Event notification should be disabled after virtqueue initialization and enabled by calling rte_eth_dev_rx_intr_enable later. When virtio user device reconnecting to vhost, virtqueue_disable_intr should be called to disable event notification. Fixes: 6ebbf4109f35 ("net/virtio-user: fix packed ring server mode") -Cc: stable@dpdk.org Signed-off-by: Marvin Liu Acked-by: Xiao Wang @@ -19,10 +20,10 @@ 1 file changed, 2 insertions(+) diff --git a/drivers/net/virtio/virtqueue.c b/drivers/net/virtio/virtqueue.c -index 408bba236a..2702e120ee 100644 +index 0b4e3bf3e2..02c8b9fc54 100644 --- a/drivers/net/virtio/virtqueue.c +++ b/drivers/net/virtio/virtqueue.c -@@ -175,6 +175,7 @@ virtqueue_rxvq_reset_packed(struct virtqueue *vq) +@@ -174,6 +174,7 @@ virtqueue_rxvq_reset_packed(struct virtqueue *vq) vring_desc_init_packed(vq, size); @@ -30,7 +31,7 @@ return 0; } -@@ -211,5 +212,6 @@ virtqueue_txvq_reset_packed(struct virtqueue *vq) +@@ -210,5 +211,6 @@ virtqueue_txvq_reset_packed(struct virtqueue *vq) vring_desc_init_packed(vq, size);