From: Alexander Aring <aahringo@redhat.com> To: linux-nfs@vger.kernel.org Cc: cluster-devel@redhat.com, ocfs2-devel@lists.linux.dev, linux-fsdevel@vger.kernel.org, teigland@redhat.com, rpeterso@redhat.com, agruenba@redhat.com, trond.myklebust@hammerspace.com, anna@kernel.org, chuck.lever@oracle.com, jlayton@kernel.org Subject: [RFCv2 6/7] dlm: use FL_SLEEP to check if blocking request Date: Mon, 14 Aug 2023 17:11:15 -0400 [thread overview] Message-ID: <20230814211116.3224759-7-aahringo@redhat.com> (raw) In-Reply-To: <20230814211116.3224759-1-aahringo@redhat.com> This patch uses the FL_SLEEP flag in struct file_lock to check if it's a blocking request in case if the request coming from nfs lockd process indicated by lm_grant() is set. IF FL_SLEEP is set a asynchronous blocking request is being made and it's waiting for lm_grant() callback being called to signal the lock was granted. If it's not set a synchronous non-blocking request is being made. Signed-off-by: Alexander Aring <aahringo@redhat.com> --- fs/dlm/plock.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c index 0094fa4004cc..524771002a2f 100644 --- a/fs/dlm/plock.c +++ b/fs/dlm/plock.c @@ -140,7 +140,6 @@ int dlm_posix_lock(dlm_lockspace_t *lockspace, u64 number, struct file *file, op->info.optype = DLM_PLOCK_OP_LOCK; op->info.pid = fl->fl_pid; op->info.ex = (fl->fl_type == F_WRLCK); - op->info.wait = IS_SETLKW(cmd); op->info.fsid = ls->ls_global_id; op->info.number = number; op->info.start = fl->fl_start; @@ -148,24 +147,31 @@ int dlm_posix_lock(dlm_lockspace_t *lockspace, u64 number, struct file *file, op->info.owner = (__u64)(long)fl->fl_owner; /* async handling */ if (fl->fl_lmops && fl->fl_lmops->lm_grant) { - op_data = kzalloc(sizeof(*op_data), GFP_NOFS); - if (!op_data) { - dlm_release_plock_op(op); - rv = -ENOMEM; - goto out; - } + if (fl->fl_flags & FL_SLEEP) { + op_data = kzalloc(sizeof(*op_data), GFP_NOFS); + if (!op_data) { + dlm_release_plock_op(op); + rv = -ENOMEM; + goto out; + } - op_data->callback = fl->fl_lmops->lm_grant; - locks_init_lock(&op_data->flc); - locks_copy_lock(&op_data->flc, fl); - op_data->fl = fl; - op_data->file = file; + op->info.wait = 1; + op_data->callback = fl->fl_lmops->lm_grant; + locks_init_lock(&op_data->flc); + locks_copy_lock(&op_data->flc, fl); + op_data->fl = fl; + op_data->file = file; - op->data = op_data; + op->data = op_data; - send_op(op); - rv = FILE_LOCK_DEFERRED; - goto out; + send_op(op); + rv = FILE_LOCK_DEFERRED; + goto out; + } else { + op->info.wait = 0; + } + } else { + op->info.wait = IS_SETLKW(cmd); } send_op(op); -- 2.31.1
WARNING: multiple messages have this Message-ID (diff)
From: Alexander Aring <aahringo@redhat.com> To: linux-nfs@vger.kernel.org Cc: jlayton@kernel.org, cluster-devel@redhat.com, ocfs2-devel@lists.linux.dev, chuck.lever@oracle.com, anna@kernel.org, linux-fsdevel@vger.kernel.org, trond.myklebust@hammerspace.com Subject: [Cluster-devel] [RFCv2 6/7] dlm: use FL_SLEEP to check if blocking request Date: Mon, 14 Aug 2023 17:11:15 -0400 [thread overview] Message-ID: <20230814211116.3224759-7-aahringo@redhat.com> (raw) In-Reply-To: <20230814211116.3224759-1-aahringo@redhat.com> This patch uses the FL_SLEEP flag in struct file_lock to check if it's a blocking request in case if the request coming from nfs lockd process indicated by lm_grant() is set. IF FL_SLEEP is set a asynchronous blocking request is being made and it's waiting for lm_grant() callback being called to signal the lock was granted. If it's not set a synchronous non-blocking request is being made. Signed-off-by: Alexander Aring <aahringo@redhat.com> --- fs/dlm/plock.c | 38 ++++++++++++++++++++++---------------- 1 file changed, 22 insertions(+), 16 deletions(-) diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c index 0094fa4004cc..524771002a2f 100644 --- a/fs/dlm/plock.c +++ b/fs/dlm/plock.c @@ -140,7 +140,6 @@ int dlm_posix_lock(dlm_lockspace_t *lockspace, u64 number, struct file *file, op->info.optype = DLM_PLOCK_OP_LOCK; op->info.pid = fl->fl_pid; op->info.ex = (fl->fl_type == F_WRLCK); - op->info.wait = IS_SETLKW(cmd); op->info.fsid = ls->ls_global_id; op->info.number = number; op->info.start = fl->fl_start; @@ -148,24 +147,31 @@ int dlm_posix_lock(dlm_lockspace_t *lockspace, u64 number, struct file *file, op->info.owner = (__u64)(long)fl->fl_owner; /* async handling */ if (fl->fl_lmops && fl->fl_lmops->lm_grant) { - op_data = kzalloc(sizeof(*op_data), GFP_NOFS); - if (!op_data) { - dlm_release_plock_op(op); - rv = -ENOMEM; - goto out; - } + if (fl->fl_flags & FL_SLEEP) { + op_data = kzalloc(sizeof(*op_data), GFP_NOFS); + if (!op_data) { + dlm_release_plock_op(op); + rv = -ENOMEM; + goto out; + } - op_data->callback = fl->fl_lmops->lm_grant; - locks_init_lock(&op_data->flc); - locks_copy_lock(&op_data->flc, fl); - op_data->fl = fl; - op_data->file = file; + op->info.wait = 1; + op_data->callback = fl->fl_lmops->lm_grant; + locks_init_lock(&op_data->flc); + locks_copy_lock(&op_data->flc, fl); + op_data->fl = fl; + op_data->file = file; - op->data = op_data; + op->data = op_data; - send_op(op); - rv = FILE_LOCK_DEFERRED; - goto out; + send_op(op); + rv = FILE_LOCK_DEFERRED; + goto out; + } else { + op->info.wait = 0; + } + } else { + op->info.wait = IS_SETLKW(cmd); } send_op(op); -- 2.31.1
next prev parent reply other threads:[~2023-08-14 21:13 UTC|newest] Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top 2023-08-14 21:11 [RFCv2 0/7] fs: nfs: async lock request changes Alexander Aring 2023-08-14 21:11 ` [Cluster-devel] " Alexander Aring 2023-08-14 21:11 ` [RFCv2 1/7] lockd: fix race in async lock request handling Alexander Aring 2023-08-14 21:11 ` [Cluster-devel] " Alexander Aring 2023-08-15 17:49 ` Jeff Layton 2023-08-15 17:49 ` [Cluster-devel] " Jeff Layton 2023-08-15 18:21 ` Jeff Layton 2023-08-15 18:21 ` [Cluster-devel] " Jeff Layton 2023-08-17 18:39 ` Alexander Aring 2023-08-17 18:39 ` [Cluster-devel] " Alexander Aring 2023-08-17 18:36 ` Alexander Aring 2023-08-17 18:36 ` [Cluster-devel] " Alexander Aring 2023-08-14 21:11 ` [RFCv2 2/7] lockd: FILE_LOCK_DEFERRED only on FL_SLEEP Alexander Aring 2023-08-14 21:11 ` [Cluster-devel] " Alexander Aring 2023-08-16 11:37 ` Jeff Layton 2023-08-16 11:37 ` [Cluster-devel] " Jeff Layton 2023-08-17 1:40 ` Alexander Aring 2023-08-17 1:40 ` Alexander Aring 2023-08-14 21:11 ` [RFCv2 3/7] lockd: introduce safe async lock op Alexander Aring 2023-08-14 21:11 ` [Cluster-devel] " Alexander Aring 2023-08-16 11:43 ` Jeff Layton 2023-08-16 11:43 ` [Cluster-devel] " Jeff Layton 2023-08-14 21:11 ` [RFCv2 4/7] locks: update lock callback documentation Alexander Aring 2023-08-14 21:11 ` [Cluster-devel] " Alexander Aring 2023-08-16 12:01 ` Jeff Layton 2023-08-16 12:01 ` [Cluster-devel] " Jeff Layton 2023-08-17 1:23 ` Alexander Aring 2023-08-17 1:23 ` Alexander Aring 2023-08-14 21:11 ` [RFCv2 5/7] dlm: use fl_owner from lockd Alexander Aring 2023-08-14 21:11 ` [Cluster-devel] " Alexander Aring 2023-08-16 12:02 ` Jeff Layton 2023-08-16 12:02 ` [Cluster-devel] " Jeff Layton 2023-08-14 21:11 ` Alexander Aring [this message] 2023-08-14 21:11 ` [Cluster-devel] [RFCv2 6/7] dlm: use FL_SLEEP to check if blocking request Alexander Aring 2023-08-16 13:07 ` Jeff Layton 2023-08-16 13:07 ` [Cluster-devel] " Jeff Layton 2023-08-17 1:19 ` Alexander Aring 2023-08-17 1:19 ` Alexander Aring 2023-08-17 11:27 ` [Cluster-devel] " Jeff Layton 2023-08-17 11:27 ` Jeff Layton 2023-08-17 13:02 ` Alexander Aring 2023-08-17 13:02 ` [Cluster-devel] " Alexander Aring 2023-08-14 21:11 ` [RFCv2 7/7] dlm: implement EXPORT_OP_SAFE_ASYNC_LOCK Alexander Aring 2023-08-14 21:11 ` [Cluster-devel] " Alexander Aring
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=20230814211116.3224759-7-aahringo@redhat.com \ --to=aahringo@redhat.com \ --cc=agruenba@redhat.com \ --cc=anna@kernel.org \ --cc=chuck.lever@oracle.com \ --cc=cluster-devel@redhat.com \ --cc=jlayton@kernel.org \ --cc=linux-fsdevel@vger.kernel.org \ --cc=linux-nfs@vger.kernel.org \ --cc=ocfs2-devel@lists.linux.dev \ --cc=rpeterso@redhat.com \ --cc=teigland@redhat.com \ --cc=trond.myklebust@hammerspace.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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.