[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 07/15] virtiofsd: Set up posix_lock hash table for root inode
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 07/15] virtiofsd: Set up posix_lock hash table for root inode |
Date: |
Fri, 18 Dec 2020 10:41:09 +0000 |
From: Vivek Goyal <vgoyal@redhat.com>
We setup per inode hash table ->posix_lock to support remote posix locks.
But we forgot to initialize this table for root inode.
Laszlo managed to trigger an issue where he sent a FUSE_FLUSH request for
root inode and lo_flush() found inode with inode->posix_lock NULL and
accessing this table crashed virtiofsd.
May be we can get rid of initializing this hash table for directory
objects completely. But that optimization is for another day.
Reported-by: Laszlo Ersek <lersek@redhat.com>
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Message-Id: <20201207195539.GB3107@redhat.com>
Reviewed-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
Signed-off-by: Dr. David Alan Gilbert <dgilbert@redhat.com>
---
tools/virtiofsd/passthrough_ll.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
index e61cc56530..80e62b1610 100644
--- a/tools/virtiofsd/passthrough_ll.c
+++ b/tools/virtiofsd/passthrough_ll.c
@@ -3380,6 +3380,9 @@ static void setup_root(struct lo_data *lo, struct
lo_inode *root)
root->key.mnt_id = mnt_id;
root->nlookup = 2;
g_atomic_int_set(&root->refcount, 2);
+ pthread_mutex_init(&root->plock_mutex, NULL);
+ root->posix_locks = g_hash_table_new_full(
+ g_direct_hash, g_direct_equal, NULL, posix_locks_value_destroy);
}
static guint lo_key_hash(gconstpointer key)
@@ -3402,6 +3405,10 @@ static void fuse_lo_data_cleanup(struct lo_data *lo)
if (lo->inodes) {
g_hash_table_destroy(lo->inodes);
}
+
+ if (lo->root.posix_locks) {
+ g_hash_table_destroy(lo->root.posix_locks);
+ }
lo_map_destroy(&lo->fd_map);
lo_map_destroy(&lo->dirp_map);
lo_map_destroy(&lo->ino_map);
--
2.29.2
- [PULL 00/15] migration queue, Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 01/15] monitor:open brace '{' following struct go on the same line, Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 02/15] monitor:braces {} are necessary for all arms of this statement, Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 03/15] monitor:Don't use '#' flag of printf format ('%#') in format strings, Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 05/15] virtiofsd: Use --thread-pool-size=0 to mean no thread pool, Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 04/15] hmp-commands.hx: List abbreviation after command for cont, quit, print, Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 06/15] virtiofsd: make the debug log timestamp on stderr more human-readable, Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 07/15] virtiofsd: Set up posix_lock hash table for root inode,
Dr. David Alan Gilbert (git) <=
- [PULL 08/15] virtiofsd: Disable posix_lock hash table if remote locks are not enabled, Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 09/15] virtiofsd: Check file type in lo_flush(), Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 10/15] virtiofsd: update FUSE_FORGET comment on "lo_inode.nlookup", Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 11/15] virtiofsd: Remove useless code about send_notify_iov, Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 13/15] savevm: Remove dead code in save_snapshot(), Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 12/15] docs/devel/migration: Improve debugging section a bit, Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 14/15] savevm: Delete snapshots just created in case of error, Dr. David Alan Gilbert (git), 2020/12/18
- [PULL 15/15] migration: Don't allow migration if vm is in POSTMIGRATE, Dr. David Alan Gilbert (git), 2020/12/18
- Re: [PULL 00/15] migration queue, Peter Maydell, 2020/12/31