From nobody Mon May 6 01:16:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=163.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 154487566943345.973170494327064; Sat, 15 Dec 2018 04:07:49 -0800 (PST) Received: from localhost ([::1]:38714 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gY8jG-0006ec-EX for importer@patchew.org; Sat, 15 Dec 2018 07:07:34 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38717) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gY8hN-0005ge-GY for qemu-devel@nongnu.org; Sat, 15 Dec 2018 07:05:38 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gY8hI-0007nq-Eo for qemu-devel@nongnu.org; Sat, 15 Dec 2018 07:05:37 -0500 Received: from m12-12.163.com ([220.181.12.12]:34490) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gY8hH-0007k2-Ev for qemu-devel@nongnu.org; Sat, 15 Dec 2018 07:05:32 -0500 Received: from localhost.localdomain (unknown [183.134.170.47]) by smtp8 (Coremail) with SMTP id DMCowABHl7Hs7RRcFlUmFg--.8864S3; Sat, 15 Dec 2018 20:05:05 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=O/EKxReaPRL+bVm4i3 ciDHsWVmkEJ3AQgpPMjz2T6Nc=; b=EU74qXsaeybBU8JAibpqnSOsSZbWYi4UR2 o7iJshbu97sk8oBEfFK6nRK4jIOxboNQzwzQwxU2h/otLif8GP/abrTDG263v0w9 VVdR0Wo5J/mZOkMtDo5xLegc3LUJwndrwnGg69r3B+fikpbps7hUlqtf8CwMrMzm 3g+iFSM6s= From: Li Qiang To: thuth@redhat.com, lvivier@redhat.com, pbonzini@redhat.com, mst@redhat.com, peter.maydell@linaro.org, marcandre.lureau@redhat.com, berrange@redhat.com, jasowang@redhat.com Date: Sat, 15 Dec 2018 04:03:51 -0800 Message-Id: <20181215120353.82786-2-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181215120353.82786-1-liq3ea@163.com> References: <20181215120353.82786-1-liq3ea@163.com> X-CM-TRANSID: DMCowABHl7Hs7RRcFlUmFg--.8864S3 X-Coremail-Antispam: 1Uf129KBjvdXoWrZF45AF4xJw1kKFWkGw47twb_yoWxtrc_Z3 W3XFs7Wr47Cr1Y9r45Xw45AF43Jay7JF1xZFyfJFy7GF47tw13Ja1v9rn7JFyrWa13JF9F vws5tr10kF42qjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUbhiStUUUUU== X-Originating-IP: [183.134.170.47] X-CM-SenderInfo: 5oltjvrd6rljoofrz/1tbiKREebVXlpAXHGQAAsE X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.12 Subject: [Qemu-devel] [PATCH v2 1/3] tests: vhost-user-test: initialize 'fd' in chr_read 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: Li Qiang , liq3ea@gmail.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Currently when processing VHOST_USER_SET_VRING_CALL if 'qemu_chr_fe_get_msgfds' get no fd, the 'fd' will be a stack uninitialized value. Signed-off-by: Li Qiang Reviewed-by: Michael S. Tsirkin Reviewed-by: Thomas Huth --- tests/vhost-user-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/vhost-user-test.c b/tests/vhost-user-test.c index 45d58d8ea2..86039e61e0 100644 --- a/tests/vhost-user-test.c +++ b/tests/vhost-user-test.c @@ -309,7 +309,7 @@ static void chr_read(void *opaque, const uint8_t *buf, = int size) CharBackend *chr =3D &s->chr; VhostUserMsg msg; uint8_t *p =3D (uint8_t *) &msg; - int fd; + int fd =3D -1; =20 if (s->test_fail) { qemu_chr_fe_disconnect(chr); --=20 2.17.1 From nobody Mon May 6 01:16:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=163.com Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1544875669775543.2240288761736; Sat, 15 Dec 2018 04:07:49 -0800 (PST) Received: from localhost ([::1]:38715 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gY8jH-0006ew-7t for importer@patchew.org; Sat, 15 Dec 2018 07:07:35 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38741) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gY8hO-0005ht-Oi for qemu-devel@nongnu.org; Sat, 15 Dec 2018 07:05:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gY8hN-0007t2-TP for qemu-devel@nongnu.org; Sat, 15 Dec 2018 07:05:38 -0500 Received: from m12-12.163.com ([220.181.12.12]:34828) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gY8hN-0007pK-3G for qemu-devel@nongnu.org; Sat, 15 Dec 2018 07:05:37 -0500 Received: from localhost.localdomain (unknown [183.134.170.47]) by smtp8 (Coremail) with SMTP id DMCowABHl7Hs7RRcFlUmFg--.8864S4; Sat, 15 Dec 2018 20:05:11 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=d1HBPpA/r2gJVXkyeD DGTflaga+QrOt4LsTskN5ZtMw=; b=cN5MEgtpldaAVbwnXpnHBYPxo/T9zbobp/ VBwRHzMKpP7F2p7JVnS+8o7uzU5gPfWT2BYog2YtexTFk1pHKmaaoKh6DWILhlsr GBxGWGKJbOdYTUc0rTL6/zd+6nXvINpauE7sjcnB+D0VpCeJLmAM4Htup7A/qcZ/ BtQMFW4f4= From: Li Qiang To: thuth@redhat.com, lvivier@redhat.com, pbonzini@redhat.com, mst@redhat.com, peter.maydell@linaro.org, marcandre.lureau@redhat.com, berrange@redhat.com, jasowang@redhat.com Date: Sat, 15 Dec 2018 04:03:52 -0800 Message-Id: <20181215120353.82786-3-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181215120353.82786-1-liq3ea@163.com> References: <20181215120353.82786-1-liq3ea@163.com> X-CM-TRANSID: DMCowABHl7Hs7RRcFlUmFg--.8864S4 X-Coremail-Antispam: 1Uf129KBjvdXoW7Xr1kKryUtFyUGFy5XFWDArb_yoWDJFc_Aa 15JFZ7WFyDWFsI93yDAw4FyFWagay7Jr18XFWFkF1Fvw17tw13J3y8Zr1kZasxZw47Ar90 yF1kArZ5Xr1agjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IUbHKZtUUUUU== X-Originating-IP: [183.134.170.47] X-CM-SenderInfo: 5oltjvrd6rljoofrz/1tbiKRcebVXlpAXHTQAAsW X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.12 Subject: [Qemu-devel] [PATCH v2 2/3] vhost-user: fix ioeventfd_enabled 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: Li Qiang , liq3ea@gmail.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Currently, the vhost-user-test assumes the eventfd is available. However it's not true because the accel is qtest. So the 'vhost_set_vring_file' will not add fds to the msg and the server side of vhost-user-test will be broken. The bug is in 'ioeventfd_enabled'. We should make this function return true if not using kvm accel. Signed-off-by: Li Qiang Reviewed-by: Michael S. Tsirkin --- v2: change the fix in 'ioeventfd_enabled' per Paolo's review hw/virtio/vhost-user.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index e09bed0e4a..564a31d12c 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -207,7 +207,7 @@ struct vhost_user { =20 static bool ioeventfd_enabled(void) { - return kvm_enabled() && kvm_eventfds_enabled(); + return !kvm_enabled() || kvm_eventfds_enabled(); } =20 static int vhost_user_read(struct vhost_dev *dev, VhostUserMsg *msg) --=20 2.17.1 From nobody Mon May 6 01:16:35 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; dkim=fail; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=163.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1544875755689126.2252127189222; Sat, 15 Dec 2018 04:09:15 -0800 (PST) Received: from localhost ([::1]:38721 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gY8ks-0008HR-NJ for importer@patchew.org; Sat, 15 Dec 2018 07:09:14 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38755) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gY8hP-0005hx-76 for qemu-devel@nongnu.org; Sat, 15 Dec 2018 07:05:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gY8hO-0007tR-Fg for qemu-devel@nongnu.org; Sat, 15 Dec 2018 07:05:39 -0500 Received: from m12-12.163.com ([220.181.12.12]:34887) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gY8hN-0007rg-L5 for qemu-devel@nongnu.org; Sat, 15 Dec 2018 07:05:38 -0500 Received: from localhost.localdomain (unknown [183.134.170.47]) by smtp8 (Coremail) with SMTP id DMCowABHl7Hs7RRcFlUmFg--.8864S5; Sat, 15 Dec 2018 20:05:13 +0800 (CST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=163.com; s=s110527; h=From:Subject:Date:Message-Id; bh=HyQk4ackbckjxRsWO3 np1LMqXrC1YBfoAnh8qIKzdxY=; b=B0MA014Xxiz1HkahZpCdw8FGDnMRj6a8ZT fqMpGrUtVFXcJpRLbpVlxiMO1j8ZRKQd3PbGhqMnWSVCWdTFdy4yiXZmHt1tmhYL 9+GXvIva/wPy9uXe2JqVd4yx+lxAJGppdVbefljrtRmUFHPufPwtQkt00gmeyyMA LSOsm8rMU= From: Li Qiang To: thuth@redhat.com, lvivier@redhat.com, pbonzini@redhat.com, mst@redhat.com, peter.maydell@linaro.org, marcandre.lureau@redhat.com, berrange@redhat.com, jasowang@redhat.com Date: Sat, 15 Dec 2018 04:03:53 -0800 Message-Id: <20181215120353.82786-4-liq3ea@163.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181215120353.82786-1-liq3ea@163.com> References: <20181215120353.82786-1-liq3ea@163.com> X-CM-TRANSID: DMCowABHl7Hs7RRcFlUmFg--.8864S5 X-Coremail-Antispam: 1Uf129KBjvdXoW7Jw1kKF4kKw4fGr45KFyUJrb_yoW3uwc_GF W2yrs5XFyUZ3ySya4qg3y5AFZagrWrGrWxZF1aqryfXrn8u3Z8GF4UZryrWrsxWayxX3WU C34I9F43CFnxtjkaLaAFLSUrUUUUUb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUvcSsGvfC2KfnxnUUI43ZEXa7IU8BMKJUUUUU== X-Originating-IP: [183.134.170.47] X-CM-SenderInfo: 5oltjvrd6rljoofrz/xtbBLxkebVUMHKXMzwAAsm X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 220.181.12.12 Subject: [Qemu-devel] [PATCH v2 3/3] util: check the return value of fcntl in qemu_set_{block, nonblock} 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: Li Qiang , liq3ea@gmail.com, qemu-devel@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Assert that the return value is not an error. This is like commit 7e6478e7d4f for qemu_set_cloexec. Signed-off-by: Li Qiang Reviewed-by: Thomas Huth --- util/oslib-posix.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/util/oslib-posix.c b/util/oslib-posix.c index c1bee2a581..4ce1ba9ca4 100644 --- a/util/oslib-posix.c +++ b/util/oslib-posix.c @@ -233,14 +233,18 @@ void qemu_set_block(int fd) { int f; f =3D fcntl(fd, F_GETFL); - fcntl(fd, F_SETFL, f & ~O_NONBLOCK); + assert(f !=3D -1); + f =3D fcntl(fd, F_SETFL, f & ~O_NONBLOCK); + assert(f !=3D -1); } =20 void qemu_set_nonblock(int fd) { int f; f =3D fcntl(fd, F_GETFL); - fcntl(fd, F_SETFL, f | O_NONBLOCK); + assert(f !=3D -1); + f =3D fcntl(fd, F_SETFL, f | O_NONBLOCK); + assert(f !=3D -1); } =20 int socket_set_fast_reuse(int fd) --=20 2.17.1