From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from out3-smtp.messagingengine.com (out3-smtp.messagingengine.com [66.111.4.27]) by dpdk.org (Postfix) with ESMTP id C073A2B9C for ; Sun, 22 Apr 2018 17:10:40 +0200 (CEST) Received: from compute1.internal (compute1.nyi.internal [10.202.2.41]) by mailout.nyi.internal (Postfix) with ESMTP id 6433620FFF; Sun, 22 Apr 2018 11:10:40 -0400 (EDT) Received: from mailfrontend2 ([10.202.2.163]) by compute1.internal (MEProxy); Sun, 22 Apr 2018 11:10:40 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fridaylinux.org; h=cc:date:from:in-reply-to:message-id:references:subject:to :x-me-sender:x-me-sender:x-sasl-enc; s=fm2; bh=/sSaulbKwieP6kiAU QFJ5wCPpzKZbV9D9CjRe2CX0fQ=; b=HewJHUXbJH2t3wJrWWm8LCsG89wtHK75d 7MDsDTIDg6tIoPW+grE62zDmnD8KIiQZGWTqKrlzbr1ZW+akrwFJ+rq9zYTXH3Kr 1Wl3Fyl1mA4MsPlhGz+8wWGnDWcePwIOfKQTJxM20XpNYN6Ak1pXA7sNQKwxAfql xmnHfC1aRttb152scGgS6gU9YSZrKY4vb6aA0XClCF4TtMpHUPB0+7RIBGUWbiTJ HDTFPMtQbN7y61mAzDTbuAiJBFfiE/c8YW95HBGbfgcBKXt6hptDcqOjBN/wYa63 h7TZ1P7RoDKWXwUIgkP4tzuQ25OK6FprUaH9plJ19mMMeCprGGxAg== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:date:from:in-reply-to:message-id :references:subject:to:x-me-sender:x-me-sender:x-sasl-enc; s= fm2; bh=/sSaulbKwieP6kiAUQFJ5wCPpzKZbV9D9CjRe2CX0fQ=; b=LN9xtZo0 c7PoaVbv1bWhuDj+otDGC/FA1qNspYQSvUA67Y5x2MmOFLS0cawdIrwgnJQkOPQA 7KfMh/O8vAKMF46MXUrqB+8xOjK9epC0nYgZ9qA3VhLHDGZywEUqGJZpBA85lRhx fXd1FK/DtDTOTzBJBuvgE3rimJuk0esSxeiOhlpIeL1QdXFLjCTJQkqdyk8cOmUw 5F61phGoEbMckapIIKiXi2SByFHTB2jAQVF0xLVXGrFbsrsfd519lvzLcCZuRUzL YryGquhhyKH2Uoev8gjuZS60KgmzT9zNx2NfXnKwWrsWlifuOBvE2KOcBYT/W/vF rI+79tQQvF+Z3A== X-ME-Sender: Received: from yuanhanliu-NB0.tencent.com (unknown [223.74.148.66]) by mail.messagingengine.com (Postfix) with ESMTPA id E51041025A; Sun, 22 Apr 2018 11:10:37 -0400 (EDT) From: Yuanhan Liu To: Tomasz Kulasek Cc: Dariusz Stojaczyk , Jianfeng Tan , Maxime Coquelin , dpdk stable Date: Sun, 22 Apr 2018 23:09:01 +0800 Message-Id: <20180422150949.17523-11-yliu@fridaylinux.org> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180422150949.17523-1-yliu@fridaylinux.org> References: <20180422150949.17523-1-yliu@fridaylinux.org> Subject: [dpdk-stable] patch 'vhost: fix device cleanup at stop' has been queued to LTS release 17.11.2 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: , X-List-Received-Date: Sun, 22 Apr 2018 15:10:41 -0000 Hi, FYI, your patch has been queued to LTS release 17.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/29/18. So please shout if anyone has objections. Thanks. --yliu --- >>From c1bea86d1a7216da292b0a26e1026b02bd6b1195 Mon Sep 17 00:00:00 2001 From: Tomasz Kulasek Date: Fri, 9 Feb 2018 18:10:00 +0100 Subject: [PATCH] vhost: fix device cleanup at stop [ upstream commit ace7b6b7859e1dc410589610a8e436c1a3b430f3 ] This prevents from destroying & recreating user device in "incomplete" vring state. virtio_is_ready() was returning true for devices with vrings which did not have valid callfd (their VHOST_USER_SET_VRING_CALL hasn't arrived yet) Fixes: 8f972312b8f4 ("vhost: support vhost-user") Signed-off-by: Dariusz Stojaczyk Signed-off-by: Tomasz Kulasek Reviewed-by: Jianfeng Tan Reviewed-by: Maxime Coquelin --- lib/librte_vhost/vhost_user.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/librte_vhost/vhost_user.c b/lib/librte_vhost/vhost_user.c index 03190d64f..02f219dc7 100644 --- a/lib/librte_vhost/vhost_user.c +++ b/lib/librte_vhost/vhost_user.c @@ -860,6 +860,11 @@ vhost_user_get_vring_base(struct virtio_net *dev, vq->kickfd = VIRTIO_UNINITIALIZED_EVENTFD; + if (vq->callfd >= 0) + close(vq->callfd); + + vq->callfd = VIRTIO_UNINITIALIZED_EVENTFD; + if (dev->dequeue_zero_copy) free_zmbufs(vq); rte_free(vq->shadow_used_ring); -- 2.11.0