NFSv4.2: Fix READ_PLUS smatch warnings
Subsystems (2)
Anna Schumaker
maintainerPATCH v2 1/3 NFSv4.2: Fix READ_PLUS smatch warnings
From: Anna Schumaker <[email protected]>
Smatch reports:
fs/nfs/nfs42xdr.c:1131 decode_read_plus() warn: missing error code? 'status'
Which Dan suggests to fix by doing a hardcoded "return 0" from the "if (segments == 0)" check.
Additionally, smatch reports that the "status = -EIO" assignment is not used. This patch addresses both these issues.
--- fs/nfs/nfs42xdr.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
fs/nfs/nfs42xdr.c +1 -2
@@ -1136,13 +1136,12 @@ static int decode_read_plus(struct xdr_stream *xdr, struct nfs_pgio_res *res) res->eof =be32_to_cpup (p++); segments =be32_to_cpup (p++);if (segments ==0 ) -return status; +return 0 ; segs =kmalloc_array (segments,sizeof (*segs),GFP_KERNEL );if (!segs)return -ENOMEM ; - status = -EIO ;for (i =0 ; i < segments; i++) { status =decode_read_plus_segment (xdr, &segs[i]);if (status <0 )
Signature · 1 line
2.41.0
Anna Schumaker
maintainerPATCH v2 2/3 NFSv4.2: Fix READ_PLUS size calculations
From: Anna Schumaker <[email protected]>
I bump the decode_read_plus_maxsz to account for hole segments, but I need to subtract out this increase when calling rpc_prepare_reply_pages() so the common case of single data segment replies can be directly placed into the xdr pages without needing to be shifted around.
--- fs/nfs/nfs42xdr.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
fs/nfs/nfs42xdr.c +9 -3
@@ -51,10 +51,16 @@ (1 /* data_content4 */ + \ 2 /* data_info4.di_offset */ + \ 1 /* data_info4.di_length */) +#define NFS42_READ_PLUS_HOLE_SEGMENT_SIZE \ + (1 /* data_content4 */ + \ + 2 /* data_info4.di_offset */ + \ + 2 /* data_info4.di_length */) +#define READ_PLUS_SEGMENT_SIZE_DIFF (NFS42_READ_PLUS_HOLE_SEGMENT_SIZE - \ + NFS42_READ_PLUS_DATA_SEGMENT_SIZE)#define decode_read_plus_maxsz (op_decode_hdr_maxsz + \ 1 /* rpr_eof */ + \ 1 /* rpr_contents count */ + \ - NFS42_READ_PLUS_DATA_SEGMENT_SIZE) + NFS42_READ_PLUS_HOLE_SEGMENT_SIZE) #define encode_seek_maxsz (op_encode_hdr_maxsz + \ encode_stateid_maxsz + \ 2 /* offset */ + \
@@ -781,8 +787,8 @@ static void nfs4_xdr_enc_read_plus(struct rpc_rqst *req,encode_putfh (xdr, args->fh, &hdr);encode_read_plus (xdr, args, &hdr); -rpc_prepare_reply_pages (req, args->pages, args->pgbase, - args->count, hdr.replen); +rpc_prepare_reply_pages (req, args->pages, args->pgbase, args->count, + hdr.replen -READ_PLUS_SEGMENT_SIZE_DIFF );encode_nops (&hdr); }
Signature · 1 line
2.41.0
Anna Schumaker
maintainerPATCH v2 3/3 NFSv4.2: Rework scratch handling for READ_PLUS (again)
In reply to Anna SchumakerFrom: Anna Schumaker <[email protected]>
I found that the read code might send multiple requests using the same nfs_pgio_header, but nfs4_proc_read_setup() is only called once. This is how we ended up occasionally double-freeing the scratch buffer, but also means we set a NULL pointer but non-zero length to the xdr scratch buffer. This results in an oops the first time decoding needs to copy something to scratch, which frequently happens when decoding READ_PLUS hole segments.
I fix this by moving scratch handling into the pageio read code. I provide a function to allocate scratch space for decoding read replies, and free the scratch buffer when the nfs_pgio_header is freed.
Krzysztof Kozlowski hit a bug a while ago with similar symptoms, and I'm hopeful that this patch fixes his issue.
pick 7de817656b9b NFSD: Repeal and replace the READ_PLUS implementation
--- fs/nfs/internal.h | 1 + fs/nfs/nfs42.h | 1 + fs/nfs/nfs42xdr.c | 2 +- fs/nfs/nfs4proc.c | 13 +------------ fs/nfs/read.c | 10 ++++++++++ 5 files changed, 14 insertions(+), 13 deletions(-)
fs/nfs/internal.h +1 -0
@@ -489,6 +489,7 @@ extern const struct nfs_pgio_completion_ops nfs_async_read_completion_ops;extern void nfs_pageio_init_read (struct nfs_pageio_descriptor *pgio,struct inode *inode,bool force_mds,const struct nfs_pgio_completion_ops *compl_ops); +extern bool nfs_read_alloc_scratch (struct nfs_pgio_header *hdr,size_t size);extern int nfs_read_add_folio (struct nfs_pageio_descriptor *pgio,struct nfs_open_context *ctx,struct folio *folio);
fs/nfs/nfs42.h +1 -0
@@ -13,6 +13,7 @@* more? Need to consider not to pre-alloc too much for a compound. */ #define PNFS_LAYOUTSTATS_MAXDEV (4) +#define READ_PLUS_SCRATCH_SIZE (16)/* nfs4.2proc.c */ #ifdef CONFIG_NFS_V4_2
fs/nfs/nfs42xdr.c +1 -1
@@ -1351,7 +1351,7 @@ static int nfs4_xdr_dec_read_plus(struct rpc_rqst *rqstp,struct compound_hdr hdr;int status; -xdr_set_scratch_buffer (xdr, res->scratch,sizeof (res->scratch)); +xdr_set_scratch_buffer (xdr, res->scratch,READ_PLUS_SCRATCH_SIZE ); status =decode_compound_hdr (xdr, &hdr);if (status)
fs/nfs/nfs4proc.c +1 -12
@@ -5437,18 +5437,8 @@ static bool nfs4_read_plus_not_supported(struct rpc_task *task,return false; } -static inline void nfs4_read_plus_scratch_free (struct nfs_pgio_header *hdr) -{ -if (hdr->res.scratch) { -kfree (hdr->res.scratch); - hdr->res.scratch =NULL ; - } -} -static int nfs4_read_done (struct rpc_task *task,struct nfs_pgio_header *hdr) { -nfs4_read_plus_scratch_free (hdr); -if (!nfs4_sequence_done (task, &hdr->res.seq_res))return -EAGAIN ;if (nfs4_read_stateid_changed (task, &hdr->args))
@@ -5468,8 +5458,7 @@ static bool nfs42_read_plus_support(struct nfs_pgio_header *hdr,/* Note: We don't use READ_PLUS with pNFS yet */ if (nfs_server_capable (hdr->inode,NFS_CAP_READ_PLUS ) && !hdr->ds_clp) { msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_READ_PLUS ]; - hdr->res.scratch =kmalloc (32 ,GFP_KERNEL ); -return hdr->res.scratch !=NULL ; +return nfs_read_alloc_scratch (hdr,READ_PLUS_SCRATCH_SIZE ); }return false; }
fs/nfs/read.c +10 -0
@@ -47,6 +47,8 @@ static struct nfs_pgio_header *nfs_readhdr_alloc(void)static void nfs_readhdr_free (struct nfs_pgio_header *rhdr) { +if (rhdr->res.scratch !=NULL ) +kfree (rhdr->res.scratch);kmem_cache_free (nfs_rdata_cachep, rhdr); }
@@ -108,6 +110,14 @@ void nfs_pageio_reset_read_mds(struct nfs_pageio_descriptor *pgio) }EXPORT_SYMBOL_GPL (nfs_pageio_reset_read_mds); +bool nfs_read_alloc_scratch (struct nfs_pgio_header *hdr,size_t size) +{ +WARN_ON (hdr->res.scratch !=NULL ); + hdr->res.scratch =kmalloc (size,GFP_KERNEL ); +return hdr->res.scratch !=NULL ; +} +EXPORT_SYMBOL_GPL (nfs_read_alloc_scratch); +static void nfs_readpage_release (struct nfs_page *req,int error) {struct folio *folio =nfs_page_to_folio (req);
Signature · 1 line
2.41.0