Minki/linux
1
0
Fork 1
mirror of https://github.com/torvalds/linux.git synced 2024-11-24 21:21:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

NFSD: Ensure that xdr_write_pages updates rq_next_page

Browse Source 
All other NFSv[23] procedures manage to keep page_ptr and
rq_next_page in lock step.

Signed-off-by: Chuck Lever <chuck.lever@oracle.com>
This commit is contained in:
Chuck Lever 2023-05-18 13:45:36 -04:00
parent 66a21db7db
commit 82078b9895
3 changed files with 35 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
fs/nfsd/nfs3xdr.c
View File

@ -828,7 +828,8 @@ nfs3svc_encode_readlinkres(struct svc_rqst *rqstp, struct xdr_stream *xdr)
return false; return false;
if (xdr_stream_encode_u32(xdr, resp->len) < 0) if (xdr_stream_encode_u32(xdr, resp->len) < 0)
return false; return false;
xdr_write_pages(xdr, resp->pages, 0, resp->len); svcxdr_encode_opaque_pages(rqstp, xdr, resp->pages, 0,
resp->len);
if (svc_encode_result_payload(rqstp, head->iov_len, resp->len) < 0) if (svc_encode_result_payload(rqstp, head->iov_len, resp->len) < 0)
return false; return false;
break; break;
@ -859,8 +860,9 @@ nfs3svc_encode_readres(struct svc_rqst *rqstp, struct xdr_stream *xdr)
return false; return false;
if (xdr_stream_encode_u32(xdr, resp->count) < 0) if (xdr_stream_encode_u32(xdr, resp->count) < 0)
return false; return false;
xdr_write_pages(xdr, resp->pages, rqstp->rq_res.page_base, svcxdr_encode_opaque_pages(rqstp, xdr, resp->pages,
resp->count); rqstp->rq_res.page_base,
resp->count);
if (svc_encode_result_payload(rqstp, head->iov_len, resp->count) < 0) if (svc_encode_result_payload(rqstp, head->iov_len, resp->count) < 0)
return false; return false;
break; break;
@ -961,7 +963,8 @@ nfs3svc_encode_readdirres(struct svc_rqst *rqstp, struct xdr_stream *xdr)
return false; return false;
if (!svcxdr_encode_cookieverf3(xdr, resp->verf)) if (!svcxdr_encode_cookieverf3(xdr, resp->verf))
return false; return false;
xdr_write_pages(xdr, dirlist->pages, 0, dirlist->len); svcxdr_encode_opaque_pages(rqstp, xdr, dirlist->pages, 0,
dirlist->len);
/* no more entries */ /* no more entries */
if (xdr_stream_encode_item_absent(xdr) < 0) if (xdr_stream_encode_item_absent(xdr) < 0)
return false; return false;

11
fs/nfsd/nfsxdr.c
View File

@ -468,7 +468,8 @@ nfssvc_encode_readlinkres(struct svc_rqst *rqstp, struct xdr_stream *xdr)
case nfs_ok: case nfs_ok:
if (xdr_stream_encode_u32(xdr, resp->len) < 0) if (xdr_stream_encode_u32(xdr, resp->len) < 0)
return false; return false;
xdr_write_pages(xdr, &resp->page, 0, resp->len); svcxdr_encode_opaque_pages(rqstp, xdr, &resp->page, 0,
resp->len);
if (svc_encode_result_payload(rqstp, head->iov_len, resp->len) < 0) if (svc_encode_result_payload(rqstp, head->iov_len, resp->len) < 0)
return false; return false;
break; break;
@ -491,8 +492,9 @@ nfssvc_encode_readres(struct svc_rqst *rqstp, struct xdr_stream *xdr)
return false; return false;
if (xdr_stream_encode_u32(xdr, resp->count) < 0) if (xdr_stream_encode_u32(xdr, resp->count) < 0)
return false; return false;
xdr_write_pages(xdr, resp->pages, rqstp->rq_res.page_base, svcxdr_encode_opaque_pages(rqstp, xdr, resp->pages,
resp->count); rqstp->rq_res.page_base,
resp->count);
if (svc_encode_result_payload(rqstp, head->iov_len, resp->count) < 0) if (svc_encode_result_payload(rqstp, head->iov_len, resp->count) < 0)
return false; return false;
break; break;
@ -511,7 +513,8 @@ nfssvc_encode_readdirres(struct svc_rqst *rqstp, struct xdr_stream *xdr)
return false; return false;
switch (resp->status) { switch (resp->status) {
case nfs_ok: case nfs_ok:
xdr_write_pages(xdr, dirlist->pages, 0, dirlist->len); svcxdr_encode_opaque_pages(rqstp, xdr, dirlist->pages, 0,
dirlist->len);
/* no more entries */ /* no more entries */
if (xdr_stream_encode_item_absent(xdr) < 0) if (xdr_stream_encode_item_absent(xdr) < 0)
return false; return false;

21
include/linux/sunrpc/svc.h
View File

@ -508,6 +508,27 @@ static inline void svcxdr_init_encode(struct svc_rqst *rqstp)
xdr->rqst = NULL; xdr->rqst = NULL;
} }
/**
* svcxdr_encode_opaque_pages - Insert pages into an xdr_stream
* @xdr: xdr_stream to be updated
* @pages: array of pages to insert
* @base: starting offset of first data byte in @pages
* @len: number of data bytes in @pages to insert
*
* After the @pages are added, the tail iovec is instantiated pointing
* to end of the head buffer, and the stream is set up to encode
* subsequent items into the tail.
*/
static inline void svcxdr_encode_opaque_pages(struct svc_rqst *rqstp,
struct xdr_stream *xdr,
struct page **pages,
unsigned int base,
unsigned int len)
{
xdr_write_pages(xdr, pages, base, len);
xdr->page_ptr = rqstp->rq_next_page - 1;
}
/** /**
* svcxdr_set_auth_slack - * svcxdr_set_auth_slack -
* @rqstp: RPC transaction * @rqstp: RPC transaction