cryptospore / rpms / qemu-kvm

Forked from rpms/qemu-kvm 2 years ago
Clone
ddf19c
From 2b921f7162b53204051955228bf99bbed55d2457 Mon Sep 17 00:00:00 2001
ddf19c
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
ddf19c
Date: Mon, 27 Jan 2020 19:01:53 +0100
ddf19c
Subject: [PATCH 082/116] virtiofsd: Clean up inodes on destroy
ddf19c
MIME-Version: 1.0
ddf19c
Content-Type: text/plain; charset=UTF-8
ddf19c
Content-Transfer-Encoding: 8bit
ddf19c
ddf19c
RH-Author: Dr. David Alan Gilbert <dgilbert@redhat.com>
ddf19c
Message-id: <20200127190227.40942-79-dgilbert@redhat.com>
ddf19c
Patchwork-id: 93532
ddf19c
O-Subject: [RHEL-AV-8.2 qemu-kvm PATCH 078/112] virtiofsd: Clean up inodes on destroy
ddf19c
Bugzilla: 1694164
ddf19c
RH-Acked-by: Philippe Mathieu-Daudé <philmd@redhat.com>
ddf19c
RH-Acked-by: Stefan Hajnoczi <stefanha@redhat.com>
ddf19c
RH-Acked-by: Sergio Lopez Pascual <slp@redhat.com>
ddf19c
ddf19c
From: "Dr. David Alan Gilbert" <dgilbert@redhat.com>
ddf19c
ddf19c
Clear out our inodes and fd's on a 'destroy' - so we get rid
ddf19c
of them if we reboot the guest.
ddf19c
ddf19c
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
ddf19c
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
ddf19c
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
ddf19c
(cherry picked from commit 771b01eb76ff480fee984bd1d21727147cc3e702)
ddf19c
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
ddf19c
---
ddf19c
 tools/virtiofsd/passthrough_ll.c | 26 ++++++++++++++++++++++++++
ddf19c
 1 file changed, 26 insertions(+)
ddf19c
ddf19c
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
ddf19c
index b176a31..9ed77a1 100644
ddf19c
--- a/tools/virtiofsd/passthrough_ll.c
ddf19c
+++ b/tools/virtiofsd/passthrough_ll.c
ddf19c
@@ -1169,6 +1169,25 @@ static void unref_inode_lolocked(struct lo_data *lo, struct lo_inode *inode,
ddf19c
     }
ddf19c
 }
ddf19c
 
ddf19c
+static int unref_all_inodes_cb(gpointer key, gpointer value, gpointer user_data)
ddf19c
+{
ddf19c
+    struct lo_inode *inode = value;
ddf19c
+    struct lo_data *lo = user_data;
ddf19c
+
ddf19c
+    inode->refcount = 0;
ddf19c
+    lo_map_remove(&lo->ino_map, inode->fuse_ino);
ddf19c
+    close(inode->fd);
ddf19c
+
ddf19c
+    return TRUE;
ddf19c
+}
ddf19c
+
ddf19c
+static void unref_all_inodes(struct lo_data *lo)
ddf19c
+{
ddf19c
+    pthread_mutex_lock(&lo->mutex);
ddf19c
+    g_hash_table_foreach_remove(lo->inodes, unref_all_inodes_cb, lo);
ddf19c
+    pthread_mutex_unlock(&lo->mutex);
ddf19c
+}
ddf19c
+
ddf19c
 static void lo_forget_one(fuse_req_t req, fuse_ino_t ino, uint64_t nlookup)
ddf19c
 {
ddf19c
     struct lo_data *lo = lo_data(req);
ddf19c
@@ -2035,6 +2054,12 @@ static void lo_lseek(fuse_req_t req, fuse_ino_t ino, off_t off, int whence,
ddf19c
     }
ddf19c
 }
ddf19c
 
ddf19c
+static void lo_destroy(void *userdata)
ddf19c
+{
ddf19c
+    struct lo_data *lo = (struct lo_data *)userdata;
ddf19c
+    unref_all_inodes(lo);
ddf19c
+}
ddf19c
+
ddf19c
 static struct fuse_lowlevel_ops lo_oper = {
ddf19c
     .init = lo_init,
ddf19c
     .lookup = lo_lookup,
ddf19c
@@ -2073,6 +2098,7 @@ static struct fuse_lowlevel_ops lo_oper = {
ddf19c
     .copy_file_range = lo_copy_file_range,
ddf19c
 #endif
ddf19c
     .lseek = lo_lseek,
ddf19c
+    .destroy = lo_destroy,
ddf19c
 };
ddf19c
 
ddf19c
 /* Print vhost-user.json backend program capabilities */
ddf19c
-- 
ddf19c
1.8.3.1
ddf19c