From patchwork Fri Oct 25 20:39:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13851568 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 57F6CD149F2 for ; Fri, 25 Oct 2024 20:42:12 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E28C36B00AE; Fri, 25 Oct 2024 16:42:11 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id DB1E86B00AF; Fri, 25 Oct 2024 16:42:11 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C52546B00B0; Fri, 25 Oct 2024 16:42:11 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id A386F6B00AE for ; Fri, 25 Oct 2024 16:42:11 -0400 (EDT) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 982BD41009 for ; Fri, 25 Oct 2024 20:42:00 +0000 (UTC) X-FDA: 82713295896.13.83ABAAF Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf11.hostedemail.com (Postfix) with ESMTP id 5278240027 for ; Fri, 25 Oct 2024 20:41:45 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=er2CgjVd; spf=pass (imf11.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729888723; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=PpSYjRYWbFXxWDdh6eO8irNXCJzGx0/SlE83d2O2JK0=; b=ZDyX1pHVFx9IV8abJuQyevlOsGONGwyG+vfHGHehlBWiGZq58/iiEFZZFsbn77yIIs9aXw fAzfNwCKB8/fOqBoFOsEOkaf49sPjGECGtYqU22m6oIwisE+OXt5PNocePnzAmWWtnSrOk zq4N5dtDsZfLV3lXsVvrYr1XWrOUtHo= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=er2CgjVd; spf=pass (imf11.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729888723; a=rsa-sha256; cv=none; b=pd5/Q4ui46apABh5+wrF0e6pxs0RzVrHOSLmGSBYY4mfgMJEsHDX7Z8P4r+pTb2iRWsHNR f8qdJNyu1pE/KvbmZ0WXRmua8pMbZ5tgtRkn4Te3AsHR3owP6UpDb3qLYWP45yK2eD+KQh OUCkPFjkCLAUYry027CvAh62rkk70Zw= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729888929; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=PpSYjRYWbFXxWDdh6eO8irNXCJzGx0/SlE83d2O2JK0=; b=er2CgjVdickOr4DSxb+UeYlR67kPtm24VebnxxWRrU4jn7o8xhmj6UMpRLosRYUzBA0vR+ WEj13gtAGxtJWwfTXCWirqM034SQLcckA3xHCa2yDuI8X83zQea1ueXrjeKBrge6IM1QK3 +/Utopdk+MY5INWwsBGMCENqj6N3TiQ= 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-594-7APQz8RuOqaEYTPIQAnFpw-1; Fri, 25 Oct 2024 16:42:03 -0400 X-MC-Unique: 7APQz8RuOqaEYTPIQAnFpw-1 Received: from mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.4]) (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 9CC691956077; Fri, 25 Oct 2024 20:42:00 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.42.28.231]) by mx-prod-int-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id AB2EE300018D; Fri, 25 Oct 2024 20:41:55 +0000 (UTC) From: David Howells To: Christian Brauner , Steve French , Matthew Wilcox Cc: David Howells , 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: [PATCH v2 15/31] netfs: Remove some extraneous directory invalidations Date: Fri, 25 Oct 2024 21:39:42 +0100 Message-ID: <20241025204008.4076565-16-dhowells@redhat.com> In-Reply-To: <20241025204008.4076565-1-dhowells@redhat.com> References: <20241025204008.4076565-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 5278240027 X-Stat-Signature: tkqesk6pwwb4qck68coejn6gdisp75ax X-Rspam-User: X-HE-Tag: 1729888905-865720 X-HE-Meta: U2FsdGVkX19zBj7/0Qiz1nw0mU4Z4Vk7yGgeyKwVn2L0Mq8CkBeIEd+vKfQvzM04xc6o+joj0nRgOrsl9JbMY25Kbtuhqx2fSjKKpGhoV+f/k2PpSatLBoLmtEIA4MAlVJY1h8ivH+GVNfk+ub+1qFYHHpO0Z0VGJQucgd6jkECBURnWLC65iPi5SR+D4+62rXDptLMGFsvKw1uxGlmDUa5SR6yZhQ0KrBFKnQfEgKtdMsJMZWJAxDtTwuFjf77xiOxmtVKuiIACWir0Q2Fq+aKYk0+ygFZQtJmEl3gZcWhlxsCghx134jOS3XGBDry4m6Aj42JrA8vA2QR+lCKnlQEZivi3Vtj9cOZYD+IG52HvVGLqUm2+lb7UTzJjYi8Oe9RSfcB6bugFZlUdQggFMdEeA9Sn+yOYvD1O5LRNjPuIT/odZpD/cUoPfNOGZzW5wdqZcH+sJ4Lxd3iBAecSl3JrumEJZFrlCcMgBWVwN+oq3KGpBZlUsiz+yS28Fh/8w1cjc3aznsWgRkWPnSv+s4JtA7nUcEO7gmajPl4tUNsq/fcF0Bz+UbVoh71JDCySWeL/lDcmi9xq43CqCjo+Kv0sb8DNacPto77RqJSlglFRp+9KvzG5ojroRZZMWhc3r32ZlaByTCt3jLjLJmeQIbR+p8NA222WdupJBDqopYbty4ywWxgtdKeR41tjdsDSfFrPtGpAfcQxhqgSZlRM2QhEAaO8N+2aYCG0+iuJ5PtZ8DzEumvKlIajaBRY5luZErBHbhYulZKBPlK95eTPr2u9dSg3LoV5SbQ4s00nDMHs2jaZx/rbL1nGSD7eKu9IbMMGV7VIv7AQqJzN6+DsEN9f6v+ZzYbrBsYdzdFn0mtxQlZVhLdLMhG3yW1xDaBLyMOtPqs+Xm/OQmHlWz4NKuaD2u80TTWWMDjG5FRzl7lFau/T56kpM4XY4yE4Rqln3fgP9mH7j4nltF4BZbk 2D0Ub6YC 7f5I0JOOtGesF1H+e2vXpGs1dUniJ7skmSm1LUUFM5hOtHpflDOPStapbzDnfSEG90IKBiPyoFLmz91dS9gwOvdhSdZItlrxqNKVdYqc+mwCOTpJESTjxBI5NNORonGDCOrWnMpoazqKRd1rQBWvBVfJwTf3C6HK6gO6O8LV+DTr0zRRQGlbODCtl88JTuS1FqYmNT7bVfiFakefAdulkLoONon7FiKXFvhwlMR0OgesgQSWpQV6qJtf+nTGJbm8rFY3SirEhypfSn51MzHgdwYg0kDZmmAwEPyERMePSOUVU9vzydz2nSopDjgBAa9hB2dViUYY3LRVbdaUXVcDEeITPybmNAMx9JqMVqEx/WP0nOZAOGoWUU68kGZ+s3pVnZheDwGnd4HoVZP9sU572s9+GQkYxVzyUperMPieieXVOFotuPPR9lxxPGxYNtLqvYFLh 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: In the directory editing code, we shouldn't re-invalidate the directory if it is already invalidated. Signed-off-by: David Howells cc: Marc Dionne cc: linux-afs@lists.infradead.org --- fs/afs/dir_edit.c | 22 +++++++++------------- 1 file changed, 9 insertions(+), 13 deletions(-) diff --git a/fs/afs/dir_edit.c b/fs/afs/dir_edit.c index fe223fb78111..13fb236a3f50 100644 --- a/fs/afs/dir_edit.c +++ b/fs/afs/dir_edit.c @@ -247,7 +247,7 @@ void afs_edit_dir_add(struct afs_vnode *vnode, */ index = b / AFS_DIR_BLOCKS_PER_PAGE; if (nr_blocks >= AFS_DIR_MAX_BLOCKS) - goto error; + goto error_too_many_blocks; if (index >= folio_nr_pages(folio0)) { folio = afs_dir_get_folio(vnode, index); if (!folio) @@ -260,7 +260,7 @@ void afs_edit_dir_add(struct afs_vnode *vnode, /* Abandon the edit if we got a callback break. */ if (!test_bit(AFS_VNODE_DIR_VALID, &vnode->flags)) - goto invalidated; + goto already_invalidated; _debug("block %u: %2u %3u %u", b, @@ -348,9 +348,8 @@ void afs_edit_dir_add(struct afs_vnode *vnode, _leave(""); return; -invalidated: +already_invalidated: trace_afs_edit_dir(vnode, why, afs_edit_dir_create_inval, 0, 0, 0, 0, name->name); - clear_bit(AFS_VNODE_DIR_VALID, &vnode->flags); kunmap_local(block); if (folio != folio0) { folio_unlock(folio); @@ -358,9 +357,10 @@ void afs_edit_dir_add(struct afs_vnode *vnode, } goto out_unmap; +error_too_many_blocks: + clear_bit(AFS_VNODE_DIR_VALID, &vnode->flags); error: trace_afs_edit_dir(vnode, why, afs_edit_dir_create_error, 0, 0, 0, 0, name->name); - clear_bit(AFS_VNODE_DIR_VALID, &vnode->flags); goto out_unmap; } @@ -421,7 +421,7 @@ void afs_edit_dir_remove(struct afs_vnode *vnode, /* Abandon the edit if we got a callback break. */ if (!test_bit(AFS_VNODE_DIR_VALID, &vnode->flags)) - goto invalidated; + goto already_invalidated; if (b > AFS_DIR_BLOCKS_WITH_CTR || meta->meta.alloc_ctrs[b] <= AFS_DIR_SLOTS_PER_BLOCK - 1 - need_slots) { @@ -475,10 +475,9 @@ void afs_edit_dir_remove(struct afs_vnode *vnode, _leave(""); return; -invalidated: +already_invalidated: trace_afs_edit_dir(vnode, why, afs_edit_dir_delete_inval, 0, 0, 0, 0, name->name); - clear_bit(AFS_VNODE_DIR_VALID, &vnode->flags); kunmap_local(block); if (folio != folio0) { folio_unlock(folio); @@ -489,7 +488,6 @@ void afs_edit_dir_remove(struct afs_vnode *vnode, error: trace_afs_edit_dir(vnode, why, afs_edit_dir_delete_error, 0, 0, 0, 0, name->name); - clear_bit(AFS_VNODE_DIR_VALID, &vnode->flags); goto out_unmap; } @@ -530,7 +528,7 @@ void afs_edit_dir_update_dotdot(struct afs_vnode *vnode, struct afs_vnode *new_d /* Abandon the edit if we got a callback break. */ if (!test_bit(AFS_VNODE_DIR_VALID, &vnode->flags)) - goto invalidated; + goto already_invalidated; slot = afs_dir_scan_block(block, &dotdot_name, b); if (slot >= 0) @@ -564,18 +562,16 @@ void afs_edit_dir_update_dotdot(struct afs_vnode *vnode, struct afs_vnode *new_d _leave(""); return; -invalidated: +already_invalidated: kunmap_local(block); folio_unlock(folio); folio_put(folio); trace_afs_edit_dir(vnode, why, afs_edit_dir_update_inval, 0, 0, 0, 0, ".."); - clear_bit(AFS_VNODE_DIR_VALID, &vnode->flags); goto out; error: trace_afs_edit_dir(vnode, why, afs_edit_dir_update_error, 0, 0, 0, 0, ".."); - clear_bit(AFS_VNODE_DIR_VALID, &vnode->flags); goto out; }