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=-7.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED 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 D081AC282CE for ; Fri, 5 Apr 2019 17:51:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8D5462171F for ; Fri, 5 Apr 2019 17:51:40 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=oracle.com header.i=@oracle.com header.b="I81AtcvY" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731326AbfDERvj (ORCPT ); Fri, 5 Apr 2019 13:51:39 -0400 Received: from userp2130.oracle.com ([156.151.31.86]:34680 "EHLO userp2130.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730870AbfDERvj (ORCPT ); Fri, 5 Apr 2019 13:51:39 -0400 Received: from pps.filterd (userp2130.oracle.com [127.0.0.1]) by userp2130.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x35HNpOH099605; Fri, 5 Apr 2019 17:51:32 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=oracle.com; h=content-type : mime-version : subject : from : in-reply-to : date : cc : content-transfer-encoding : message-id : references : to; s=corp-2018-07-02; bh=g1FEVacTsKiYzFwfWbbGKGGicC3/KjOo1N6Pm/B+faY=; b=I81AtcvYXW7yfSx9L/pxeL75HpcYWsfLKzQ8o0WUqpSVoBvCbfRmem1bWox8aBzr+hO1 hzMbe5t8s6ubs0kWqbr4BHitc1rpjcgJr0GGA/xyq3AtfMiEQuTs3bYcuYvbDXk2HN/I gp63rJheBQEezCb7cLf2DsEVO4a5t64qNqw8gieRO2JviRuo3DTzl/ZFiLf80CpdKF9t feWz8Hz35bS6KuaOoJZGppkkwl+O87t0DoN4poVeyDSWzcylMmKV/Xo4T67DYa2T44dJ rv1CSrvh27k0YmFbSAHEfXyZMJpqTNiAocfeNj+wM3OYc0kBm2lbgEcQu4jFKx3eMHcJ 6w== Received: from aserp3030.oracle.com (aserp3030.oracle.com [141.146.126.71]) by userp2130.oracle.com with ESMTP id 2rhyvtp81q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 05 Apr 2019 17:51:32 +0000 Received: from pps.filterd (aserp3030.oracle.com [127.0.0.1]) by aserp3030.oracle.com (8.16.0.27/8.16.0.27) with SMTP id x35HpOKZ162237; Fri, 5 Apr 2019 17:51:31 GMT Received: from aserv0121.oracle.com (aserv0121.oracle.com [141.146.126.235]) by aserp3030.oracle.com with ESMTP id 2rp34jgk4c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 05 Apr 2019 17:51:31 +0000 Received: from abhmp0003.oracle.com (abhmp0003.oracle.com [141.146.116.9]) by aserv0121.oracle.com (8.14.4/8.13.8) with ESMTP id x35HpVPl023868; Fri, 5 Apr 2019 17:51:31 GMT Received: from anon-dhcp-171.1015granger.net (/68.61.232.219) by default (Oracle Beehive Gateway v4.0) with ESMTP ; Fri, 05 Apr 2019 10:51:30 -0700 Content-Type: text/plain; charset=us-ascii Mime-Version: 1.0 (Mac OS X Mail 12.2 \(3445.102.3\)) Subject: Re: [PATCH v1 20/23] NFS: Account for XDR pad of buf->pages From: Chuck Lever In-Reply-To: Date: Fri, 5 Apr 2019 13:51:29 -0400 Cc: Anna Schumaker , linux-rdma , Linux NFS Mailing List Content-Transfer-Encoding: quoted-printable Message-Id: <0157F163-7554-413C-ACCA-FE6646C04716@oracle.com> References: <20190211161920.2817.20881.stgit@manet.1015granger.net> <20190211162525.2817.60645.stgit@manet.1015granger.net> To: Olga Kornievskaia X-Mailer: Apple Mail (2.3445.102.3) X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9218 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0 phishscore=0 bulkscore=0 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904050118 X-Proofpoint-Virus-Version: vendor=nai engine=5900 definitions=9218 signatures=668685 X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 priorityscore=1501 malwarescore=0 suspectscore=0 phishscore=0 bulkscore=0 spamscore=0 clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0 mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.0.1-1810050000 definitions=main-1904050118 Sender: linux-nfs-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org > On Apr 5, 2019, at 1:36 PM, Olga Kornievskaia wrote: >=20 > Hi Chuck, >=20 > This patch break ACLs. After applying this patch nfs4_getfacl fails > (it fails within xdr and returns ENOTSUPP). Any ideas why? Possibly the macro that defines the maximum size of the reply is incorrect. > On Mon, Feb 11, 2019 at 11:25 AM Chuck Lever = wrote: >>=20 >> Certain NFS results (eg. READLINK) might expect a data payload that >> is not an exact multiple of 4 bytes. In this case, XDR encoding >> is required to pad that payload so its length on the wire is a >> multiple of 4 bytes. The constants that define the maximum size of >> each NFS result do not appear to account for this extra word. >>=20 >> In each case where the data payload is to be received into pages: >>=20 >> - 1 word is added to the size of the receive buffer allocated by >> call_allocate >>=20 >> - rpc_inline_rcv_pages subtracts 1 word from @hdrsize so that the >> extra buffer space falls into the rcv_buf's tail iovec >>=20 >> - If buf->pagelen is word-aligned, an XDR pad is not needed and >> is thus removed from the tail >>=20 >> Signed-off-by: Chuck Lever >> --- >> fs/nfs/nfs2xdr.c | 6 +++--- >> fs/nfs/nfs3xdr.c | 10 +++++----- >> fs/nfs/nfs4xdr.c | 15 ++++++++------- >> net/sunrpc/clnt.c | 6 +++++- >> net/sunrpc/xdr.c | 2 ++ >> 5 files changed, 23 insertions(+), 16 deletions(-) >>=20 >> diff --git a/fs/nfs/nfs2xdr.c b/fs/nfs/nfs2xdr.c >> index 1dcd0fe..a7ed29d 100644 >> --- a/fs/nfs/nfs2xdr.c >> +++ b/fs/nfs/nfs2xdr.c >> @@ -56,11 +56,11 @@ >>=20 >> #define NFS_attrstat_sz (1+NFS_fattr_sz) >> #define NFS_diropres_sz = (1+NFS_fhandle_sz+NFS_fattr_sz) >> -#define NFS_readlinkres_sz (2) >> -#define NFS_readres_sz (1+NFS_fattr_sz+1) >> +#define NFS_readlinkres_sz (2+1) >> +#define NFS_readres_sz (1+NFS_fattr_sz+1+1) >> #define NFS_writeres_sz (NFS_attrstat_sz) >> #define NFS_stat_sz (1) >> -#define NFS_readdirres_sz (1) >> +#define NFS_readdirres_sz (1+1) >> #define NFS_statfsres_sz (1+NFS_info_sz) >>=20 >> static int nfs_stat_to_errno(enum nfs_stat); >> diff --git a/fs/nfs/nfs3xdr.c b/fs/nfs/nfs3xdr.c >> index a54dcf4..110358f 100644 >> --- a/fs/nfs/nfs3xdr.c >> +++ b/fs/nfs/nfs3xdr.c >> @@ -69,13 +69,13 @@ >> #define NFS3_removeres_sz (NFS3_setattrres_sz) >> #define NFS3_lookupres_sz (1+NFS3_fh_sz+(2 * = NFS3_post_op_attr_sz)) >> #define NFS3_accessres_sz (1+NFS3_post_op_attr_sz+1) >> -#define NFS3_readlinkres_sz (1+NFS3_post_op_attr_sz+1) >> -#define NFS3_readres_sz (1+NFS3_post_op_attr_sz+3) >> +#define NFS3_readlinkres_sz (1+NFS3_post_op_attr_sz+1+1) >> +#define NFS3_readres_sz (1+NFS3_post_op_attr_sz+3+1) >> #define NFS3_writeres_sz (1+NFS3_wcc_data_sz+4) >> #define NFS3_createres_sz = (1+NFS3_fh_sz+NFS3_post_op_attr_sz+NFS3_wcc_data_sz) >> #define NFS3_renameres_sz (1+(2 * NFS3_wcc_data_sz)) >> #define NFS3_linkres_sz = (1+NFS3_post_op_attr_sz+NFS3_wcc_data_sz) >> -#define NFS3_readdirres_sz (1+NFS3_post_op_attr_sz+2) >> +#define NFS3_readdirres_sz (1+NFS3_post_op_attr_sz+2+1) >> #define NFS3_fsstatres_sz (1+NFS3_post_op_attr_sz+13) >> #define NFS3_fsinfores_sz (1+NFS3_post_op_attr_sz+12) >> #define NFS3_pathconfres_sz (1+NFS3_post_op_attr_sz+6) >> @@ -85,7 +85,7 @@ >> #define ACL3_setaclargs_sz (NFS3_fh_sz+1+ \ >> XDR_QUADLEN(NFS_ACL_INLINE_BUFSIZE)) >> #define ACL3_getaclres_sz (1+NFS3_post_op_attr_sz+1+ \ >> - XDR_QUADLEN(NFS_ACL_INLINE_BUFSIZE)) >> + = XDR_QUADLEN(NFS_ACL_INLINE_BUFSIZE)+1) >> #define ACL3_setaclres_sz (1+NFS3_post_op_attr_sz) >>=20 >> static int nfs3_stat_to_errno(enum nfs_stat); >> @@ -1629,7 +1629,7 @@ static int nfs3_xdr_dec_read3res(struct = rpc_rqst *req, struct xdr_stream *xdr, >> result->op_status =3D status; >> if (status !=3D NFS3_OK) >> goto out_status; >> - result->replen =3D 3 + ((xdr_stream_pos(xdr) - pos) >> 2); >> + result->replen =3D 4 + ((xdr_stream_pos(xdr) - pos) >> 2); >> error =3D decode_read3resok(xdr, result); >> out: >> return error; >> diff --git a/fs/nfs/nfs4xdr.c b/fs/nfs/nfs4xdr.c >> index d0fa18d..6d9d5e2 100644 >> --- a/fs/nfs/nfs4xdr.c >> +++ b/fs/nfs/nfs4xdr.c >> @@ -215,14 +215,14 @@ static int decode_layoutget(struct xdr_stream = *xdr, struct rpc_rqst *req, >> nfs4_fattr_bitmap_maxsz) >> #define encode_read_maxsz (op_encode_hdr_maxsz + \ >> encode_stateid_maxsz + 3) >> -#define decode_read_maxsz (op_decode_hdr_maxsz + 2) >> +#define decode_read_maxsz (op_decode_hdr_maxsz + 2 + 1) >> #define encode_readdir_maxsz (op_encode_hdr_maxsz + \ >> 2 + encode_verifier_maxsz + 5 + \ >> nfs4_label_maxsz) >> #define decode_readdir_maxsz (op_decode_hdr_maxsz + \ >> - decode_verifier_maxsz) >> + decode_verifier_maxsz + 1) >> #define encode_readlink_maxsz (op_encode_hdr_maxsz) >> -#define decode_readlink_maxsz (op_decode_hdr_maxsz + 1) >> +#define decode_readlink_maxsz (op_decode_hdr_maxsz + 1 + 1) >> #define encode_write_maxsz (op_encode_hdr_maxsz + \ >> encode_stateid_maxsz + 4) >> #define decode_write_maxsz (op_decode_hdr_maxsz + \ >> @@ -284,14 +284,14 @@ static int decode_layoutget(struct xdr_stream = *xdr, struct rpc_rqst *req, >> #define decode_delegreturn_maxsz (op_decode_hdr_maxsz) >> #define encode_getacl_maxsz (encode_getattr_maxsz) >> #define decode_getacl_maxsz (op_decode_hdr_maxsz + \ >> - nfs4_fattr_bitmap_maxsz + 1) >> + nfs4_fattr_bitmap_maxsz + 1 + 1) >> #define encode_setacl_maxsz (op_encode_hdr_maxsz + \ >> encode_stateid_maxsz + 3) >> #define decode_setacl_maxsz (decode_setattr_maxsz) >> #define encode_fs_locations_maxsz \ >> (encode_getattr_maxsz) >> #define decode_fs_locations_maxsz \ >> - (0) >> + (1) >> #define encode_secinfo_maxsz (op_encode_hdr_maxsz + = nfs4_name_maxsz) >> #define decode_secinfo_maxsz (op_decode_hdr_maxsz + 1 + = ((NFS_MAX_SECFLAVORS * (16 + GSS_OID_MAX_LEN)) / 4)) >>=20 >> @@ -392,12 +392,13 @@ static int decode_layoutget(struct xdr_stream = *xdr, struct rpc_rqst *req, >> 1 /* opaque devaddr4 length */ + \ >> /* devaddr4 payload is read into = page */ \ >> 1 /* notification bitmap length */ + \ >> - 1 /* notification bitmap, word 0 */) >> + 1 /* notification bitmap, word 0 */ + = \ >> + 1 /* possible XDR padding */) >> #define encode_layoutget_maxsz (op_encode_hdr_maxsz + 10 + \ >> encode_stateid_maxsz) >> #define decode_layoutget_maxsz (op_decode_hdr_maxsz + 8 + \ >> decode_stateid_maxsz + \ >> - XDR_QUADLEN(PNFS_LAYOUT_MAXSIZE)) >> + XDR_QUADLEN(PNFS_LAYOUT_MAXSIZE) + 1) >> #define encode_layoutcommit_maxsz (op_encode_hdr_maxsz + \ >> 2 /* offset */ + \ >> 2 /* length */ + \ >> diff --git a/net/sunrpc/clnt.c b/net/sunrpc/clnt.c >> index f780605..4ea38b0 100644 >> --- a/net/sunrpc/clnt.c >> +++ b/net/sunrpc/clnt.c >> @@ -1177,7 +1177,11 @@ void rpc_prepare_reply_pages(struct rpc_rqst = *req, struct page **pages, >> unsigned int base, unsigned int len, >> unsigned int hdrsize) >> { >> - hdrsize +=3D RPC_REPHDRSIZE + = req->rq_cred->cr_auth->au_rslack; >> + /* Subtract one to force an extra word of buffer space for = the >> + * payload's XDR pad to fall into the rcv_buf's tail iovec. >> + */ >> + hdrsize +=3D RPC_REPHDRSIZE + = req->rq_cred->cr_auth->au_rslack - 1; >> + >> xdr_inline_pages(&req->rq_rcv_buf, hdrsize << 2, pages, base, = len); >> trace_rpc_reply_pages(req); >> } >> diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c >> index 7cca515..aa8177d 100644 >> --- a/net/sunrpc/xdr.c >> +++ b/net/sunrpc/xdr.c >> @@ -189,6 +189,8 @@ __be32 *xdr_encode_opaque(__be32 *p, const void = *ptr, unsigned int nbytes) >>=20 >> tail->iov_base =3D buf + offset; >> tail->iov_len =3D buflen - offset; >> + if ((xdr->page_len & 3) =3D=3D 0) >> + tail->iov_len -=3D sizeof(__be32); >>=20 >> xdr->buflen +=3D len; >> } >>=20 -- Chuck Lever