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 798F3A051C for ; Tue, 11 Feb 2020 12:42:32 +0100 (CET) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 6C9471C0B2; Tue, 11 Feb 2020 12:42:31 +0100 (CET) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id C1A811C0C1 for ; Tue, 11 Feb 2020 12:42:29 +0100 (CET) Received: by mail-wm1-f65.google.com with SMTP id s10so3102320wmh.3 for ; Tue, 11 Feb 2020 03:42:29 -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=MEXIz+4Qmy8CEokMc+rVAGQEaTPgA3k3wB6WZGB30cY=; b=neM6dW6Yg1OPa9SGGdFBr7qtV0bYGcESlCBvbuAB/VLkagyDjzu58DLQdf2zKMd4BG H74ZSYcW0n9OF9JtGTh8Usz5SExLBL2r2Xu3Ad0uNMiVpYKTcg6pX287Mn+LiL6R8pYQ 4rYnZW2v4Fbu97F64a2SmmPBzCgA0PU/9aI/GF5RFr2Jt2DkzyyLuyyUuSp4s7XP2CBx vHPM3hjYbVDKlPAJ25h0qqpGo+LhWLm3UQbfinbZufVg7ye9oq3tPa4m5eQ/Yr/mZLux OeHkTYdzGaA0y5yeG5tK45a0mj6/dgri22u1sJ/L/1qw1KSYUeukW4ESDOSKIiJfl65m u0LQ== 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=MEXIz+4Qmy8CEokMc+rVAGQEaTPgA3k3wB6WZGB30cY=; b=dL0edwF1VeaEWXZVtp1lW8a3FYCFhOiosXpVVL+O4yLJCwJFyaaEZcCwhYCFrIj0Ph dglA/5w+bcI1mj+fztpieZLeXDmTw+xfg1RPleSPt+hwh7lXwONPlxIhIUAPvZzNUDKq wCXgC8PixfcJcj5yzxslWmzohURkToLNXN+WAk31QbyZ4uCsUhVfHbnDrFnb/Z7SJKNK XA+Jy8+nwLhWKMI7X3yIKh8JBfjiCwIKGx75tq7YdeZjmk1R3STOi7eaSx5i5KNVr2Lg 9jCIzrXRGQChDXnO18Q2jql+EceQgB/ydJsmprUPFftUsNxkT0smZhj/SRbE+a7FE00z 4ulg== X-Gm-Message-State: APjAAAU2cUDji6KQbhdcSnLIv3pO7m1BSLGx2DP2s9tRsRL92NuVnP+z XVpEb5cHMssmDyX7cCg6RAwI2eR9+lc= X-Google-Smtp-Source: APXvYqyufjFCsJEtA3r7ex/iTzESRVrstd8HMCyObMORCFDH3jDkF52ibMRgQsprs6P8U89EQjLPrA== X-Received: by 2002:a1c:660a:: with SMTP id a10mr5193599wmc.122.1581421349506; Tue, 11 Feb 2020 03:42:29 -0800 (PST) Received: from localhost ([88.98.246.218]) by smtp.gmail.com with ESMTPSA id r6sm4956567wrq.92.2020.02.11.03.42.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 11 Feb 2020 03:42:28 -0800 (PST) From: luca.boccassi@gmail.com To: Adrian Moreno Cc: Tiwei Bie , dpdk stable Date: Tue, 11 Feb 2020 11:22:06 +0000 Message-Id: <20200211112216.3929-180-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 'vhost: fix packed virtqueue ready condition' 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 8e1c060d3fe59027f40cc00f78fe4043b62bb1fa Mon Sep 17 00:00:00 2001 From: Adrian Moreno Date: Sat, 25 Jan 2020 09:52:16 +0100 Subject: [PATCH] vhost: fix packed virtqueue ready condition [ upstream commit c5a910dd92ecbad24f86b4c59b4ff8105b5149fd ] Consider a virtqueue ready when, apart from the descriptor area, both event suppression areas have been mapped. Fixes: 2d1541e2b6b3 ("vhost: add vring address setup for packed queues") Signed-off-by: Adrian Moreno Reviewed-by: Tiwei Bie --- lib/librte_vhost/vhost_user.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index 0cfb8b792b..1c3a1a89fc 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -1298,7 +1298,8 @@ vq_is_ready(struct virtio_net *dev, struct vhost_virtqueue *vq) return false; if (vq_is_packed(dev)) - rings_ok = !!vq->desc_packed; + rings_ok = vq->desc_packed && vq->driver_event && + vq->device_event; else rings_ok = vq->desc && vq->avail && vq->used; -- 2.20.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2020-02-11 11:17:44.800365311 +0000 +++ 0180-vhost-fix-packed-virtqueue-ready-condition.patch 2020-02-11 11:17:38.828009350 +0000 @@ -1,13 +1,14 @@ -From c5a910dd92ecbad24f86b4c59b4ff8105b5149fd Mon Sep 17 00:00:00 2001 +From 8e1c060d3fe59027f40cc00f78fe4043b62bb1fa Mon Sep 17 00:00:00 2001 From: Adrian Moreno Date: Sat, 25 Jan 2020 09:52:16 +0100 Subject: [PATCH] vhost: fix packed virtqueue ready condition +[ upstream commit c5a910dd92ecbad24f86b4c59b4ff8105b5149fd ] + Consider a virtqueue ready when, apart from the descriptor area, both event suppression areas have been mapped. Fixes: 2d1541e2b6b3 ("vhost: add vring address setup for packed queues") -Cc: stable@dpdk.org Signed-off-by: Adrian Moreno Reviewed-by: Tiwei Bie @@ -16,7 +17,7 @@ 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c -index 69b84a8820..c9cc4d6489 100644 +index 0cfb8b792b..1c3a1a89fc 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -1298,7 +1298,8 @@ vq_is_ready(struct virtio_net *dev, struct vhost_virtqueue *vq)