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=-6.9 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 7C836C2D0CE for ; Tue, 21 Jan 2020 13:49:37 +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 458202070C for ; Tue, 21 Jan 2020 13:49:37 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="IW9MGKvg" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 458202070C Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:54208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ittuR-000603-L3 for qemu-devel@archiver.kernel.org; Tue, 21 Jan 2020 08:49:35 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:52501) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1itsgh-0002bw-0W for qemu-devel@nongnu.org; Tue, 21 Jan 2020 07:31:23 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1itsgc-0004R2-4w for qemu-devel@nongnu.org; Tue, 21 Jan 2020 07:31:18 -0500 Received: from us-smtp-1.mimecast.com ([205.139.110.61]:50329 helo=us-smtp-delivery-1.mimecast.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1itsgZ-0004Pj-FH for qemu-devel@nongnu.org; Tue, 21 Jan 2020 07:31:11 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1579609870; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RiEISjCX3BKvVv6er1yuVLiUnfihUTExv2EGJg7bkWg=; b=IW9MGKvgfRe33G3/iUnm/U2ZpAyeAV/mDbxH1YERm8pIt+OJ9S7LlrgHQT/fOE+UX3jqFI qK/TxLzaVAlThVsEIRaHJjjjkmGMtD+ubqm1D4AiyDonwHfhTk+dQsIF4gbWp6+1eMVzIP jt9us0+Z/7vJRr50ahUoIwLSBdWnm8w= 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-120-cGFUZUnyN3i8t8H9zgo9rw-1; Tue, 21 Jan 2020 07:31:09 -0500 Received: from smtp.corp.redhat.com (int-mx02.intmail.prod.int.phx2.redhat.com [10.5.11.12]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 2608D801A2F; Tue, 21 Jan 2020 12:31:08 +0000 (UTC) Received: from dgilbert-t580.localhost (unknown [10.36.118.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4A5A760BE0; Tue, 21 Jan 2020 12:31:05 +0000 (UTC) From: "Dr. David Alan Gilbert (git)" To: qemu-devel@nongnu.org, stefanha@redhat.com, vgoyal@redhat.com, berrange@redhat.com, slp@redhat.com, philmd@redhat.com Subject: [PATCH v2 076/109] virtiofsd: Clean up inodes on destroy Date: Tue, 21 Jan 2020 12:24:00 +0000 Message-Id: <20200121122433.50803-77-dgilbert@redhat.com> In-Reply-To: <20200121122433.50803-1-dgilbert@redhat.com> References: <20200121122433.50803-1-dgilbert@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.12 X-MC-Unique: cGFUZUnyN3i8t8H9zgo9rw-1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 205.139.110.61 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: m.mizuma@jp.fujitsu.com, misono.tomohiro@jp.fujitsu.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" 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 --- 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 e0f76b37b7..3b60e61c74 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