From patchwork Fri May 7 12:14:55 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Trond Myklebust X-Patchwork-Id: 12244443 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=-20.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH, INCLUDES_PULL_REQUEST,MAILING_LIST_MULTI,MENTIONS_GIT_HOSTING,SPF_HELO_NONE, SPF_PASS,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 2B393C433ED for ; Fri, 7 May 2021 12:15:01 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D6CEB6100C for ; Fri, 7 May 2021 12:15:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230386AbhEGMP6 (ORCPT ); Fri, 7 May 2021 08:15:58 -0400 Received: from mail-dm6nam11on2125.outbound.protection.outlook.com ([40.107.223.125]:16160 "EHLO NAM11-DM6-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S229637AbhEGMP6 (ORCPT ); Fri, 7 May 2021 08:15:58 -0400 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Ym+FTqDXEz86lkzz27JfbBIEix4mBIMF3neBTsqZeQe5O8zN00RjVDjCOCXd0dcdHafOTPb0yB+qi+ok/GmJWLwpDmtzFreSUEZPZxLu+nVJqVuRER17x1Ae+Wv2W7W9KRD1acLO5Vv9VJwYTPlWT4hORLQlxpTef1ZhCTcCwExCI/xaLKADh6qXCf5+A3MNufR5H7h5hqZNlR+N2RMYo4cHArrqvzBsBt5MyhF3RYl4HfQwnl79XLJ5E3fMcCX4UN+Hqqo//SEBV+ESBjNbVWenuikFStYQpHJzSnHqZWsZAw9QRJCDTm9tRMuXPGjvJPoI0ZyNBcHUrcbg88MlYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KhAudFNZWOdP0iSKCOXFPPQTHPWL2hFKYfmLXL1n+SA=; b=bDbs2So6qMuarP8/+A5HVPsHKKz1aOgkqyOOEiAEYUdjBTqIoCkpWk3+8KlghvUdHnSi6cCQ/femfSx4uR7ud87FuRouMl5X0icyGhafhRpD8od0aJesi+jBuiNzooNzN3fr3tiz+pmGvspdmRiuldtgQKSkqB9j0v6WjIZ0Ox2O4pDGY3iRfnZXC+FZjOtJLomps4PY1WGiiwzU7Jkjdf64SayRRs3g6tnoRnRIIpD4z5QcpYOfVZLvVrWaavjA1lhwRUDPoUBUEqpgERfvsxP9fIxaZeNSp/zf2zCHDFlVn4B+aCazk0DiwiWMye7VWKDRZhsrfWSzlh2TnFJINA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=hammerspace.com; dmarc=pass action=none header.from=hammerspace.com; dkim=pass header.d=hammerspace.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=hammerspace.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=KhAudFNZWOdP0iSKCOXFPPQTHPWL2hFKYfmLXL1n+SA=; b=fxNTxxxxQyh/3HUG1EQBWxDJ+SDNzL7hzCCMBX5afAaNjLqS0g8X+dNkPScJgRqOmXu9vfqFdQQQduN/AR5L6tt6Qyz/KSNI56nt+oUXa8FShHEVuuIAHHrx2z9DoMb+lnImqKUY73Yp+vEWk70Qh4S3bn1WbPDThpWG4Yfn7p0= Received: from DS7PR13MB4733.namprd13.prod.outlook.com (2603:10b6:5:3b1::24) by DM5PR13MB1482.namprd13.prod.outlook.com (2603:10b6:3:124::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4129.11; Fri, 7 May 2021 12:14:55 +0000 Received: from DS7PR13MB4733.namprd13.prod.outlook.com ([fe80::4c65:55ca:a5a2:f18]) by DS7PR13MB4733.namprd13.prod.outlook.com ([fe80::4c65:55ca:a5a2:f18%7]) with mapi id 15.20.4129.011; Fri, 7 May 2021 12:14:55 +0000 From: Trond Myklebust To: "torvalds@linux-foundation.org" CC: "linux-nfs@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: [GIT PULL] Please pull NFS client requests for Linux 5.13 Thread-Topic: [GIT PULL] Please pull NFS client requests for Linux 5.13 Thread-Index: AQHXQzqXYCTxxtRpqEWYablN+o/Oeg== Date: Fri, 7 May 2021 12:14:55 +0000 Message-ID: <7895439af9444064f1917fd94a2d0e57ef51a686.camel@hammerspace.com> Accept-Language: en-US, en-GB Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: authentication-results: linux-foundation.org; dkim=none (message not signed) header.d=none;linux-foundation.org; dmarc=none action=none header.from=hammerspace.com; x-originating-ip: [68.36.133.222] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 284acfcb-f589-486a-b0ce-08d91151b9e2 x-ms-traffictypediagnostic: DM5PR13MB1482: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:454; x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: 7OI0TzeiewjGEdw7Dx9fjbXjQ1zG7HBu9EnBANmWQMbrgggaxhmrbASJfUr07hqpuEToG7OMaUMUMoa4sBr7OdfBZZsmxcO4p0bcG2TlraezjwEadRu6jOYbTdUv7B0s0oQsOOZrH67btAyOdVy+05qCXF91LxEV1xhVMkuEEBjnstFi4Fw7oTxkRFEbD7hJ5F0eLlHMGAjVf70cJ9CsAQlW2UiT7dCl4lnfTFyluFB5HUbxsPbIpDVyVdH2JyIZyK3370VSjNfWYyg1B47mi3vVaDs5etA7wWFoxLgcgA4CVOMsKwYwDqcWSjtbxXGzOoZ1DU8jTaOma/JWvi83/Q8IqqbDrkpSYZTNiy8/+JpkbrozhLU250ecPNT6ZiuoMVKv3ZXen1LYNRxsplZalJLsFhten7kQAsKYas3gKlak9IUHyA1WaR5/6hvBiQMxLH3DTLaXq8pJNItz+5nEkabVzPxXl4Jk8s3zNAMpjTJkEkF7GfMxuxKIpIyIJT/1aITRvkybVIoCNTZXHZ931NOFNzPpUCOft1FFVOvxGRBfoG7RQzu9YwGvA8c/AvEXPPS6bCUk9iUhfiHoCAwTtlVXF7p8MQCfVPobwKCo9Cg= x-forefront-antispam-report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:DS7PR13MB4733.namprd13.prod.outlook.com;PTR:;CAT:NONE;SFS:(366004)(346002)(136003)(376002)(6916009)(66556008)(2906002)(26005)(5660300002)(64756008)(86362001)(66476007)(54906003)(6506007)(66446008)(508600001)(38100700002)(6512007)(6486002)(8676002)(8936002)(83380400001)(71200400001)(186003)(2616005)(76116006)(91956017)(66946007)(36756003)(122000001)(4326008);DIR:OUT;SFP:1102; x-ms-exchange-antispam-messagedata: =?utf-8?q?EeTTdpFxEmVLpW81VpkacRX/IshsHY?= =?utf-8?q?AZ1RL9wkR1Xx5g0UyJ1nZITYt8OHqcL/88AEASDMZLEaFrV9dTaiU+EyS85ZWkRs5?= =?utf-8?q?+/Ys++HjI6jZuHF3DkpNk4R+B70tcC+KVML3SorV5ZGkL6Sewj30wd1qONJWPTfKH?= =?utf-8?q?gDGyX24imnNUWLmZCyjeUuw/AfVauf+/eQZSzTYesEM8318OXPJxRxMQzLOTdPFxp?= =?utf-8?q?tVytNVJenNb3KzbyQwB0dnywlT2nPtCB5P3Kyc/yicEvUZwSYmzRtkqnWwy4cz5Cw?= =?utf-8?q?KY2Ae20l9xXu6otXW/sCELRLFraqgywhZ/UwyOXb/ULnEaKRnI9BaatKXeyGl6pTf?= =?utf-8?q?BxIXgHO8AAo9TcUeBeF9AuPwv4gNUxbhfV7x1wnyuKIehjkXjyKf9Qh0AfgDP3b0w?= =?utf-8?q?fhrm7DqlyJdhR3p/QQiR3foy8Aonf2ZKFTqQkMBAYSjLCmzO2otU8UuFWtlF1ij6X?= =?utf-8?q?9UGuTA57YcZonRSUZM0vFie9HIzIIkTfOXdBC6HbkSJeaf5m2VD8b7NFlHhCyCXyG?= =?utf-8?q?HNBBgv42wSLdP/Vcd2fQLt5esqh/qQgSIE207B1Fs2uWWNJ/IDhyL4QVnwKm1+j06?= =?utf-8?q?43yhH8ROFWXt45dUf9dQMBwyh9DzkLMKgZs2ZMgt9hI1dvEaYTaXLz6/B56b0w0Fh?= =?utf-8?q?sl37vRtX6+xSLZ/zkFOECuBMXCrL3DNzkChgXs+Q8Je01kGxHa/mzMJv5mZmJBgMH?= =?utf-8?q?gmrMJlc1fjVI8s5Dcl5PNs6EYlPm2Q8dE5+ACqst4l5uvWL+9JTzaFLW85jyARdyH?= =?utf-8?q?cckkD9MTXCX7o5Mm3gvZpwXt8zGzewb1eTrx/wGs5fxgW2I9yjOYmWYCdJ+AP7Rem?= =?utf-8?q?D2Gl/SxaZpOkG9OyjnVSc+3qOZiTVtk47D7hibXgm0GfLvqxoCQjDiFfIxDwhJmMu?= =?utf-8?q?r0GfUHVD/2A6PLNoGp92mv+y/ppiIlM/Gwi7wC5lTpt3IRKoXzsCbEqhdeUxvgF7h?= =?utf-8?q?e2ww8hOPXzshyJsM6rFUn1fmYirzoOODZJXN1ZIn1j4tmlt9EXBmAtxshO0nL2Xu+?= =?utf-8?q?UvLDmdQXWvXH0Ff7kXXb1+x73FdvKJO2yltbibEFL2DaXFmrSwHbs0+JPztmC137S?= =?utf-8?q?QP9ROI+Apib+aTYrBL7BeIMFbUKUUUjvcqOD5Vs47+8oLVo20ajx0x2XcUUIHjMDQ?= =?utf-8?q?on9TyVIss+LOSFBEKgYIXR+S1f2RdLfCSij/Wssa5PlZyuU6gFRhddtcY4SLGfapb?= =?utf-8?q?TB7qRe1DKqIHWBLIBjRGQYpLR3TUWf7cg8iQgELL6gspKeVYsXbNtE+bFbM1oMiWu?= =?utf-8?q?oIaoaVXIc3rGen?= x-ms-exchange-transport-forked: True Content-ID: MIME-Version: 1.0 X-OriginatorOrg: hammerspace.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: DS7PR13MB4733.namprd13.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 284acfcb-f589-486a-b0ce-08d91151b9e2 X-MS-Exchange-CrossTenant-originalarrivaltime: 07 May 2021 12:14:55.7553 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 0d4fed5c-3a70-46fe-9430-ece41741f59e X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: nKlktaVYoZ8770H7bN1qsFLyYihxIZ+3vfDyLCiC3HFLT03Pl3C9HwhCsN0xLNNewbjbNKVET8gzkjZyZ6KC8g== X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR13MB1482 Precedence: bulk List-ID: X-Mailing-List: linux-nfs@vger.kernel.org Hi Linus, The following changes since commit e49d033bddf5b565044e2abe4241353959bc9120: Linux 5.12-rc6 (2021-04-04 14:15:36 -0700) are available in the Git repository at: git://git.linux-nfs.org/projects/trondmy/linux-nfs.git tags/nfs-for-5.13-1 for you to fetch changes up to 9e895cd9649abe4392c59d14e31b0f5667d082d2: xprtrdma: Fix a NULL dereference in frwr_unmap_sync() (2021-05-01 19:42:22 -0400) Thanks! Trond ---------------------------------------------------------------- NFS client updates for Linux 5.13 Highlights include: Stable fixes: - Add validation of the UDP retrans parameter to prevent shift out-of-bounds - Don't discard pNFS layout segments that are marked for return Bugfixes: - Fix a NULL dereference crash in xprt_complete_bc_request() when the NFSv4.1 server misbehaves. - Fix the handling of NFS READDIR cookie verifiers - Sundry fixes to ensure attribute revalidation works correctly when the server does not return post-op attributes. - nfs4_bitmask_adjust() must not change the server global bitmasks - Fix major timeout handling in the RPC code. - NFSv4.2 fallocate() fixes. - Fix the NFSv4.2 SEEK_HOLE/SEEK_DATA end-of-file handling - Copy offload attribute revalidation fixes - Fix an incorrect filehandle size check in the pNFS flexfiles driver - Fix several RDMA transport setup/teardown races - Fix several RDMA queue wrapping issues - Fix a misplaced memory read barrier in sunrpc's call_decode() Features: - Micro optimisation of the TCP transmission queue using TCP_CORK - statx() performance improvements by further splitting up the tracking of invalid cached file metadata. - Support the NFSv4.2 "change_attr_type" attribute and use it to optimise handling of change attribute updates. ---------------------------------------------------------------- Baptiste Lepers (1): sunrpc: Fix misplaced barrier in call_decode Benjamin Coddington (1): SUNRPC: Ensure the transport backchannel association Bhaskar Chowdhury (1): nfs: Fix a typo in the file nfs42xattr.c Chris Dion (1): SUNRPC: Handle major timeout in xprt_adjust_timeout() Chuck Lever (27): SUNRPC: Move fault injection call sites SUNRPC: Add tracepoint that fires when an RPC is retransmitted SUNRPC: Remove trace_xprt_transmit_queued xprtrdma: Avoid Receive Queue wrapping xprtrdma: Do not refresh Receive Queue while it is draining xprtrdma: Put flushed Receives on free list instead of destroying them xprtrdma: Improve locking around rpcrdma_rep destruction xprtrdma: Improve commentary around rpcrdma_reps_unmap() xprtrdma: Improve locking around rpcrdma_rep creation xprtrdma: Fix cwnd update ordering xprtrdma: Delete rpcrdma_recv_buffer_put() xprtrdma: rpcrdma_mr_pop() already does list_del_init() xprtrdma: Rename frwr_release_mr() xprtrdma: Clarify use of barrier in frwr_wc_localinv_done() xprtrdma: Do not recycle MR after FastReg/LocalInv flushes xprtrdma: Do not wake RPC consumer on a failed LocalInv xprtrdma: Avoid Send Queue wrapping xprtrdma: Add tracepoints showing FastReg WRs and remote invalidation xprtrdma: Add an rpcrdma_mr_completion_class xprtrdma: Don't display r_xprt memory addresses in tracepoints xprtrdma: Remove the RPC/RDMA QP event handler xprtrdma: Move fr_cid to struct rpcrdma_mr xprtrdma: Move cqe to struct rpcrdma_mr xprtrdma: Move fr_linv_done field to struct rpcrdma_mr xprtrdma: Move the Work Request union to struct rpcrdma_mr xprtrdma: Move fr_mr field to struct rpcrdma_mr xprtrdma: Fix a NULL dereference in frwr_unmap_sync() Dai Ngo (1): NFSv4.2: Remove ifdef CONFIG_NFSD from NFSv4.2 client SSC code. Eryu Guan (2): sunrpc: honor rpc_task's timeout value in rpcb_create() nfs: hornor timeo and retrans option when mounting NFSv3 Nagendra S Tomar (1): nfs: Subsequent READDIR calls should carry non-zero cookieverifier Nikola Livic (1): pNFS/flexfiles: fix incorrect size check in decode_nfs_fh() Olga Kornievskaia (1): NFSv4.2 fix handling of sr_eof in SEEK's reply Randy Dunlap (1): NFS: fs_context: validate UDP retrans to prevent shift out-of-bounds Trond Myklebust (47): NFSv4: Simplify nfs4_retry_setlk() SUNRPC: Set TCP_CORK until the transmit queue is empty NFS: Fix up incorrect documentation NFS: Fix handling of cookie verifier in uncached_readdir() NFS: Only change the cookie verifier if the directory page cache is empty NFS: Fix up the support for CONFIG_NFS_DISABLE_UDP_SUPPORT NFS: fix nfs_fetch_iversion() NFS: Fix fscache invalidation in nfs_set_cache_invalid() NFS: nfs4_bitmask_adjust() must not change the server global bitmasks NFS: Fix attribute bitmask in _nfs42_proc_fallocate() NFSv4.2: Always flush out writes in nfs42_proc_fallocate() NFS: Deal correctly with attribute generation counter overflow NFS: Fix up inode cache tracing NFS: Mask out unsupported attributes in nfs_getattr() NFS: NFS_INO_REVAL_PAGECACHE should mark the change attribute invalid NFS: Fix up revalidation of space used NFS: Don't revalidate attributes that are not being asked for NFS: Fix up statx() results NFS: nfs_setattr_update_inode() should clear the suid/sgid bits NFS: Add a cache validity flag argument to nfs_revalidate_inode() NFS: Replace use of NFS_INO_REVAL_PAGECACHE when checking cache validity NFS: Don't set NFS_INO_REVAL_PAGECACHE in the inode cache validity NFSv4: Fix nfs4_bitmap_copy_adjust() NFS: Separate tracking of file nlinks cache validity from the mode/uid/gid NFS: Separate tracking of file mode cache validity from the uid/gid NFS: Fix up handling of outstanding layoutcommit in nfs_update_inode() NFS: Remove a line of code that has no effect in nfs_update_inode() NFS: Simplify cache consistency in nfs_check_inode_attributes() NFSv4: Fix value of decode_fsinfo_maxsz NFSv4: Don't modify the change attribute cached in the inode NFSv4: Add support for the NFSv4.2 "change_attr_type" attribute NFS: Use information about the change attribute to optimise updates NFS: Another inode revalidation improvement NFSv4: nfs4_inc/dec_nlink_locked should also invalidate ctime NFSv4: link must update the inode nlink. NFS: Don't store NFS_INO_REVAL_FORCED NFS: Split attribute support out from the server capabilities NFSv4: Add tracing for COMPOUND errors NFSv4: Convert nfs_xdr_status tracepoint to an event class NFSv4: Catch and trace server filehandle encoding errors NFSv42: Copy offload should update the file size when appropriate NFSv42: Don't force attribute revalidation of the copy offload source NFSv4.x: Don't return NFS4ERR_NOMATCHING_LAYOUT if we're unmounting NFS: Don't discard pNFS layout segments that are marked for return NFSv4: Don't discard segments marked for return in _pnfs_return_layout() NFSv4.1: Simplify layout return in pnfs_layout_process() NFS: The 'fattr_valid' field in struct nfs_server should be unsigned int fs/Kconfig | 4 +- fs/nfs/callback_proc.c | 17 +- fs/nfs/client.c | 20 +- fs/nfs/delegation.c | 29 ++- fs/nfs/delegation.h | 3 +- fs/nfs/dir.c | 29 ++- fs/nfs/export.c | 15 +- fs/nfs/file.c | 2 +- fs/nfs/flexfilelayout/flexfilelayout.c | 2 +- fs/nfs/fs_context.c | 66 ++++-- fs/nfs/inode.c | 418 +++++++++++++++++++++------------ fs/nfs/internal.h | 2 +- fs/nfs/io.c | 2 +- fs/nfs/mount_clnt.c | 14 +- fs/nfs/nfs3acl.c | 2 +- fs/nfs/nfs3xdr.c | 5 +- fs/nfs/nfs42proc.c | 77 ++++-- fs/nfs/nfs42xattr.c | 2 +- fs/nfs/nfs4file.c | 4 - fs/nfs/nfs4proc.c | 258 +++++++++++--------- fs/nfs/nfs4state.c | 2 +- fs/nfs/nfs4trace.h | 47 +++- fs/nfs/nfs4xdr.c | 60 ++++- fs/nfs/nfstrace.c | 1 + fs/nfs/nfstrace.h | 22 +- fs/nfs/pagelist.c | 4 +- fs/nfs/pnfs.c | 11 +- fs/nfs/proc.c | 1 + fs/nfs/super.c | 6 +- fs/nfs/write.c | 7 +- fs/nfsd/Kconfig | 2 +- include/linux/nfs4.h | 9 + include/linux/nfs_fs.h | 6 +- include/linux/nfs_fs_sb.h | 13 +- include/linux/nfs_xdr.h | 13 +- include/linux/sunrpc/xprt.h | 1 + include/trace/events/rpcrdma.h | 146 ++++++------ include/trace/events/sunrpc.h | 41 +++- net/sunrpc/clnt.c | 12 +- net/sunrpc/rpcb_clnt.c | 7 +- net/sunrpc/xprt.c | 18 +- net/sunrpc/xprtrdma/backchannel.c | 4 +- net/sunrpc/xprtrdma/frwr_ops.c | 209 +++++++---------- net/sunrpc/xprtrdma/rpc_rdma.c | 39 ++- net/sunrpc/xprtrdma/transport.c | 6 +- net/sunrpc/xprtrdma/verbs.c | 131 +++++------ net/sunrpc/xprtrdma/xprt_rdma.h | 29 ++- net/sunrpc/xprtsock.c | 9 +- 48 files changed, 1112 insertions(+), 715 deletions(-)