From nobody Sun Oct 5 19:25:51 2025 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=fail; 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; dmarc=fail(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1613161270; cv=none; d=zohomail.com; s=zohoarc; b=mX1ugwZpj94Um3xoKjxJmEl+ueTjUMVsPELMIIbWqlXa3dCsDLFezzEmM0beG183+Uh65/3N1L9K+IRfAFQ+F/pt+UC52gOAPWaCnNFBmHHaTX7LMdC61dnOeP7EtfFe6YVIprkagGTABL87+XwU7V07zhQR1LIo9e0rDHDY7A0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1613161270; 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=vmgkwd3GZ3WDtD2SuR6rBfdgEJ8/qhaQNF0kYao3QJ8=; b=kvBQH6x5Qbcb5UYsNXtEO1DY4ICA4WMuHhpW52z0/3l+W+4Q1KM+tn4k7LDwcD/ftIZPY502udxL3/MLwdyNBMeLhdYEWrsXh6CBaoTFT4Idm2SnC1n8kG1XJ8sbL6K8WXFIjtnfwUktX3uFiWpWQS3+I6SeXjcKAue5O5sFsfU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=fail; 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; dmarc=fail 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 1613161270018481.68719978972194; Fri, 12 Feb 2021 12:21:10 -0800 (PST) Received: from localhost ([::1]:52802 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lAew5-0000gz-UE for importer@patchew.org; Fri, 12 Feb 2021 15:21:05 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58152) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lAero-0004HM-3C for qemu-devel@nongnu.org; Fri, 12 Feb 2021 15:16:40 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:45631) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lAerj-0003sV-9s for qemu-devel@nongnu.org; Fri, 12 Feb 2021 15:16:38 -0500 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-284-Bm9Ushb5M8SN25g9QO2S5Q-1; Fri, 12 Feb 2021 15:16:31 -0500 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 1943B108BD18; Fri, 12 Feb 2021 20:16:30 +0000 (UTC) Received: from blue.redhat.com (ovpn-114-150.phx2.redhat.com [10.3.114.150]) by smtp.corp.redhat.com (Postfix) with ESMTP id A08E06E51F; Fri, 12 Feb 2021 20:16:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1613160993; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=vmgkwd3GZ3WDtD2SuR6rBfdgEJ8/qhaQNF0kYao3QJ8=; b=Efq97of2Bphae94mIZ5cNGhqxAeCZmfLV9tyxF6ErgScWQTus0Ip157Qg0FAuDBbOU6f8I jPPDrbR7zOST2sgUlmVYR1BLDcEQb07wJ5i5Qcr84YRMXRo9XyTnf1g1o0VSQcjomBIroE mto854yqlAmHDoc5FNf5fGMXFbFwnL4= X-MC-Unique: Bm9Ushb5M8SN25g9QO2S5Q-1 From: Eric Blake To: qemu-devel@nongnu.org Subject: [PULL 06/14] block/nbd: implement .bdrv_cancel_in_flight Date: Fri, 12 Feb 2021 14:16:11 -0600 Message-Id: <20210212201619.1388255-7-eblake@redhat.com> In-Reply-To: <20210212201619.1388255-1-eblake@redhat.com> References: <20210212201619.1388255-1-eblake@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=eblake@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable 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=63.128.21.124; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -33 X-Spam_score: -3.4 X-Spam_bar: --- X-Spam_report: (-3.4 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.569, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-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: Kevin Wolf , Vladimir Sementsov-Ogievskiy , "open list:Network Block Dev..." , Max Reitz Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) Content-Type: text/plain; charset="utf-8" From: Vladimir Sementsov-Ogievskiy Just stop waiting for connection in existing requests. Signed-off-by: Vladimir Sementsov-Ogievskiy Reviewed-by: Eric Blake Message-Id: <20210205163720.887197-3-vsementsov@virtuozzo.com> Signed-off-by: Eric Blake --- block/nbd.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/block/nbd.c b/block/nbd.c index b3cbbeb4b0cb..c26dc5a54f52 100644 --- a/block/nbd.c +++ b/block/nbd.c @@ -2458,6 +2458,18 @@ static const char *const nbd_strong_runtime_opts[] = =3D { NULL }; +static void nbd_cancel_in_flight(BlockDriverState *bs) +{ + BDRVNBDState *s =3D (BDRVNBDState *)bs->opaque; + + reconnect_delay_timer_del(s); + + if (s->state =3D=3D NBD_CLIENT_CONNECTING_WAIT) { + s->state =3D NBD_CLIENT_CONNECTING_NOWAIT; + qemu_co_queue_restart_all(&s->free_sema); + } +} + static BlockDriver bdrv_nbd =3D { .format_name =3D "nbd", .protocol_name =3D "nbd", @@ -2484,6 +2496,7 @@ static BlockDriver bdrv_nbd =3D { .bdrv_co_block_status =3D nbd_client_co_block_status, .bdrv_dirname =3D nbd_dirname, .strong_runtime_opts =3D nbd_strong_runtime_opts, + .bdrv_cancel_in_flight =3D nbd_cancel_in_flight, }; static BlockDriver bdrv_nbd_tcp =3D { @@ -2512,6 +2525,7 @@ static BlockDriver bdrv_nbd_tcp =3D { .bdrv_co_block_status =3D nbd_client_co_block_status, .bdrv_dirname =3D nbd_dirname, .strong_runtime_opts =3D nbd_strong_runtime_opts, + .bdrv_cancel_in_flight =3D nbd_cancel_in_flight, }; static BlockDriver bdrv_nbd_unix =3D { @@ -2540,6 +2554,7 @@ static BlockDriver bdrv_nbd_unix =3D { .bdrv_co_block_status =3D nbd_client_co_block_status, .bdrv_dirname =3D nbd_dirname, .strong_runtime_opts =3D nbd_strong_runtime_opts, + .bdrv_cancel_in_flight =3D nbd_cancel_in_flight, }; static void bdrv_nbd_init(void) --=20 2.30.1