nfsd4: turn off zero-copy-read in exotic cases

We currently allow only one read per compound, with operations before
and after whose responses will require no more than about a page to
encode.

While we don't expect clients to violate those limits any time soon,
this limitation isn't really condoned by the spec, so to future proof
the server we should lift the limitation.

At the same time we'd like to continue to support zero-copy reads.

Supporting multiple zero-copy-reads per compound would require a new
data structure to replace struct xdr_buf, which can represent only one
set of included pages.

So for now we plan to modify encode_read() to support either zero-copy
or non-zero-copy reads, and use some heuristics at the start of the
compound processing to decide whether a zero-copy read will work.

This will allow us to support more exotic compounds without introducing
a performance regression in the normal case.

Later patches handle those "exotic compounds", this one just makes sure
zero-copy is turned off in those cases.

Signed-off-by: J. Bruce Fields <bfields@redhat.com>

diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c
index cda6226bda9149b1d929278e2ae1958922aa95e7..f6a5cb722697ae2ca1a1cb69307dac5657446311 100644 (file)
--- a/fs/nfsd/nfs4xdr.c
+++ b/fs/nfsd/nfs4xdr.c
@@ -1612,6 +1612,8 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp)
        struct nfsd4_op *op;
        bool cachethis = false;
        int max_reply = 2 * RPC_MAX_AUTH_SIZE + 8; /* opcnt, status */
+       int readcount = 0;
+       int readbytes = 0;
        int i;
 
        READ_BUF(4);
@@ -1658,7 +1660,11 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp)
                 */
                cachethis |= nfsd4_cache_this_op(op);
 
-               max_reply += nfsd4_max_reply(argp->rqstp, op);
+               if (op->opnum == OP_READ) {
+                       readcount++;
+                       readbytes += nfsd4_max_reply(argp->rqstp, op);
+               } else
+                       max_reply += nfsd4_max_reply(argp->rqstp, op);
 
                if (op->status) {
                        argp->opcnt = i+1;
@@ -1668,9 +1674,12 @@ nfsd4_decode_compound(struct nfsd4_compoundargs *argp)
        /* Sessions make the DRC unnecessary: */
        if (argp->minorversion)
                cachethis = false;
-       svc_reserve(argp->rqstp, max_reply);
+       svc_reserve(argp->rqstp, max_reply + readbytes);
        argp->rqstp->rq_cachetype = cachethis ? RC_REPLBUFF : RC_NOCACHE;
 
+       if (readcount > 1 || max_reply > PAGE_SIZE - 2*RPC_MAX_AUTH_SIZE)
+               argp->rqstp->rq_splice_ok = false;
+
        DECODE_TAIL;
 }
 
@@ -3078,15 +3087,19 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr,
                return nfserr;
 
        p = xdr_reserve_space(xdr, 8); /* eof flag and byte count */
-       if (!p)
+       if (!p) {
+               WARN_ON_ONCE(resp->rqstp->rq_splice_ok);
                return nfserr_resource;
+       }
 
        /* Make sure there will be room for padding if needed: */
        if (xdr->end - xdr->p < 1)
                return nfserr_resource;
 
-       if (resp->xdr.buf->page_len)
+       if (resp->xdr.buf->page_len) {
+               WARN_ON_ONCE(resp->rqstp->rq_splice_ok);
                return nfserr_resource;
+       }
 
        maxcount = svc_max_payload(resp->rqstp);
        if (maxcount > read->rd_length)