Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 44524359 authored by NeilBrown's avatar NeilBrown Committed by Linus Torvalds
Browse files

[PATCH] knfsd: Replace two page lists in struct svc_rqst with one 



We are planning to increase RPCSVC_MAXPAGES from about 8 to about 256.  This
means we need to be a bit careful about arrays of size RPCSVC_MAXPAGES.

struct svc_rqst contains two such arrays.  However the there are never more
that RPCSVC_MAXPAGES pages in the two arrays together, so only one array is
needed.

The two arrays are for the pages holding the request, and the pages holding
the reply.  Instead of two arrays, we can simply keep an index into where the
first reply page is.

This patch also removes a number of small inline functions that probably
server to obscure what is going on rather than clarify it, and opencode the
needed functionality.

Also remove the 'rq_restailpage' variable as it is *always* 0.  i.e.  if the
response 'xdr' structure has a non-empty tail it is always in the same pages
as the head.

 check counters are initilised and incr properly
 check for consistant usage of ++ etc
 maybe extra some inlines for common approach
 general review

Signed-off-by: default avatarNeil Brown <neilb@suse.de>
Cc: Magnus Maatta <novell@kiruna.se>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 5680c446

fs/nfsd/nfs2acl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -241,7 +241,7 @@ static int nfsaclsvc_encode_getaclres(struct svc_rqst *rqstp, u32 *p, 




	rqstp->rq_res.page_len = w;

	rqstp->rq_res.page_len = w;

	while (w > 0) {

	while (w > 0) {

		if (!svc_take_res_page(rqstp))

		if (!rqstp->rq_respages[rqstp->rq_resused++])

			return 0;

			return 0;

		w -= PAGE_SIZE;

		w -= PAGE_SIZE;

	}

	}

fs/nfsd/nfs3acl.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -185,7 +185,7 @@ static int nfs3svc_encode_getaclres(struct svc_rqst *rqstp, u32 *p, 




		rqstp->rq_res.page_len = w;

		rqstp->rq_res.page_len = w;

		while (w > 0) {

		while (w > 0) {

			if (!svc_take_res_page(rqstp))

			if (!rqstp->rq_respages[rqstp->rq_resused++])

				return 0;

				return 0;

			w -= PAGE_SIZE;

			w -= PAGE_SIZE;

		}

		}

fs/nfsd/nfs3xdr.c

+9 −14
Original line number Original line Diff line number Diff line
@@ -343,8 +343,7 @@ nfs3svc_decode_readargs(struct svc_rqst *rqstp, u32 *p, 
	/* set up the kvec */

	/* set up the kvec */

	v=0;

	v=0;

	while (len > 0) {

	while (len > 0) {

		pn = rqstp->rq_resused;

		pn = rqstp->rq_resused++;

		svc_take_page(rqstp);

		args->vec[v].iov_base = page_address(rqstp->rq_respages[pn]);

		args->vec[v].iov_base = page_address(rqstp->rq_respages[pn]);

		args->vec[v].iov_len = len < PAGE_SIZE? len : PAGE_SIZE;

		args->vec[v].iov_len = len < PAGE_SIZE? len : PAGE_SIZE;

		len -= args->vec[v].iov_len;

		len -= args->vec[v].iov_len;
@@ -382,7 +381,7 @@ nfs3svc_decode_writeargs(struct svc_rqst *rqstp, u32 *p, 
	while (len > args->vec[v].iov_len) {

	while (len > args->vec[v].iov_len) {

		len -= args->vec[v].iov_len;

		len -= args->vec[v].iov_len;

		v++;

		v++;

		args->vec[v].iov_base = page_address(rqstp->rq_argpages[v]);

		args->vec[v].iov_base = page_address(rqstp->rq_pages[v]);

		args->vec[v].iov_len = PAGE_SIZE;

		args->vec[v].iov_len = PAGE_SIZE;

	}

	}

	args->vec[v].iov_len = len;

	args->vec[v].iov_len = len;
@@ -446,11 +445,11 @@ nfs3svc_decode_symlinkargs(struct svc_rqst *rqstp, u32 *p, 
	 * This page appears in the rq_res.pages list, but as pages_len is always

	 * This page appears in the rq_res.pages list, but as pages_len is always

	 * 0, it won't get in the way

	 * 0, it won't get in the way

	 */

	 */

	svc_take_page(rqstp);

	len = ntohl(*p++);

	len = ntohl(*p++);

	if (len == 0 || len > NFS3_MAXPATHLEN || len >= PAGE_SIZE)

	if (len == 0 || len > NFS3_MAXPATHLEN || len >= PAGE_SIZE)

		return 0;

		return 0;

	args->tname = new = page_address(rqstp->rq_respages[rqstp->rq_resused-1]);

	args->tname = new =

		page_address(rqstp->rq_respages[rqstp->rq_resused++]);

	args->tlen = len;

	args->tlen = len;

	/* first copy and check from the first page */

	/* first copy and check from the first page */

	old = (char*)p;

	old = (char*)p;
@@ -522,8 +521,8 @@ nfs3svc_decode_readlinkargs(struct svc_rqst *rqstp, u32 *p, 
{

{

	if (!(p = decode_fh(p, &args->fh)))

	if (!(p = decode_fh(p, &args->fh)))

		return 0;

		return 0;

	svc_take_page(rqstp);

	args->buffer =

	args->buffer = page_address(rqstp->rq_respages[rqstp->rq_resused-1]);

		page_address(rqstp->rq_respages[rqstp->rq_resused++]);





	return xdr_argsize_check(rqstp, p);

	return xdr_argsize_check(rqstp, p);

}

}
@@ -554,8 +553,8 @@ nfs3svc_decode_readdirargs(struct svc_rqst *rqstp, u32 *p, 
	if (args->count > PAGE_SIZE)

	if (args->count > PAGE_SIZE)

		args->count = PAGE_SIZE;

		args->count = PAGE_SIZE;





	svc_take_page(rqstp);

	args->buffer =

	args->buffer = page_address(rqstp->rq_respages[rqstp->rq_resused-1]);

		page_address(rqstp->rq_respages[rqstp->rq_resused++]);





	return xdr_argsize_check(rqstp, p);

	return xdr_argsize_check(rqstp, p);

}

}
@@ -578,8 +577,7 @@ nfs3svc_decode_readdirplusargs(struct svc_rqst *rqstp, u32 *p, 
	args->count = len;

	args->count = len;





	while (len > 0) {

	while (len > 0) {

		pn = rqstp->rq_resused;

		pn = rqstp->rq_resused++;

		svc_take_page(rqstp);

		if (!args->buffer)

		if (!args->buffer)

			args->buffer = page_address(rqstp->rq_respages[pn]);

			args->buffer = page_address(rqstp->rq_respages[pn]);

		len -= PAGE_SIZE;

		len -= PAGE_SIZE;
@@ -668,7 +666,6 @@ nfs3svc_encode_readlinkres(struct svc_rqst *rqstp, u32 *p, 
		rqstp->rq_res.page_len = resp->len;

		rqstp->rq_res.page_len = resp->len;

		if (resp->len & 3) {

		if (resp->len & 3) {

			/* need to pad the tail */

			/* need to pad the tail */

			rqstp->rq_restailpage = 0;

			rqstp->rq_res.tail[0].iov_base = p;

			rqstp->rq_res.tail[0].iov_base = p;

			*p = 0;

			*p = 0;

			rqstp->rq_res.tail[0].iov_len = 4 - (resp->len&3);

			rqstp->rq_res.tail[0].iov_len = 4 - (resp->len&3);
@@ -693,7 +690,6 @@ nfs3svc_encode_readres(struct svc_rqst *rqstp, u32 *p, 
		rqstp->rq_res.page_len = resp->count;

		rqstp->rq_res.page_len = resp->count;

		if (resp->count & 3) {

		if (resp->count & 3) {

			/* need to pad the tail */

			/* need to pad the tail */

			rqstp->rq_restailpage = 0;

			rqstp->rq_res.tail[0].iov_base = p;

			rqstp->rq_res.tail[0].iov_base = p;

			*p = 0;

			*p = 0;

			rqstp->rq_res.tail[0].iov_len = 4 - (resp->count & 3);

			rqstp->rq_res.tail[0].iov_len = 4 - (resp->count & 3);
@@ -768,7 +764,6 @@ nfs3svc_encode_readdirres(struct svc_rqst *rqstp, u32 *p, 
		rqstp->rq_res.page_len = (resp->count) << 2;

		rqstp->rq_res.page_len = (resp->count) << 2;





		/* add the 'tail' to the end of the 'head' page - page 0. */

		/* add the 'tail' to the end of the 'head' page - page 0. */

		rqstp->rq_restailpage = 0;

		rqstp->rq_res.tail[0].iov_base = p;

		rqstp->rq_res.tail[0].iov_base = p;

		*p++ = 0;		/* no more entries */

		*p++ = 0;		/* no more entries */

		*p++ = htonl(resp->common.err == nfserr_eof);

		*p++ = htonl(resp->common.err == nfserr_eof);

fs/nfsd/nfs4xdr.c

+13 −14
Original line number Original line Diff line number Diff line
@@ -2039,7 +2039,8 @@ nfsd4_encode_open_downgrade(struct nfsd4_compoundres *resp, int nfserr, struct n 
}

}





static int

static int

nfsd4_encode_read(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_read *read)

nfsd4_encode_read(struct nfsd4_compoundres *resp, int nfserr,

		  struct nfsd4_read *read)

{

{

	u32 eof;

	u32 eof;

	int v, pn;

	int v, pn;
@@ -2061,10 +2062,11 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_read 
	len = maxcount;

	len = maxcount;

	v = 0;

	v = 0;

	while (len > 0) {

	while (len > 0) {

		pn = resp->rqstp->rq_resused;

		pn = resp->rqstp->rq_resused++;

		svc_take_page(resp->rqstp);

		read->rd_iov[v].iov_base =

		read->rd_iov[v].iov_base = page_address(resp->rqstp->rq_respages[pn]);

			page_address(resp->rqstp->rq_respages[pn]);

		read->rd_iov[v].iov_len = len < PAGE_SIZE ? len : PAGE_SIZE;

		read->rd_iov[v].iov_len =

			len < PAGE_SIZE ? len : PAGE_SIZE;

		v++;

		v++;

		len -= PAGE_SIZE;

		len -= PAGE_SIZE;

	}

	}
@@ -2078,7 +2080,8 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_read 
		nfserr = nfserr_inval;

		nfserr = nfserr_inval;

	if (nfserr)

	if (nfserr)

		return nfserr;

		return nfserr;

	eof = (read->rd_offset + maxcount >= read->rd_fhp->fh_dentry->d_inode->i_size);

	eof = (read->rd_offset + maxcount >=

	       read->rd_fhp->fh_dentry->d_inode->i_size);





	WRITE32(eof);

	WRITE32(eof);

	WRITE32(maxcount);

	WRITE32(maxcount);
@@ -2088,7 +2091,6 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_read 
	resp->xbuf->page_len = maxcount;

	resp->xbuf->page_len = maxcount;





	/* Use rest of head for padding and remaining ops: */

	/* Use rest of head for padding and remaining ops: */

	resp->rqstp->rq_restailpage = 0;

	resp->xbuf->tail[0].iov_base = p;

	resp->xbuf->tail[0].iov_base = p;

	resp->xbuf->tail[0].iov_len = 0;

	resp->xbuf->tail[0].iov_len = 0;

	if (maxcount&3) {

	if (maxcount&3) {
@@ -2113,8 +2115,7 @@ nfsd4_encode_readlink(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_r 
	if (resp->xbuf->page_len)

	if (resp->xbuf->page_len)

		return nfserr_resource;

		return nfserr_resource;





	svc_take_page(resp->rqstp);

	page = page_address(resp->rqstp->rq_respages[resp->rqstp->rq_resused++]);

	page = page_address(resp->rqstp->rq_respages[resp->rqstp->rq_resused-1]);





	maxcount = PAGE_SIZE;

	maxcount = PAGE_SIZE;

	RESERVE_SPACE(4);

	RESERVE_SPACE(4);
@@ -2138,7 +2139,6 @@ nfsd4_encode_readlink(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_r 
	resp->xbuf->page_len = maxcount;

	resp->xbuf->page_len = maxcount;





	/* Use rest of head for padding and remaining ops: */

	/* Use rest of head for padding and remaining ops: */

	resp->rqstp->rq_restailpage = 0;

	resp->xbuf->tail[0].iov_base = p;

	resp->xbuf->tail[0].iov_base = p;

	resp->xbuf->tail[0].iov_len = 0;

	resp->xbuf->tail[0].iov_len = 0;

	if (maxcount&3) {

	if (maxcount&3) {
@@ -2189,8 +2189,7 @@ nfsd4_encode_readdir(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_re 
		goto err_no_verf;

		goto err_no_verf;

	}

	}





	svc_take_page(resp->rqstp);

	page = page_address(resp->rqstp->rq_respages[resp->rqstp->rq_resused++]);

	page = page_address(resp->rqstp->rq_respages[resp->rqstp->rq_resused-1]);

	readdir->common.err = 0;

	readdir->common.err = 0;

	readdir->buflen = maxcount;

	readdir->buflen = maxcount;

	readdir->buffer = page;

	readdir->buffer = page;
@@ -2215,10 +2214,10 @@ nfsd4_encode_readdir(struct nfsd4_compoundres *resp, int nfserr, struct nfsd4_re 
	p = readdir->buffer;

	p = readdir->buffer;

	*p++ = 0;	/* no more entries */

	*p++ = 0;	/* no more entries */

	*p++ = htonl(readdir->common.err == nfserr_eof);

	*p++ = htonl(readdir->common.err == nfserr_eof);

	resp->xbuf->page_len = ((char*)p) - (char*)page_address(resp->rqstp->rq_respages[resp->rqstp->rq_resused-1]);

	resp->xbuf->page_len = ((char*)p) - (char*)page_address(

		resp->rqstp->rq_respages[resp->rqstp->rq_resused-1]);





	/* Use rest of head for padding and remaining ops: */

	/* Use rest of head for padding and remaining ops: */

	resp->rqstp->rq_restailpage = 0;

	resp->xbuf->tail[0].iov_base = tailbase;

	resp->xbuf->tail[0].iov_base = tailbase;

	resp->xbuf->tail[0].iov_len = 0;

	resp->xbuf->tail[0].iov_len = 0;

	resp->p = resp->xbuf->tail[0].iov_base;

	resp->p = resp->xbuf->tail[0].iov_base;

fs/nfsd/nfsxdr.c

+4 −9
Original line number Original line Diff line number Diff line
@@ -262,8 +262,7 @@ nfssvc_decode_readargs(struct svc_rqst *rqstp, u32 *p, 
	 */

	 */

	v=0;

	v=0;

	while (len > 0) {

	while (len > 0) {

		pn=rqstp->rq_resused;

		pn = rqstp->rq_resused++;

		svc_take_page(rqstp);

		args->vec[v].iov_base = page_address(rqstp->rq_respages[pn]);

		args->vec[v].iov_base = page_address(rqstp->rq_respages[pn]);

		args->vec[v].iov_len = len < PAGE_SIZE?len:PAGE_SIZE;

		args->vec[v].iov_len = len < PAGE_SIZE?len:PAGE_SIZE;

		len -= args->vec[v].iov_len;

		len -= args->vec[v].iov_len;
@@ -295,7 +294,7 @@ nfssvc_decode_writeargs(struct svc_rqst *rqstp, u32 *p, 
	while (len > args->vec[v].iov_len) {

	while (len > args->vec[v].iov_len) {

		len -= args->vec[v].iov_len;

		len -= args->vec[v].iov_len;

		v++;

		v++;

		args->vec[v].iov_base = page_address(rqstp->rq_argpages[v]);

		args->vec[v].iov_base = page_address(rqstp->rq_pages[v]);

		args->vec[v].iov_len = PAGE_SIZE;

		args->vec[v].iov_len = PAGE_SIZE;

	}

	}

	args->vec[v].iov_len = len;

	args->vec[v].iov_len = len;
@@ -333,8 +332,7 @@ nfssvc_decode_readlinkargs(struct svc_rqst *rqstp, u32 *p, struct nfsd_readlinka 
{

{

	if (!(p = decode_fh(p, &args->fh)))

	if (!(p = decode_fh(p, &args->fh)))

		return 0;

		return 0;

	svc_take_page(rqstp);

	args->buffer = page_address(rqstp->rq_respages[rqstp->rq_resused++]);

	args->buffer = page_address(rqstp->rq_respages[rqstp->rq_resused-1]);





	return xdr_argsize_check(rqstp, p);

	return xdr_argsize_check(rqstp, p);

}

}
@@ -375,8 +373,7 @@ nfssvc_decode_readdirargs(struct svc_rqst *rqstp, u32 *p, 
	if (args->count > PAGE_SIZE)

	if (args->count > PAGE_SIZE)

		args->count = PAGE_SIZE;

		args->count = PAGE_SIZE;





	svc_take_page(rqstp);

	args->buffer = page_address(rqstp->rq_respages[rqstp->rq_resused++]);

	args->buffer = page_address(rqstp->rq_respages[rqstp->rq_resused-1]);





	return xdr_argsize_check(rqstp, p);

	return xdr_argsize_check(rqstp, p);

}

}
@@ -416,7 +413,6 @@ nfssvc_encode_readlinkres(struct svc_rqst *rqstp, u32 *p, 
	rqstp->rq_res.page_len = resp->len;

	rqstp->rq_res.page_len = resp->len;

	if (resp->len & 3) {

	if (resp->len & 3) {

		/* need to pad the tail */

		/* need to pad the tail */

		rqstp->rq_restailpage = 0;

		rqstp->rq_res.tail[0].iov_base = p;

		rqstp->rq_res.tail[0].iov_base = p;

		*p = 0;

		*p = 0;

		rqstp->rq_res.tail[0].iov_len = 4 - (resp->len&3);

		rqstp->rq_res.tail[0].iov_len = 4 - (resp->len&3);
@@ -436,7 +432,6 @@ nfssvc_encode_readres(struct svc_rqst *rqstp, u32 *p, 
	rqstp->rq_res.page_len = resp->count;

	rqstp->rq_res.page_len = resp->count;

	if (resp->count & 3) {

	if (resp->count & 3) {

		/* need to pad the tail */

		/* need to pad the tail */

		rqstp->rq_restailpage = 0;

		rqstp->rq_res.tail[0].iov_base = p;

		rqstp->rq_res.tail[0].iov_base = p;

		*p = 0;

		*p = 0;

		rqstp->rq_res.tail[0].iov_len = 4 - (resp->count&3);

		rqstp->rq_res.tail[0].iov_len = 4 - (resp->count&3);