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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id CB549D64070 for ; Fri, 8 Nov 2024 17:23:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id F19756B0088; Fri, 8 Nov 2024 12:23:27 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id EA26A6B008A; Fri, 8 Nov 2024 12:23:27 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id D1BBC6B0092; Fri, 8 Nov 2024 12:23:27 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id AEDEC6B0088 for ; Fri, 8 Nov 2024 12:23:27 -0500 (EST) Received: from smtpin12.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 3A7D6120A05 for ; Fri, 8 Nov 2024 17:23:27 +0000 (UTC) X-FDA: 82763598204.12.24EC444 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf13.hostedemail.com (Postfix) with ESMTP id 290682001C for ; Fri, 8 Nov 2024 17:22:47 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="hJdhMv/V"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf13.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731086433; a=rsa-sha256; cv=none; b=ZFgC7PPWGdmi+soS0j1Cop9jZSw+40/+oH6YEkfi4wI8G1sIEbwFwfHkIsGFS6ta68TwSr 7DzdsiL5HJ/wC/j7hJ5hDnJ1w1cAnpSPGiwBuOO2QJ8sw6pEe1pZtmma9S/WMfWNylT1JR xQnKQpzB4PVJecVlPWsw8mnI09V4vGs= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="hJdhMv/V"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf13.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1731086433; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=XwJwM3+z7apLKFV/fpUBCprrM/E8Cp6F04ODxbzFqfw=; b=hLvKFR4N6Ziky97GKoB2kOqBp5aKi2XGIM9YIfFnMl+yCakilb+CrlQ7fw75OGSf4nNBJb w0D8vr5oGpADECwwsrchiua5tmLCi7ABHh0dR5r3uHnjM+bDJJlugJsEwtvQdIDxxxMvGL 7DyWfvbsDKZa7CFJPqK6vO5hO2K/JBU= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1731086604; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XwJwM3+z7apLKFV/fpUBCprrM/E8Cp6F04ODxbzFqfw=; b=hJdhMv/VZit2cpYXn81ixGMl6gFZ3HU0VqQHbiPllNjdgvNKDeqZiGJ69pTlRwBsuiBgJ1 vXuUy21mbD1ozg2JR5IZxxWRkyurpAKVUWRA0mxZdPu3Jz0oWl/Al3FClk5TRDP4owewV9 5AyEZA3BY6vhZl40HBNEH12lyRjeW4k= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-657-jwRKCGCpNXimF2m3kjGVAg-1; Fri, 08 Nov 2024 12:23:21 -0500 X-MC-Unique: jwRKCGCpNXimF2m3kjGVAg-1 X-Mimecast-MFC-AGG-ID: jwRKCGCpNXimF2m3kjGVAg Received: from mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.17]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id E948D195F198; Fri, 8 Nov 2024 17:23:17 +0000 (UTC) Received: from warthog.procyon.org.uk (unknown [10.42.28.231]) by mx-prod-int-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 64CE21953882; Fri, 8 Nov 2024 17:23:11 +0000 (UTC) Organization: Red Hat UK Ltd. Registered Address: Red Hat UK Ltd, Amberley Place, 107-111 Peascod Street, Windsor, Berkshire, SI4 1TE, United Kingdom. Registered in England and Wales under Company Registration No. 3798903 From: David Howells In-Reply-To: <20241106123559.724888-24-dhowells@redhat.com> References: <20241106123559.724888-24-dhowells@redhat.com> <20241106123559.724888-1-dhowells@redhat.com> To: Christian Brauner , Steve French , Matthew Wilcox Cc: dhowells@redhat.com, Jeff Layton , Gao Xiang , Dominique Martinet , Marc Dionne , Paulo Alcantara , Shyam Prasad N , Tom Talpey , Eric Van Hensbergen , Ilya Dryomov , netfs@lists.linux.dev, linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, ceph-devel@vger.kernel.org, v9fs@lists.linux.dev, linux-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 23/33] afs: Use netfslib for directories MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-ID: <1360666.1731086590.1@warthog.procyon.org.uk> Content-Transfer-Encoding: quoted-printable Date: Fri, 08 Nov 2024 17:23:10 +0000 Message-ID: <1360667.1731086590@warthog.procyon.org.uk> X-Scanned-By: MIMEDefang 3.0 on 10.30.177.17 X-Stat-Signature: ik56fzh1h9nj3k6g1ksemxyzunxk83b7 X-Rspamd-Queue-Id: 290682001C X-Rspamd-Server: rspam08 X-Rspam-User: X-HE-Tag: 1731086567-875331 X-HE-Meta: U2FsdGVkX18FXr1Hxmyg9TF+bU30wNPBYbn3gijTh/RQMz9BDBm92N57XOMOykuotUjZXEbltr2eXtGrhMKwW9wu8TMdCUdJXKxgSNjDAGs1IopqLdyvisZpil5bjW1U7gHhGozeSHj2w8snFf2qps41VbDj2eTw5+3UwZJTI5s1CEAwm8iBSHChw+Bz5rFBtyWy97XFcKZqQClW++ryzuQI9VO5a+5qh3Vfh/Ln2yQtdSV3JLjSVHogfmrDPnQ6+PISQFxYbjAowYsv1mQH/rrZPZV2VUBS4GR15rtH5NFWly+a+zujaqJVZTvkr9fVLaPtjepzwZyJo5y7mXjRQStAaPBBQ3adQ7B+svPBM1gy+zBYgGjQHoqY9xO7QBWB7hJq3H1MhOp/h3fITWCqF5HTbN971JqYRDi6Ouo9sWZ/fpFKiSh3PKHcjifyuUPcjOFygkfbTR2BtmQB48J+aB2JJY6wqgXko0tr0XuQY1qm+Z+VBq8wciOnp4M9bjTzi6myLdiINLtRIoAwjFL+43vRxzKOXenoGnBZ2mAsH+aYZ1Ul57OM8lEBXUPYC6PoI5fdzVI6psrKTFcwcG7jun6DL4UNM8utDKSYlfp7bZk/IEDT5Zi0xqXTKwvNC+1dKS9zpYedVIysa5UHnoK3RqithyfBLKtWyORM5wfe0dP1jYdJCDN6O2NXJX8sXC+05IN7v2S7W7lOT1t6eaBnYM8Oui6BbVnwGB6jE/MKTQHTP4SaHtPuuewXzEtY5wMYBp6m6Qn1ZSNmMo+qDEqcDWWD7iD0Nt9ar0FjsbwFxK4Xxm5qaFEzaGLFbI/7jlf2PWIS5OIWcfQfRKLkdM9fGNdn4c/6/YPeZFE6q1Le4LDX/J3CAh39OqR5ZpZh7oaGHuViH2TfvWZkpOukNxS7pvheU/uGJPvct77fGM3runvMc0I8v7T+BqioAE9S2F4BvlaaELr5Qe5xkmRbt8j o7Yr1eIm bIkSzEbPLxHO4AqwYI2tkdUKyVdYxuAy4VnrXCIXSg8h7CvjoEGoeLdIYgC2XOEOa2sTWlqp8em6FHM39HN93EC7rZbZmzXfGQyT5tJhVK5k+cQjWdojxwAV3uvHcaDUbH0RAc27QrzfwKiFyUtqPBE7g7sNKJ9LierZUMMY8dU1x9af6KJvwXD/qSoG+qWCbStD66L8a8V+Qn/zDB6h8Vurm46gqIL+1h+mVJfxjnQAKE++SBiHTgik46HPnBligreNTBbE0f6rEB84gC5r4kXLkkrRn+YcqTrRmiGJBrfN0bf1CbZqNcCF7X3cYZeSvOzfA00N2LKaNm4VdKxtCfrEyHaCPBkQ5eFQYrqjH9HldDtdR++M8mf2BxihVX1yUBeCOQVM2xDkggt92asDyw5c/oJTbANgE6PujSbLkACimhUVVXEIYMK3vbeyqQnftITeV X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: The attached fix needs folding in across this patch (23), patch 24, patch 29 and patch 31. David --- commit 9d4429bc7bb3f2b518d6decd1ca0e99e4d80d58e Author: David Howells Date: Thu Nov 7 23:46:48 2024 +0000 afs: Fix handling of signals during readdir = When a directory is being read, whether or not the dvnode->directory b= uffer pointer is NULL is used to track whether we've checked fscache yet. However, if a signal occurs after the buffer being allocated but whils= t we're doing the read, we may end up in an invalid state with ->directo= ry set but no data in the buffer. = In this state, afs_readdir(), afs_lookup() and afs_d_revalidate() see corrupt directory contents leading to a variety of malfunctions. = Fix this by providing a specific flag to record whether or not we've performed a read yet - and, incidentally, sampled fscache - rather tha= n using the value in ->directory instead. = Signed-off-by: David Howells cc: Marc Dionne cc: linux-afs@lists.infradead.org diff --git a/fs/afs/dir.c b/fs/afs/dir.c index 663a212964d8..b6a202fd9926 100644 --- a/fs/afs/dir.c +++ b/fs/afs/dir.c @@ -323,7 +323,7 @@ ssize_t afs_read_dir(struct afs_vnode *dvnode, struct = file *file) * haven't read it yet. */ if (test_bit(AFS_VNODE_DIR_VALID, &dvnode->flags) && - dvnode->directory) { + test_bit(AFS_VNODE_DIR_READ, &dvnode->flags)) { ret =3D i_size; goto valid; } @@ -336,7 +336,7 @@ ssize_t afs_read_dir(struct afs_vnode *dvnode, struct = file *file) afs_invalidate_cache(dvnode, 0); = if (!test_bit(AFS_VNODE_DIR_VALID, &dvnode->flags) || - !dvnode->directory) { + !test_bit(AFS_VNODE_DIR_READ, &dvnode->flags)) { trace_afs_reload_dir(dvnode); ret =3D afs_read_single(dvnode, file); if (ret < 0) @@ -345,6 +345,7 @@ ssize_t afs_read_dir(struct afs_vnode *dvnode, struct = file *file) // TODO: Trim excess pages = set_bit(AFS_VNODE_DIR_VALID, &dvnode->flags); + set_bit(AFS_VNODE_DIR_READ, &dvnode->flags); } else { ret =3D i_size; } diff --git a/fs/afs/dir_edit.c b/fs/afs/dir_edit.c index f6f4b1adc8dc..60a549f1d9c5 100644 --- a/fs/afs/dir_edit.c +++ b/fs/afs/dir_edit.c @@ -644,4 +644,5 @@ void afs_mkdir_init_dir(struct afs_vnode *dvnode, stru= ct afs_vnode *parent_dvnod = netfs_single_mark_inode_dirty(&dvnode->netfs.inode); set_bit(AFS_VNODE_DIR_VALID, &dvnode->flags); + set_bit(AFS_VNODE_DIR_READ, &dvnode->flags); } diff --git a/fs/afs/inode.c b/fs/afs/inode.c index f5618564b3fc..e9538e91f848 100644 --- a/fs/afs/inode.c +++ b/fs/afs/inode.c @@ -39,6 +39,7 @@ void afs_init_new_symlink(struct afs_vnode *vnode, struc= t afs_operation *op) p =3D kmap_local_folio(folioq_folio(vnode->directory, 0), 0); memcpy(p, op->create.symlink, size); kunmap_local(p); + set_bit(AFS_VNODE_DIR_READ, &vnode->flags); netfs_single_mark_inode_dirty(&vnode->netfs.inode); } = @@ -60,12 +61,12 @@ const char *afs_get_link(struct dentry *dentry, struct= inode *inode, = if (!dentry) { /* RCU pathwalk. */ - if (!vnode->directory || !afs_check_validity(vnode)) + if (!test_bit(AFS_VNODE_DIR_READ, &vnode->flags) || !afs_check_validity= (vnode)) return ERR_PTR(-ECHILD); goto good; } = - if (!vnode->directory) + if (test_bit(AFS_VNODE_DIR_READ, &vnode->flags)) goto fetch; = ret =3D afs_validate(vnode, NULL); @@ -73,13 +74,14 @@ const char *afs_get_link(struct dentry *dentry, struct= inode *inode, return ERR_PTR(ret); = if (!test_and_clear_bit(AFS_VNODE_ZAP_DATA, &vnode->flags) && - vnode->directory) + test_bit(AFS_VNODE_DIR_READ, &vnode->flags)) goto good; = fetch: ret =3D afs_read_single(vnode, NULL); if (ret < 0) return ERR_PTR(ret); + set_bit(AFS_VNODE_DIR_READ, &vnode->flags); = good: folio =3D folioq_folio(vnode->directory, 0); diff --git a/fs/afs/internal.h b/fs/afs/internal.h index a5da0dd8e9cc..90f407774a9a 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h @@ -705,6 +705,7 @@ struct afs_vnode { #define AFS_VNODE_NEW_CONTENT 8 /* Set if file has new content (create/t= runc-0) */ #define AFS_VNODE_SILLY_DELETED 9 /* Set if file has been silly-deleted = */ #define AFS_VNODE_MODIFYING 10 /* Set if we're performing a modification= op */ +#define AFS_VNODE_DIR_READ 11 /* Set if we've read a dir's contents */ = struct folio_queue *directory; /* Directory contents */ struct list_head wb_keys; /* List of keys available for writeback */