From nobody Fri Oct 3 11:37:10 2025 Delivered-To: importer@patchew.org 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; 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=1579808102; cv=none; d=zohomail.com; s=zohoarc; b=nt9TLj5ciPOB7yrEzcPV+G8/l23GZ6B2q/RqOgPtS3M2Bj+L2GNRdEwpbqJGPewliRtMvLshEfy3oDuQ+rBr0n50g1kLdyI8BZHgzmSpl3aKGYhyyz0iR+EMqICeC8MX6YtLUb4wc7rFasCbXPKUSM4IbXdoJ4Oby2tc6XvZHoM= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1579808102; h=Content-Type:Content-Transfer-Encoding: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=6Tgsuz0515jUU3tlQilcNU5ypUdTbKqTJOhwN9PRTaY=; b=Yvsjv8hNHcMKXuruGQdxWzEaJsLwXhgHV5aDzmg8QRxKZtBv9OsLgA7Tl0D50AAEGKGkkNmli3DpOzZPfqazdGTbP0Jyspwi9F4WwxSFsrb/+sjvXmJ6mpDcp16eTRqghvT/bpKukmsCrL1Ftx0h7WXIaIb9ftGOdXowmHXBZpc= 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) header.from= Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1579808102028862.7271488903085; Thu, 23 Jan 2020 11:35:02 -0800 (PST) Received: from localhost ([::1]:60160 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iuiFo-0002Dg-SD for importer@patchew.org; Thu, 23 Jan 2020 14:35:00 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:42185) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1iufeX-0005gL-5m for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:22 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1iufeV-0007XE-UR for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:20 -0500 Received: from us-smtp-delivery-1.mimecast.com ([205.139.110.120]:49329 helo=us-smtp-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1iufeV-0007Vz-R8 for qemu-devel@nongnu.org; Thu, 23 Jan 2020 11:48:19 -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-402-nP3a76XNNuStGK40hckTqg-1; Thu, 23 Jan 2020 11:48:17 -0500 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id E5BE8190D351 for ; Thu, 23 Jan 2020 16:48:16 +0000 (UTC) Received: from dgilbert-t580.localhost (ovpn-116-110.ams2.redhat.com [10.36.116.110]) by smtp.corp.redhat.com (Postfix) with ESMTP id 391D619C69; Thu, 23 Jan 2020 16:48:16 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579798099; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6Tgsuz0515jUU3tlQilcNU5ypUdTbKqTJOhwN9PRTaY=; b=GkXZb0w+RINwR2Dyx9j604w/A/8xxDQB0siXT2Fzr35rH1dduIxXRUiuXw4w+lGlVToqnp c7i0UDpSQmLqLmAcw3vsnEMXNDl3RCqPWFvemKp6JD4+qRcW6njyh0+8XTU0HlEANg/GGD 2v8PDqWWQazeS7bZECi1aWEt4aX/q2I= From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com Subject: [PULL 075/108] virtiofsd: Clean up inodes on destroy Date: Thu, 23 Jan 2020 16:45:57 +0000 Message-Id: <20200123164630.91498-76-dgilbert@redhat.com> In-Reply-To: <20200123164630.91498-1-dgilbert@redhat.com> References: <20200123164630.91498-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 X-MC-Unique: nP3a76XNNuStGK40hckTqg-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 205.139.110.120 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: , Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: pass (identity @redhat.com) Content-Type: text/plain; charset="utf-8" From: "Dr. David Alan Gilbert" Clear out our inodes and fd's on a 'destroy' - so we get rid of them if we reboot the guest. Signed-off-by: Dr. David Alan Gilbert Reviewed-by: Daniel P. Berrang=C3=A9 Signed-off-by: Dr. David Alan Gilbert --- tools/virtiofsd/passthrough_ll.c | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough= _ll.c index b176a314d6..9ed77a17fd 100644 --- a/tools/virtiofsd/passthrough_ll.c +++ b/tools/virtiofsd/passthrough_ll.c @@ -1169,6 +1169,25 @@ static void unref_inode_lolocked(struct lo_data *lo,= struct lo_inode *inode, } } =20 +static int unref_all_inodes_cb(gpointer key, gpointer value, gpointer user= _data) +{ + struct lo_inode *inode =3D value; + struct lo_data *lo =3D user_data; + + inode->refcount =3D 0; + lo_map_remove(&lo->ino_map, inode->fuse_ino); + close(inode->fd); + + return TRUE; +} + +static void unref_all_inodes(struct lo_data *lo) +{ + pthread_mutex_lock(&lo->mutex); + g_hash_table_foreach_remove(lo->inodes, unref_all_inodes_cb, lo); + pthread_mutex_unlock(&lo->mutex); +} + static void lo_forget_one(fuse_req_t req, fuse_ino_t ino, uint64_t nlookup) { struct lo_data *lo =3D lo_data(req); @@ -2035,6 +2054,12 @@ static void lo_lseek(fuse_req_t req, fuse_ino_t ino,= off_t off, int whence, } } =20 +static void lo_destroy(void *userdata) +{ + struct lo_data *lo =3D (struct lo_data *)userdata; + unref_all_inodes(lo); +} + static struct fuse_lowlevel_ops lo_oper =3D { .init =3D lo_init, .lookup =3D lo_lookup, @@ -2073,6 +2098,7 @@ static struct fuse_lowlevel_ops lo_oper =3D { .copy_file_range =3D lo_copy_file_range, #endif .lseek =3D lo_lseek, + .destroy =3D lo_destroy, }; =20 /* Print vhost-user.json backend program capabilities */ --=20 2.24.1