From patchwork Fri Jan 10 22:35:35 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna Schumaker X-Patchwork-Id: 11328579 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 6F2AD921 for ; Fri, 10 Jan 2020 22:35:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4E34020721 for ; Fri, 10 Jan 2020 22:35:43 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="czuB8y8+" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727463AbgAJWfm (ORCPT ); Fri, 10 Jan 2020 17:35:42 -0500 Received: from mail-yw1-f67.google.com ([209.85.161.67]:36785 "EHLO mail-yw1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727387AbgAJWfm (ORCPT ); Fri, 10 Jan 2020 17:35:42 -0500 Received: by mail-yw1-f67.google.com with SMTP id n184so1326642ywc.3 for ; Fri, 10 Jan 2020 14:35:42 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=toeTekbN8QoMVU4KUzIxJQ1Ah6+ST9n2qRcQzM7pL5E=; b=czuB8y8+QGOXFV06UxMNzhD8km3tii3DOhkUgUDWm15rt1g8qWp5FUWFKd9EpRrMTv ZwAmymhpC4xWDfkgPNz92nvFp7VmgscJ/w6BWxrxCl9ltkifQ8QEjh8vVi7i14ljpSFQ s+ZSF2B2bdrxqsv05B4FSLgBEjaCaB1UqrwrhWit2+3J96K+RqjMqOwdLBOTynsKd0fD Zu5QUscNUZOBTGHKkKXvZ58+fVzM7l/Z0zGSajHvxdOGzG5dLRlnyMEY7qOARYR7XfZm LgOTMyNcnc/JSNg7E0uyzSy6O73y6g3JD/MCikr11f+87KTCzw/nwRkQL1SM8pIi1MAq rUOQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=toeTekbN8QoMVU4KUzIxJQ1Ah6+ST9n2qRcQzM7pL5E=; b=P4Kr0fqltcqEUDQuOvhhcPfaJwFlsPqw8aECv3tA4V+hbDZAtX8WdeIfPhPgqCO3xH C9ImmGqPq6eh0XX3nrfkS2HfMZHe3cXCsZ5KXRrcjStIqrGA324AQsy8Zf2e9eCiPBaV QQh+vgEZsUU5xh46KUz0zB2j8dRdG4HsM1qfw0cBxpeDZmu+4tQ93cal1+qfRWTKbdgY +i5ywkbY5AdNHr0awCUi6+xhA5qrjMESk2kFmZ7onFfj/GM6pkP2lYGN+mHRmE2z0lya u2tyTx6aqcc4d9GVcjLyplCHgkeE2NXp57Z45FHhCKBFRMBKRoGufjkXqtJHhFcoZ8IZ yo9w== X-Gm-Message-State: APjAAAUlvQgTeD2o7eS62p8zVkaxDpz4Ws9p2qcCXT+ikPE5n7s+Agn4 UgYlNwPtMIsE4Qid7RpHhfQ= X-Google-Smtp-Source: APXvYqwlyTnR2feVjDanp7Wq1fPnhBJbpM6YBJU2wQ/ah1oAjKnQWH64DLAFvZp4TaLZ1KtWIHUsYQ== X-Received: by 2002:a81:3ad0:: with SMTP id h199mr597628ywa.37.1578695741657; Fri, 10 Jan 2020 14:35:41 -0800 (PST) Received: from gouda.nowheycreamery.com (c-68-32-74-190.hsd1.mi.comcast.net. [68.32.74.190]) by smtp.gmail.com with ESMTPSA id h23sm1607735ywc.105.2020.01.10.14.35.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2020 14:35:40 -0800 (PST) From: schumaker.anna@gmail.com X-Google-Original-From: Anna.Schumaker@Netapp.com To: bfields@redhat.com, linux-nfs@vger.kernel.org Cc: Anna.Schumaker@Netapp.com Subject: [PATCH 1/4] NFSD: Return eof and maxcount to nfsd4_encode_read() Date: Fri, 10 Jan 2020 17:35:35 -0500 Message-Id: <20200110223538.528560-2-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200110223538.528560-1-Anna.Schumaker@Netapp.com> References: <20200110223538.528560-1-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Anna Schumaker I want to reuse nfsd4_encode_readv() and nfsd4_encode_splice_read() in READ_PLUS rather than reimplementing them. READ_PLUS returns a single eof flag for the entire call and a separate maxcount for each data segment, so we need to have the READ call encode these values in a different place. Signed-off-by: Anna Schumaker --- fs/nfsd/nfs4xdr.c | 60 ++++++++++++++++++++--------------------------- 1 file changed, 26 insertions(+), 34 deletions(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index d2dc4c0e22e8..812e82097879 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -3446,23 +3446,22 @@ nfsd4_encode_open_downgrade(struct nfsd4_compoundres *resp, __be32 nfserr, struc static __be32 nfsd4_encode_splice_read( struct nfsd4_compoundres *resp, - struct nfsd4_read *read, - struct file *file, unsigned long maxcount) + struct nfsd4_read *read, struct file *file, + unsigned long *maxcount, u32 *eof) { struct xdr_stream *xdr = &resp->xdr; struct xdr_buf *buf = xdr->buf; - u32 eof; + long len; int space_left; __be32 nfserr; - __be32 *p = xdr->p - 2; /* Make sure there will be room for padding if needed */ if (xdr->end - xdr->p < 1) return nfserr_resource; + len = *maxcount; nfserr = nfsd_splice_read(read->rd_rqstp, read->rd_fhp, - file, read->rd_offset, &maxcount, &eof); - read->rd_length = maxcount; + file, read->rd_offset, maxcount, eof); if (nfserr) { /* * nfsd_splice_actor may have already messed with the @@ -3473,24 +3472,21 @@ static __be32 nfsd4_encode_splice_read( return nfserr; } - *(p++) = htonl(eof); - *(p++) = htonl(maxcount); - - buf->page_len = maxcount; - buf->len += maxcount; - xdr->page_ptr += (buf->page_base + maxcount + PAGE_SIZE - 1) + buf->page_len = *maxcount; + buf->len += *maxcount; + xdr->page_ptr += (buf->page_base + *maxcount + PAGE_SIZE - 1) / PAGE_SIZE; /* Use rest of head for padding and remaining ops: */ buf->tail[0].iov_base = xdr->p; buf->tail[0].iov_len = 0; xdr->iov = buf->tail; - if (maxcount&3) { - int pad = 4 - (maxcount&3); + if (*maxcount&3) { + int pad = 4 - (*maxcount&3); *(xdr->p++) = 0; - buf->tail[0].iov_base += maxcount&3; + buf->tail[0].iov_base += *maxcount&3; buf->tail[0].iov_len = pad; buf->len += pad; } @@ -3504,22 +3500,20 @@ static __be32 nfsd4_encode_splice_read( } static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp, - struct nfsd4_read *read, - struct file *file, unsigned long maxcount) + struct nfsd4_read *read, struct file *file, + unsigned long *maxcount, u32 *eof) { struct xdr_stream *xdr = &resp->xdr; - u32 eof; int v; int starting_len = xdr->buf->len - 8; long len; int thislen; __be32 nfserr; - __be32 tmp; __be32 *p; u32 zzz = 0; int pad; - len = maxcount; + len = *maxcount; v = 0; thislen = min_t(long, len, ((void *)xdr->end - (void *)xdr->p)); @@ -3541,22 +3535,15 @@ static __be32 nfsd4_encode_readv(struct nfsd4_compoundres *resp, } read->rd_vlen = v; - len = maxcount; + len = *maxcount; nfserr = nfsd_readv(resp->rqstp, read->rd_fhp, file, read->rd_offset, - resp->rqstp->rq_vec, read->rd_vlen, &maxcount, - &eof); - read->rd_length = maxcount; + resp->rqstp->rq_vec, read->rd_vlen, maxcount, eof); if (nfserr) return nfserr; - xdr_truncate_encode(xdr, starting_len + 8 + ((maxcount+3)&~3)); - - tmp = htonl(eof); - write_bytes_to_xdr_buf(xdr->buf, starting_len , &tmp, 4); - tmp = htonl(maxcount); - write_bytes_to_xdr_buf(xdr->buf, starting_len + 4, &tmp, 4); + xdr_truncate_encode(xdr, starting_len + 8 + ((*maxcount+3)&~3)); - pad = (maxcount&3) ? 4 - (maxcount&3) : 0; - write_bytes_to_xdr_buf(xdr->buf, starting_len + 8 + maxcount, + pad = (*maxcount&3) ? 4 - (*maxcount&3) : 0; + write_bytes_to_xdr_buf(xdr->buf, starting_len + 8 + *maxcount, &zzz, pad); return 0; @@ -3567,6 +3554,7 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_read *read) { unsigned long maxcount; + u32 eof; struct xdr_stream *xdr = &resp->xdr; struct file *file; int starting_len = xdr->buf->len; @@ -3595,13 +3583,17 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr, if (file->f_op->splice_read && test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags)) - nfserr = nfsd4_encode_splice_read(resp, read, file, maxcount); + nfserr = nfsd4_encode_splice_read(resp, read, file, &maxcount, &eof); else - nfserr = nfsd4_encode_readv(resp, read, file, maxcount); + nfserr = nfsd4_encode_readv(resp, read, file, &maxcount, &eof); if (nfserr) xdr_truncate_encode(xdr, starting_len); + read->rd_length = maxcount; + *p++ = htonl(eof); + *p++ = htonl(maxcount); + return nfserr; } From patchwork Fri Jan 10 22:35:36 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna Schumaker X-Patchwork-Id: 11328581 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 2340B92A for ; Fri, 10 Jan 2020 22:35:45 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EC6702072A for ; Fri, 10 Jan 2020 22:35:44 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="WlE0ER4b" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727376AbgAJWfo (ORCPT ); Fri, 10 Jan 2020 17:35:44 -0500 Received: from mail-yb1-f195.google.com ([209.85.219.195]:37133 "EHLO mail-yb1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727387AbgAJWfo (ORCPT ); Fri, 10 Jan 2020 17:35:44 -0500 Received: by mail-yb1-f195.google.com with SMTP id o199so1372978ybc.4 for ; Fri, 10 Jan 2020 14:35:43 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=ZDFyN6GaEQgVFJv09EIzqSqPKD1FAcJxGvZJzf+l6rQ=; b=WlE0ER4bhT9O0GgkAHhw17rCpu+TJpgMLepoy3rEEgE0zLWv6pI7v4ygWR9GgVfZA0 21/tVsOEFxg7nMeMgQUAqgRfkO7SElZrjiYhv4CVKQlQPqAW4gQgs2d6mCcx6/O+i6wf /U1j/v3btB1+Y6Qd/P+pDA1Fv+cOm8WaghWZkZ/cFIhC10BoZcKHHebYp1G/3M5M4So6 Q4bp8RN1md9p54b203b+eUnOpJzwCrQtMps7KxZky9OmmtMHayP3+Pn1uQ+Ch6GjtPlB /ckWo6TDYGNBeKQ6CsCnXjQxaSHnz8horR2fGEV8jwTn+4RMFBgXS0ySPXswAEXtm7e1 K9sA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=ZDFyN6GaEQgVFJv09EIzqSqPKD1FAcJxGvZJzf+l6rQ=; b=hYyjfOjYeqG/hjwz2E9hkRdUDf6EIUU9p+++J8qaUQMxMa3hWBlyxxWXVwcvqH9KQ2 q/FLk0W7/7Jxp5mtPwMlAMcn1c6GOhNEE0mH2T7gA4M3mcAl+kLqMeYkB8NQurhQMx8V t7/a765+/LKcXsXUdlWHakeTGu8HNWlgRQUK+EZpvsCElHysrRWJzO3cJdN8TfgWIIyC mJ46ar4Y4zJMuys3YmcQKZZN9Csj95oGgICXa4G+N+Db3pBmVDC675bNntK25etiKkQ8 pJ0gPcv95Hq0B/wo3jY9BvTVq47Wcq0v+Lda1Q16rBlbq+dgWz6YcUD09bCnNJcAjqXw phug== X-Gm-Message-State: APjAAAX7Y6K8MaXF5JleHi5IFpLb1nwBygVTyQmbiWN0vE/PtO5uq49x NUk1jJ2l8QviTQHnatILb9aejdxIaqo= X-Google-Smtp-Source: APXvYqxqt4IWC+HCzw0vy0F1TKELwNFmBTcXhUJQTkVv1R/7ajIXa45DJtsycGWJRcMpATtQ7gAr2A== X-Received: by 2002:a25:d1d4:: with SMTP id i203mr4238045ybg.484.1578695742977; Fri, 10 Jan 2020 14:35:42 -0800 (PST) Received: from gouda.nowheycreamery.com (c-68-32-74-190.hsd1.mi.comcast.net. [68.32.74.190]) by smtp.gmail.com with ESMTPSA id h23sm1607735ywc.105.2020.01.10.14.35.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2020 14:35:42 -0800 (PST) From: schumaker.anna@gmail.com X-Google-Original-From: Anna.Schumaker@Netapp.com To: bfields@redhat.com, linux-nfs@vger.kernel.org Cc: Anna.Schumaker@Netapp.com Subject: [PATCH 2/4] NFSD: Add READ_PLUS data support Date: Fri, 10 Jan 2020 17:35:36 -0500 Message-Id: <20200110223538.528560-3-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200110223538.528560-1-Anna.Schumaker@Netapp.com> References: <20200110223538.528560-1-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Anna Schumaker This patch adds READ_PLUS support for returning a single NFS4_CONTENT_DATA segment to the client. This is basically the same as the READ operation, only with the extra information about data segments. Signed-off-by: Anna Schumaker --- fs/nfsd/nfs4proc.c | 17 +++++++++ fs/nfsd/nfs4xdr.c | 90 ++++++++++++++++++++++++++++++++++++++++++---- 2 files changed, 101 insertions(+), 6 deletions(-) diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 4798667af647..3c11ca9bd5d7 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -2179,6 +2179,16 @@ static inline u32 nfsd4_read_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op) return (op_encode_hdr_size + 2 + XDR_QUADLEN(rlen)) * sizeof(__be32); } +static inline u32 nfsd4_read_plus_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op) +{ + u32 maxcount = svc_max_payload(rqstp); + u32 rlen = min(op->u.read.rd_length, maxcount); + /* enough extra xdr space for encoding either a hole or data segment. */ + u32 segments = 1 + 2 + 2; + + return (op_encode_hdr_size + 2 + segments + XDR_QUADLEN(rlen)) * sizeof(__be32); +} + static inline u32 nfsd4_readdir_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op) { u32 maxcount = 0, rlen = 0; @@ -2700,6 +2710,13 @@ static const struct nfsd4_operation nfsd4_ops[] = { .op_name = "OP_COPY", .op_rsize_bop = nfsd4_copy_rsize, }, + [OP_READ_PLUS] = { + .op_func = nfsd4_read, + .op_release = nfsd4_read_release, + .op_name = "OP_READ_PLUS", + .op_rsize_bop = nfsd4_read_plus_rsize, + .op_get_currentstateid = nfsd4_get_readstateid, + }, [OP_SEEK] = { .op_func = nfsd4_seek, .op_name = "OP_SEEK", diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 812e82097879..014e05365c17 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -1882,7 +1882,7 @@ static const nfsd4_dec nfsd4_dec_ops[] = { [OP_LAYOUTSTATS] = (nfsd4_dec)nfsd4_decode_notsupp, [OP_OFFLOAD_CANCEL] = (nfsd4_dec)nfsd4_decode_offload_status, [OP_OFFLOAD_STATUS] = (nfsd4_dec)nfsd4_decode_offload_status, - [OP_READ_PLUS] = (nfsd4_dec)nfsd4_decode_notsupp, + [OP_READ_PLUS] = (nfsd4_dec)nfsd4_decode_read, [OP_SEEK] = (nfsd4_dec)nfsd4_decode_seek, [OP_WRITE_SAME] = (nfsd4_dec)nfsd4_decode_notsupp, [OP_CLONE] = (nfsd4_dec)nfsd4_decode_clone, @@ -3589,10 +3589,11 @@ nfsd4_encode_read(struct nfsd4_compoundres *resp, __be32 nfserr, if (nfserr) xdr_truncate_encode(xdr, starting_len); - - read->rd_length = maxcount; - *p++ = htonl(eof); - *p++ = htonl(maxcount); + else { + read->rd_length = maxcount; + *p++ = htonl(eof); + *p++ = htonl(maxcount); + } return nfserr; } @@ -4264,6 +4265,83 @@ nfsd4_encode_offload_status(struct nfsd4_compoundres *resp, __be32 nfserr, return nfserr_resource; p = xdr_encode_hyper(p, os->count); *p++ = cpu_to_be32(0); + return nfserr; +} + +static __be32 +nfsd4_encode_read_plus_data(struct nfsd4_compoundres *resp, + struct nfsd4_read *read, + unsigned long maxcount, u32 *eof) +{ + struct xdr_stream *xdr = &resp->xdr; + struct file *file = read->rd_nf->nf_file; + __be32 nfserr; + __be32 *p; + + /* Content type, offset, byte count */ + p = xdr_reserve_space(xdr, 4 + 8 + 4); + if (!p) + return nfserr_resource; + xdr_commit_encode(xdr); + + if (file->f_op->splice_read && + test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags)) + nfserr = nfsd4_encode_splice_read(resp, read, file, &maxcount, eof); + else + nfserr = nfsd4_encode_readv(resp, read, file, &maxcount, eof); + + if (nfserr) + return nfserr; + + *p++ = htonl(NFS4_CONTENT_DATA); + p = xdr_encode_hyper(p, read->rd_offset); + *p++ = htonl(maxcount); + + read->rd_offset += maxcount; + read->rd_length = (maxcount > 0) ? read->rd_length - maxcount : 0; + return nfserr; +} + +static __be32 +nfsd4_encode_read_plus(struct nfsd4_compoundres *resp, __be32 nfserr, + struct nfsd4_read *read) +{ + unsigned long maxcount; + u32 eof; + struct xdr_stream *xdr = &resp->xdr; + struct file *file; + int starting_len = xdr->buf->len; + __be32 *p; + + if (nfserr) + return nfserr; + file = read->rd_nf->nf_file; + + /* eof flag, segment count */ + p = xdr_reserve_space(xdr, 4 + 4); + if (!p) { + WARN_ON_ONCE(test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags)); + return nfserr_resource; + } + if (resp->xdr.buf->page_len && + test_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags)) { + WARN_ON_ONCE(1); + return nfserr_resource; + } + xdr_commit_encode(xdr); + + maxcount = svc_max_payload(resp->rqstp); + maxcount = min_t(unsigned long, maxcount, + (xdr->buf->buflen - xdr->buf->len)); + maxcount = min_t(unsigned long, maxcount, read->rd_length); + + nfserr = nfsd4_encode_read_plus_data(resp, read, maxcount, &eof); + if (nfserr) + xdr_truncate_encode(xdr, starting_len); + else { + *p++ = htonl(eof); + *p++ = htonl(1); + } return nfserr; } @@ -4372,7 +4450,7 @@ static const nfsd4_enc nfsd4_enc_ops[] = { [OP_LAYOUTSTATS] = (nfsd4_enc)nfsd4_encode_noop, [OP_OFFLOAD_CANCEL] = (nfsd4_enc)nfsd4_encode_noop, [OP_OFFLOAD_STATUS] = (nfsd4_enc)nfsd4_encode_offload_status, - [OP_READ_PLUS] = (nfsd4_enc)nfsd4_encode_noop, + [OP_READ_PLUS] = (nfsd4_enc)nfsd4_encode_read_plus, [OP_SEEK] = (nfsd4_enc)nfsd4_encode_seek, [OP_WRITE_SAME] = (nfsd4_enc)nfsd4_encode_noop, [OP_CLONE] = (nfsd4_enc)nfsd4_encode_noop, From patchwork Fri Jan 10 22:35:37 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna Schumaker X-Patchwork-Id: 11328583 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0861692A for ; Fri, 10 Jan 2020 22:35:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id DB76B2072A for ; Fri, 10 Jan 2020 22:35:45 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="n8UaaSa7" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727474AbgAJWfp (ORCPT ); Fri, 10 Jan 2020 17:35:45 -0500 Received: from mail-yw1-f68.google.com ([209.85.161.68]:33375 "EHLO mail-yw1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727387AbgAJWfp (ORCPT ); Fri, 10 Jan 2020 17:35:45 -0500 Received: by mail-yw1-f68.google.com with SMTP id 192so1332250ywy.0 for ; Fri, 10 Jan 2020 14:35:44 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=Xsfb9xbGJqHF0vJh/iXTq267VS4JgDlr9nlfdAvU1UQ=; b=n8UaaSa7QkR69IfxxXsb4sy8HgKiL9Qon5KYnph3QfUgrN2dMNlEqkANaB/IbeqILd sXBWGtAGcLGXc0bDMo7e7SUv57aWLyP7TRm5sIlSBeLLyTMHwwfQCsviGfqo5KeveFjc gWrTky/xttbI8YeO+bP2Y4XcKk6Yw5/0tLuae+sEVfLKYHwQ9xY7PmIecHp0FwGzmBMh gj/bIWhCahuE/hM9Dz1ZckJPrZJ3/P6x2i90NoRidrE3IyiDecE6pyLIu8Z69gpO5GtH rr0Z2Kb3WLJtgk4gjD+TLtvbsy2Z5m1euDZUZlX61GffBbcFRAnkDcu+W1ILLzZmQqLM ljcQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=Xsfb9xbGJqHF0vJh/iXTq267VS4JgDlr9nlfdAvU1UQ=; b=b4oW7stLKDf5hG1V4qozJjAPAI1fsDzWgF8MuDS7LZdqG7B4hJULdSK9kEa+EF1DSk bCEMQdlYsT+jdDvd/+PNCtId1E04LCiAhuJ26K8pCLmq+gEIm9+ep98mPHIm12Bjm/lQ bLJcF4/fog0K1AJNqb1GMmkVwxPN+ODEGqySr4IyoYwuq1Ix0nMkiBwB2t702v0kscxz ZTySS8PGt+jun7aeZJ909sDAwK6JU5sdFBymVRJnrGo+LFAZC1MYwOBV293wtcIbB+y3 wd0/wujvXFrG3y2yl06yMOS+Ch9hUU3ytLjASVu4r+JGAZlmlLdCpkgPIx+iZ9mFYI0w LPTw== X-Gm-Message-State: APjAAAV1Lfg6X4rqpL14d+7FFFxA21XJhYvNrUbjwzri6qMjCfa3Lw8f n1sYUlVRh+PN2BcZg76D9/s= X-Google-Smtp-Source: APXvYqwrdoSEU2PtDAfYZ9ssqyadL/M2Q+FgmYpiXAiw58hP/jP6fEdChTJqqJ0OfnahIJqLhcgjoA== X-Received: by 2002:a0d:ffc2:: with SMTP id p185mr4714977ywf.256.1578695744090; Fri, 10 Jan 2020 14:35:44 -0800 (PST) Received: from gouda.nowheycreamery.com (c-68-32-74-190.hsd1.mi.comcast.net. [68.32.74.190]) by smtp.gmail.com with ESMTPSA id h23sm1607735ywc.105.2020.01.10.14.35.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2020 14:35:43 -0800 (PST) From: schumaker.anna@gmail.com X-Google-Original-From: Anna.Schumaker@Netapp.com To: bfields@redhat.com, linux-nfs@vger.kernel.org Cc: Anna.Schumaker@Netapp.com Subject: [PATCH 3/4] NFSD: Add READ_PLUS hole segment encoding Date: Fri, 10 Jan 2020 17:35:37 -0500 Message-Id: <20200110223538.528560-4-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200110223538.528560-1-Anna.Schumaker@Netapp.com> References: <20200110223538.528560-1-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Anna Schumaker However, we only encode the hole if it is at the beginning of the range and treat everything else as data to keep things simple. Signed-off-by: Anna Schumaker --- fs/nfsd/nfs4proc.c | 2 +- fs/nfsd/nfs4xdr.c | 47 ++++++++++++++++++++++++++++++++++++++++++++-- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c index 3c11ca9bd5d7..fc8c821eda8b 100644 --- a/fs/nfsd/nfs4proc.c +++ b/fs/nfsd/nfs4proc.c @@ -2184,7 +2184,7 @@ static inline u32 nfsd4_read_plus_rsize(struct svc_rqst *rqstp, struct nfsd4_op u32 maxcount = svc_max_payload(rqstp); u32 rlen = min(op->u.read.rd_length, maxcount); /* enough extra xdr space for encoding either a hole or data segment. */ - u32 segments = 1 + 2 + 2; + u32 segments = 2 * (1 + 2 + 2); return (op_encode_hdr_size + 2 + segments + XDR_QUADLEN(rlen)) * sizeof(__be32); } diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 014e05365c17..552972b35547 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -4302,6 +4302,31 @@ nfsd4_encode_read_plus_data(struct nfsd4_compoundres *resp, return nfserr; } +static __be32 +nfsd4_encode_read_plus_hole(struct nfsd4_compoundres *resp, struct nfsd4_read *read, + unsigned long maxcount, u32 *eof) +{ + struct file *file = read->rd_nf->nf_file; + __be32 *p; + + /* Content type, offset, byte count */ + p = xdr_reserve_space(&resp->xdr, 4 + 8 + 8); + if (!p) + return nfserr_resource; + + maxcount = min_t(unsigned long, maxcount, read->rd_length); + + *p++ = cpu_to_be32(NFS4_CONTENT_HOLE); + p = xdr_encode_hyper(p, read->rd_offset); + p = xdr_encode_hyper(p, maxcount); + + *eof = (read->rd_offset + maxcount) >= i_size_read(file_inode(file)); + + read->rd_offset += maxcount; + read->rd_length = (maxcount > 0) ? read->rd_length - maxcount : 0; + return nfs_ok; +} + static __be32 nfsd4_encode_read_plus(struct nfsd4_compoundres *resp, __be32 nfserr, struct nfsd4_read *read) @@ -4311,6 +4336,8 @@ nfsd4_encode_read_plus(struct nfsd4_compoundres *resp, __be32 nfserr, struct xdr_stream *xdr = &resp->xdr; struct file *file; int starting_len = xdr->buf->len; + unsigned int segments = 0; + loff_t data_pos; __be32 *p; if (nfserr) @@ -4335,12 +4362,28 @@ nfsd4_encode_read_plus(struct nfsd4_compoundres *resp, __be32 nfserr, (xdr->buf->buflen - xdr->buf->len)); maxcount = min_t(unsigned long, maxcount, read->rd_length); - nfserr = nfsd4_encode_read_plus_data(resp, read, maxcount, &eof); + data_pos = vfs_llseek(file, read->rd_offset, SEEK_DATA); + if (data_pos == -ENXIO) + data_pos = i_size_read(file_inode(file)); + else if (data_pos < 0) + data_pos = read->rd_offset; + + if (data_pos > read->rd_offset) { + nfserr = nfsd4_encode_read_plus_hole(resp, read, + data_pos - read->rd_offset, &eof); + segments++; + } + + if (!nfserr && !eof && read->rd_length > 0) { + nfserr = nfsd4_encode_read_plus_data(resp, read, maxcount, &eof); + segments++; + } + if (nfserr) xdr_truncate_encode(xdr, starting_len); else { *p++ = htonl(eof); - *p++ = htonl(1); + *p++ = htonl(segments); } return nfserr; From patchwork Fri Jan 10 22:35:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Anna Schumaker X-Patchwork-Id: 11328585 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id A0CE8921 for ; Fri, 10 Jan 2020 22:35:47 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 7DCD020721 for ; Fri, 10 Jan 2020 22:35:47 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="ENlQHWr5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727488AbgAJWfr (ORCPT ); Fri, 10 Jan 2020 17:35:47 -0500 Received: from mail-yb1-f196.google.com ([209.85.219.196]:37918 "EHLO mail-yb1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727387AbgAJWfq (ORCPT ); Fri, 10 Jan 2020 17:35:46 -0500 Received: by mail-yb1-f196.google.com with SMTP id c13so1374799ybq.5 for ; Fri, 10 Jan 2020 14:35:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=al9AW7PiGeGwKTiknMMI9dpHunApjGN++EYzlNVZUeo=; b=ENlQHWr5oGDrIu3dG1XpZeKDB+CSEjb/PljFnWqbCFHYNdYyD55nNschtI+6Edztu4 XdcmruT+o0AU4fT+o9sBomlFdNFfL1xMZDaGVkuLJsySxQ4I43HB1SswNsiorWPL5tsa EzwFWgsZCKWAdjDkR40wf18sz3ES0Gk9irGAhnWuyQroWjXbkSBwZbvjk8piKOoCWDuE z6hDaVBy6RZmjdC0cmwLdSFWH7jFvin8v1HlvWwQqBxaS3s4q8ysLlaeUNUoMSKZEwp4 hUzO6pQIcD31zDxUUcjManG4o5VHDRAXcX5yXXIaXiGAmfLQTngw3hQBXWNgibtFMDhd 14rg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-transfer-encoding; bh=al9AW7PiGeGwKTiknMMI9dpHunApjGN++EYzlNVZUeo=; b=ixkLq/iBNeL/BlghmsBeFco+uc0LY0+wQvEdy9nLWa06raBQ8brS6tmkHN1Oo8lPil 2+D9qwA013mJ+D52aKoQxVcM7+fyp+WEavGE66qCE/JN6S/RHIToh8HIsW7SCi2sKojt RcrceMllOlAruql4xR6P7WY0wRDjc4jzM7vbu6eNNOdezO3FA8B3ts9dTB4foBmTgaE+ vgDbhOZImcF/eS0aVpYhnsGa9eZcSegxNcDbG/P2rH9eGXJhxcJ7DVaM1KqREPchVpMr DSKHZ3sL8AwNNv7cATLvM2lCnxYSRu5tVTZt9haSFWa6//plOZ3Cg7xpH6CcSskUUcHu kgqA== X-Gm-Message-State: APjAAAUajzZdmNyCGKVbr8c7HN7pPH9sK2ohxXkZzKfH9nNBHBMydJCe R1LOprH4P7TBB1C7wcmltHs= X-Google-Smtp-Source: APXvYqzSKRZRIKQMbdQFn6woC4zwMMsWdE7h4uQaXcNJ5fiW7SHtZZBsNbwQCePX4xX/pJUmMfm5cw== X-Received: by 2002:a25:d4d6:: with SMTP id m205mr645326ybf.285.1578695745266; Fri, 10 Jan 2020 14:35:45 -0800 (PST) Received: from gouda.nowheycreamery.com (c-68-32-74-190.hsd1.mi.comcast.net. [68.32.74.190]) by smtp.gmail.com with ESMTPSA id h23sm1607735ywc.105.2020.01.10.14.35.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 10 Jan 2020 14:35:44 -0800 (PST) From: schumaker.anna@gmail.com X-Google-Original-From: Anna.Schumaker@Netapp.com To: bfields@redhat.com, linux-nfs@vger.kernel.org Cc: Anna.Schumaker@Netapp.com Subject: [PATCH 4/4] NFSD: Encode a full READ_PLUS reply Date: Fri, 10 Jan 2020 17:35:38 -0500 Message-Id: <20200110223538.528560-5-Anna.Schumaker@Netapp.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200110223538.528560-1-Anna.Schumaker@Netapp.com> References: <20200110223538.528560-1-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org From: Anna Schumaker Reply to the client with multiple hole and data segments. This might have performance issues due to the number of calls to vfs_llseek(), depending on the underlying filesystem used on the server. Signed-off-by: Anna Schumaker --- fs/nfsd/nfs4xdr.c | 41 +++++++++++++++++++++++++++++------------ 1 file changed, 29 insertions(+), 12 deletions(-) diff --git a/fs/nfsd/nfs4xdr.c b/fs/nfsd/nfs4xdr.c index 552972b35547..c63846729d0b 100644 --- a/fs/nfsd/nfs4xdr.c +++ b/fs/nfsd/nfs4xdr.c @@ -4270,14 +4270,18 @@ nfsd4_encode_offload_status(struct nfsd4_compoundres *resp, __be32 nfserr, static __be32 nfsd4_encode_read_plus_data(struct nfsd4_compoundres *resp, - struct nfsd4_read *read, - unsigned long maxcount, u32 *eof) + struct nfsd4_read *read, u32 *eof) { struct xdr_stream *xdr = &resp->xdr; struct file *file = read->rd_nf->nf_file; + unsigned long maxcount = read->rd_length; + loff_t hole_pos = vfs_llseek(file, read->rd_offset, SEEK_HOLE); __be32 nfserr; __be32 *p; + if (hole_pos > read->rd_offset) + maxcount = min_t(unsigned long, maxcount, hole_pos - read->rd_offset); + /* Content type, offset, byte count */ p = xdr_reserve_space(xdr, 4 + 8 + 4); if (!p) @@ -4289,6 +4293,7 @@ nfsd4_encode_read_plus_data(struct nfsd4_compoundres *resp, nfserr = nfsd4_encode_splice_read(resp, read, file, &maxcount, eof); else nfserr = nfsd4_encode_readv(resp, read, file, &maxcount, eof); + clear_bit(RQ_SPLICE_OK, &resp->rqstp->rq_flags); if (nfserr) return nfserr; @@ -4303,18 +4308,24 @@ nfsd4_encode_read_plus_data(struct nfsd4_compoundres *resp, } static __be32 -nfsd4_encode_read_plus_hole(struct nfsd4_compoundres *resp, struct nfsd4_read *read, - unsigned long maxcount, u32 *eof) +nfsd4_encode_read_plus_hole(struct nfsd4_compoundres *resp, + struct nfsd4_read *read, u32 *eof, loff_t data_pos) { struct file *file = read->rd_nf->nf_file; + unsigned long maxcount = read->rd_length; __be32 *p; + if (data_pos == 0) + data_pos = vfs_llseek(file, read->rd_offset, SEEK_DATA); + if (data_pos == -ENXIO) + data_pos = i_size_read(file_inode(file)); + /* Content type, offset, byte count */ p = xdr_reserve_space(&resp->xdr, 4 + 8 + 8); if (!p) return nfserr_resource; - maxcount = min_t(unsigned long, maxcount, read->rd_length); + maxcount = min_t(unsigned long, maxcount, data_pos - read->rd_offset); *p++ = cpu_to_be32(NFS4_CONTENT_HOLE); p = xdr_encode_hyper(p, read->rd_offset); @@ -4338,6 +4349,7 @@ nfsd4_encode_read_plus(struct nfsd4_compoundres *resp, __be32 nfserr, int starting_len = xdr->buf->len; unsigned int segments = 0; loff_t data_pos; + bool is_data; __be32 *p; if (nfserr) @@ -4361,21 +4373,26 @@ nfsd4_encode_read_plus(struct nfsd4_compoundres *resp, __be32 nfserr, maxcount = min_t(unsigned long, maxcount, (xdr->buf->buflen - xdr->buf->len)); maxcount = min_t(unsigned long, maxcount, read->rd_length); + read->rd_length = maxcount; data_pos = vfs_llseek(file, read->rd_offset, SEEK_DATA); if (data_pos == -ENXIO) data_pos = i_size_read(file_inode(file)); else if (data_pos < 0) data_pos = read->rd_offset; + is_data = (data_pos == read->rd_offset); + eof = read->rd_offset > i_size_read(file_inode(file)); - if (data_pos > read->rd_offset) { - nfserr = nfsd4_encode_read_plus_hole(resp, read, - data_pos - read->rd_offset, &eof); - segments++; - } + while (read->rd_length > 0 && !eof) { + if (is_data) + nfserr = nfsd4_encode_read_plus_data(resp, read, &eof); + else + nfserr = nfsd4_encode_read_plus_hole(resp, read, &eof, data_pos); - if (!nfserr && !eof && read->rd_length > 0) { - nfserr = nfsd4_encode_read_plus_data(resp, read, maxcount, &eof); + if (nfserr) + break; + is_data = !is_data; + data_pos = 0; segments++; }