From patchwork Wed Nov 6 12:35:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13864783 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 53FFBD44D54 for ; Wed, 6 Nov 2024 12:38:21 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id D70AA6B00AE; Wed, 6 Nov 2024 07:38:20 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id D216B6B00C2; Wed, 6 Nov 2024 07:38:20 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id B9E4B6B00C3; Wed, 6 Nov 2024 07:38:20 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 9A9946B00AE for ; Wed, 6 Nov 2024 07:38:20 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 4C5AA140135 for ; Wed, 6 Nov 2024 12:38:20 +0000 (UTC) X-FDA: 82755621438.13.7EB78BF Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf03.hostedemail.com (Postfix) with ESMTP id B7EDE20007 for ; Wed, 6 Nov 2024 12:38:02 +0000 (UTC) Authentication-Results: imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TFmIIiXb; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf03.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730896529; a=rsa-sha256; cv=none; b=icMbnenUf9U2p7aiEjP78z+ru3NoJuExZwgPdDiTWDe9CyyCpeh3qILBIn3iW5X2ae5xhn dfYFQbfSAf2uVqKtVadJPmGhrzyMmAZAgQ3DjfeVVz2PLjSx1mntoUYUHKYLYn4DlOuks5 yu67SSxhpyRBEgTfPbR654SBpapaTgk= ARC-Authentication-Results: i=1; imf03.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=TFmIIiXb; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf03.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.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=1730896529; 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=RGIXspKVB5f/ghCAUN8rweEsEMhTNYCFFeHEEbp/i0NunRRuSZ+GGib3H9wKqvTPnYAPBo h8+I+cP+H0/OLLcf3KdMat2EMAWpINF5zczTtnbgZ0/4AsHiseyhgaYIJkT5pj/afnsrL1 fk5OQeIdpd7V7J4KqE72ABQJ8eqwSQo= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730896698; 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=TFmIIiXbemdiWUSYb03gOBJtOYbzWUYctjGdgZP84XvO4QFud0J6F87PGQezEZmu3vLBkU orwkiJJWEQrlya7fSSbPDXfMcT92m6SxvIFbN6gFIx29bijEkXvASbd32ZAUfP4cEDrjmf 9Xith3VcI9Zt/Ld3N3Pf/31geC/vRGM= Received: from mx-prod-mc-02.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-604-3XojettGO-SysSahWRcLQw-1; Wed, 06 Nov 2024 07:38:14 -0500 X-MC-Unique: 3XojettGO-SysSahWRcLQw-1 X-Mimecast-MFC-AGG-ID: 3XojettGO-SysSahWRcLQw Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DEE661955F41; Wed, 6 Nov 2024 12:38:11 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.42.28.231]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 6D6A019560AA; Wed, 6 Nov 2024 12:38:06 +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 v3 16/33] netfs: Remove some extraneous directory invalidations Date: Wed, 6 Nov 2024 12:35:40 +0000 Message-ID: <20241106123559.724888-17-dhowells@redhat.com> In-Reply-To: <20241106123559.724888-1-dhowells@redhat.com> References: <20241106123559.724888-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Stat-Signature: 96c7ypw4pwrbouaj65t1gc1tgowbotmd X-Rspamd-Queue-Id: B7EDE20007 X-Rspamd-Server: rspam08 X-Rspam-User: X-HE-Tag: 1730896682-300628 X-HE-Meta: U2FsdGVkX1+eTiX/xhsslx2Vma/immZc1C2tzsocdJ666tW96JhjwzhNFpTA1fN6Eejsj6xUVYCPAu4ULj8xWYioPuyq/aardGKZJUr3f6E5zq9AbKaMfx2sX29hnRMBCMHi+rEqO6f1DhXAeVZ3ySa/e38bdnGkVOnpsrhC2aCnQin61CccO0xtvD6BapWhA1hbuP1X6SEdVaQn2wtyuTyX1K+YMQTOfiLW775g14OSKT5tHoBpekbP+DDDHBV5KKPAIdMpu5G7QsdVAJAP6Thqfpheke+poJ5YEhLc3xSA7WhSdNPup4Yx7yucjZYsTOyGZ24kOPHcGsZj+3it9A89VhKwNv20BbsdFN93uQUXbxyte/GL7KanSHYJQr+I3Bfbdt5utSGQWBNJ7bDXL4bSm/hEgo5eL6qAGKVw+nSOxWo+lSLaFLkwkup6MrIu4Kb/IdZVFLcg5680fgdQx4/aZFkDZrkIEn7YGIM7iEw5ajg5G8U2LDo/Le+ZFiWn5zRVhydXDOQkgiNV+O4gvPna0b4mlZILV8DVthHt4X1xk5yPvBNKdb3p0bfOh4lAj2dhV7KyYZYQzv96/pK7taEoDBRnVbscU1RBzb7teOoO13nAdqismVaUmEsmPtuccpM3d5pS0b1Sgw49/eF+kTdMi+JsJkGt0tRkw3t1QRrE0AWC0bqhw2FOAcyiuqz+5yumKXYyQzQhuBp5A3tlMNeXZYPx6EDJprUJ5YgTKjOsLt7dG1n8tNMRQdFKRgtx6gbzdrl/+NUFRwYkOTFX554xlMoh/e7H3ICo/Mq6kzfuEKo4+EyenZzSwexBa7dmWK+s6WDAnY9zbaEkiGYSy3CraeYhcyX+cJ7tmAFBcO57WRwBVboB4afYnBAxA9CJ28nLbwB67g0mAD4Kf+S8non312Y1ptKY3PxVPTFT54CwCI0ZdMpcE9Zb1xWgB9R3Dx73YzJ6k3NC1BHfEHU RjTwxRJW 4a8OQ63Q3vrbyQi0EP60TLerY6E31zk7g/nvt0eXHr6fYt1y8+OI6U4/doJKEXWr3jM7p3oQvYY/u7lrycgIL0v1TuDvKn0atIh1gW9CV9wqy9vPZKw95lKw0blqfwoZWMwhBkjnkCfwjkaY3K6qAFOHCQhf7s8GfmjFfrrYdqVS34LyvXbrxvqWnXLtjJqvz6CtSBn79T0EoOMqBLyx28I9k5qXwzCMnzxEVEunvuPZA91pM20FqYMsvB2/afVz0UEs5l4gx6tphTfQxOmuSXjItmXwHbBhhNdkpFzN58pTC+V7jFKkOdimfGJkEiakLCTrs6P17I+bxCBAHIm0JMzKuKnyUBGWI2o370cDjA+QzIFlLI6bIryZpOhxxbtAMdcOim6YSE74erNP1D2CWrkN3VSuH2FtdslBWmjpY/Tn9Umc9t/RD+t+PiFGjR4Ymc0gEAEyq//sMJRvi5FJfj4F/eZwyBv0onemzJ1JpxnwmXclwQiylRqn2WnOoSn6liRdvqhh0hwSeyb8= 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; }