[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 08/15] virtiofsd: Disable posix_lock hash table if remote locks ar
From: |
Dr. David Alan Gilbert (git) |
Subject: |
[PULL 08/15] virtiofsd: Disable posix_lock hash table if remote locks are not enabled |
Date: |
Fri, 18 Dec 2020 10:41:10 +0000 |
From: Vivek Goyal <vgoyal@redhat.com>
If remote posix locks are not enabled (lo->posix_lock == false), then disable
code paths taken to initialize inode->posix_lock hash table and corresponding
destruction and search etc.
lo_getlk() and lo_setlk() have been modified to return ENOSYS if daemon
does not support posix lock but client still sends a lock/unlock request.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Message-Id: <20201207183021.22752-3-vgoyal@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 | 51 +++++++++++++++++++++-----------
1 file changed, 34 insertions(+), 17 deletions(-)
diff --git a/tools/virtiofsd/passthrough_ll.c b/tools/virtiofsd/passthrough_ll.c
index 80e62b1610..4f805cbb82 100644
--- a/tools/virtiofsd/passthrough_ll.c
+++ b/tools/virtiofsd/passthrough_ll.c
@@ -902,10 +902,11 @@ static int lo_do_lookup(fuse_req_t req, fuse_ino_t
parent, const char *name,
inode->key.ino = e->attr.st_ino;
inode->key.dev = e->attr.st_dev;
inode->key.mnt_id = mnt_id;
- pthread_mutex_init(&inode->plock_mutex, NULL);
- inode->posix_locks = g_hash_table_new_full(
- g_direct_hash, g_direct_equal, NULL, posix_locks_value_destroy);
-
+ if (lo->posix_lock) {
+ pthread_mutex_init(&inode->plock_mutex, NULL);
+ inode->posix_locks = g_hash_table_new_full(
+ g_direct_hash, g_direct_equal, NULL,
posix_locks_value_destroy);
+ }
pthread_mutex_lock(&lo->mutex);
inode->fuse_ino = lo_add_inode_mapping(req, inode);
g_hash_table_insert(lo->inodes, &inode->key, inode);
@@ -1291,12 +1292,13 @@ static void unref_inode(struct lo_data *lo, struct
lo_inode *inode, uint64_t n)
if (!inode->nlookup) {
lo_map_remove(&lo->ino_map, inode->fuse_ino);
g_hash_table_remove(lo->inodes, &inode->key);
- if (g_hash_table_size(inode->posix_locks)) {
- fuse_log(FUSE_LOG_WARNING, "Hash table is not empty\n");
+ if (lo->posix_lock) {
+ if (g_hash_table_size(inode->posix_locks)) {
+ fuse_log(FUSE_LOG_WARNING, "Hash table is not empty\n");
+ }
+ g_hash_table_destroy(inode->posix_locks);
+ pthread_mutex_destroy(&inode->plock_mutex);
}
- g_hash_table_destroy(inode->posix_locks);
- pthread_mutex_destroy(&inode->plock_mutex);
-
/* Drop our refcount from lo_do_lookup() */
lo_inode_put(lo, &inode);
}
@@ -1772,6 +1774,11 @@ static void lo_getlk(fuse_req_t req, fuse_ino_t ino,
struct fuse_file_info *fi,
ino, fi->flags, fi->lock_owner, lock->l_type, lock->l_start,
lock->l_len);
+ if (!lo->posix_lock) {
+ fuse_reply_err(req, ENOSYS);
+ return;
+ }
+
inode = lo_inode(req, ino);
if (!inode) {
fuse_reply_err(req, EBADF);
@@ -1817,6 +1824,11 @@ static void lo_setlk(fuse_req_t req, fuse_ino_t ino,
struct fuse_file_info *fi,
ino, fi->flags, lock->l_type, lock->l_pid, fi->lock_owner, sleep,
lock->l_whence, lock->l_start, lock->l_len);
+ if (!lo->posix_lock) {
+ fuse_reply_err(req, ENOSYS);
+ return;
+ }
+
if (sleep) {
fuse_reply_err(req, EOPNOTSUPP);
return;
@@ -1941,6 +1953,7 @@ static void lo_flush(fuse_req_t req, fuse_ino_t ino,
struct fuse_file_info *fi)
int res;
(void)ino;
struct lo_inode *inode;
+ struct lo_data *lo = lo_data(req);
inode = lo_inode(req, ino);
if (!inode) {
@@ -1949,12 +1962,14 @@ static void lo_flush(fuse_req_t req, fuse_ino_t ino,
struct fuse_file_info *fi)
}
/* An fd is going away. Cleanup associated posix locks */
- pthread_mutex_lock(&inode->plock_mutex);
- g_hash_table_remove(inode->posix_locks, GUINT_TO_POINTER(fi->lock_owner));
- pthread_mutex_unlock(&inode->plock_mutex);
-
+ if (lo->posix_lock) {
+ pthread_mutex_lock(&inode->plock_mutex);
+ g_hash_table_remove(inode->posix_locks,
+ GUINT_TO_POINTER(fi->lock_owner));
+ pthread_mutex_unlock(&inode->plock_mutex);
+ }
res = close(dup(lo_fi_fd(req, fi)));
- lo_inode_put(lo_data(req), &inode);
+ lo_inode_put(lo, &inode);
fuse_reply_err(req, res == -1 ? errno : 0);
}
@@ -3380,9 +3395,11 @@ 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);
+ if (lo->posix_lock) {
+ 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)
--
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), 2020/12/18
- [PULL 08/15] virtiofsd: Disable posix_lock hash table if remote locks are not enabled,
Dr. David Alan Gilbert (git) <=
- [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