From patchwork Tue Oct 2 14:09:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Maximets X-Patchwork-Id: 977862 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=samsung.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (1024-bit key; unprotected) header.d=samsung.com header.i=@samsung.com header.b="EabgUnV4"; dkim-atps=neutral Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42Pgwj2WPlz9vDk for ; Wed, 3 Oct 2018 00:08:21 +1000 (AEST) Received: from localhost ([::1]:43951 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g7LLX-0005iV-2M for incoming@patchwork.ozlabs.org; Tue, 02 Oct 2018 10:08:19 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40550) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1g7LL9-0005iM-1B for qemu-devel@nongnu.org; Tue, 02 Oct 2018 10:07:56 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1g7LL5-0004er-Nr for qemu-devel@nongnu.org; Tue, 02 Oct 2018 10:07:54 -0400 Received: from mailout1.w1.samsung.com ([210.118.77.11]:51598) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1g7LL5-0004dM-AE for qemu-devel@nongnu.org; Tue, 02 Oct 2018 10:07:51 -0400 Received: from eucas1p1.samsung.com (unknown [182.198.249.206]) by mailout1.w1.samsung.com (KnoxPortal) with ESMTP id 20181002140748euoutp01927227121340daf6465b25a6d314ed79~Zz9aIF-1i2730727307euoutp01z; Tue, 2 Oct 2018 14:07:48 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 mailout1.w1.samsung.com 20181002140748euoutp01927227121340daf6465b25a6d314ed79~Zz9aIF-1i2730727307euoutp01z DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=samsung.com; s=mail20170921; t=1538489268; bh=ibTmVXA1nIFhxaQdv9P8yzSHKBcRDjggz9VU9G1fZAE=; h=From:To:Cc:Subject:Date:References:From; b=EabgUnV4BB9QikVExTQDhHIBqoAQEBg1Ok8jNjbqvYD0/LuHajG5R/j7NjZS+HwaU 9HQYcjEj1illAmLSNg5W+nN7NPhaDA9Zd/AwNAaIbx0ATLJ4o7rGALR8lmW2V3zy0T /ZGo4WLeJv7Q3o/bWzkcXo1F/5aUEtH+3PlFrrXI= Received: from eusmges1new.samsung.com (unknown [203.254.199.242]) by eucas1p2.samsung.com (KnoxPortal) with ESMTP id 20181002140747eucas1p2949fa828f68343d0f7fcd9781100e5b8~Zz9Zuwazh2234322343eucas1p2Q; Tue, 2 Oct 2018 14:07:47 +0000 (GMT) Received: from eucas1p2.samsung.com ( [182.198.249.207]) by eusmges1new.samsung.com (EUCPMTA) with SMTP id 7A.5F.04441.3BB73BB5; Tue, 2 Oct 2018 15:07:47 +0100 (BST) Received: from eusmgms1.samsung.com (unknown [182.198.249.179]) by eucas1p1.samsung.com (KnoxPortal) with ESMTP id 20181002140746eucas1p14d822ee1600d78687a73d6bf9a44e36b~Zz9ZASKbI2313723137eucas1p1D; Tue, 2 Oct 2018 14:07:46 +0000 (GMT) X-AuditID: cbfec7f2-5c9ff70000001159-c2-5bb37bb32f56 Received: from eusync1.samsung.com ( [203.254.199.211]) by eusmgms1.samsung.com (EUCPMTA) with SMTP id D7.05.04284.2BB73BB5; Tue, 2 Oct 2018 15:07:46 +0100 (BST) Received: from imaximets.rnd.samsung.ru ([106.109.129.180]) by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0PFZ000X35WR4E40@eusync1.samsung.com>; Tue, 02 Oct 2018 15:07:46 +0100 (BST) From: Ilya Maximets To: "Michael S. Tsirkin" Date: Tue, 02 Oct 2018 17:09:47 +0300 Message-id: <20181002140947.4107-1-i.maximets@samsung.com> X-Mailer: git-send-email 2.17.1 MIME-version: 1.0 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrPIsWRmVeSWpSXmKPExsWy7djP87qbqzdHG5x/K2zRu+0eu8WV9p/s Fgva2lktjnXuYbH4/+sVq8Xx3h0sDmweT65tZvJ4v+8qm0ffllWMAcxRXDYpqTmZZalF+nYJ XBmvNhxnL5gjVNHdpdjAeJi3i5GTQ0LARGL9uz1MXYxcHEICKxgl1v7/wgrhfGaUuL5vPytM 1beHK9khEssYJU6cn8oI4TQzSbSunMcMUsUmoCNxavURRhBbREBT4umt12BzmQVeAnX8esYG khAW8JJ4vOoYWAOLgKrEnLZVYCt4BawkJq6fBbVOXmL1hgPMEHFBiR+T77GA2MxA8YNXnrOA DJUQ+MkqcWnvGqgGF4mH944yQ9jCEq+Ob2GHsGUkOjsOMkHY9RL3W14yQjR3MEpMP/QPKmEv seX1OXaIDXwSk7ZNBxrEARTnlehoE4Io8ZCYdfQ62GdCArES75+sYpnAKDULyX2zkNy3gJFp FaN4amlxbnpqsWFearlecWJucWleul5yfu4mRmC0nv53/NMOxq+Xkg4xCnAwKvHwMshvihZi TSwrrsw9xCjBwawkwtuXuDlaiDclsbIqtSg/vqg0J7X4EKM0B4uSOO+yeRujhQTSE0tSs1NT C1KLYLJMHJxSDYxKO3sNTyq/kz+h1bW0ITq5qPRvpsnTj6nd1su5dq/MVdP8X3mijTGYf8O7 54YFF/Pc61T6n4bX+Hxbz3cyavf9qNutpyM3iEwPkXlkKv/a54WYpcqO8smxKp9DJH/n/5l6 SPAWX+RWEVOdiNeqOpuFnI8YbObxnr2s6MZp1nyZcvss/qVhP5RYijMSDbWYi4oTAefzEWLS AgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFprILMWRmVeSWpSXmKPExsVy+t/xy7qbqjdHGzw+pmDRu+0eu8WV9p/s Fgva2lktjnXuYbH4/+sVq8Xx3h0sDmweT65tZvJ4v+8qm0ffllWMAcxRXDYpqTmZZalF+nYJ XBmvNhxnL5gjVNHdpdjAeJi3i5GTQ0LAROLbw5XsXYxcHEICSxglpv9dwAjhtDJJzNyylQmk ik1AR+LU6iOMILaIgKbE01uvmUCKmAVeMkrc77vFCpIQFvCSeLzqGDOIzSKgKjGnbRVYnFfA SmLi+lmsEOvkJVZvOMAMEReU+DH5HguIzQwUP3jlOcsERp5ZSFKzkKQWMDKtYhRJLS3OTc8t NtQrTswtLs1L10vOz93ECAyobcd+bt7BeGlj8CFGAQ5GJR5eBvlN0UKsiWXFlbmHGCU4mJVE ePsSN0cL8aYkVlalFuXHF5XmpBYfYpTmYFES5z1vUBklJJCeWJKanZpakFoEk2Xi4JRqYAxL mzDz7+H5zkWxa/Orz5x7y7c4+J3MlH2bi5f+vHTYUnqO43p96UVLU1pNGoLS5eUO17grJC9O 51nxoKvdUMTj2g6bw5s472hIuRYHLokzYHm8SIsvadYE9oAdU2Run94x//b9Vcn1p088cy4/ Vvjt4ke5O+t/t15oXjRnZ4D3IUsLR5m6tDYlluKMREMt5qLiRAByOz5sJAIAAA== X-CMS-MailID: 20181002140746eucas1p14d822ee1600d78687a73d6bf9a44e36b X-Msg-Generator: CA CMS-TYPE: 201P X-CMS-RootMailID: 20181002140746eucas1p14d822ee1600d78687a73d6bf9a44e36b References: X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 210.118.77.11 Subject: [Qemu-devel] [PATCH] vhost-user: Don't ask for reply on postcopy mem table set X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Ilya Maximets , =?utf-8?q?Marc-Andr=C3=A9_Lure?= =?utf-8?q?au?= , Maxime Coquelin , qemu-devel@nongnu.org, "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" According to documentation, NEED_REPLY_MASK should not be set for VHOST_USER_SET_MEM_TABLE request in postcopy mode. This restriction was mistakenly applied to 'reply_supported' variable, which is local and used only for non-postcopy case. CC: Dr. David Alan Gilbert Fixes: 9bb38019942c ("vhost+postcopy: Send address back to qemu") Signed-off-by: Ilya Maximets Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Maxime Coquelin --- hw/virtio/vhost-user.c | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index b041343632..c442daa562 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -374,8 +374,6 @@ static int vhost_user_set_mem_table_postcopy(struct vhost_dev *dev, int fds[VHOST_MEMORY_MAX_NREGIONS]; int i, fd; size_t fd_num = 0; - bool reply_supported = virtio_has_feature(dev->protocol_features, - VHOST_USER_PROTOCOL_F_REPLY_ACK); VhostUserMsg msg_reply; int region_i, msg_i; @@ -384,10 +382,6 @@ static int vhost_user_set_mem_table_postcopy(struct vhost_dev *dev, .hdr.flags = VHOST_USER_VERSION, }; - if (reply_supported) { - msg.hdr.flags |= VHOST_USER_NEED_REPLY_MASK; - } - if (u->region_rb_len < dev->mem->nregions) { u->region_rb = g_renew(RAMBlock*, u->region_rb, dev->mem->nregions); u->region_rb_offset = g_renew(ram_addr_t, u->region_rb_offset, @@ -503,10 +497,6 @@ static int vhost_user_set_mem_table_postcopy(struct vhost_dev *dev, return -1; } - if (reply_supported) { - return process_message_reply(dev, &msg); - } - return 0; } @@ -519,8 +509,7 @@ static int vhost_user_set_mem_table(struct vhost_dev *dev, size_t fd_num = 0; bool do_postcopy = u->postcopy_listen && u->postcopy_fd.handler; bool reply_supported = virtio_has_feature(dev->protocol_features, - VHOST_USER_PROTOCOL_F_REPLY_ACK) && - !do_postcopy; + VHOST_USER_PROTOCOL_F_REPLY_ACK); if (do_postcopy) { /* Postcopy has enough differences that it's best done in it's own