From: Vivek Goyal <vgoyal@redhat.com>
To: qemu-devel@nongnu.org
Cc: mszeredi@redhat.com, dgilbert@redhat.com, virtio-fs@redhat.com,
stefanha@redhat.com, lersek@redhat.com, vgoyal@redhat.com
Subject: [PATCH 1/3] virtiofsd: Set up posix_lock hash table for root inode
Date: Mon, 7 Dec 2020 13:30:19 -0500 [thread overview]
Message-ID: <20201207183021.22752-2-vgoyal@redhat.com> (raw)
In-Reply-To: <20201207183021.22752-1-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>
---
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 97485b22b4..59202a843b 100644
--- a/tools/virtiofsd/passthrough_ll.c
+++ b/tools/virtiofsd/passthrough_ll.c
@@ -3372,6 +3372,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)
@@ -3394,6 +3397,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.25.4
next prev parent reply other threads:[~2020-12-07 18:35 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-07 18:30 [PATCH 0/3] virtiofsd: Fix lo_flush() and inode->posix_lock init Vivek Goyal
2020-12-07 18:30 ` Vivek Goyal [this message]
2020-12-07 19:55 ` [PATCH 1/3] virtiofsd: Set up posix_lock hash table for root inode Vivek Goyal
2020-12-10 19:50 ` Dr. David Alan Gilbert
2020-12-07 18:30 ` [PATCH 2/3] virtiofsd: Disable posix_lock hash table if remote locks are not enabled Vivek Goyal
2020-12-10 19:58 ` Dr. David Alan Gilbert
2020-12-07 18:30 ` [PATCH 3/3] virtiofsd: Check file type in lo_flush() Vivek Goyal
2020-12-10 20:03 ` Dr. David Alan Gilbert
2020-12-10 20:09 ` Vivek Goyal
2020-12-10 20:14 ` Dr. David Alan Gilbert
2020-12-11 14:25 ` Vivek Goyal
2020-12-11 19:54 ` Dr. David Alan Gilbert
2020-12-10 21:24 ` ceph + freeipa ubuntu/fedora common small bug Harry G. Coin
2020-12-11 11:05 ` Dr. David Alan Gilbert
2020-12-11 15:06 ` Vivek Goyal
2020-12-12 6:39 ` Harry Coin
2020-12-07 19:12 ` [PATCH 0/3] virtiofsd: Fix lo_flush() and inode->posix_lock init no-reply
2020-12-08 4:51 ` Laszlo Ersek
2020-12-08 14:16 ` Vivek Goyal
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201207183021.22752-2-vgoyal@redhat.com \
--to=vgoyal@redhat.com \
--cc=dgilbert@redhat.com \
--cc=lersek@redhat.com \
--cc=mszeredi@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=stefanha@redhat.com \
--cc=virtio-fs@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).