Received-SPF: pass (google.com: domain of linux-kernel+bounces-29143-linux.lists.archive=gmail.com@vger.kernel.org designates 147.75.80.249 as permitted sender) client-ip=147.75.80.249;
Date: Wed, 17 Jan 2024 10:12:30 -0500
From: Chuck Lever <chuck.lever@oracle.com>
To: Jeff Layton <jlayton@kernel.org>
Cc: Christian Brauner <brauner@kernel.org>,
        Alexander Viro <viro@zeniv.linux.org.uk>,
        Eric Van Hensbergen <ericvh@kernel.org>,
        Latchesar Ionkov <lucho@ionkov.net>,
        Dominique Martinet <asmadeus@codewreck.org>,
        Christian Schoenebeck <linux_oss@crudebyte.com>,
        David Howells <dhowells@redhat.com>,
        Marc Dionne <marc.dionne@auristor.com>, Xiubo Li <xiubli@redhat.com>,
        Ilya Dryomov <idryomov@gmail.com>,
        Alexander Aring <aahringo@redhat.com>,
        David Teigland <teigland@redhat.com>,
        Miklos Szeredi <miklos@szeredi.hu>,
        Andreas Gruenbacher <agruenba@redhat.com>,
        Trond Myklebust <trond.myklebust@hammerspace.com>,
        Anna Schumaker <anna@kernel.org>, Neil Brown <neilb@suse.de>,
        Olga Kornievskaia <kolga@netapp.com>, Dai Ngo <Dai.Ngo@oracle.com>,
        Tom Talpey <tom@talpey.com>, Jan Kara <jack@suse.cz>,
        Mark Fasheh <mark@fasheh.com>, Joel Becker <jlbec@evilplan.org>,
        Joseph Qi <joseph.qi@linux.alibaba.com>,
        Steve French <sfrench@samba.org>, Paulo Alcantara <pc@manguebit.com>,
        Ronnie Sahlberg <lsahlber@redhat.com>,
        Shyam Prasad N <sprasad@microsoft.com>,
        Namjae Jeon <linkinjeon@kernel.org>,
        Sergey Senozhatsky <senozhatsky@chromium.org>,
        Steven Rostedt <rostedt@goodmis.org>,
        Masami Hiramatsu <mhiramat@kernel.org>,
        Mathieu Desnoyers <mathieu.desnoyers@efficios.com>,
        linux-kernel@vger.kernel.org, v9fs@lists.linux.dev,
        linux-afs@lists.infradead.org, ceph-devel@vger.kernel.org,
        gfs2@lists.linux.dev, linux-fsdevel@vger.kernel.org,
        linux-nfs@vger.kernel.org, ocfs2-devel@lists.linux.dev,
        linux-cifs@vger.kernel.org, samba-technical@lists.samba.org,
        linux-trace-kernel@vger.kernel.org
Subject: Re: [PATCH 00/20] filelock: split struct file_lock into file_lock
 and file_lease structs
