From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.0 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6BD5BC433F5 for ; Fri, 3 Sep 2021 16:26:11 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id E9B1C60EC0 for ; Fri, 3 Sep 2021 16:26:10 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org E9B1C60EC0 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=nongnu.org Received: from localhost ([::1]:38528 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mMC13-0006NC-PN for qemu-devel@archiver.kernel.org; Fri, 03 Sep 2021 12:26:09 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:34280) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMBs1-0002rW-CX for qemu-devel@nongnu.org; Fri, 03 Sep 2021 12:16:49 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:35553) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mMBrx-0000nc-Pn for qemu-devel@nongnu.org; Fri, 03 Sep 2021 12:16:47 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1630685804; 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: in-reply-to:in-reply-to:references:references; bh=DVpX7asYtOBpub3evycVS0OWTVq9Kr9E8PraeXs3XCQ=; b=ak9ei3XEJmHxyqvQkt0uTtYP/Exmma7MO+yocJtLhFxAwlLTB1rrs8mReCCjZNoK7l/pAN O4f0fesLrUva8tqsmXHPP9xeak5gk3kNlO2X6qXtWL0LdojGnTemKT6FfRVQRQiKAvu28F qY38zsEAXNvVY0DeMXiWeVnbXtg/MTI= 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-274-O9Y5aT-NO_u0iP8U9x5p9g-1; Fri, 03 Sep 2021 12:16:42 -0400 X-MC-Unique: O9Y5aT-NO_u0iP8U9x5p9g-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DF7E6100670C; Fri, 3 Sep 2021 16:16:35 +0000 (UTC) Received: from redhat.com (ovpn-113-81.phx2.redhat.com [10.3.113.81]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 658A169CBB; Fri, 3 Sep 2021 16:16:35 +0000 (UTC) Date: Fri, 3 Sep 2021 11:16:33 -0500 From: Eric Blake To: Vladimir Sementsov-Ogievskiy Subject: Re: [PATCH v6 1/5] block/nbd: nbd_channel_error() shutdown channel unconditionally Message-ID: <20210903161633.6ribvygzdvtqpfu5@redhat.com> References: <20210902103805.25686-1-vsementsov@virtuozzo.com> <20210902103805.25686-2-vsementsov@virtuozzo.com> MIME-Version: 1.0 In-Reply-To: <20210902103805.25686-2-vsementsov@virtuozzo.com> User-Agent: NeoMutt/20210205-739-420e15 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 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-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=170.10.133.124; envelope-from=eblake@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -31 X-Spam_score: -3.2 X-Spam_bar: --- X-Spam_report: (-3.2 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.392, 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_H2=-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: kwolf@redhat.com, hreitz@redhat.com, qemu-devel@nongnu.org, qemu-block@nongnu.org, rkagan@virtuozzo.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Thu, Sep 02, 2021 at 01:38:01PM +0300, Vladimir Sementsov-Ogievskiy wrote: > Don't rely on connection being totally broken in case of -EIO. More > safe and correct just shutdown the channel anyway, as we change the > state and going to reconnect. If you don't mind me tweaking grammar, I propose: Safer and more correct is to just shut down the channel anyway, since we change the state and plan on reconnecting. > > Signed-off-by: Vladimir Sementsov-Ogievskiy > Reviewed-by: Eric Blake > --- > block/nbd.c | 7 ++++--- > 1 file changed, 4 insertions(+), 3 deletions(-) > > diff --git a/block/nbd.c b/block/nbd.c > index f6ff1c4fb4..d88f4b954c 100644 > --- a/block/nbd.c > +++ b/block/nbd.c > @@ -129,15 +129,16 @@ static bool nbd_client_connected(BDRVNBDState *s) > > static void nbd_channel_error(BDRVNBDState *s, int ret) > { > + if (nbd_client_connected(s)) { > + qio_channel_shutdown(s->ioc, QIO_CHANNEL_SHUTDOWN_BOTH, NULL); > + } > + > if (ret == -EIO) { > if (nbd_client_connected(s)) { > s->state = s->reconnect_delay ? NBD_CLIENT_CONNECTING_WAIT : > NBD_CLIENT_CONNECTING_NOWAIT; > } > } else { > - if (nbd_client_connected(s)) { > - qio_channel_shutdown(s->ioc, QIO_CHANNEL_SHUTDOWN_BOTH, NULL); > - } > s->state = NBD_CLIENT_QUIT; > } > } > -- > 2.29.2 > -- Eric Blake, Principal Software Engineer Red Hat, Inc. +1-919-301-3266 Virtualization: qemu.org | libvirt.org