From nobody Sun Feb 8 09:16:36 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=1556260437; cv=none; d=zoho.com; s=zohoarc; b=T46kEfvjPnFitbA4scP4kLbSxrmnePJPWqQ9BoT6Wb9t2wMPoeOBRSdpaEMNyUJfh0afbhrTKe+Rjv4vKVK3UysEE5hH3BjUfgeOe2F27EJ+wwnPVHCEJuNVAU1Pj1MjkCOaOELhwpmk+msJd6z62Yf2OHiS138uPec1q/NqOT0= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zoho.com; s=zohoarc; t=1556260437; h=Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:Message-ID:Sender:Subject:To:ARC-Authentication-Results; bh=fSXrYpF4SxBllQtB/NUKTUWLcnHZSmuYmv2mbSEXjQ0=; b=CABJYV2pN4DFkjr9MqtdAb/u9xVO+YFkoKkg7+FjsDcMszJs6rKA0i7PFLB/VZ8cNrGl3FYSPx5FQuPheqb4qD3ZxeMmCYfb8GHr5Dff9d4ClegnfBt2uKBRc9D1sCKgIbiDyFW2zWXaOm5eGK8qvJ7yIezkxJfVLNg/fGA6W40= 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 (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1556260437103838.0631017074511; Thu, 25 Apr 2019 23:33:57 -0700 (PDT) Received: from localhost ([127.0.0.1]:40316 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJuQh-0007Uf-4f for importer@patchew.org; Fri, 26 Apr 2019 02:33:51 -0400 Received: from eggs.gnu.org ([209.51.188.92]:35861) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hJuCt-0001pU-AY for qemu-devel@nongnu.org; Fri, 26 Apr 2019 02:19:36 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hJuCj-0007zh-4i for qemu-devel@nongnu.org; Fri, 26 Apr 2019 02:19:29 -0400 Received: from mga09.intel.com ([134.134.136.24]:61552) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hJuCh-0007lI-4z; Fri, 26 Apr 2019 02:19:25 -0400 Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by orsmga102.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 25 Apr 2019 23:19:11 -0700 Received: from npg_dpdk_virtio_tbie_2.sh.intel.com ([10.67.104.173]) by fmsmga008.fm.intel.com with ESMTP; 25 Apr 2019 23:19:10 -0700 X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.60,396,1549958400"; d="scan'208";a="143760228" From: Tiwei Bie To: mst@redhat.com, qemu-devel@nongnu.org Date: Fri, 26 Apr 2019 14:18:15 +0800 Message-Id: <20190426061815.6384-1-tiwei.bie@intel.com> X-Mailer: git-send-email 2.17.1 X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 134.134.136.24 Subject: [Qemu-devel] [PATCH] vhost-user: fix reconnection support for host notifier X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 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" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 --- hw/virtio/vhost-user.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c index 553319c7ac..56656629c0 100644 --- a/hw/virtio/vhost-user.c +++ b/hw/virtio/vhost-user.c @@ -1454,10 +1454,24 @@ static int vhost_user_backend_init(struct vhost_dev= *dev, void *opaque) static int vhost_user_backend_cleanup(struct vhost_dev *dev) { struct vhost_user *u; + VhostUserState *user; + int i; =20 assert(dev->vhost_ops->backend_type =3D=3D VHOST_BACKEND_TYPE_USER); =20 u =3D dev->opaque; + + if (dev->vq_index =3D=3D 0) { + user =3D u->user; + 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; + } + } + } + if (u->postcopy_notifier.notify) { postcopy_remove_notifier(&u->postcopy_notifier); u->postcopy_notifier.notify =3D NULL; @@ -1881,6 +1895,8 @@ bool vhost_user_init(VhostUserState *user, CharBacken= d *chr, Error **errp) error_setg(errp, "Cannot initialize vhost-user state"); return false; } + + memset(user, 0, sizeof(*user)); user->chr =3D chr; return true; } --=20 2.17.1