Message-ID: <ZafuXpR4Y8Y6HFFl@tissot.1015granger.net>
References: <20240116-flsplit-v1-0-c9d0f4370a5d@kernel.org>
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20240116-flsplit-v1-0-c9d0f4370a5d@kernel.org>
Precedence: bulk
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: 
	=?us-ascii?Q?L3f/jSU5YcAtUCmD7cE9EfYHQslwHkwiMCHYot9QE9IpFYTzcvNnRO85yIJc?=
 =?us-ascii?Q?pG0Z5YwmF48WxyU2GnFvDRu6gHfLXgcIrjHithF+bVWR8nBQ9ggOJAgN3Stz?=
 =?us-ascii?Q?CauLcuqnUgh5JERaOppfM7DBqJDY8NjGyfoJQShMM06vhBBOgHMB/qJDdSNT?=
 =?us-ascii?Q?s5AoKkwmYVACkzLAfccImf9AztWqHAK08afUjk6eWtds6515Bu1sPIVPxeEg?=
 =?us-ascii?Q?BxcJOFxlBxkwp9G8SnLXReiGu9M3GvWvgETNXKGLYiI7ax/dzyW6oti835+9?=
 =?us-ascii?Q?b0SiAjF+ejfVhfKdFIoIsi5Xx87JoQcbBn+uJJaXHDszhaSrgo6dI/nuRCB/?=
 =?us-ascii?Q?KEMIWTtvak6TkCq9dGflD+mw/ZUEwkaTASkegqc4mnFog5BYp7UZombSXN6M?=
 =?us-ascii?Q?1EXteUdfaLOoaCpjCqlFGX0X33V3+B3emZSXR6Ivkkjkb8pzlrieRR9KeGRY?=
 =?us-ascii?Q?bVunV5eujgvNaxnzxjLNKqGRYInarrdYWY0/pwYUoPQm9ihOyFd1d8l/Ften?=
 =?us-ascii?Q?Ww2O6rVCRQBMJHQNF6wObXvcUN8OQBbUMT8z7JdyHm3cGh7HgKvamXnEoaph?=
 =?us-ascii?Q?3IttTzmHqTQ79N8KoyZRvRx+FScLxoFzDxVmn2JLw/C93rZYTlzYk+3PbDGq?=
 =?us-ascii?Q?LrY//ihxMldZO9g/BuMA+sxkgHWlZSdADaqptIbCsp1SjiW3D1lU7fz7iAs6?=
 =?us-ascii?Q?3COVwwTxHMRNngrZ8a10e/4wlCbjriWpbMZrV56t1X6ioCm/UR6RaVVAwrD+?=
 =?us-ascii?Q?M7S1ITnHQAoMSddM2UgWL+UZZMFQGw1EpJevcgLLNTDJ8DMrsImRkVPtI3br?=
 =?us-ascii?Q?/4B1rEqIgUwJ3Ela2Q5xpx2T0zQXPvDG2hpVCremR1+1E8vndFFTIrL84/Zh?=
 =?us-ascii?Q?CjVLX6/eK+P0Zsvtdd4k2m7/KJOPctFoBKEf0IqFcUyyo5QzG2Gl2KcakJ8O?=
 =?us-ascii?Q?WvEMNDgJKKxftaRo2xLYSgaJWVEsJXvoXrehP5kddQial/gyop75FzX1QmEt?=
 =?us-ascii?Q?sOo+czOu3PoOaQ9AOxBXNfrgv/cFEPOVtqi55rD5D5cXu7vAliGOSaJ4xfts?=
 =?us-ascii?Q?B+IyYM7MzWa2Y3H/xvY9sF1cPCnGoOJx5IjqLD/yDliUtvI7A1k6eia7jwup?=
 =?us-ascii?Q?Dj4qsZKGu0Vbq3Ur9JiNp6bnm+AI134PqDwBJjCMEtOVIhGVdxYzG8bN4jWi?=
 =?us-ascii?Q?VmmwCyaGD11Wg0iqlpgsq2nSUNtbKfd8Uj4rPm3Vv+bwwX/U9BYgG8Yq6HtY?=
 =?us-ascii?Q?/nAqYQ+L2Q3kbiCiW3CDhax5M1Le2HKaYOhmUYb4pwimbtic7evP+NbpS1Iy?=
 =?us-ascii?Q?LE+5CcPPF3PrZgpJhXquB1M5THqGZvauEFvmkhHBVC4HeSxSkkIpQ87W7PcO?=
 =?us-ascii?Q?vSqf6Ko0Spqcj7TC/S7kAS81B1VMKYL/awf0xAb+tvwJrTXIDRrHcftaxaca?=
 =?us-ascii?Q?fiX1kNxqeAObkpCnd6CKir5c2sR/ACyUZPwiNrJytapZkYCq3ZtBVxylPGER?=
 =?us-ascii?Q?0M2Lzf9RpI4iLiql5zAgoOYlJ6qbQrStg4VOgzR8fhuDilnkR2DsFoI8XXKC?=
 =?us-ascii?Q?RLRsJUuUtuFMuHESrFwEAiN3XtbR00VDGUrgms+L2B4N6TqSfdo001r24JKv?=
 =?us-ascii?Q?AQ=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: 
	1WYn3GS/LDrgUiFWJ8+qHlxNSRbJg0Iw6xwoICCCTfg7n7oeBPzHNnEG+aP7lC36te213Zz6rp/HMsVqFLr1BQJU6EZjhd0ciyu5JG/WRjeQ61emlmSoD59i0yqCGQShfqTJXoWHp+353eiyx+bufJdnP7d1Bmb9VA1BsQfpdgnfNCdGHoiC5B1wDoJ1EluDGiRwciiQRAT2QPOfHvGzE4Edx6NBTdr9jTrTGqrSKfRRP6v9QSCHVvG9TUtOWwrU80vAwNbmf78+upUY/hoxfzoJWPI7AiEXTVZJKWd45j4HcSljnkaO2gHz6E4kzl8GG6DDolAeeOrxw/ekTJduoixZe8QB7+6jyFJnwaQl0AO00KyA8k2JCWOpfxB7gPeR0a+Kx9KjAOHTHAgxf2IgpDSEHaAhzGtzngQe4yTxVacEWEF02DUxBNP8CuR02IVUCKvA7lVVT8K2duiB1Zrbsc3NkP1dyzk3DhAc2CDOKPamilxfg0T+c0vYxxVzb7vTgfV+CFTI7x1ELYfSbroQqZM58OQEp1InzGmx0Td3CpIrHX2y64O65uSBbqCsmUaPPsdkFRuW2ph0fJJHvvScbPUfM1nM3kFump7RSyd2SEM=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 50511efe-a713-4dae-11e3-08dc176ebc2e
