Revert "lockd: Show pid of lockd for remote locks"
diff mbox series

Message ID 952928a350da64fd8de3e1a79deb8cc23552972f.1558362681.git.bcodding@redhat.com
State New
Headers show
Series
  • Revert "lockd: Show pid of lockd for remote locks"
Related show

Commit Message

Benjamin Coddington May 20, 2019, 2:33 p.m. UTC
This reverts most of commit b8eee0e90f97 ("lockd: Show pid of lockd for
remote locks"), which caused remote locks to not be differentiated between
remote processes for NLM.

We retain the fixup for setting the client's fl_pid to a negative value.

Fixes: b8eee0e90f97 ("lockd: Show pid of lockd for remote locks")
Cc: stable@vger.kernel.org

Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
---
 fs/lockd/xdr.c  | 4 ++--
 fs/lockd/xdr4.c | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

Comments

bfields@fieldses.org May 21, 2019, 3:58 p.m. UTC | #1
On Mon, May 20, 2019 at 10:33:07AM -0400, Benjamin Coddington wrote:
> This reverts most of commit b8eee0e90f97 ("lockd: Show pid of lockd for
> remote locks"), which caused remote locks to not be differentiated between
> remote processes for NLM.

To make sure I understand: I assume a client resolves conflicts among
its own processes before involving the server, so the server only needs
to resolve conflicts among nlm_hosts.  Is that right?  So the only
practical affect is the missing grant callbacks that Xuewei noticed?

Or is my assumption not true in general?  Or is it true only for some
client implementations?

--b.

> 
> We retain the fixup for setting the client's fl_pid to a negative value.
> 
> Fixes: b8eee0e90f97 ("lockd: Show pid of lockd for remote locks")
> Cc: stable@vger.kernel.org
> 
> Signed-off-by: Benjamin Coddington <bcodding@redhat.com>
> ---
>  fs/lockd/xdr.c  | 4 ++--
>  fs/lockd/xdr4.c | 4 ++--
>  2 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c
> index 9846f7e95282..7147e4aebecc 100644
> --- a/fs/lockd/xdr.c
> +++ b/fs/lockd/xdr.c
> @@ -127,7 +127,7 @@ nlm_decode_lock(__be32 *p, struct nlm_lock *lock)
>  
>  	locks_init_lock(fl);
>  	fl->fl_owner = current->files;
> -	fl->fl_pid   = current->tgid;
> +	fl->fl_pid   = (pid_t)lock->svid;
>  	fl->fl_flags = FL_POSIX;
>  	fl->fl_type  = F_RDLCK;		/* as good as anything else */
>  	start = ntohl(*p++);
> @@ -269,7 +269,7 @@ nlmsvc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p)
>  	memset(lock, 0, sizeof(*lock));
>  	locks_init_lock(&lock->fl);
>  	lock->svid = ~(u32) 0;
> -	lock->fl.fl_pid = current->tgid;
> +	lock->fl.fl_pid = (pid_t)lock->svid;
>  
>  	if (!(p = nlm_decode_cookie(p, &argp->cookie))
>  	 || !(p = xdr_decode_string_inplace(p, &lock->caller,
> diff --git a/fs/lockd/xdr4.c b/fs/lockd/xdr4.c
> index 70154f376695..7ed9edf9aed4 100644
> --- a/fs/lockd/xdr4.c
> +++ b/fs/lockd/xdr4.c
> @@ -119,7 +119,7 @@ nlm4_decode_lock(__be32 *p, struct nlm_lock *lock)
>  
>  	locks_init_lock(fl);
>  	fl->fl_owner = current->files;
> -	fl->fl_pid   = current->tgid;
> +	fl->fl_pid   = (pid_t)lock->svid;
>  	fl->fl_flags = FL_POSIX;
>  	fl->fl_type  = F_RDLCK;		/* as good as anything else */
>  	p = xdr_decode_hyper(p, &start);
> @@ -266,7 +266,7 @@ nlm4svc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p)
>  	memset(lock, 0, sizeof(*lock));
>  	locks_init_lock(&lock->fl);
>  	lock->svid = ~(u32) 0;
> -	lock->fl.fl_pid = current->tgid;
> +	lock->fl.fl_pid = (pid_t)lock->svid;
>  
>  	if (!(p = nlm4_decode_cookie(p, &argp->cookie))
>  	 || !(p = xdr_decode_string_inplace(p, &lock->caller,
> -- 
> 2.20.1
Benjamin Coddington May 21, 2019, 8:45 p.m. UTC | #2
On 21 May 2019, at 11:58, J . Bruce Fields wrote:

> On Mon, May 20, 2019 at 10:33:07AM -0400, Benjamin Coddington wrote:
>> This reverts most of commit b8eee0e90f97 ("lockd: Show pid of lockd for
>> remote locks"), which caused remote locks to not be differentiated between
>> remote processes for NLM.
>
> To make sure I understand: I assume a client resolves conflicts among
> its own processes before involving the server, so the server only needs
> to resolve conflicts among nlm_hosts.  Is that right?  So the only
> practical affect is the missing grant callbacks that Xuewei noticed?

For the linux client, I think that is correct.

> Or is my assumption not true in general?  Or is it true only for some
> client implementations?

I don't know the answer here.  I imagine a client could leave off checking
for local lock conflicts.

I have a set of patches that stuff nlm_lockowner into fl_owner on the
server.  That allows us to set fl_pid of lockd and not lose the svid.  I am
just testing them thoroughly at this point, and I'll probably get them
posted tomorrow.

Ben
Xuewei Zhang May 21, 2019, 10:33 p.m. UTC | #3
On Tue, May 21, 2019 at 1:45 PM Benjamin Coddington <bcodding@redhat.com> wrote:
>
> On 21 May 2019, at 11:58, J . Bruce Fields wrote:
>
> > On Mon, May 20, 2019 at 10:33:07AM -0400, Benjamin Coddington wrote:
> >> This reverts most of commit b8eee0e90f97 ("lockd: Show pid of lockd for
> >> remote locks"), which caused remote locks to not be differentiated between
> >> remote processes for NLM.

I just tested this today to be sure. And yes, this revert fixes the
problem we observed.

Reviewed-by: Xuewei Zhang <xueweiz@google.com>

Best regards,
Xuewei

Patch
diff mbox series

diff --git a/fs/lockd/xdr.c b/fs/lockd/xdr.c
index 9846f7e95282..7147e4aebecc 100644
--- a/fs/lockd/xdr.c
+++ b/fs/lockd/xdr.c
@@ -127,7 +127,7 @@  nlm_decode_lock(__be32 *p, struct nlm_lock *lock)
 
 	locks_init_lock(fl);
 	fl->fl_owner = current->files;
-	fl->fl_pid   = current->tgid;
+	fl->fl_pid   = (pid_t)lock->svid;
 	fl->fl_flags = FL_POSIX;
 	fl->fl_type  = F_RDLCK;		/* as good as anything else */
 	start = ntohl(*p++);
@@ -269,7 +269,7 @@  nlmsvc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p)
 	memset(lock, 0, sizeof(*lock));
 	locks_init_lock(&lock->fl);
 	lock->svid = ~(u32) 0;
-	lock->fl.fl_pid = current->tgid;
+	lock->fl.fl_pid = (pid_t)lock->svid;
 
 	if (!(p = nlm_decode_cookie(p, &argp->cookie))
 	 || !(p = xdr_decode_string_inplace(p, &lock->caller,
diff --git a/fs/lockd/xdr4.c b/fs/lockd/xdr4.c
index 70154f376695..7ed9edf9aed4 100644
--- a/fs/lockd/xdr4.c
+++ b/fs/lockd/xdr4.c
@@ -119,7 +119,7 @@  nlm4_decode_lock(__be32 *p, struct nlm_lock *lock)
 
 	locks_init_lock(fl);
 	fl->fl_owner = current->files;
-	fl->fl_pid   = current->tgid;
+	fl->fl_pid   = (pid_t)lock->svid;
 	fl->fl_flags = FL_POSIX;
 	fl->fl_type  = F_RDLCK;		/* as good as anything else */
 	p = xdr_decode_hyper(p, &start);
@@ -266,7 +266,7 @@  nlm4svc_decode_shareargs(struct svc_rqst *rqstp, __be32 *p)
 	memset(lock, 0, sizeof(*lock));
 	locks_init_lock(&lock->fl);
 	lock->svid = ~(u32) 0;
-	lock->fl.fl_pid = current->tgid;
+	lock->fl.fl_pid = (pid_t)lock->svid;
 
 	if (!(p = nlm4_decode_cookie(p, &argp->cookie))
 	 || !(p = xdr_decode_string_inplace(p, &lock->caller,