From patchwork Wed Jan 23 15:48:49 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Max Reitz X-Patchwork-Id: 1030013 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=209.51.188.17; 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=redhat.com Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43l8qF5j2Rz9s1l for ; Thu, 24 Jan 2019 02:49:29 +1100 (AEDT) Received: from localhost ([127.0.0.1]:37145 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmKmN-0001hM-QQ for incoming@patchwork.ozlabs.org; Wed, 23 Jan 2019 10:49:27 -0500 Received: from eggs.gnu.org ([209.51.188.92]:38765) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gmKlx-0001ez-3t for qemu-devel@nongnu.org; Wed, 23 Jan 2019 10:49:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gmKlu-0008M1-Ay for qemu-devel@nongnu.org; Wed, 23 Jan 2019 10:48:59 -0500 Received: from mx1.redhat.com ([209.132.183.28]:48582) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1gmKlr-0008KC-8H; Wed, 23 Jan 2019 10:48:55 -0500 Received: from smtp.corp.redhat.com (int-mx07.intmail.prod.int.phx2.redhat.com [10.5.11.22]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 70A5AC05D3E1; Wed, 23 Jan 2019 15:48:54 +0000 (UTC) Received: from dresden.str.redhat.com (unknown [10.40.206.13]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 2BF8C100195E; Wed, 23 Jan 2019 15:48:50 +0000 (UTC) To: Qemu-block From: Max Reitz Openpgp: preference=signencrypt Autocrypt: addr=mreitz@redhat.com; prefer-encrypt=mutual; keydata= mQENBFXOJlcBCADEyyhOTsoa/2ujoTRAJj4MKA21dkxxELVj3cuILpLTmtachWj7QW+TVG8U /PsMCFbpwsQR7oEy8eHHZwuGQsNpEtNC2G/L8Yka0BIBzv7dEgrPzIu+W3anZXQW4702+uES U29G8TP/NGfXRRHGlbBIH9KNUnOSUD2vRtpOLXkWsV5CN6vQFYgQfFvmp5ZpPeUe6xNplu8V mcTw8OSEDW/ZnxJc8TekCKZSpdzYoxfzjm7xGmZqB18VFwgJZlIibt1HE0EB4w5GsD7x5ekh awIe3RwoZgZDLQMdOitJ1tUc8aqaxvgA4tz6J6st8D8pS//m1gAoYJWGwwIVj1DjTYLtABEB AAG0HU1heCBSZWl0eiA8bXJlaXR6QHJlZGhhdC5jb20+iQFTBBMBCAA9AhsDBQkSzAMABQsJ CAcCBhUICQoLAgQWAgMBAh4BAheABQJVzie5FRhoa3A6Ly9rZXlzLmdudXBnLm5ldAAKCRD0 B9sAYdXPQDcIB/9uNkbYEex1rHKz3mr12uxYMwLOOFY9fstP5aoVJQ1nWQVB6m2cfKGdcRe1 2/nFaHSNAzT0NnKz2MjhZVmcrpyd2Gp2QyISCfb1FbT82GMtXFj1wiHmPb3CixYmWGQUUh+I AvUqsevLA+WihgBUyaJq/vuDVM1/K9Un+w+Tz5vpeMidlIsTYhcsMhn0L9wlCjoucljvbDy/ 8C9L2DUdgi3XTa0ORKeflUhdL4gucWoAMrKX2nmPjBMKLgU7WLBc8AtV+84b9OWFML6NEyo4 4cP7cM/07VlJK53pqNg5cHtnWwjHcbpGkQvx6RUx6F1My3y52vM24rNUA3+ligVEgPYBuQEN BFXOJlcBCADAmcVUNTWT6yLWQHvxZ0o47KCP8OcLqD+67T0RCe6d0LP8GsWtrJdeDIQk+T+F xO7DolQPS6iQ6Ak2/lJaPX8L0BkEAiMuLCKFU6Bn3lFOkrQeKp3u05wCSV1iKnhg0UPji9V2 W5eNfy8F4ZQHpeGUGy+liGXlxqkeRVhLyevUqfU0WgNqAJpfhHSGpBgihUupmyUg7lfUPeRM DzAN1pIqoFuxnN+BRHdAecpsLcbR8sQddXmDg9BpSKozO/JyBmaS1RlquI8HERQoe6EynJhd 64aICHDfj61rp+/0jTIcevxIIAzW70IadoS/y3DVIkuhncgDBvGbF3aBtjrJVP+5ABEBAAGJ ASUEGAEIAA8FAlXOJlcCGwwFCRLMAwAACgkQ9AfbAGHVz0CbFwf9F/PXxQR9i4N0iipISYjU sxVdjJOM2TMut+ZZcQ6NSMvhZ0ogQxJ+iEQ5OjnIputKvPVd5U7WRh+4lF1lB/NQGrGZQ1ic alkj6ocscQyFwfib+xIe9w8TG1CVGkII7+TbS5pXHRxZH1niaRpoi/hYtgzkuOPp35jJyqT/ /ELbqQTDAWcqtJhzxKLE/ugcOMK520dJDeb6x2xVES+S5LXby0D4juZlvUj+1fwZu+7Io5+B bkhSVPb/QdOVTpnz7zWNyNw+OONo1aBUKkhq2UIByYXgORPFnbfMY7QWHcjpBVw9MgC4tGeF R4bv+1nAMMxKmb5VvQCExr0eFhJUAHAhVg== Message-ID: <3da8da19-72dc-8f5e-f2e1-820999994cb2@redhat.com> Date: Wed, 23 Jan 2019 16:48:49 +0100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.4.0 MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.22 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.32]); Wed, 23 Jan 2019 15:48:54 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 209.132.183.28 X-Content-Filtered-By: Mailman/MimeDel 2.1.21 Subject: [Qemu-devel] Aborts in iotest 169 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: Vladimir Sementsov-Ogievskiy , "qemu-devel@nongnu.org" , Luiz Capitulino Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Hi, When running 169 in parallel (e.g. like so: $ while TEST_DIR=/tmp/t0 ./check -T -qcow2 169; do; done $ while TEST_DIR=/tmp/t1 ./check -T -qcow2 169; do; done $ while TEST_DIR=/tmp/t2 ./check -T -qcow2 169; do; done $ while TEST_DIR=/tmp/t3 ./check -T -qcow2 169; do; done in four different shells), I get aborts: (Often I get segfaults, but that's because of http://lists.nongnu.org/archive/html/qemu-devel/2018-12/msg05579.html -- feel free to apply the attached patch to make them go away) WARNING:qemu:qemu received signal 6: build/tests/qemu-iotests/../../x86_64-softmmu/qemu-system-x86_64 -chardev socket,id=mon,path=/tmp/t0/tmpbX30XU/qemua-25745-monitor.sock -mon chardev=mon,mode=control -display none -vga none -qtest unix:path=/tmp/t0/qemua-25745-qtest.sock -machine accel=qtest -nodefaults -machine accel=qtest -drive if=virtio,id=drive0,file=/tmp/t0/disk_a,format=qcow2,cache=writeback .................E.. ====================================================================== ERROR: test_do_test_migration_resume_source_not_persistent__not_migbitmap (__main__.TestDirtyBitmapMigration) ---------------------------------------------------------------------- Traceback (most recent call last): File "169", line 206, in setattr(klass, 'test_' + method + name, lambda self: mc(self)) File "169", line 113, in do_test_migration_resume_source self.check_bitmap(self.vm_a, sha256) File "169", line 72, in check_bitmap node='drive0', name='bitmap0') File "tests/qemu-iotests/../../scripts/qemu.py", line 369, in qmp return self._qmp.cmd(cmd, args=qmp_args) File "tests/qemu-iotests/../../scripts/qmp/qmp.py", line 191, in cmd return self.cmd_obj(qmp_cmd) File "tests/qemu-iotests/../../scripts/qmp/qmp.py", line 174, in cmd_obj resp = self.__json_read() File "tests/qemu-iotests/../../scripts/qmp/qmp.py", line 82, in __json_read data = self.__sockfile.readline() File "/usr/lib64/python2.7/socket.py", line 451, in readline data = self._sock.recv(self._rbufsize) error: [Errno 104] Connection reset by peer ---------------------------------------------------------------------- Ran 20 tests FAILED (errors=1) Or: WARNING:qemu:qemu received signal 6: build/tests/qemu-iotests/../../x86_64-softmmu/qemu-system-x86_64 -chardev socket,id=mon,path=/tmp/t3/tmp0pllWD/qemua-3445-monitor.sock -mon chardev=mon,mode=control -display none -vga none -qtest unix:path=/tmp/t3/qemua-3445-qtest.sock -machine accel=qtest -nodefaults -machine accel=qtest -drive if=virtio,id=drive0,file=/tmp/t3/disk_a,format=qcow2,cache=writeback WARNING:qemu:qemu received signal 6: build/tests/qemu-iotests/../../x86_64-softmmu/qemu-system-x86_64 -chardev socket,id=mon,path=/tmp/t3/tmp0pllWD/qemua-3445-monitor.sock -mon chardev=mon,mode=control -display none -vga none -qtest unix:path=/tmp/t3/qemua-3445-qtest.sock -machine accel=qtest -nodefaults -machine accel=qtest -drive if=virtio,id=drive0,file=/tmp/t3/disk_a,format=qcow2,cache=writeback ...................F ====================================================================== FAIL: test_do_test_migration_resume_source_persistent__not_migbitmap (__main__.TestDirtyBitmapMigration) ---------------------------------------------------------------------- Traceback (most recent call last): File "169", line 206, in setattr(klass, 'test_' + method + name, lambda self: mc(self)) File "169", line 125, in do_test_migration_resume_source self.assertEqual(log, '') AssertionError: "qemu-system-x86_64: invalid runstate transition: 'running' -> 'postmigrate'\n" != '' ---------------------------------------------------------------------- Ran 20 tests FAILED (failures=1) The backtrace always goes like this: (gdb) bt #0 0x00007f0acf5cc53f in raise () at /lib64/libc.so.6 #1 0x00007f0acf5b6895 in abort () at /lib64/libc.so.6 #2 0x000055a46ebbb1a6 in runstate_set (new_state=RUN_STATE_POSTMIGRATE) at vl.c:742 #3 0x000055a46ebbb1a6 in runstate_set (new_state=new_state@entry=RUN_STATE_POSTMIGRATE) at vl.c:730 #4 0x000055a46ed39129 in migration_iteration_finish (s=0x55a4708be000) at migration/migration.c:2972 #5 0x000055a46ed39129 in migration_thread (opaque=opaque@entry=0x55a4708be000) at migration/migration.c:3130 #6 0x000055a46eea665a in qemu_thread_start (args=) at util/qemu-thread-posix.c:502 #7 0x00007f0acf76258e in start_thread () at /lib64/libpthread.so.0 #8 0x00007f0acf6916a3 in clone () at /lib64/libc.so.6 (gdb) frame 2 #2 0x000055a46ebbb1a6 in runstate_set (new_state=RUN_STATE_POSTMIGRATE) at vl.c:742 742 abort(); (gdb) print current_run_state $1 = RUN_STATE_RUNNING Neither of migration or runstates are my strong suite, so I thought I'd report it before diving into it. Max From 4f141f42f2ae8cf509495ee0962fd45e160f33af Mon Sep 17 00:00:00 2001 From: Max Reitz Date: Wed, 23 Jan 2019 16:48:07 +0100 Subject: [PATCH] Hack to fix race in tcp_chr_disconnect() --- chardev/char-socket.c | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/chardev/char-socket.c b/chardev/char-socket.c index eaa8e8b68f..9c326dcbf3 100644 --- a/chardev/char-socket.c +++ b/chardev/char-socket.c @@ -124,7 +124,12 @@ static void tcp_chr_accept(QIONetListener *listener, void *opaque); static int tcp_chr_read_poll(void *opaque); -static void tcp_chr_disconnect(Chardev *chr); +static void tcp_chr_do_disconnect(Chardev *chr, bool locked); + +static void tcp_chr_disconnect(Chardev *chr) +{ + tcp_chr_do_disconnect(chr, false); +} /* Called with chr_write_lock held. */ static int tcp_chr_write(Chardev *chr, const uint8_t *buf, int len) @@ -148,7 +153,7 @@ static int tcp_chr_write(Chardev *chr, const uint8_t *buf, int len) if (ret < 0 && errno != EAGAIN) { if (tcp_chr_read_poll(chr) <= 0) { - tcp_chr_disconnect(chr); + tcp_chr_do_disconnect(chr, true); return len; } /* else let the read handler finish it properly */ } @@ -444,8 +449,12 @@ static void update_disconnected_filename(SocketChardev *s) * reached, due to TLS or telnet initialization failure, * so can *not* assume s->connected == true */ -static void tcp_chr_disconnect(Chardev *chr) +static void tcp_chr_do_disconnect(Chardev *chr, bool locked) { + if (!locked) { + qemu_mutex_lock(&chr->chr_write_lock); + } + SocketChardev *s = SOCKET_CHARDEV(chr); bool emit_close = s->connected; @@ -462,6 +471,10 @@ static void tcp_chr_disconnect(Chardev *chr) if (s->reconnect_time) { qemu_chr_socket_restart_timer(chr); } + + if (!locked) { + qemu_mutex_unlock(&chr->chr_write_lock); + } } static gboolean tcp_chr_read(QIOChannel *chan, GIOCondition cond, void *opaque) -- 2.20.1