X-MS-Exchange-CrossTenant-AuthSource: BN0PR10MB5128.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Jan 2024 15:12:35.1950
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: Tb2XCpCuEsSKiiAA2e1SMYOmNAFP6HiuwukHSWFThrRyVnyERAzU/ZXb2AoHc/K+jFIi3+tmqAcSXa3gt/7BGQ==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA1PR10MB5899
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.272,Aquarius:18.0.997,Hydra:6.0.619,FMLib:17.11.176.26
 definitions=2024-01-17_08,2024-01-17_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 mlxscore=0 suspectscore=0 bulkscore=0
 spamscore=0 mlxlogscore=999 phishscore=0 malwarescore=0 adultscore=0
 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311290000
 definitions=main-2401170110
X-Proofpoint-GUID: 087vxukcvrOgit3Ek01Al633oscSpxJB
X-Proofpoint-ORIG-GUID: 087vxukcvrOgit3Ek01Al633oscSpxJB

On Tue, Jan 16, 2024 at 02:45:56PM -0500, Jeff Layton wrote:
> Long ago, file locks used to hang off of a singly-linked list in struct
> inode. Because of this, when leases were added, they were added to the
> same list and so they had to be tracked using the same sort of
> structure.
> 
> Several years ago, we added struct file_lock_context, which allowed us
> to use separate lists to track different types of file locks. Given
> that, leases no longer need to be tracked using struct file_lock.
> 
> That said, a lot of the underlying infrastructure _is_ the same between
> file leases and locks, so we can't completely separate everything.

Naive question: locks and leases are similar. Why do they need to be
split apart? The cover letter doesn't address that, and I'm new
enough at this that I don't have that context.


