From nobody Thu Sep 19 01:04:16 2024 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; dmarc=pass(p=none dis=none) header.from=redhat.com ARC-Seal: i=1; a=rsa-sha256; t=1719951325; cv=none; d=zohomail.com; s=zohoarc; b=VYDv3d+5Gq6g6P5Eb1KwrWaYVwOI9DHOVQR0jDJfTPMVxa0wrDCLe9qnuM+FmFs1+2F4IdFEj4DOzslUu7h6TpZuko/UWrXMUcevSMDd//CRkbxT+DhqK93/+loIizv4Fi/sgwj4S1OC06QLt5o6QuuDUad9Idwoe5C//VH7a+k= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1719951325; h=Content-Type:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=cwZ47LpotxgqMUotTFYaru0nOsyfZI/sw2MfKtbkph8=; b=oHlgBXrEL5dV85uaDTOKJKK4n3KR2C00qriiChqSaVNfLFaMuxNsnf7Hqx2GmS9cl7u+g2+05s4G3nWcDDFvIX//d0rlXxx+LH1UBNBx3enP53vpfwdd9dZ3ctZaFiJjN735kBYMY1x3lMUv7tD5nAoCb1TBmdpSV6lesV66kEI= ARC-Authentication-Results: i=1; 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; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1719951325501147.48122830960108; Tue, 2 Jul 2024 13:15:25 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sOjts-0003LJ-Nx; Tue, 02 Jul 2024 16:14:52 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sOjtr-0003Kt-Ag for qemu-devel@nongnu.org; Tue, 02 Jul 2024 16:14:51 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sOjto-0007d2-Oc for qemu-devel@nongnu.org; Tue, 02 Jul 2024 16:14:51 -0400 Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-66-Umjc7JPrPcKT8m3oCrSX3A-1; Tue, 02 Jul 2024 16:14:47 -0400 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-4257f95ffc6so19691955e9.1 for ; Tue, 02 Jul 2024 13:14:45 -0700 (PDT) Received: from redhat.com ([2a02:14f:1f5:eadd:8c31:db01:9d01:7604]) by smtp.gmail.com with ESMTPSA id ffacd0b85a97d-36791d7a93bsm217862f8f.81.2024.07.02.13.14.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 02 Jul 2024 13:14:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1719951288; 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=cwZ47LpotxgqMUotTFYaru0nOsyfZI/sw2MfKtbkph8=; b=UVf5hETu1VPFnYAPCUe064IveI/DZNgvKR9zGipugjMGQY3lrSLatARrKRY0WoJvA3pKHh jNOj7xtTYo+A/khaGiFGbWUzt1EYlxd7b/LxkyNFW8EnsNq4cyn0aKHlo3oY3DyBoCPHTD YZtHiUUg7W3/6DHDRooCZ8bS2Ph5Wm0= X-MC-Unique: Umjc7JPrPcKT8m3oCrSX3A-1 X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719951284; x=1720556084; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=cwZ47LpotxgqMUotTFYaru0nOsyfZI/sw2MfKtbkph8=; b=dc2oko2TBtCRy1IdJl8qVR8lW+0C77hfgkyBFD6U3NgX0qt2HXMnrfkaWoSm578nnO CHmT7gwFcj8LxJwjabqJ6ErXGtrVqmHHAi5NXKT+1AAGXJIcLVT4wE2BGf1CfF4k9DI9 YnAyVpEaCURbxGCEGyFjA/6+5wFotWGRwQDe31ZyQjwmOZFdkbaWlJbrERjAc5dezaaB s22SQ32ySWs7tAfzlB01d5gu3KKVeSqamXsAbL0z6imscxU31uBeYp+RUA8RfG4WhFz+ hiiq0Bb0cv7MbKhYRF4vUM6sHKPCW7sez/0Cmxdy7eHcX+PH2nsuyVjZtFIU4lR1x8lq Ox4A== X-Gm-Message-State: AOJu0Yx+uHtkgB9MDn7Ad16pKldI1oP95z/T2aTiZdKd60GVNYvxUOUf hxDAY5cQlSgkyOXmqdvfZ09V+rvEkPSSGNdXn0watyXGGLIHH0cLfddDjAbVyxx+j+9QhvOhcE3 Lquip0lLQ3venILjEml0dQggJfvDJypGepnWjgILI0iJMzpcTW9Meg6IOlIsYQImV/wGWT2AGKM vsaBFr7QoxvTl8WwxixIqRTyUZ2JSJfg== X-Received: by 2002:a5d:5f91:0:b0:367:83e9:b4a5 with SMTP id ffacd0b85a97d-36783e9b614mr2378822f8f.49.1719951284226; Tue, 02 Jul 2024 13:14:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHx9z8DbkNgvM2YOUOsYaENWLTgRpnuCmA5D/jO6tvh0FaPQuHFCYGjVJMShL+j9LPomfu1Ew== X-Received: by 2002:a5d:5f91:0:b0:367:83e9:b4a5 with SMTP id ffacd0b85a97d-36783e9b614mr2378789f8f.49.1719951283470; Tue, 02 Jul 2024 13:14:43 -0700 (PDT) Date: Tue, 2 Jul 2024 16:14:39 -0400 From: "Michael S. Tsirkin" To: qemu-devel@nongnu.org Cc: Peter Maydell , Li Feng , Raphael Norwitz , Kevin Wolf , Hanna Reitz , Paolo Bonzini , Fam Zheng , Alex =?utf-8?Q?Benn=C3=A9e?= , qemu-block@nongnu.org Subject: [PULL v2 15/91] vhost-user: fix lost reconnect again Message-ID: <6eaf0e612b415877d1c411b95bed2ecb53b546bb.1719951026.git.mst@redhat.com> References: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: X-Mailer: git-send-email 2.27.0.106.g8ac3dc51b1 X-Mutt-Fcc: =sent 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=170.10.133.124; envelope-from=mst@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @redhat.com) X-ZM-MESSAGEID: 1719951327082100003 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Li Feng When the vhost-user is reconnecting to the backend, and if the vhost-user f= ails at the get_features in vhost_dev_init(), then the reconnect will fail and it will not be retriggered forever. The reason is: When the vhost-user fail at get_features, the vhost_dev_cleanup will be cal= led immediately. vhost_dev_cleanup calls 'memset(hdev, 0, sizeof(struct vhost_dev))'. The reconnect path is: vhost_user_blk_event vhost_user_async_close(.. vhost_user_blk_disconnect ..) qemu_chr_fe_set_handlers <----- clear the notifier callback schedule vhost_user_async_close_bh The vhost->vdev is null, so the vhost_user_blk_disconnect will not be called, then the event fd callback will not be reinstalled. We need to ensure that even if vhost_dev_init initialization fails, the eve= nt handler still needs to be reinstalled when s->connected is false. All vhost-user devices have this issue, including vhost-user-blk/scsi. Fixes: 71e076a07d ("hw/virtio: generalise CHR_EVENT_CLOSED handling") Signed-off-by: Li Feng Message-Id: <20240516025753.130171-3-fengli@smartx.com> Reviewed-by: Raphael Norwitz Reviewed-by: Michael S. Tsirkin Signed-off-by: Michael S. Tsirkin --- hw/block/vhost-user-blk.c | 3 ++- hw/scsi/vhost-user-scsi.c | 3 ++- hw/virtio/vhost-user-base.c | 3 ++- hw/virtio/vhost-user.c | 10 +--------- 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/hw/block/vhost-user-blk.c b/hw/block/vhost-user-blk.c index 15cc24d017..fdbc30b9ce 100644 --- a/hw/block/vhost-user-blk.c +++ b/hw/block/vhost-user-blk.c @@ -354,7 +354,7 @@ static void vhost_user_blk_disconnect(DeviceState *dev) VHostUserBlk *s =3D VHOST_USER_BLK(vdev); =20 if (!s->connected) { - return; + goto done; } s->connected =3D false; =20 @@ -362,6 +362,7 @@ static void vhost_user_blk_disconnect(DeviceState *dev) =20 vhost_dev_cleanup(&s->dev); =20 +done: /* Re-instate the event handler for new connections */ qemu_chr_fe_set_handlers(&s->chardev, NULL, NULL, vhost_user_blk_event, NULL, dev, NULL, true); diff --git a/hw/scsi/vhost-user-scsi.c b/hw/scsi/vhost-user-scsi.c index 421cd654f8..cc91ade525 100644 --- a/hw/scsi/vhost-user-scsi.c +++ b/hw/scsi/vhost-user-scsi.c @@ -182,7 +182,7 @@ static void vhost_user_scsi_disconnect(DeviceState *dev) VirtIOSCSICommon *vs =3D VIRTIO_SCSI_COMMON(dev); =20 if (!s->connected) { - return; + goto done; } s->connected =3D false; =20 @@ -190,6 +190,7 @@ static void vhost_user_scsi_disconnect(DeviceState *dev) =20 vhost_dev_cleanup(&vsc->dev); =20 +done: /* Re-instate the event handler for new connections */ qemu_chr_fe_set_handlers(&vs->conf.chardev, NULL, NULL, vhost_user_scsi_event, NULL, dev, NULL, true); diff --git a/hw/virtio/vhost-user-base.c b/hw/virtio/vhost-user-base.c index 4b54255682..11e72b1e3b 100644 --- a/hw/virtio/vhost-user-base.c +++ b/hw/virtio/vhost-user-base.c @@ -225,13 +225,14 @@ static void vub_disconnect(DeviceState *dev) VHostUserBase *vub =3D VHOST_USER_BASE(vdev); =20 if (!vub->connected) { - return; + goto done; } vub->connected =3D false; =20 vub_stop(vdev); vhost_dev_cleanup(&vub->vhost_dev); =20 +done: /* Re-instate the event handler for new connections */ qemu_chr_fe_set_handlers(&vub->chardev, NULL, NULL, vub_event, diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index c929097e87..c407ea8939 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -2781,16 +2781,8 @@ typedef struct { static void vhost_user_async_close_bh(void *opaque) { VhostAsyncCallback *data =3D opaque; - struct vhost_dev *vhost =3D data->vhost; =20 - /* - * If the vhost_dev has been cleared in the meantime there is - * nothing left to do as some other path has completed the - * cleanup. - */ - if (vhost->vdev) { - data->cb(data->dev); - } + data->cb(data->dev); =20 g_free(data); } --=20 MST