From nobody Sat Nov 15 13:22:06 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1595235768; cv=pass; d=zohomail.com; s=zohoarc; b=C2qKNRIdBlXSHOQso8rSVauKfHYE72n2J4Bhg+YASnFliyOyBPHGKT/bvKVSDkw3DVHlwpStZ5bMgs+F5vDfmNScrZ9dWqal8blrC7r5mcD/58KkQ5AeyrQmPujh+bixV4TngLPJT7QS/H6SB3m45iU7EgW4i8FI+FahC8tFWr4= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595235768; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=biV/oDpnBp6C3oTD6Neeubd07SsjUE/FVtiSksJaL+0=; b=TsGGBYw3bxlpSjpmlLTnEfV78MvTHSDXfjDdSDtNnIeC0lx9da1c6fsHk6/2rjcwg13ruNVbWBOa1wrETreOX0yoIPoiZT6osKVVSmCMxRL7QXCrkKmqargvQWSgen0EeNWp+0yDgVbKp5MhDEl6rl1uihHdYoYeIPw113/HHWY= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595235768958426.8765652091503; Mon, 20 Jul 2020 02:02:48 -0700 (PDT) Received: from localhost ([::1]:46076 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jxRh9-0000ar-Im for importer@patchew.org; Mon, 20 Jul 2020 05:02:47 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47260) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxRfG-0007K7-Nc; Mon, 20 Jul 2020 05:00:50 -0400 Received: from mail-eopbgr80094.outbound.protection.outlook.com ([40.107.8.94]:22905 helo=EUR04-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxRfE-00076G-SE; Mon, 20 Jul 2020 05:00:50 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3767.eurprd08.prod.outlook.com (2603:10a6:20b:84::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.17; Mon, 20 Jul 2020 09:00:42 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312%3]) with mapi id 15.20.3195.025; Mon, 20 Jul 2020 09:00:42 +0000 Received: from localhost.localdomain (185.215.60.179) by AM0PR10CA0097.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.17 via Frontend Transport; Mon, 20 Jul 2020 09:00:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KjfdLBWMW9I5mMXR7gAL0vzL0aS5S8CiTJ+bH8PsAGihaksDJbRFR/QCpxYd0He88VuSk4n9Mus7C81A6FeOFGQbiJH/lxMWAVDUkAOuLPFgeLdzYjLPZK4TRZKAkSIj08hpI/0gwQnnAERGhrRvmxm39pYVUsCF8vrhehQwt3AvCQV/RKUDowUqltsO+zXqq5+aigpdw4qEQ5ErPCrjDAyaxXaYPG9/OtHDXrf+gosmboDs1cmhvfNkPxxfUquoUiK+G6pd3snuuBLOmDeB+YUwE1XDIlXS14h2Xd09eFdglsFUcriQl0bJgPEc87y2FfcOf5hBfaJmbXmWxQKE9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=biV/oDpnBp6C3oTD6Neeubd07SsjUE/FVtiSksJaL+0=; b=be+n88xAYjc7E+d4Hf0w5U4ZoGTBghHoPLOgx3fB8V20e3CpyETw6VBoYgnofUUhe32+LD0d4S06GbTFAY7a33K+r37RnjRUuRnOZcJqWveY0YVDQOPoUqMKwJ43Clic68HDmN5t2jennDJTb76/1stSkswRb3vsczzpjPfGuZnA3KXJkkQo5BvYr6BEfaSn9jvx5hEXkofBFtehg9RYh1hGv+r0ovPOeuOx1AlJ5Yl8P3NruHrEiRZJjMesV5Mha1HzpAsrSfEmI/SLGwinfKdwSnsP1yWyEYOrd0rUSB2m4ZGVp7JkYy/YV7+5DmnqyzHTTb3mzsn6cmvkMswwKw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=biV/oDpnBp6C3oTD6Neeubd07SsjUE/FVtiSksJaL+0=; b=ja3D7sb+Df2+ZEhqUm0EejlhyGQ42pl7xqGcOApTwdz1vsCrIaSwKNyDbJxvedbbUVfoB6Ur/vpYg849rgesqqsNWfTTkp4J2eX2eGrAFDm68Ktt3zwTDw8EU+sni3WC50eBtoKGEJQ/8XATpEBg8YK5XNZkyKdq0eR2z0e4zS8= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH 1/3] block/nbd: allow drain during reconnect attempt Date: Mon, 20 Jul 2020 12:00:22 +0300 Message-Id: <20200720090024.18186-2-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200720090024.18186-1-vsementsov@virtuozzo.com> References: <20200720090024.18186-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR10CA0097.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:e6::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.179] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 733cf195-b166-420f-1c9e-08d82c8b61be X-MS-TrafficTypeDiagnostic: AM6PR08MB3767: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:299; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: dAzeg5IltM68gnD/+tuQk7zJZ8efRSXHVzIN1Ef8fiI7o/GWX+VGCOiWjL6rygfUFTYW6q2CEp6dFGYzCA5RZfrM+ShAg0r6oPJm4t4QjiXG2bXCkp7WXsCMynnb4c79ci2UkM98zSsuHiPag8gY8KsjpvocYjwbwwqH7F+xfO1MxaNQ6qdwsQ7lCejIji1kf6MkQMcccBAJcQanvh8/yVnMWTwnJB7BlyyVT0ftfTl/s83zc1ApJgaH8SzoC/vzz5xZYKdGctpvO/8xLhfSUYwGORuo9F8O5KdwiafTf3A/nYVOURm2O+auiaJU7oDZ65ZUx8NIaFdDVAs1aYiXHggGeRRqePiTcZUkdPtqVHR76T51CqI+MmzIbo//aFze X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(39830400003)(366004)(376002)(346002)(396003)(136003)(316002)(52116002)(107886003)(83380400001)(186003)(16526019)(4326008)(956004)(2616005)(1076003)(69590400007)(8676002)(66946007)(66476007)(66556008)(6486002)(26005)(6916009)(36756003)(478600001)(2906002)(8936002)(6666004)(6512007)(86362001)(6506007)(5660300002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: nwWs80rAwrV19njEDJYb9KhJvlUm0KIR6AAZOSyscdRtULeNevoilnC8q+gRVnNca2jwYicfkpJhNNH1ksST3JJP6QfFz+X2NW7yViJEOKCjfO+KRWmCxW+U2gZ6R2kHh3OoMV5tG44UEKBbzm8/f9yXLrQcq/m+1RoZFUh0BAKF/pDrkCy4SgnUBxZINZdtjAxTIkwHQ2am2AKCOqWRqe6qN6XwxU2bASufGKe56ch9ukH5k+lxfcAoVRm4CsuKYc1/9rW51LNgAr2o1ToLqOuDXUlzI3VVB9q3g3v7waa06sUL5tT25QB4pAOjLYFLruoEA1q8RqHXEJaKw3B9fnKCXgEZ6ZRyxQeGkfk7so/yDgHHF7KjqwweBHS67FQuunjJYZnMU0TxCK0Y8zUR2XokyzpmgUgrGe/ed3KTw59jtmImjDxiBK1RSdQpkHLY6bpmWTI01HQKktmxjRlQdETtCdQk8P8z1U/EbMapSANs7YZpmY4dco23Dbe9/48h X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 733cf195-b166-420f-1c9e-08d82c8b61be X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2020 09:00:42.6055 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: 7ApHhie87qyizkMg1vhdomq/ntn6nhWxvUiVGUEi4yj2BiH/WRFr2U/AFPG5NnD5Kma/CMKSzgZF6VcxziCbs7bprrh+oEqwFO8pffEYL4Q= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3767 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.8.94; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-VI1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/20 05:00:42 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -37 X-Spam_score: -3.8 X-Spam_bar: --- X-Spam_report: (-3.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" It should be to reenter qio_channel_yield() on io/channel read/write path, so it's safe to reduce in_flight and allow attaching new aio context. And no problem to allow drain itself: connection attempt is not a guest request. Moreover, if remote server is down, we can hang in negotiation, blocking drain section and provoking a dead lock. How to reproduce the dead lock: 1. Create nbd-fault-injector.conf with the following contents: [inject-error "mega1"] event=3Ddata io=3Dreadwrite when=3Dbefore 2. In one terminal run nbd-fault-injector in a loop, like this: n=3D1; while true; do echo $n; ((n++)); ./nbd-fault-injector.py 127.0.0.1:10000 nbd-fault-injector.conf; done 3. In another terminal run qemu-io in a loop, like this: n=3D1; while true; do echo $n; ((n++)); ./qemu-io -c 'read 0 512' nbd+tcp://127.0.0.1:10000; done After some time, qemu-io will hang trying to drain, for example, like this: #3 aio_poll (ctx=3D0x55f006bdd890, blocking=3Dtrue) at util/aio-posix.c:600 #4 bdrv_do_drained_begin (bs=3D0x55f006bea710, recursive=3Dfalse, parent=3D0x0, ignore_bds_parents=3Dfalse, poll=3Dtrue) at block/io.c:427 #5 bdrv_drained_begin (bs=3D0x55f006bea710) at block/io.c:433 #6 blk_drain (blk=3D0x55f006befc80) at block/block-backend.c:1710 #7 blk_unref (blk=3D0x55f006befc80) at block/block-backend.c:498 #8 bdrv_open_inherit (filename=3D0x7fffba1563bc "nbd+tcp://127.0.0.1:10000", reference=3D0x0, options=3D0x55f006be86d0, flags=3D24578, parent=3D0x0, child_class=3D0x0, child_role=3D0, errp=3D0x7fffba154620) at block.c:3491 #9 bdrv_open (filename=3D0x7fffba1563bc "nbd+tcp://127.0.0.1:10000", reference=3D0x0, options=3D0x0, flags=3D16386, errp=3D0x7fffba154620) at block.c:3513 #10 blk_new_open (filename=3D0x7fffba1563bc "nbd+tcp://127.0.0.1:10000", reference=3D0x0, options=3D0x0, flags=3D16386, errp=3D0x7fffba154620) at block/block-backend.c:421 And connection_co stack like this: #0 qemu_coroutine_switch (from_=3D0x55f006bf2650, to_=3D0x7fe96e07d918, action=3DCOROUTINE_YIELD) at util/coroutine-ucontext.c:302 #1 qemu_coroutine_yield () at util/qemu-coroutine.c:193 #2 qio_channel_yield (ioc=3D0x55f006bb3c20, condition=3DG_IO_IN) at io/channel.c:472 #3 qio_channel_readv_all_eof (ioc=3D0x55f006bb3c20, iov=3D0x7fe96d729bf0, niov=3D1, errp=3D0x7fe96d729eb0) at io/channel.c:110 #4 qio_channel_readv_all (ioc=3D0x55f006bb3c20, iov=3D0x7fe96d729bf0, niov=3D1, errp=3D0x7fe96d729eb0) at io/channel.c:143 #5 qio_channel_read_all (ioc=3D0x55f006bb3c20, buf=3D0x7fe96d729d28 "\300.\366\004\360U", buflen=3D8, errp=3D0x7fe96d729eb0) at io/channel.c:247 #6 nbd_read (ioc=3D0x55f006bb3c20, buffer=3D0x7fe96d729d28, size=3D8, desc=3D0x55f004f69644 "initial magic", errp=3D0x7fe96d729eb0) at /work/src/qemu/master/include/block/nbd.h:365 #7 nbd_read64 (ioc=3D0x55f006bb3c20, val=3D0x7fe96d729d28, desc=3D0x55f004f69644 "initial magic", errp=3D0x7fe96d729eb0) at /work/src/qemu/master/include/block/nbd.h:391 #8 nbd_start_negotiate (aio_context=3D0x55f006bdd890, ioc=3D0x55f006bb3c20, tlscreds=3D0x0, hostname=3D0x0, outioc=3D0x55f006bf19f8, structured_reply=3Dtrue, zeroes=3D0x7fe96d729dca, errp=3D0x7fe96d729eb0) at nbd/client.c:904 #9 nbd_receive_negotiate (aio_context=3D0x55f006bdd890, ioc=3D0x55f006bb3c20, tlscreds=3D0x0, hostname=3D0x0, outioc=3D0x55f006bf19f8, info=3D0x55f006bf1a00, errp=3D0x7fe96d729eb0) = at nbd/client.c:1032 #10 nbd_client_connect (bs=3D0x55f006bea710, errp=3D0x7fe96d729eb0) at block/nbd.c:1460 #11 nbd_reconnect_attempt (s=3D0x55f006bf19f0) at block/nbd.c:287 #12 nbd_co_reconnect_loop (s=3D0x55f006bf19f0) at block/nbd.c:309 #13 nbd_connection_entry (opaque=3D0x55f006bf19f0) at block/nbd.c:360 #14 coroutine_trampoline (i0=3D113190480, i1=3D22000) at util/coroutine-ucontext.c:173 Note, that the hang may be triggered by another bug, so the whole case is fixed only together with commit "block/nbd: on shutdown terminate connection attempt". Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/nbd.c | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/block/nbd.c b/block/nbd.c index 65a4f56924..49254f1c3c 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -280,7 +280,18 @@ static coroutine_fn void nbd_reconnect_attempt(BDRVNBD= State *s) s->ioc =3D NULL; } =20 + bdrv_dec_in_flight(s->bs); s->connect_status =3D nbd_client_connect(s->bs, &local_err); + s->wait_drained_end =3D true; + while (s->drained) { + /* + * We may be entered once from nbd_client_attach_aio_context_bh + * and then from nbd_client_co_drain_end. So here is a loop. + */ + qemu_coroutine_yield(); + } + bdrv_inc_in_flight(s->bs); + error_free(s->connect_err); s->connect_err =3D NULL; error_propagate(&s->connect_err, local_err); --=20 2.21.0 From nobody Sat Nov 15 13:22:06 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1595235765; cv=pass; d=zohomail.com; s=zohoarc; b=lllPTUFVrRUOB1Qn59G86Rdn167ByYNB3UEkd/16lft8hTfCO+79I6Ib5laz9oniUM5fZnW68itjIJOVvPS0liJM+9WtiKh/NRQLsTCE6I5sapeeUV5JuXcTUcsTW38Z+lt+Nr9y3/epygTabP/Zohzke9YqLPKE5mh5nHCx8+k= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595235765; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=okPr8s04mfuJdKu/DUImIAeFNbR5KFkCEiBrp/rXWa8=; b=mMfjuUjR95QeeP/2MxtUrDlEVhbdS2lw5WY8E4Qd54x2lGEqul47YDY8GXSBGYpx8ofKamOB4z+Stg2z9VErWHn2NiRE92Hr8vTPxDUm5vkiYnYXida6PV0gpzRDVIYi+2yj2JhrmqQkpRVxipk8TZa/WC0bjzMeCme2O20Sn6c= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595235765243432.02989260911295; Mon, 20 Jul 2020 02:02:45 -0700 (PDT) Received: from localhost ([::1]:45826 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jxRh6-0000U6-13 for importer@patchew.org; Mon, 20 Jul 2020 05:02:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47284) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxRfJ-0007Nb-61; Mon, 20 Jul 2020 05:00:53 -0400 Received: from mail-eopbgr80094.outbound.protection.outlook.com ([40.107.8.94]:22905 helo=EUR04-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxRfH-00076G-Bi; Mon, 20 Jul 2020 05:00:52 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3767.eurprd08.prod.outlook.com (2603:10a6:20b:84::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.17; Mon, 20 Jul 2020 09:00:43 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312%3]) with mapi id 15.20.3195.025; Mon, 20 Jul 2020 09:00:43 +0000 Received: from localhost.localdomain (185.215.60.179) by AM0PR10CA0097.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.17 via Frontend Transport; Mon, 20 Jul 2020 09:00:42 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=bR1mZlZ3EoVwhl3LlsBLR5AaIBpJw6gMPGV3F3L6qmFz9i8L7ffSSzWknWihqarEjk4+odjn8zUPnsJH5D+/gks7JZjkGaK7pJAXHJMRAeLSm9L1A8WWRlI4jYXXOzRNo7ZRU6MPqRe0bF84aeZ4StHTUNFW0Kr0qQEp+NGTXaxXVqhaJwj9nWRDtJffMELC19TsGtt7PzI8rmN2cYxdeVu+TIy+lGE6IJOqJuGjvEg5y/YGMafcRoh32DX20AaDMzX3Ojjj5zAm47gD89M6oK1mh230fepiYJSqBYuXgWusrfj1d8XwwaLB8JvDKpESxzPj5ml1F25tb7b0BCOTWw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=okPr8s04mfuJdKu/DUImIAeFNbR5KFkCEiBrp/rXWa8=; b=EmA2djRRYtsPSkKpVnVgqt8n9dUjnTJe8mXnv/xJ3WkhHVLWJmm+i6ALcKAXiEEdKn71mfR73r8pG19OPNBqj9ff8XznZYmD/gIenFOG+e8gz3tyxpqGkCnhLNgpzyf1/pscXp1PNNJnADsGomko1H09I8fOMPJQfTQ3l9JbWq1XoDTEUrjCiQm1x6HCtHj5sF4Shu+A7m2QO1cFNq7xVdV0Te+QWQEK+O1iPnAAH+rmTSYxqWdf0HwwRDO10Muk6XWDd3D6Owrv9jjbn2Wl+NBwKj1Nenvj6cOdicwokVaUNW6ovjq4T62+b6et/ma/KLa1r+lB4+121MLMXjBJ0Q== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=okPr8s04mfuJdKu/DUImIAeFNbR5KFkCEiBrp/rXWa8=; b=t0HalUaFT1wv3I+qIWJ7OQBgJlwW06zedMUJRq9D9K4rFUJQEJ2TU+hzQRRa5+X3qQpVeIGZOzzV5jBhWPR86sCUDgGNUwRNC1DD9UBikoxkFiiCJ2CZDMOGIw4YAHIY5EHkuy+2isNEmCFqY0e5NwC/9nk9RK2It/kDGqe24wc= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH 2/3] block/nbd: on shutdown terminate connection attempt Date: Mon, 20 Jul 2020 12:00:23 +0300 Message-Id: <20200720090024.18186-3-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200720090024.18186-1-vsementsov@virtuozzo.com> References: <20200720090024.18186-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR10CA0097.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:e6::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.179] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 39b52143-ea8e-447e-2a11-08d82c8b6221 X-MS-TrafficTypeDiagnostic: AM6PR08MB3767: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:86; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: jqdO52kFpOAK0Bbnn5X6EZojTM0pLPixw11wTfOzfQIgkhXIVm4S2r5VvgmwAO0R0Zg0nm8dKFTefS3U106ZhSxomUGmASNa9htkxfahcoT1FthHgP4V3S/IdrVxNV6bqrlyQgQZvRvO2PUkrVdXVOolbDCmi3uNP8a0b+sN95Z6Ss3NVjRL4xnPyO0QmUyfmwGSqnjZ2NSy+fpMEyikmP5aN/paBPhFTbEnqsvqg6BP1qOUXQ/vaaEl4l4BoxjVgdTSEY3q1Re8DLhp07Z1kPzgc3shLi0ppyRXzmBVZ8tIWd9xYlM05gE0WpIAVrY7aXI7BMJNPtQQoBLsXdghYKEBh1BcRS1VXRf6gsu2Z79wQgOGmc52LfyXh2r8Afr5 X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(39830400003)(366004)(376002)(346002)(396003)(136003)(316002)(52116002)(107886003)(83380400001)(186003)(16526019)(4326008)(956004)(2616005)(1076003)(69590400007)(8676002)(66946007)(66476007)(66556008)(6486002)(26005)(6916009)(36756003)(478600001)(2906002)(8936002)(6666004)(6512007)(86362001)(6506007)(5660300002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: r87+wKkAMK5vZe0bPSVPNcKqWI8sL80jWQNveUpJK7dLgI4LNtgykhAlUy2sZR2Ypa415Cbpdmr3D4KoN5raBub/vssMvcrRUNt/XK8jNTLfNDMYmRFIG8k2Wy+Aq0VQONIrBqnvGOles17jZMU0CaHkZa324mKgG13Aib/g4ncPuAbq5SnWXht3nLE7kSQMSGObUP8B8sEgbqcUrngGIVZ53k6DhN48fXAKqrjoypf0Prt+nDhBS05mQSUve3H9HqINitiWNl2t6KqVh1ThJIWtYLHTHmQuPyaRG+8xsQ+6EUheAmUT5tdSeTRF+CO4vfFvQQcYSl2R1+TGKXKcCGC9j1kbrL3t8ImVxwu7pN1XkmRdPooRXTLjH5zs4dQKus9sdwwirwJ67IcooIxkp6pK5wr6C0KBLcuIjj1NGUehFdvuATXEtxS3lctmZOrsiy+HG7SBJZ9O5Y36TlengEXcnrm0L9sec6cr5uY8ZIk= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 39b52143-ea8e-447e-2a11-08d82c8b6221 X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2020 09:00:43.2845 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: B2NnbONugke4GktB49sBBgnmdVnQf1FCaiuaXRxpAo09sLwXLh1tkGrvc4RTw1dUKrP6wqKWNGjsWOeZ3QalBSdyr5S0o6Whz2HtlgBlXco= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3767 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.8.94; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-VI1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/20 05:00:42 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -37 X-Spam_score: -3.8 X-Spam_bar: --- X-Spam_report: (-3.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" On shutdown nbd driver may be in a connecting state. We should shutdown it as well, otherwise we may hang in nbd_teardown_connection, waiting for conneciton_co to finish in BDRV_POLL_WHILE(bs, s->connection_co) loop if remote server is down. How to reproduce the dead lock: 1. Create nbd-fault-injector.conf with the following contents: [inject-error "mega1"] event=3Ddata io=3Dreadwrite when=3Dbefore 2. In one terminal run nbd-fault-injector in a loop, like this: n=3D1; while true; do echo $n; ((n++)); ./nbd-fault-injector.py 127.0.0.1:10000 nbd-fault-injector.conf; done 3. In another terminal run qemu-io in a loop, like this: n=3D1; while true; do echo $n; ((n++)); ./qemu-io -c 'read 0 512' nbd+tcp://127.0.0.1:10000; done After some time, qemu-io will hang. Note, that this hang may be triggered by another bug, so the whole case is fixed only together with commit "block/nbd: allow drain during reconnect attempt". Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/nbd.c | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 49254f1c3c..42146a26f7 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -206,11 +206,15 @@ static void nbd_teardown_connection(BlockDriverState = *bs) { BDRVNBDState *s =3D (BDRVNBDState *)bs->opaque; =20 - if (s->state =3D=3D NBD_CLIENT_CONNECTED) { + if (s->ioc) { /* finish any pending coroutines */ - assert(s->ioc); qio_channel_shutdown(s->ioc, QIO_CHANNEL_SHUTDOWN_BOTH, NULL); + } else if (s->sioc) { + /* abort negotiation */ + qio_channel_shutdown(QIO_CHANNEL(s->sioc), QIO_CHANNEL_SHUTDOWN_BO= TH, + NULL); } + s->state =3D NBD_CLIENT_QUIT; if (s->connection_co) { if (s->connection_co_sleep_ns_state) { @@ -1452,6 +1456,8 @@ static int nbd_client_connect(BlockDriverState *bs, E= rror **errp) return -ECONNREFUSED; } =20 + s->sioc =3D sioc; + /* NBD handshake */ trace_nbd_client_connect(s->export); qio_channel_set_blocking(QIO_CHANNEL(sioc), false, NULL); @@ -1468,6 +1474,7 @@ static int nbd_client_connect(BlockDriverState *bs, E= rror **errp) g_free(s->info.name); if (ret < 0) { object_unref(OBJECT(sioc)); + s->sioc =3D NULL; return ret; } if (s->x_dirty_bitmap && !s->info.base_allocation) { @@ -1493,8 +1500,6 @@ static int nbd_client_connect(BlockDriverState *bs, E= rror **errp) } } =20 - s->sioc =3D sioc; - if (!s->ioc) { s->ioc =3D QIO_CHANNEL(sioc); object_ref(OBJECT(s->ioc)); @@ -1515,6 +1520,7 @@ static int nbd_client_connect(BlockDriverState *bs, E= rror **errp) nbd_send_request(s->ioc ?: QIO_CHANNEL(sioc), &request); =20 object_unref(OBJECT(sioc)); + s->sioc =3D NULL; =20 return ret; } --=20 2.21.0 From nobody Sat Nov 15 13:22:06 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass(p=none dis=none) header.from=virtuozzo.com ARC-Seal: i=2; a=rsa-sha256; t=1595235857; cv=pass; d=zohomail.com; s=zohoarc; b=hRYVnpGINjeeDGzSB2115WQ3CGNswDcBolBkktDr7hTqdX3MWFzXdkq8YxhdH0t+cjqKoeFw3vOlNkwvZRPOnk9lP0MM2FtdsbPYliF61oKo/d6/MvBKmcVSeQ4CKTpSkCe7Nf1eYl/tKA2WvBM8LlI83/ZKjNH2t7QXuB/AjR8= ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1595235857; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=XnlIBhwOPeuvYKpRLux1PRhqBEBZprefd4CW6AU5dJg=; b=TCqBHJltqFcFpAgF7+j9xos9rw13RPYZ109XO/1AfucfjQv+stYTPVSB31+M6rfUUAf6iev5yodqy+J7HqEHel48cKtkLXkAiinpustAsr/eqxdM+lA495NxQVxy6W8OVT/Ls+UU8e35L1JfR+6a7KmWNRkCI2vmFkTf/PrDk2I= ARC-Authentication-Results: i=2; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; arc=pass (i=1dmarc=pass fromdomain=virtuozzo.com); dmarc=pass header.from= (p=none dis=none) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1595235857365108.30447652802161; Mon, 20 Jul 2020 02:04:17 -0700 (PDT) Received: from localhost ([::1]:51490 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jxRia-0002mq-3S for importer@patchew.org; Mon, 20 Jul 2020 05:04:16 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47314) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxRfL-0007SH-Hr; Mon, 20 Jul 2020 05:00:55 -0400 Received: from mail-eopbgr80094.outbound.protection.outlook.com ([40.107.8.94]:22905 helo=EUR04-VI1-obe.outbound.protection.outlook.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jxRfJ-00076G-PQ; Mon, 20 Jul 2020 05:00:55 -0400 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) by AM6PR08MB3767.eurprd08.prod.outlook.com (2603:10a6:20b:84::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.17; Mon, 20 Jul 2020 09:00:44 +0000 Received: from AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312]) by AM7PR08MB5494.eurprd08.prod.outlook.com ([fe80::a408:2f0f:bc6c:d312%3]) with mapi id 15.20.3195.025; Mon, 20 Jul 2020 09:00:44 +0000 Received: from localhost.localdomain (185.215.60.179) by AM0PR10CA0097.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:e6::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3195.17 via Frontend Transport; Mon, 20 Jul 2020 09:00:43 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=JBhSDGbcL5CX+mE48MMXWKpRN/h+GM7nMvMaLek2V625zFTm4VhZYXVkQ6gSeHD3MYyrigLQRoj7fpxXoZY0AUAoSHlqE0WcV4YO80xc60WGKcP1saBBayyGli/1qBpe05KE/23Vzo011fI05vHf9mQUblGdnOjGzQmZqwi1MbvCf3MsDhzyjW91hglaA1DqpkDMGgRo5IOe6pJnui1r69s65H+OkHABdltOkFjdPCnwnybAf1jVwWJkfqXXENgz2V0oQTtoXEf2upTCW8NxsrLM0T6lGGSCpru17zaTZ5dcLGHgzwKUv5vGaX9oyi+z6mHQ/LoqpMHntCyIC/J3eA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XnlIBhwOPeuvYKpRLux1PRhqBEBZprefd4CW6AU5dJg=; b=i8oPt7uvk5qF0io88ws3BI7meVpI71covnyxNHs0nSvaTX8d+tDa0u9MYhJ6phRJcnfyosgMI8KloxhanCC24O/nNDmIJvILcjaqIqPQQH+vOPE7YIZMu2hK9G4+b15kVw36UU6WpcdBrUznRam7Dch20jLb3jwT1U/WZRqU89VStdPy+1K4MvoJE8Ag33KYMKqoFhkEsGoWgp0mUEYP0qprHmIhRR7xxvI6N1XQehWvFjR6eZGxU3Z8E6cX+cdekk3LJN643Lr6+xJsedrBkI3qDIoaei4MMsAz1/5Qcw5YyrzcXOcpoGSA7SVD5Gu/GcgU+FdywDEg/j/xE6//vQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=virtuozzo.com; dmarc=pass action=none header.from=virtuozzo.com; dkim=pass header.d=virtuozzo.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=virtuozzo.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XnlIBhwOPeuvYKpRLux1PRhqBEBZprefd4CW6AU5dJg=; b=rjZsFMWjI181ux6xwx5yKrWhBUFopC+8zj9jjP61byG0brag3nVICgqjN/SHtfH6cCtYZb7IwaVHwn+1U7tI8TVMAp3WUuqqwhH6Kh+sB8u0yZ7xNmX0Lt8qApEG14cwYp7MvB9FKgYxt3S/hmiYIz4arvU00fYfRQhuNJ954Ho= Authentication-Results: nongnu.org; dkim=none (message not signed) header.d=none;nongnu.org; dmarc=none action=none header.from=virtuozzo.com; From: Vladimir Sementsov-Ogievskiy To: qemu-block@nongnu.org Subject: [PATCH 3/3] block/nbd: nbd_co_reconnect_loop(): don't sleep if drained Date: Mon, 20 Jul 2020 12:00:24 +0300 Message-Id: <20200720090024.18186-4-vsementsov@virtuozzo.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20200720090024.18186-1-vsementsov@virtuozzo.com> References: <20200720090024.18186-1-vsementsov@virtuozzo.com> Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: AM0PR10CA0097.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:208:e6::14) To AM7PR08MB5494.eurprd08.prod.outlook.com (2603:10a6:20b:dc::15) MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-Mailer: git-send-email 2.21.0 X-Originating-IP: [185.215.60.179] X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 7386a24e-9eda-43b3-7be0-08d82c8b628d X-MS-TrafficTypeDiagnostic: AM6PR08MB3767: X-MS-Exchange-Transport-Forked: True X-Microsoft-Antispam-PRVS: X-MS-Oob-TLC-OOBClassifiers: OLM:517; X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nbRisPANNsK/TlrwjiIoGHV9sotLsT6TF60a5ovFMmDeFGCK8M4D1FmC7zl+GO2YJ4NpZf/OgKZBiYm6KH+r1aAHBNuohmgv4ByQWKYSQhmNTLsG62Qk1I4vC0Ozk+YIlNA8VFL2HdbjNAfyj/wzkYJZYu6h/TCHYuKCpTp5B46ATb3RUf+ZTnzBpSF6dvA1K1OJBvyCxB9ecnLhpHeJ6tantT4hWuP6+JEuvjmL2sLBZC7Rr95vBXXdHTTo3FKehj+W94GQhjOk9nY/wXHbtQ06tdd2cgJCJcmLbGLxqYVqaSEbNPGo3vZ97+fsPyFsy3nJRIj0lyWN3nNp8l6ml8PWnDGWOKSfExU6OAqqQfzD3u2bnnO0ENrLACAs04KZ X-Forefront-Antispam-Report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM7PR08MB5494.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(39830400003)(366004)(376002)(346002)(396003)(136003)(316002)(52116002)(107886003)(83380400001)(186003)(16526019)(4326008)(956004)(2616005)(1076003)(69590400007)(8676002)(66946007)(66476007)(66556008)(6486002)(26005)(6916009)(36756003)(478600001)(2906002)(8936002)(6666004)(6512007)(86362001)(6506007)(5660300002); DIR:OUT; SFP:1102; X-MS-Exchange-AntiSpam-MessageData: hfQk2YSc1NTTirH7yNMpXRBcf2yx4qHdtFAwvenDv67IwirTfk0/+hTREXl8HOSMKpv/e+i4gWPHI6fNt0d54F4YBASMnnya+IgcDq/gxrvyVKgBBrSuLwIll19UtJwKzFkmkbnXz/JxJgUO30dsjzpeCz1njvg87CT6pz2DiyQZHvlJqv0Gn9pTt6iDzyHerVt3xdMLEguDG1TbgUrvsD8kzipM0RHQZUcErlO9Zg9X+dKpmHxGMcy16dBMerqS1ZxROrY0eGMSBTSJrFy+QP+OY60JtQPdSA2l0kke3KecFThKGm1MNLA5UhVf90tFaDZvpyGypygv1alIWXq6mRM7bGJs8ZVpvpSvlb96vPHPAVfB6G2qPxy19XvLkpugUWZfNSVKWyvdPuYPLs4WNoi1rfd1OPzI/wMGetMVcp27tOiBa6dv0hHs2nw1RokOZO1j3Fh+Yc71NPdt5eYxJ2FvM746flgcnGo2x6gm7WQ= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7386a24e-9eda-43b3-7be0-08d82c8b628d X-MS-Exchange-CrossTenant-AuthSource: AM7PR08MB5494.eurprd08.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Jul 2020 09:00:43.9526 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: kNzVPfvdLFCUvLMYgTLK0RNDXLspxSA9ffS50OiVs15v/dvlG86SzxEpZMtKC2OAcFnlqVV2sS1oSkfUMq364Phb/UP8YinwluUEeJQzKR8= X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB3767 Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: pass client-ip=40.107.8.94; envelope-from=vsementsov@virtuozzo.com; helo=EUR04-VI1-obe.outbound.protection.outlook.com X-detected-operating-system: by eggs.gnu.org: First seen = 2020/07/20 05:00:42 X-ACL-Warn: Detected OS = Windows NT kernel [generic] [fuzzy] X-Spam_score_int: -37 X-Spam_score: -3.8 X-Spam_bar: --- X-Spam_report: (-3.8 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, MSGID_FROM_MTA_HEADER=0.001, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-1, SPF_HELO_PASS=-0.001, SPF_PASS=-0.001, URIBL_BLOCKED=0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: kwolf@redhat.com, vsementsov@virtuozzo.com, qemu-devel@nongnu.org, mreitz@redhat.com, den@openvz.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @virtuozzo.com) Content-Type: text/plain; charset="utf-8" We try to go to wakeable sleep, so that, if drain begins it will break the sleep. But what if nbd_client_co_drain_begin() already called and s->drained is already true? We'll go to sleep, and drain will have to wait for the whole timeout. Let's improve it. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake --- block/nbd.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/block/nbd.c b/block/nbd.c index 42146a26f7..d9cde30457 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -327,8 +327,6 @@ static coroutine_fn void nbd_co_reconnect_loop(BDRVNBDS= tate *s) qemu_co_queue_restart_all(&s->free_sema); } =20 - qemu_co_sleep_ns_wakeable(QEMU_CLOCK_REALTIME, timeout, - &s->connection_co_sleep_ns_state); if (s->drained) { bdrv_dec_in_flight(s->bs); s->wait_drained_end =3D true; @@ -340,9 +338,12 @@ static coroutine_fn void nbd_co_reconnect_loop(BDRVNBD= State *s) qemu_coroutine_yield(); } bdrv_inc_in_flight(s->bs); - } - if (timeout < max_timeout) { - timeout *=3D 2; + } else { + qemu_co_sleep_ns_wakeable(QEMU_CLOCK_REALTIME, timeout, + &s->connection_co_sleep_ns_state); + if (timeout < max_timeout) { + timeout *=3D 2; + } } =20 nbd_reconnect_attempt(s); --=20 2.21.0