> This patchset first splits a group of fields used by both file locks and
> leases into a new struct file_lock_core, that is then embedded in struct
> file_lock. Coccinelle was then used to convert a lot of the callers to
> deal with the move, with the remaining 25% or so converted by hand.
> 
> It then converts several internal functions in fs/locks.c to work
> with struct file_lock_core. Lastly, struct file_lock is split into
> struct file_lock and file_lease, and the lease-related APIs converted to
> take struct file_lease.
> 
> After the first few patches (which I left split up for easier review),
> the set should be bisectable. I'll plan to squash the first few
> together to make sure the resulting set is bisectable before merge.
> 
> Finally, I left the coccinelle scripts I used in tree. I had heard it
> was preferable to merge those along with the patches that they
> generate, but I wasn't sure where they go. I can either move those to a
> more appropriate location or we can just drop that commit if it's not
> needed.
> 
> I'd like to have this considered for inclusion in v6.9. Christian, would
> you be amenable to shepherding this into mainline (assuming there are no
> major objections, of course)?
> 
> Signed-off-by: Jeff Layton <jlayton@kernel.org>
> ---
> Jeff Layton (20):
>       filelock: split common fields into struct file_lock_core
>       filelock: add coccinelle scripts to move fields to struct file_lock_core
>       filelock: the results of the coccinelle conversion
>       filelock: fixups after the coccinelle changes
>       filelock: convert some internal functions to use file_lock_core instead
>       filelock: convert more internal functions to use file_lock_core
>       filelock: make posix_same_owner take file_lock_core pointers
>       filelock: convert posix_owner_key to take file_lock_core arg
>       filelock: make locks_{insert,delete}_global_locks take file_lock_core arg
>       filelock: convert locks_{insert,delete}_global_blocked
>       filelock: convert the IS_* macros to take file_lock_core
>       filelock: make __locks_delete_block and __locks_wake_up_blocks take file_lock_core
>       filelock: convert __locks_insert_block, conflict and deadlock checks to use file_lock_core
>       filelock: convert fl_blocker to file_lock_core
>       filelock: clean up locks_delete_block internals
>       filelock: reorganize locks_delete_block and __locks_insert_block
>       filelock: make assign_type helper take a file_lock_core pointer
>       filelock: convert locks_wake_up_blocks to take a file_lock_core pointer
>       filelock: convert locks_insert_lock_ctx and locks_delete_lock_ctx
>       filelock: split leases out of struct file_lock
> 
>  cocci/filelock.cocci            |  81 +++++
>  cocci/filelock2.cocci           |   6 +
>  cocci/nlm.cocci                 |  81 +++++
>  fs/9p/vfs_file.c                |  38 +-
>  fs/afs/flock.c                  |  55 +--
>  fs/ceph/locks.c                 |  74 ++--
>  fs/dlm/plock.c                  |  44 +--
>  fs/fuse/file.c                  |  14 +-
>  fs/gfs2/file.c                  |  16 +-
>  fs/libfs.c                      |   2 +-
>  fs/lockd/clnt4xdr.c             |  14 +-
>  fs/lockd/clntlock.c             |   2 +-
>  fs/lockd/clntproc.c             |  60 +--
>  fs/lockd/clntxdr.c              |  14 +-
>  fs/lockd/svc4proc.c             |  10 +-
>  fs/lockd/svclock.c              |  64 ++--
>  fs/lockd/svcproc.c              |  10 +-
>  fs/lockd/svcsubs.c              |  24 +-
>  fs/lockd/xdr.c                  |  14 +-
>  fs/lockd/xdr4.c                 |  14 +-
>  fs/locks.c                      | 785 ++++++++++++++++++++++------------------
>  fs/nfs/delegation.c             |   4 +-
>  fs/nfs/file.c                   |  22 +-
>  fs/nfs/nfs3proc.c               |   2 +-
>  fs/nfs/nfs4_fs.h                |   2 +-
>  fs/nfs/nfs4file.c               |   2 +-
>  fs/nfs/nfs4proc.c               |  39 +-
>  fs/nfs/nfs4state.c              |   6 +-
>  fs/nfs/nfs4trace.h              |   4 +-
>  fs/nfs/nfs4xdr.c                |   8 +-
>  fs/nfs/write.c                  |   8 +-
>  fs/nfsd/filecache.c             |   4 +-
>  fs/nfsd/nfs4callback.c          |   2 +-
>  fs/nfsd/nfs4layouts.c           |  34 +-
>  fs/nfsd/nfs4state.c             |  98 ++---
>  fs/ocfs2/locks.c                |  12 +-
>  fs/ocfs2/stack_user.c           |   2 +-
>  fs/smb/client/cifsfs.c          |   2 +-
>  fs/smb/client/cifssmb.c         |   8 +-
>  fs/smb/client/file.c            |  74 ++--
>  fs/smb/client/smb2file.c        |   2 +-
>  fs/smb/server/smb2pdu.c         |  44 +--
>  fs/smb/server/vfs.c             |  14 +-
>  include/linux/filelock.h        |  58 ++-
>  include/linux/fs.h              |   5 +-
>  include/linux/lockd/lockd.h     |   8 +-
>  include/trace/events/afs.h      |   4 +-
>  include/trace/events/filelock.h |  54 +--
>  48 files changed, 1119 insertions(+), 825 deletions(-)
> ---
> base-commit: 052d534373b7ed33712a63d5e17b2b6cdbce84fd
> change-id: 20240116-flsplit-bdb46824db68
> 
> Best regards,
> -- 
> Jeff Layton <jlayton@kernel.org>
> 

-- 
Chuck Lever