From: Vasily Averin <vvs@virtuozzo.com>
To: Eric Van Hensbergen <ericvh@gmail.com>,
Latchesar Ionkov <lucho@ionkov.net>,
Dominique Martinet <asmadeus@codewreck.org>
Cc: kernel@openvz.org, v9fs-developer@lists.sourceforge.net,
linux-kernel@vger.kernel.org
Subject: [PATCH] v9fs: handle async processing of F_SETLK with FL_SLEEP flag
Date: Thu, 23 Dec 2021 21:21:23 +0300 [thread overview]
Message-ID: <076a9ce6-ae06-5b3e-f577-d993e55089f1@virtuozzo.com> (raw)
kernel export thread (nfsd/lockd/ksmbd) uses F_SETLK cmd with the FL_SLEEP
flag set to request asynchronous processing of blocking locks.
Currently v9fs does not support such requests and calls blocking
locks_lock_file_wait() function.
To work around the problem let's detect such request, drop FL_SLEEP
before execution of potentially blocking functions.
Dropped FL_SLEEP flag should be restored back because some calling
function (nfsd4_lock) require it.
https://bugzilla.kernel.org/show_bug.cgi?id=215383
Signed-off-by: Vasily Averin <vvs@virtuozzo.com>
---
fs/9p/vfs_file.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/fs/9p/vfs_file.c b/fs/9p/vfs_file.c
index 612e297f3763..81c98afdbb32 100644
--- a/fs/9p/vfs_file.c
+++ b/fs/9p/vfs_file.c
@@ -135,6 +135,7 @@ static int v9fs_file_do_lock(struct file *filp, int cmd, struct file_lock *fl)
int res = 0;
unsigned char fl_type;
struct v9fs_session_info *v9ses;
+ bool async = false;
fid = filp->private_data;
BUG_ON(fid == NULL);
@@ -142,6 +143,10 @@ static int v9fs_file_do_lock(struct file *filp, int cmd, struct file_lock *fl)
if ((fl->fl_flags & FL_POSIX) != FL_POSIX)
BUG();
+ async = (fl->fl_flags & FL_SLEEP) && IS_SETLK(cmd);
+ if (async)
+ fl->fl_flags &= ~FL_SLEEP;
+
res = locks_lock_file_wait(filp, fl);
if (res < 0)
goto out;
@@ -230,6 +235,8 @@ static int v9fs_file_do_lock(struct file *filp, int cmd, struct file_lock *fl)
if (flock.client_id != fid->clnt->name)
kfree(flock.client_id);
out:
+ if (async)
+ fl->fl_flags |= FL_SLEEP;
return res;
}
--
2.25.1
next reply other threads:[~2021-12-23 18:21 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-12-23 18:21 Vasily Averin [this message]
2021-12-23 23:14 ` Dominique Martinet
2021-12-24 7:08 ` Vasily Averin
2021-12-24 7:31 ` Dominique Martinet
2021-12-24 8:24 ` Vasily Averin
2021-12-24 10:18 ` Vasily Averin
2021-12-24 10:21 ` [PATCH v2] " Vasily Averin
2021-12-24 14:56 ` [PATCH] " Dominique Martinet
2021-12-27 7:42 ` Vasily Averin
2021-12-27 9:17 ` Dominique Martinet
2021-12-24 12:07 ` Vasily Averin
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=076a9ce6-ae06-5b3e-f577-d993e55089f1@virtuozzo.com \
--to=vvs@virtuozzo.com \
--cc=asmadeus@codewreck.org \
--cc=ericvh@gmail.com \
--cc=kernel@openvz.org \
--cc=linux-kernel@vger.kernel.org \
--cc=lucho@ionkov.net \
--cc=v9fs-developer@lists.sourceforge.net \
/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
all inboxes | Powered by JetHome®