LinuxLists.cc - [PATCH] nfsd: calculate the missing length of bitmap in EXCHANG

2013-12-10 07:24:42

Subject: [PATCH] nfsd: calculate the missing length of bitmap in EXCHANG_ID

commit 58cd57bfd9db3bc213bf9d6a10920f82095f0114
"nfsd: Fix SP4_MACH_CRED negotiation in EXCHANGE_ID"
miss calculating the length of bitmap for spo_must_enforce and spo_must_allow.

Signed-off-by: Kinglong Mee <[email protected]>
---
fs/nfsd/nfs4proc.c | 3 ++-
fs/nfsd/nfs4xdr.c | 24 ++++++++++++++++--------
2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
index 419572f..7bac4bd 100644
--- a/fs/nfsd/nfs4proc.c
+++ b/fs/nfsd/nfs4proc.c
@@ -1524,7 +1524,8 @@ static inline u32 nfsd4_write_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op)
static inline u32 nfsd4_exchange_id_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op)
{
return (op_encode_hdr_size + 2 + 1 + /* eir_clientid, eir_sequenceid */\
- 1 + 1 + 2 + /* eir_flags, spr_how, spo_must_enforce & _allow */\
+ 1 + 1 + /* eir_flags, spr_how */\
+ 4 + /* spo_must_enforce & _allow with bitmap */\
2 + /*eir_server_owner.so_minor_id */\
/* eir_server_owner.so_major_id<> */\
XDR_QUADLEN(NFS4_OPAQUE_LIMIT) + 1 +\
diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index a57e67d..817c99f 100644
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -3368,35 +3368,43 @@ nfsd4_encode_exchange_id(struct nfsd4_compoundres *resp, __be32 nfserr,
8 /* eir_clientid */ +
4 /* eir_sequenceid */ +
4 /* eir_flags */ +
- 4 /* spr_how */ +
- 8 /* spo_must_enforce, spo_must_allow */ +
- 8 /* so_minor_id */ +
- 4 /* so_major_id.len */ +
- (XDR_QUADLEN(major_id_sz) * 4) +
- 4 /* eir_server_scope.len */ +
- (XDR_QUADLEN(server_scope_sz) * 4) +
- 4 /* eir_server_impl_id.count (0) */);
+ 4 /* spr_how */);

WRITEMEM(&exid->clientid, 8);
WRITE32(exid->seqid);
WRITE32(exid->flags);

WRITE32(exid->spa_how);
+ ADJUST_ARGS();
+
switch (exid->spa_how) {
case SP4_NONE:
break;
case SP4_MACH_CRED:
+ /* spo_must_enforce, spo_must_allow */
+ RESERVE_SPACE(16);
+
/* spo_must_enforce bitmap: */
WRITE32(2);
WRITE32(nfs4_minimal_spo_must_enforce[0]);
WRITE32(nfs4_minimal_spo_must_enforce[1]);
/* empty spo_must_allow bitmap: */
WRITE32(0);
+
+ ADJUST_ARGS();
break;
default:
WARN_ON_ONCE(1);
}

+ RESERVE_SPACE(
+ 8 /* so_minor_id */ +
+ 4 /* so_major_id.len */ +
+ (XDR_QUADLEN(major_id_sz) * 4) +
+ 4 /* eir_server_scope.len */ +
+ (XDR_QUADLEN(server_scope_sz) * 4) +
+ 4 /* eir_server_impl_id.count (0) */);
+
/* The server_owner struct */
WRITE64(minor_id); /* Minor id */
/* major id */
--
1.8.4.2

2013-12-12 16:11:16

by J. Bruce Fields

[permalink] [raw]

Subject: Re: [PATCH] nfsd: calculate the missing length of bitmap in EXCHANG_ID

On Tue, Dec 10, 2013 at 03:24:36PM +0800, Kinglong Mee wrote:
> commit 58cd57bfd9db3bc213bf9d6a10920f82095f0114
> "nfsd: Fix SP4_MACH_CRED negotiation in EXCHANGE_ID"
> miss calculating the length of bitmap for spo_must_enforce and spo_must_allow.

Good catch, thanks! Looks like this was an oversight from
57266a6e916e2522ea61758a3ee5576b60156791 "nfsd4: implement minimal
SP4_MACH_CRED" where I changed the xdr but forgot to update this length
calculation.

But it doesn't look urgent. I'll queue it up for 3.14.

--b.

>
> Signed-off-by: Kinglong Mee <[email protected]>
> ---
> fs/nfsd/nfs4proc.c | 3 ++-
> fs/nfsd/nfs4xdr.c | 24 ++++++++++++++++--------
> 2 files changed, 18 insertions(+), 9 deletions(-)
>
> diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
> index 419572f..7bac4bd 100644
> --- a/fs/nfsd/nfs4proc.c
> +++ b/fs/nfsd/nfs4proc.c
> @@ -1524,7 +1524,8 @@ static inline u32 nfsd4_write_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op)
> static inline u32 nfsd4_exchange_id_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op)
> {
> return (op_encode_hdr_size + 2 + 1 + /* eir_clientid, eir_sequenceid */\
> - 1 + 1 + 2 + /* eir_flags, spr_how, spo_must_enforce & _allow */\
> + 1 + 1 + /* eir_flags, spr_how */\
> + 4 + /* spo_must_enforce & _allow with bitmap */\
> 2 + /*eir_server_owner.so_minor_id */\
> /* eir_server_owner.so_major_id<> */\
> XDR_QUADLEN(NFS4_OPAQUE_LIMIT) + 1 +\
> diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
> index a57e67d..817c99f 100644
> --- a/fs/nfsd/nfs4xdr.c
> +++ b/fs/nfsd/nfs4xdr.c
> @@ -3368,35 +3368,43 @@ nfsd4_encode_exchange_id(struct nfsd4_compoundres *resp, __be32 nfserr,
> 8 /* eir_clientid */ +
> 4 /* eir_sequenceid */ +
> 4 /* eir_flags */ +
> - 4 /* spr_how */ +
> - 8 /* spo_must_enforce, spo_must_allow */ +
> - 8 /* so_minor_id */ +
> - 4 /* so_major_id.len */ +
> - (XDR_QUADLEN(major_id_sz) * 4) +
> - 4 /* eir_server_scope.len */ +
> - (XDR_QUADLEN(server_scope_sz) * 4) +
> - 4 /* eir_server_impl_id.count (0) */);
> + 4 /* spr_how */);
>
> WRITEMEM(&exid->clientid, 8);
> WRITE32(exid->seqid);
> WRITE32(exid->flags);
>
> WRITE32(exid->spa_how);
> + ADJUST_ARGS();
> +
> switch (exid->spa_how) {
> case SP4_NONE:
> break;
> case SP4_MACH_CRED:
> + /* spo_must_enforce, spo_must_allow */
> + RESERVE_SPACE(16);
> +
> /* spo_must_enforce bitmap: */
> WRITE32(2);
> WRITE32(nfs4_minimal_spo_must_enforce[0]);
> WRITE32(nfs4_minimal_spo_must_enforce[1]);
> /* empty spo_must_allow bitmap: */
> WRITE32(0);
> +
> + ADJUST_ARGS();
> break;
> default:
> WARN_ON_ONCE(1);
> }
>
> + RESERVE_SPACE(
> + 8 /* so_minor_id */ +
> + 4 /* so_major_id.len */ +
> + (XDR_QUADLEN(major_id_sz) * 4) +
> + 4 /* eir_server_scope.len */ +
> + (XDR_QUADLEN(server_scope_sz) * 4) +
> + 4 /* eir_server_impl_id.count (0) */);
> +
> /* The server_owner struct */
> WRITE64(minor_id); /* Minor id */
> /* major id */
> --
> 1.8.4.2

2013-12-12 16:11:59

by J. Bruce Fields

[permalink] [raw]

Subject: Re: [PATCH] nfsd: calculate the missing length of bitmap in EXCHANG_ID

On Thu, Dec 12, 2013 at 11:11:11AM -0500, J. Bruce Fields wrote:
> On Tue, Dec 10, 2013 at 03:24:36PM +0800, Kinglong Mee wrote:
> > commit 58cd57bfd9db3bc213bf9d6a10920f82095f0114
> > "nfsd: Fix SP4_MACH_CRED negotiation in EXCHANGE_ID"
> > miss calculating the length of bitmap for spo_must_enforce and spo_must_allow.
>
> Good catch, thanks! Looks like this was an oversight from
> 57266a6e916e2522ea61758a3ee5576b60156791 "nfsd4: implement minimal
> SP4_MACH_CRED" where I changed the xdr but forgot to update this length
> calculation.

(Um, I just repeated what you said in the changelog, sorry, obviously
I'm not reading!)

--b.

>
> But it doesn't look urgent. I'll queue it up for 3.14.
>
> --b.
>
> >
> > Signed-off-by: Kinglong Mee <[email protected]>
> > ---
> > fs/nfsd/nfs4proc.c | 3 ++-
> > fs/nfsd/nfs4xdr.c | 24 ++++++++++++++++--------
> > 2 files changed, 18 insertions(+), 9 deletions(-)
> >
> > diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c
> > index 419572f..7bac4bd 100644
> > --- a/fs/nfsd/nfs4proc.c
> > +++ b/fs/nfsd/nfs4proc.c
> > @@ -1524,7 +1524,8 @@ static inline u32 nfsd4_write_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op)
> > static inline u32 nfsd4_exchange_id_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op)
> > {
> > return (op_encode_hdr_size + 2 + 1 + /* eir_clientid, eir_sequenceid */\
> > - 1 + 1 + 2 + /* eir_flags, spr_how, spo_must_enforce & _allow */\
> > + 1 + 1 + /* eir_flags, spr_how */\
> > + 4 + /* spo_must_enforce & _allow with bitmap */\
> > 2 + /*eir_server_owner.so_minor_id */\
> > /* eir_server_owner.so_major_id<> */\
> > XDR_QUADLEN(NFS4_OPAQUE_LIMIT) + 1 +\
> > diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
> > index a57e67d..817c99f 100644
> > --- a/fs/nfsd/nfs4xdr.c
> > +++ b/fs/nfsd/nfs4xdr.c
> > @@ -3368,35 +3368,43 @@ nfsd4_encode_exchange_id(struct nfsd4_compoundres *resp, __be32 nfserr,
> > 8 /* eir_clientid */ +
> > 4 /* eir_sequenceid */ +
> > 4 /* eir_flags */ +
> > - 4 /* spr_how */ +
> > - 8 /* spo_must_enforce, spo_must_allow */ +
> > - 8 /* so_minor_id */ +
> > - 4 /* so_major_id.len */ +
> > - (XDR_QUADLEN(major_id_sz) * 4) +
> > - 4 /* eir_server_scope.len */ +
> > - (XDR_QUADLEN(server_scope_sz) * 4) +
> > - 4 /* eir_server_impl_id.count (0) */);
> > + 4 /* spr_how */);
> >
> > WRITEMEM(&exid->clientid, 8);
> > WRITE32(exid->seqid);
> > WRITE32(exid->flags);
> >
> > WRITE32(exid->spa_how);
> > + ADJUST_ARGS();
> > +
> > switch (exid->spa_how) {
> > case SP4_NONE:
> > break;
> > case SP4_MACH_CRED:
> > + /* spo_must_enforce, spo_must_allow */
> > + RESERVE_SPACE(16);
> > +
> > /* spo_must_enforce bitmap: */
> > WRITE32(2);
> > WRITE32(nfs4_minimal_spo_must_enforce[0]);
> > WRITE32(nfs4_minimal_spo_must_enforce[1]);
> > /* empty spo_must_allow bitmap: */
> > WRITE32(0);
> > +
> > + ADJUST_ARGS();
> > break;
> > default:
> > WARN_ON_ONCE(1);
> > }
> >
> > + RESERVE_SPACE(
> > + 8 /* so_minor_id */ +
> > + 4 /* so_major_id.len */ +
> > + (XDR_QUADLEN(major_id_sz) * 4) +
> > + 4 /* eir_server_scope.len */ +
> > + (XDR_QUADLEN(server_scope_sz) * 4) +
> > + 4 /* eir_server_impl_id.count (0) */);
> > +
> > /* The server_owner struct */
> > WRITE64(minor_id); /* Minor id */
> > /* major id */
> > --
> > 1.8.4.2