From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.8 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 1F8D9C433E6 for ; Fri, 28 Aug 2020 21:25:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DC904206FA for ; Fri, 28 Aug 2020 21:25:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Ox/0Ozpg" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726379AbgH1VZa (ORCPT ); Fri, 28 Aug 2020 17:25:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:44362 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726338AbgH1VZ2 (ORCPT ); Fri, 28 Aug 2020 17:25:28 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1598649926; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=7DjDuHQg68KHy6eAhIlkcpw+XM/izg/oN/2k6snQESg=; b=Ox/0OzpgMCMsqWmxd4KLdP5dMYTK+4MTy6hjGUNB9PxueXk8vLCQGADz+Wbri9/bu9J9kU KW/pKp6doGGE5/6zJK89qOLDRBJDxWX44tVLXLApyIAL/35XUlvQ00kmzjKxtRMHJVl7cI 81+OPCTsHkGtWmjY8OwOIs2jlSAR2Q8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-205--a7p6i6xMA2opH_xntbcLg-1; Fri, 28 Aug 2020 17:25:24 -0400 X-MC-Unique: -a7p6i6xMA2opH_xntbcLg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id C89AE10066FB; Fri, 28 Aug 2020 21:25:22 +0000 (UTC) Received: from pick.fieldses.org (ovpn-119-133.rdu2.redhat.com [10.10.119.133]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 3FDEE5D990; Fri, 28 Aug 2020 21:25:22 +0000 (UTC) Received: by pick.fieldses.org (Postfix, from userid 2815) id 5CC2D12045D; Fri, 28 Aug 2020 17:25:21 -0400 (EDT) Date: Fri, 28 Aug 2020 17:25:21 -0400 From: "J. Bruce Fields" To: schumaker.anna@gmail.com Cc: chuck.lever@oracle.com, linux-nfs@vger.kernel.org, Anna.Schumaker@netapp.com Subject: Re: [PATCH v4 2/5] NFSD: Add READ_PLUS data support Message-ID: <20200828212521.GA33226@pick.fieldses.org> References: <20200817165310.354092-1-Anna.Schumaker@Netapp.com> <20200817165310.354092-3-Anna.Schumaker@Netapp.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20200817165310.354092-3-Anna.Schumaker@Netapp.com> X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org On Mon, Aug 17, 2020 at 12:53:07PM -0400, schumaker.anna@gmail.com wrote: > 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 | 83 ++++++++++++++++++++++++++++++++++++++++++++-- > 2 files changed, 98 insertions(+), 2 deletions(-) > > diff --git a/fs/nfsd/nfs4proc.c b/fs/nfsd/nfs4proc.c > index a09c35f0f6f0..9630d33211f2 100644 > --- a/fs/nfsd/nfs4proc.c > +++ b/fs/nfsd/nfs4proc.c > @@ -2523,6 +2523,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); I'm not sure I understand this calculation. In the final code, there's no fixed limit on the number of segments returned by a single READ_PLUS op, right? --b. > +} > + > static inline u32 nfsd4_readdir_rsize(struct svc_rqst *rqstp, struct nfsd4_op *op) > { > u32 maxcount = 0, rlen = 0; > @@ -3059,6 +3069,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 6a1c0a7fae05..9af92f538000 100644 > --- a/fs/nfsd/nfs4xdr.c > +++ b/fs/nfsd/nfs4xdr.c > @@ -1957,7 +1957,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, > @@ -4367,6 +4367,85 @@ 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; > + int starting_len = xdr->buf->len; > + __be32 nfserr; > + __be32 *p, tmp; > + __be64 tmp64; > + > + /* Content type, offset, byte count */ > + p = xdr_reserve_space(xdr, 4 + 8 + 4); > + if (!p) > + return nfserr_resource; > + > + read->rd_vlen = xdr_reserve_space_vec(xdr, resp->rqstp->rq_vec, maxcount); > + if (read->rd_vlen < 0) > + return nfserr_resource; > + > + nfserr = nfsd_readv(resp->rqstp, read->rd_fhp, file, read->rd_offset, > + resp->rqstp->rq_vec, read->rd_vlen, &maxcount, eof); > + if (nfserr) > + return nfserr; > + > + tmp = htonl(NFS4_CONTENT_DATA); > + write_bytes_to_xdr_buf(xdr->buf, starting_len, &tmp, 4); > + tmp64 = cpu_to_be64(read->rd_offset); > + write_bytes_to_xdr_buf(xdr->buf, starting_len + 4, &tmp64, 8); > + tmp = htonl(maxcount); > + write_bytes_to_xdr_buf(xdr->buf, starting_len + 12, &tmp, 4); > + return nfs_ok; > +} > + > +static __be32 > +nfsd4_encode_read_plus(struct nfsd4_compoundres *resp, __be32 nfserr, > + struct nfsd4_read *read) > +{ > + unsigned long maxcount; > + struct xdr_stream *xdr = &resp->xdr; > + struct file *file; > + int starting_len = xdr->buf->len; > + int segments = 0; > + __be32 *p, tmp; > + u32 eof; > + > + if (nfserr) > + return nfserr; > + file = read->rd_nf->nf_file; > + > + /* eof flag, segment count */ > + p = xdr_reserve_space(xdr, 4 + 4); > + if (!p) > + 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); > + > + eof = read->rd_offset >= i_size_read(file_inode(file)); > + if (!eof) { > + nfserr = nfsd4_encode_read_plus_data(resp, read, maxcount, &eof); > + segments++; > + } > + > + if (nfserr) > + xdr_truncate_encode(xdr, starting_len); > + else { > + tmp = htonl(eof); > + write_bytes_to_xdr_buf(xdr->buf, starting_len, &tmp, 4); > + tmp = htonl(segments); > + write_bytes_to_xdr_buf(xdr->buf, starting_len + 4, &tmp, 4); > + } > > return nfserr; > } > @@ -4509,7 +4588,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, > -- > 2.28.0 >