From nobody Sat Feb 7 03:38:53 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.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; Authentication-Results: mx.zohomail.com; spf=pass (zoho.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=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1560835195; cv=none; d=zoho.com; s=zohoarc; b=Rwjx4ej0ocLmhz3nOYd8fV4mQJDjm0A/8I135CQP3v9e2CA+7HKGwQpMjhX6kmrYkC/nuMHRXDP9CAZV08xGsi5Q+J2J7B4MmfPiV8xd74zC4E2tA/ReDNq4z9EIyz2gfl0nBlRwO/7EV3hdYUxfZzpwBjrZJKxgUnIC4TvQd8g= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1560835195; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=cuQnfTAevhtycZ8v5dM3bGF3EVj4Hsh8xYKfCUo2aKY=; b=gn2VJd6/uR8nx/ZMLCY3pHoq2ZXeZnVoMpqejdmSce5uyxEAQrzooe3eJ73SG3b3sDYcj8S1zqiu65EmyIP4mWOWqdW+1KodoPAbgV5taBPWvtxfy08lpToOyKzxYX2Pa1oTFZ2zXMvjnwR2DqkMMsm5Qen80n5qBajgekuP/eg= ARC-Authentication-Results: i=1; mx.zoho.com; spf=pass (zoho.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 (209.51.188.17 [209.51.188.17]) by mx.zohomail.com with SMTPS id 1560835195285437.2841607871393; Mon, 17 Jun 2019 22:19:55 -0700 (PDT) Received: from localhost ([::1]:53734 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hd6X2-0004vm-1r for importer@patchew.org; Tue, 18 Jun 2019 01:19:44 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:51151) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hd6W1-0004N3-1C for qemu-devel@nongnu.org; Tue, 18 Jun 2019 01:18:42 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hd6W0-0006OM-0L for qemu-devel@nongnu.org; Tue, 18 Jun 2019 01:18:40 -0400 Received: from mga03.intel.com ([134.134.136.65]:44962) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hd6Vw-0006EU-01; Tue, 18 Jun 2019 01:18:37 -0400 Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga103.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 17 Jun 2019 22:18:26 -0700 Received: from npg-dpdk-virtio-tbie-2.sh.intel.com ([10.67.104.151]) by fmsmga005.fm.intel.com with ESMTP; 17 Jun 2019 22:18:25 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 From: Tiwei Bie To: mst@redhat.com, marcandre.lureau@gmail.com, jasowang@redhat.com, qemu-devel@nongnu.org Date: Tue, 18 Jun 2019 13:14:58 +0800 Message-Id: <20190618051458.7855-1-tiwei.bie@intel.com> X-Mailer: git-send-email 2.17.1 MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.65 Subject: [Qemu-devel] [PATCH v2] vhost-user: fix reconnection support for host notifier 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: cunming.liang@intel.com, qemu-stable@nongnu.org Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" We need to destroy the host notifiers when cleaning up the backend. Otherwise, some resources are not released after the connection is closed, and it may prevent the external backend from reopening them (e.g. VFIO files) during restart. Fixes: 44866521bd6e ("vhost-user: support registering external host notifie= rs") Cc: qemu-stable@nongnu.org Signed-off-by: Tiwei Bie --- v2: - Drop superfluous memset() (Marc-Andr=C3=A9); - Factor the notifier code in a separate function (Marc-Andr=C3=A9); hw/virtio/vhost-user.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 4ca5b2551e..e27a2a4647 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -226,6 +226,20 @@ static bool ioeventfd_enabled(void) return !kvm_enabled() || kvm_eventfds_enabled(); } =20 +static void +vhost_user_host_notifiers_cleanup(VhostUserState *user) +{ + int i; + + for (i =3D 0; i < VIRTIO_QUEUE_MAX; i++) { + if (user->notifier[i].addr) { + object_unparent(OBJECT(&user->notifier[i].mr)); + munmap(user->notifier[i].addr, qemu_real_host_page_size); + user->notifier[i].addr =3D NULL; + } + } +} + static int vhost_user_read_header(struct vhost_dev *dev, VhostUserMsg *msg) { struct vhost_user *u =3D dev->opaque; @@ -1469,6 +1483,9 @@ static int vhost_user_backend_cleanup(struct vhost_de= v *dev) assert(dev->vhost_ops->backend_type =3D=3D VHOST_BACKEND_TYPE_USER); =20 u =3D dev->opaque; + if (dev->vq_index =3D=3D 0) { + vhost_user_host_notifiers_cleanup(u->user); + } if (u->postcopy_notifier.notify) { postcopy_remove_notifier(&u->postcopy_notifier); u->postcopy_notifier.notify =3D NULL; @@ -1898,19 +1915,10 @@ bool vhost_user_init(VhostUserState *user, CharBack= end *chr, Error **errp) =20 void vhost_user_cleanup(VhostUserState *user) { - int i; - if (!user->chr) { return; } - - for (i =3D 0; i < VIRTIO_QUEUE_MAX; i++) { - if (user->notifier[i].addr) { - object_unparent(OBJECT(&user->notifier[i].mr)); - munmap(user->notifier[i].addr, qemu_real_host_page_size); - user->notifier[i].addr =3D NULL; - } - } + vhost_user_host_notifiers_cleanup(user); user->chr =3D NULL; } =20 --=20 2.17.1