nfsd: Implement large extent array support in pNFS
Subsystems (3)
v4 cover nfsd: Implement large extent array support in pNFS
This series is the result of splitting the patch v3. Removing dprintk is now done in a separate cleanup commit. No additional changes.
Prerequisite patch: [v3] nfsd: Use correct error code when decoding extents
---
Sergey Bashirov (2):
nfsd: Drop dprintk in blocklayout xdr functions
nfsd: Implement large extent array support in pNFS
fs/nfsd/blocklayout.c | 20 ++++--- fs/nfsd/blocklayoutxdr.c | 118 ++++++++++++++++++++------------------- fs/nfsd/blocklayoutxdr.h | 4 +- fs/nfsd/nfs4proc.c | 2 +- fs/nfsd/nfs4xdr.c | 11 ++-- fs/nfsd/pnfs.h | 1 + fs/nfsd/xdr4.h | 3 +- 7 files changed, 83 insertions(+), 76 deletions(-)
Signature · 1 line
2.43.0
PATCH v4 1/2 nfsd: Drop dprintk in blocklayout xdr functions
Minor clean up. Instead of dprintk there are appropriate error codes.
--- fs/nfsd/blocklayoutxdr.c | 40 +++++++--------------------------------- 1 file changed, 7 insertions(+), 33 deletions(-)
fs/nfsd/blocklayoutxdr.c +7 -33
@@ -139,28 +139,19 @@ nfsd4_block_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp,struct iomap *iomaps;u32 nr_iomaps, i; -if (len <sizeof (u32)) { -dprintk ("%s: extent array too small: %u\n" , __func__, len); +if (len <sizeof (u32))return nfserr_bad_xdr; - } len -=sizeof (u32); -if (len %PNFS_BLOCK_EXTENT_SIZE ) { -dprintk ("%s: extent array invalid: %u\n" , __func__, len); +if (len %PNFS_BLOCK_EXTENT_SIZE )return nfserr_bad_xdr; - } nr_iomaps =be32_to_cpup (p++); -if (nr_iomaps != len /PNFS_BLOCK_EXTENT_SIZE ) { -dprintk ("%s: extent array size mismatch: %u/%u\n" , - __func__, len, nr_iomaps); +if (nr_iomaps != len /PNFS_BLOCK_EXTENT_SIZE )return nfserr_bad_xdr; - } iomaps =kcalloc (nr_iomaps,sizeof (*iomaps),GFP_KERNEL ); -if (!iomaps) { -dprintk ("%s: failed to allocate extent array\n" , __func__); +if (!iomaps)return nfserr_delay; - }for (i =0 ; i < nr_iomaps; i++) {struct pnfs_block_extent bex;
@@ -170,26 +161,18 @@ nfsd4_block_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp, p =xdr_decode_hyper (p, &bex.foff);if (bex.foff & (block_size -1 )) { -dprintk ("%s: unaligned offset 0x%llx\n" , - __func__, bex.foff); goto fail; } p =xdr_decode_hyper (p, &bex.len);if (bex.len & (block_size -1 )) { -dprintk ("%s: unaligned length 0x%llx\n" , - __func__, bex.foff); goto fail; } p =xdr_decode_hyper (p, &bex.soff);if (bex.soff & (block_size -1 )) { -dprintk ("%s: unaligned disk offset 0x%llx\n" , - __func__, bex.soff); goto fail; } bex.es =be32_to_cpup (p++);if (bex.es !=PNFS_BLOCK_READWRITE_DATA ) { -dprintk ("%s: incorrect extent state %d\n" , - __func__, bex.es); goto fail; }
@@ -231,38 +214,29 @@ nfsd4_scsi_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp,struct iomap *iomaps;u32 nr_iomaps, expected, i; -if (len <sizeof (u32)) { -dprintk ("%s: extent array too small: %u\n" , __func__, len); +if (len <sizeof (u32))return nfserr_bad_xdr; - } nr_iomaps =be32_to_cpup (p++); expected =sizeof (__be32) + nr_iomaps *PNFS_SCSI_RANGE_SIZE ; -if (len != expected) { -dprintk ("%s: extent array size mismatch: %u/%u\n" , - __func__, len, expected); +if (len != expected)return nfserr_bad_xdr; - } iomaps =kcalloc (nr_iomaps,sizeof (*iomaps),GFP_KERNEL ); -if (!iomaps) { -dprintk ("%s: failed to allocate extent array\n" , __func__); +if (!iomaps)return nfserr_delay; - }for (i =0 ; i < nr_iomaps; i++) {u64 val; p =xdr_decode_hyper (p, &val);if (val & (block_size -1 )) { -dprintk ("%s: unaligned offset 0x%llx\n" , __func__, val); goto fail; } iomaps[i].offset = val; p =xdr_decode_hyper (p, &val);if (val & (block_size -1 )) { -dprintk ("%s: unaligned length 0x%llx\n" , __func__, val); goto fail; } iomaps[i].length = val;
Signature · 1 line
2.43.0
Re: [PATCH v4 1/2] nfsd: Drop dprintk in blocklayout xdr functions
Quoted 103 lines · Sergey Bashirov
Minor clean up. Instead of dprintk there are appropriate error codes.
Signed-off-by Sergey Bashirov <[email protected]>--- fs/nfsd/blocklayoutxdr.c | 40 +++++++--------------------------------- 1 file changed, 7 insertions(+), 33 deletions(-)fs/nfsd/blocklayoutxdr.c +7
-32@@ -139,28 +139,19 @@ nfsd4_block_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp,struct iomap *iomaps;u32 nr_iomaps, i; -if (len <sizeof (u32)) { -dprintk ("%s: extent array too small: %u\n" , __func__, len); +if (len <sizeof (u32))return nfserr_bad_xdr; - } len -=sizeof (u32); -if (len %PNFS_BLOCK_EXTENT_SIZE ) { -dprintk ("%s: extent array invalid: %u\n" , __func__, len); +if (len %PNFS_BLOCK_EXTENT_SIZE )return nfserr_bad_xdr; - } nr_iomaps =be32_to_cpup (p++); -if (nr_iomaps != len /PNFS_BLOCK_EXTENT_SIZE ) { -dprintk ("%s: extent array size mismatch: %u/%u\n" , - __func__, len, nr_iomaps); +if (nr_iomaps != len /PNFS_BLOCK_EXTENT_SIZE )return nfserr_bad_xdr; - } iomaps =kcalloc (nr_iomaps,sizeof (*iomaps),GFP_KERNEL ); -if (!iomaps) { -dprintk ("%s: failed to allocate extent array\n" , __func__); +if (!iomaps)return nfserr_delay; - }for (i =0 ; i < nr_iomaps; i++) {struct pnfs_block_extent bex;@@ -170,26 +161,18 @@ nfsd4_block_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp, p =xdr_decode_hyper (p, &bex.foff);if (bex.foff & (block_size -1 )) { -dprintk ("%s: unaligned offset 0x%llx\n" , - __func__, bex.foff); goto fail; } p =xdr_decode_hyper (p, &bex.len);if (bex.len & (block_size -1 )) { -dprintk ("%s: unaligned length 0x%llx\n" , - __func__, bex.foff); goto fail; } p =xdr_decode_hyper (p, &bex.soff);if (bex.soff & (block_size -1 )) { -dprintk ("%s: unaligned disk offset 0x%llx\n" , - __func__, bex.soff); goto fail; } bex.es =be32_to_cpup (p++);if (bex.es !=PNFS_BLOCK_READWRITE_DATA ) { -dprintk ("%s: incorrect extent state %d\n" , - __func__, bex.es); goto fail; }@@ -231,38 +214,29 @@ nfsd4_scsi_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp,struct iomap *iomaps;u32 nr_iomaps, expected, i; -if (len <sizeof (u32)) { -dprintk ("%s: extent array too small: %u\n" , __func__, len); +if (len <sizeof (u32))return nfserr_bad_xdr; - } nr_iomaps =be32_to_cpup (p++); expected =sizeof (__be32) + nr_iomaps *PNFS_SCSI_RANGE_SIZE ; -if (len != expected) { -dprintk ("%s: extent array size mismatch: %u/%u\n" , - __func__, len, expected); +if (len != expected)return nfserr_bad_xdr; - } iomaps =kcalloc (nr_iomaps,sizeof (*iomaps),GFP_KERNEL ); -if (!iomaps) { -dprintk ("%s: failed to allocate extent array\n" , __func__); +if (!iomaps)return nfserr_delay; - }for (i =0 ; i < nr_iomaps; i++) {u64 val; p =xdr_decode_hyper (p, &val);if (val & (block_size -1 )) { -dprintk ("%s: unaligned offset 0x%llx\n" , __func__, val);
fs/nfsd/blocklayoutxdr.c nfsd4_scsi_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp, · line 242
Quoted 10 lines
fs/nfsd/blocklayoutxdr.c +0
-1goto fail; } iomaps[i].offset = val; p =xdr_decode_hyper (p, &val);if (val & (block_size -1 )) { -dprintk ("%s: unaligned length 0x%llx\n" , __func__, val); goto fail; } iomaps[i].length = val;
Looks sane, and most of these dprintks aren't terribly helpful for day to day usage.
Re: [PATCH v4 1/2] nfsd: Drop dprintk in blocklayout xdr functions
In reply to Sergey BashirovLooks good:
PATCH v4 2/2 nfsd: Implement large extent array support in pNFS
In reply to Sergey BashirovWhen pNFS client in the block or scsi layout mode sends layoutcommit to MDS, a variable length array of modified extents is supplied within the request. This patch allows the server to accept such extent arrays if they do not fit within single memory page.
The issue can be reproduced when writing to a 1GB file using FIO with O_DIRECT, 4K block and large I/O depth without preallocation of the file. In this case, the server returns NFSERR_BADXDR to the client.
--- fs/nfsd/blocklayout.c | 20 ++++++---- fs/nfsd/blocklayoutxdr.c | 86 +++++++++++++++++++++++++++------------- fs/nfsd/blocklayoutxdr.h | 4 +- fs/nfsd/nfs4proc.c | 2 +- fs/nfsd/nfs4xdr.c | 11 +++-- fs/nfsd/pnfs.h | 1 + fs/nfsd/xdr4.h | 3 +- 7 files changed, 80 insertions(+), 47 deletions(-)
fs/nfsd/blocklayout.c +12 -8
@@ -173,16 +173,18 @@ nfsd4_block_proc_getdeviceinfo(struct super_block *sb, }static __be32 -nfsd4_block_proc_layoutcommit (struct inode *inode, +nfsd4_block_proc_layoutcommit (struct inode *inode,struct svc_rqst *rqstp,struct nfsd4_layoutcommit *lcp) {struct iomap *iomaps;int nr_iomaps;__be32 nfserr; - nfserr =nfsd4_block_decode_layoutupdate (lcp->lc_up_layout, - lcp->lc_up_len, &iomaps, &nr_iomaps, -i_blocksize (inode)); +memcpy (&rqstp->rq_arg, &lcp->lc_up_layout,sizeof (struct xdr_buf )); +svcxdr_init_decode (rqstp); + + nfserr =nfsd4_block_decode_layoutupdate (&rqstp->rq_arg_stream, + &iomaps, &nr_iomaps,i_blocksize (inode));if (nfserr != nfs_ok)return nfserr;
@@ -313,16 +315,18 @@ nfsd4_scsi_proc_getdeviceinfo(struct super_block *sb,return nfserrno (nfsd4_block_get_device_info_scsi (sb, clp, gdp)); }static __be32 -nfsd4_scsi_proc_layoutcommit (struct inode *inode, +nfsd4_scsi_proc_layoutcommit (struct inode *inode,struct svc_rqst *rqstp,struct nfsd4_layoutcommit *lcp) {struct iomap *iomaps;int nr_iomaps;__be32 nfserr; - nfserr =nfsd4_scsi_decode_layoutupdate (lcp->lc_up_layout, - lcp->lc_up_len, &iomaps, &nr_iomaps, -i_blocksize (inode)); +memcpy (&rqstp->rq_arg, &lcp->lc_up_layout,sizeof (struct xdr_buf )); +svcxdr_init_decode (rqstp); + + nfserr =nfsd4_scsi_decode_layoutupdate (&rqstp->rq_arg_stream, + &iomaps, &nr_iomaps,i_blocksize (inode));if (nfserr != nfs_ok)return nfserr;
fs/nfsd/blocklayoutxdr.c +58 -28
168 lines not on this page · raw message
fs/nfsd/blocklayoutxdr.h +2 -2
@@ -54,9 +54,9 @@ __be32 nfsd4_block_encode_getdeviceinfo(struct xdr_stream *xdr, const struct nfsd4_getdeviceinfo *gdp);__be32 nfsd4_block_encode_layoutget (struct xdr_stream *xdr,const struct nfsd4_layoutget *lgp); -__be32 nfsd4_block_decode_layoutupdate (__be32 *p,u32 len, +__be32 nfsd4_block_decode_layoutupdate (struct xdr_stream *xdr,struct iomap **iomapp,int *nr_iomapsp,u32 block_size); -__be32 nfsd4_scsi_decode_layoutupdate (__be32 *p,u32 len, +__be32 nfsd4_scsi_decode_layoutupdate (struct xdr_stream *xdr,struct iomap **iomapp,int *nr_iomapsp,u32 block_size);#endif /* _NFSD_BLOCKLAYOUTXDR_H */
fs/nfsd/nfs4proc.c +1 -1
@@ -2533,7 +2533,7 @@ nfsd4_layoutcommit(struct svc_rqst *rqstp, lcp->lc_size_chg = false; } - nfserr = ops->proc_layoutcommit (inode, lcp); + nfserr = ops->proc_layoutcommit (inode, rqstp, lcp);nfs4_put_stid (&ls->ls_stid); out:return nfserr;
fs/nfsd/nfs4xdr.c +5 -6
@@ -604,6 +604,8 @@ static __be32 nfsd4_decode_layoutupdate4(struct nfsd4_compoundargs *argp, struct nfsd4_layoutcommit *lcp) { + u32 len; +if (xdr_stream_decode_u32 (argp->xdr, &lcp->lc_layout_type) <0 )return nfserr_bad_xdr;if (lcp->lc_layout_type <LAYOUT_NFSV4_1_FILES )
@@ -611,13 +613,10 @@ nfsd4_decode_layoutupdate4(struct nfsd4_compoundargs *argp,if (lcp->lc_layout_type >=LAYOUT_TYPE_MAX )return nfserr_bad_xdr; -if (xdr_stream_decode_u32 (argp->xdr, &lcp->lc_up_len) <0 ) +if (xdr_stream_decode_u32 (argp->xdr, &len) <0 ) +return nfserr_bad_xdr; +if (!xdr_stream_subsegment (argp->xdr, &lcp->lc_up_layout, len))return nfserr_bad_xdr; -if (lcp->lc_up_len >0 ) { - lcp->lc_up_layout =xdr_inline_decode (argp->xdr, lcp->lc_up_len); -if (!lcp->lc_up_layout) -return nfserr_bad_xdr; - }return nfs_ok; }
fs/nfsd/pnfs.h +1 -0
@@ -35,6 +35,7 @@ struct nfsd4_layout_ops { const struct nfsd4_layoutget *lgp);__be32 (*proc_layoutcommit)(struct inode *inode, +struct svc_rqst *rqstp,struct nfsd4_layoutcommit *lcp); void (*fence_client)(struct nfs4_layout_stateid *ls,
fs/nfsd/xdr4.h +1 -2
@@ -630,8 +630,7 @@ struct nfsd4_layoutcommit {u64 lc_last_wr;/* request */ struct timespec64 lc_mtime;/* request */ u32 lc_layout_type;/* request */ -u32 lc_up_len;/* layout length */ -void *lc_up_layout;/* decoded by callback */ +struct xdr_buf lc_up_layout;/* decoded by callback */ bool lc_size_chg;/* response */ u64 lc_newsize;/* response */ };
Signature · 1 line
2.43.0
Quoted 32 lines · Sergey Bashirov
When pNFS client in the block or scsi layout mode sends layoutcommit to MDS, a variable length array of modified extents is supplied within the request. This patch allows the server to accept such extent arrays if they do not fit within single memory page.
The issue can be reproduced when writing to a 1GB file using FIO with
O_DIRECT, 4K block and large I/O depth without preallocation of the file. In this case, the server returnsNFSERR_BADXDRto the client.Co-developed-by Konstantin Evtushenko <[email protected]>Signed-off-by Konstantin Evtushenko <[email protected]>Signed-off-by Sergey Bashirov <[email protected]>--- fs/nfsd/blocklayout.c | 20 ++++++---- fs/nfsd/blocklayoutxdr.c | 86 +++++++++++++++++++++++++++------------- fs/nfsd/blocklayoutxdr.h | 4 +- fs/nfsd/nfs4proc.c | 2 +- fs/nfsd/nfs4xdr.c | 11 +++-- fs/nfsd/pnfs.h | 1 + fs/nfsd/xdr4.h | 3 +- 7 files changed, 80 insertions(+), 47 deletions(-)fs/nfsd/blocklayout.c +1
-1@@ -173,16 +173,18 @@ nfsd4_block_proc_getdeviceinfo(struct super_block *sb, } static __be32 -nfsd4_block_proc_layoutcommit(struct inode *inode, +nfsd4_block_proc_layoutcommit(struct inode *inode, struct svc_rqst *rqstp,
fs/nfsd/blocklayout.c nfsd4_block_proc_getdeviceinfo(struct super_block *sb, · line 183
Quoted 10 lines
fs/nfsd/blocklayout.c +1
-3struct nfsd4_layoutcommit *lcp) {struct iomap *iomaps;int nr_iomaps;__be32 nfserr; - nfserr =nfsd4_block_decode_layoutupdate (lcp->lc_up_layout, - lcp->lc_up_len, &iomaps, &nr_iomaps, -i_blocksize (inode)); +memcpy (&rqstp->rq_arg, &lcp->lc_up_layout,sizeof (struct xdr_buf ));
Huh? rqstp->rq_arg is an xdr_buf. This is going to end up scri
Quoted 285 lines
fs/nfsd/blocklayout.c +10
-4+svcxdr_init_decode (rqstp); + + nfserr =nfsd4_block_decode_layoutupdate (&rqstp->rq_arg_stream, + &iomaps, &nr_iomaps,i_blocksize (inode));if (nfserr != nfs_ok)return nfserr;@@ -313,16 +315,18 @@ nfsd4_scsi_proc_getdeviceinfo(struct super_block *sb,return nfserrno (nfsd4_block_get_device_info_scsi (sb, clp, gdp)); }static __be32 -nfsd4_scsi_proc_layoutcommit (struct inode *inode, +nfsd4_scsi_proc_layoutcommit (struct inode *inode,struct svc_rqst *rqstp,struct nfsd4_layoutcommit *lcp) {struct iomap *iomaps;int nr_iomaps;__be32 nfserr; - nfserr =nfsd4_scsi_decode_layoutupdate (lcp->lc_up_layout, - lcp->lc_up_len, &iomaps, &nr_iomaps, -i_blocksize (inode)); +memcpy (&rqstp->rq_arg, &lcp->lc_up_layout,sizeof (struct xdr_buf )); +svcxdr_init_decode (rqstp); + + nfserr =nfsd4_scsi_decode_layoutupdate (&rqstp->rq_arg_stream, + &iomaps, &nr_iomaps,i_blocksize (inode));if (nfserr != nfs_ok)return nfserr;fs/nfsd/blocklayoutxdr.c +58
-28@@ -114,8 +114,7 @@ nfsd4_block_encode_getdeviceinfo(struct xdr_stream *xdr,/** * nfsd4_block_decode_layoutupdate - decode the block layout extent array -* @p: pointer to the xdr data -* @len: number of bytes to decode +* @xdr: subbuf set to the encoded array * @iomapp: pointer to store the decoded extent array * @nr_iomapsp: pointer to store the number of extents * @block_size: alignment of extent offset and length @@ -128,25 +127,24 @@ nfsd4_block_encode_getdeviceinfo(struct xdr_stream *xdr,* * Return values: * %nfs_ok: Successful decoding, @iomapp and @nr_iomapsp are valid -* %nfserr_bad_xdr: The encoded array in @p is invalid +* %nfserr_bad_xdr: The encoded array in @xdr is invalid * %nfserr_inval: An unaligned extent found * %nfserr_delay: Failed to allocate memory for @iomapp */ __be32 -nfsd4_block_decode_layoutupdate (__be32 *p,u32 len,struct iomap **iomapp, +nfsd4_block_decode_layoutupdate (struct xdr_stream *xdr,struct iomap **iomapp,int *nr_iomapsp,u32 block_size) {struct iomap *iomaps; -u32 nr_iomaps, i; +u32 nr_iomaps, expected, len, i; +__be32 nfserr; -if (len <sizeof (u32)) -return nfserr_bad_xdr; - len -=sizeof (u32); -if (len %PNFS_BLOCK_EXTENT_SIZE ) +if (xdr_stream_decode_u32 (xdr, &nr_iomaps))return nfserr_bad_xdr; - nr_iomaps =be32_to_cpup (p++); -if (nr_iomaps != len /PNFS_BLOCK_EXTENT_SIZE ) + len =sizeof (__be32) +xdr_stream_remaining (xdr); + expected =sizeof (__be32) + nr_iomaps *PNFS_BLOCK_EXTENT_SIZE ; +if (len != expected)return nfserr_bad_xdr; iomaps =kcalloc (nr_iomaps,sizeof (*iomaps),GFP_KERNEL );@@ -155,24 +153,48 @@ nfsd4_block_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp,for (i =0 ; i < nr_iomaps; i++) {struct pnfs_block_extent bex; +ssize_t ret; -memcpy (&bex.vol_id, p,sizeof (struct nfsd4_deviceid )); - p +=XDR_QUADLEN (sizeof (struct nfsd4_deviceid )); + ret =xdr_stream_decode_opaque_fixed (xdr, + &bex.vol_id,sizeof (bex.vol_id)); +if (ret <sizeof (bex.vol_id)) { + nfserr = nfserr_bad_xdr; + goto fail; + } - p =xdr_decode_hyper (p, &bex.foff); +if (xdr_stream_decode_u64 (xdr, &bex.foff)) { + nfserr = nfserr_bad_xdr; + goto fail; + }if (bex.foff & (block_size -1 )) { + nfserr = nfserr_inval; + goto fail; + } + +if (xdr_stream_decode_u64 (xdr, &bex.len)) { + nfserr = nfserr_bad_xdr; goto fail; } - p =xdr_decode_hyper (p, &bex.len);if (bex.len & (block_size -1 )) { + nfserr = nfserr_inval; + goto fail; + } + +if (xdr_stream_decode_u64 (xdr, &bex.soff)) { + nfserr = nfserr_bad_xdr; goto fail; } - p =xdr_decode_hyper (p, &bex.soff);if (bex.soff & (block_size -1 )) { + nfserr = nfserr_inval; + goto fail; + } + +if (xdr_stream_decode_u32 (xdr, &bex.es)) { + nfserr = nfserr_bad_xdr; goto fail; } - bex.es =be32_to_cpup (p++);if (bex.es !=PNFS_BLOCK_READWRITE_DATA ) { + nfserr = nfserr_inval; goto fail; }@@ -185,13 +207,12 @@ nfsd4_block_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp,return nfs_ok; fail:kfree (iomaps); -return nfserr_inval; +return nfserr; }/** * nfsd4_scsi_decode_layoutupdate - decode the scsi layout extent array -* @p: pointer to the xdr data -* @len: number of bytes to decode +* @xdr: subbuf set to the encoded array * @iomapp: pointer to store the decoded extent array * @nr_iomapsp: pointer to store the number of extents * @block_size: alignment of extent offset and length @@ -203,21 +224,22 @@ nfsd4_block_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp,* * Return values: * %nfs_ok: Successful decoding, @iomapp and @nr_iomapsp are valid -* %nfserr_bad_xdr: The encoded array in @p is invalid +* %nfserr_bad_xdr: The encoded array in @xdr is invalid * %nfserr_inval: An unaligned extent found * %nfserr_delay: Failed to allocate memory for @iomapp */ __be32 -nfsd4_scsi_decode_layoutupdate (__be32 *p,u32 len,struct iomap **iomapp, +nfsd4_scsi_decode_layoutupdate (struct xdr_stream *xdr,struct iomap **iomapp,int *nr_iomapsp,u32 block_size) {struct iomap *iomaps; -u32 nr_iomaps, expected, i; +u32 nr_iomaps, expected, len, i; +__be32 nfserr; -if (len <sizeof (u32)) +if (xdr_stream_decode_u32 (xdr, &nr_iomaps))return nfserr_bad_xdr; - nr_iomaps =be32_to_cpup (p++); + len =sizeof (__be32) +xdr_stream_remaining (xdr); expected =sizeof (__be32) + nr_iomaps *PNFS_SCSI_RANGE_SIZE ;if (len != expected)return nfserr_bad_xdr;@@ -229,14 +251,22 @@ nfsd4_scsi_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp,for (i =0 ; i < nr_iomaps; i++) {u64 val; - p =xdr_decode_hyper (p, &val); +if (xdr_stream_decode_u64 (xdr, &val)) { + nfserr = nfserr_bad_xdr; + goto fail; + }if (val & (block_size -1 )) { + nfserr = nfserr_inval; goto fail; } iomaps[i].offset = val; - p =xdr_decode_hyper (p, &val); +if (xdr_stream_decode_u64 (xdr, &val)) { + nfserr = nfserr_bad_xdr; + goto fail; + }if (val & (block_size -1 )) { + nfserr = nfserr_inval; goto fail; } iomaps[i].length = val;@@ -247,5 +277,5 @@ nfsd4_scsi_decode_layoutupdate(__be32 *p, u32 len, struct iomap **iomapp,return nfs_ok; fail:kfree (iomaps); -return nfserr_inval; +return nfserr; }fs/nfsd/blocklayoutxdr.h +2
-2@@ -54,9 +54,9 @@ __be32 nfsd4_block_encode_getdeviceinfo(struct xdr_stream *xdr, const struct nfsd4_getdeviceinfo *gdp);__be32 nfsd4_block_encode_layoutget (struct xdr_stream *xdr,const struct nfsd4_layoutget *lgp); -__be32 nfsd4_block_decode_layoutupdate (__be32 *p,u32 len, +__be32 nfsd4_block_decode_layoutupdate (struct xdr_stream *xdr,struct iomap **iomapp,int *nr_iomapsp,u32 block_size); -__be32 nfsd4_scsi_decode_layoutupdate (__be32 *p,u32 len, +__be32 nfsd4_scsi_decode_layoutupdate (struct xdr_stream *xdr,struct iomap **iomapp,int *nr_iomapsp,u32 block_size);#endif /* _NFSD_BLOCKLAYOUTXDR_H */ fs/nfsd/nfs4proc.c +1
-1@@ -2533,7 +2533,7 @@ nfsd4_layoutcommit(struct svc_rqst *rqstp, lcp->lc_size_chg = false; } - nfserr = ops->proc_layoutcommit (inode, lcp); + nfserr = ops->proc_layoutcommit (inode, rqstp, lcp);nfs4_put_stid (&ls->ls_stid); out:return nfserr;fs/nfsd/nfs4xdr.c +5
-6@@ -604,6 +604,8 @@ static __be32 nfsd4_decode_layoutupdate4(struct nfsd4_compoundargs *argp, struct nfsd4_layoutcommit *lcp) { + u32 len; +if (xdr_stream_decode_u32 (argp->xdr, &lcp->lc_layout_type) <0 )return nfserr_bad_xdr;if (lcp->lc_layout_type <LAYOUT_NFSV4_1_FILES )@@ -611,13 +613,10 @@ nfsd4_decode_layoutupdate4(struct nfsd4_compoundargs *argp,if (lcp->lc_layout_type >=LAYOUT_TYPE_MAX )return nfserr_bad_xdr; -if (xdr_stream_decode_u32 (argp->xdr, &lcp->lc_up_len) <0 ) +if (xdr_stream_decode_u32 (argp->xdr, &len) <0 ) +return nfserr_bad_xdr; +if (!xdr_stream_subsegment (argp->xdr, &lcp->lc_up_layout, len))return nfserr_bad_xdr; -if (lcp->lc_up_len >0 ) { - lcp->lc_up_layout =xdr_inline_decode (argp->xdr, lcp->lc_up_len); -if (!lcp->lc_up_layout) -return nfserr_bad_xdr; - }return nfs_ok; }fs/nfsd/pnfs.h +1
-0@@ -35,6 +35,7 @@ struct nfsd4_layout_ops { const struct nfsd4_layoutget *lgp);__be32 (*proc_layoutcommit)(struct inode *inode, +struct svc_rqst *rqstp,struct nfsd4_layoutcommit *lcp); void (*fence_client)(struct nfs4_layout_stateid *ls,fs/nfsd/xdr4.h +0
-0
fs/nfsd/xdr4.h struct nfsd4_layoutcommit { · line 636
Quoted 9 lines
fs/nfsd/xdr4.h +1
-2@@ -630,8 +630,7 @@ struct nfsd4_layoutcommit {u64 lc_last_wr;/* request */ struct timespec64 lc_mtime;/* request */ u32 lc_layout_type;/* request */ -u32 lc_up_len;/* layout length */ -void *lc_up_layout;/* decoded by callback */ +struct xdr_buf lc_up_layout;/* decoded by callback */ bool lc_size_chg;/* response */ u64 lc_newsize;/* response */ };
LGTM. Nice work!
Review
Quoted 1 line · Sergey Bashirov
(quoted diff) +1
-0+ memcpy(&rqstp->rq_arg, &lcp->lc_up_layout, sizeof(struct xdr_buf));
Nit: using a struct assignment like:
rqstp->rq_arg = lcp->lc_up_layout;
might be a tad bettet due to type safety here.
Review
Quoted 1 line
(quoted diff) +1
-0+ memcpy(&rqstp->rq_arg, &lcp->lc_up_layout, sizeof(struct xdr_buf));
Same here.
Otherwise this looks good to me (but I'm not the best reviwer for XDR code :)):
Chuck Lever
maintainerFrom: Chuck Lever <[email protected]>
Quoted 6 lines · Sergey Bashirov
This series is the result of splitting the patch v3. Removing dprintk is now done in a separate cleanup commit. No additional changes.
Prerequisite patch: [v3] nfsd: Use correct error code when decoding extents
Applied to nfsd-testing, thanks!
[1/2] nfsd: Drop dprintk in blocklayout xdr functions
commit: 46e337cf767d14baf8738393adb9816f7d7b7db0
[2/2] nfsd: Implement large extent array support in pNFS
commit: 49ccb2bd38c6cb6d713faee9bb958a3abcf76e28--
Chuck Lever