From patchwork Thu Oct 24 14:05:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13849273 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 F16F3CE8E7A for ; Thu, 24 Oct 2024 14:08:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 820DA8D0002; Thu, 24 Oct 2024 10:08:00 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 7A9426B00BD; Thu, 24 Oct 2024 10:08:00 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5D49E8D0002; Thu, 24 Oct 2024 10:08:00 -0400 (EDT) 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 3516D6B00BC for ; Thu, 24 Oct 2024 10:08:00 -0400 (EDT) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id C00EC1A13A7 for ; Thu, 24 Oct 2024 14:07:26 +0000 (UTC) X-FDA: 82708673460.17.53A0293 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf14.hostedemail.com (Postfix) with ESMTP id 766AF100004 for ; Thu, 24 Oct 2024 14:07:37 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=HgQw4R76; spf=pass (imf14.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.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=1729778724; 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=NskRGEsCMIQoQ3V0yWzV2hAsAPU+TJd2i6tQloO9bwCiOIf2iJ9VgQe7NZqQrBn3ZelJcT V4p6oJgLCSmhuivlMOp0ZT5xXwwwmuvKYJasRFFUA4ZWnqPXrj2EHrfmowkHXJWI2yo2vb ItQCQVJpouSLSIn1vekC3QN8/qVKqz8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729778724; a=rsa-sha256; cv=none; b=YfH+fQRDskVpP1QNvDTLJP80gT3wGLP0bpr5yrVpIf1C9J8y+NDBLivFkgwAMXGi3NkV5c aTIxUreozI8bb6CU55m3W+KEnEwllcn+fda1Axgqzf016pnDz1IEk87rHeZ7fp7AFLjnEC Yo6e6Oz9D+/fJnf2DSRZ6tpuw8tJIZA= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=HgQw4R76; spf=pass (imf14.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729778877; 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=HgQw4R76byHV4By2iNBdUZwdbzo5Ray+sHSB5PZQLxHHFgsN0WBW63RrypZl9Jkxc9pNk1 B07JkQWI7+YxEJiH+O0vowJwAIRgO/OONkk3yq9iwYC4X9CtVO2CZZ6fkCrsecKdxFrrQg BaM4dj6EH0RL2hKNMk9BhX08vFmpof0= 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-127-X2salaQqORGe0htRiH1TeQ-1; Thu, 24 Oct 2024 10:07:53 -0400 X-MC-Unique: X2salaQqORGe0htRiH1TeQ-1 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 831B21955EAA; Thu, 24 Oct 2024 14:07:49 +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 C92C3196BB7D; Thu, 24 Oct 2024 14:07:43 +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 15/27] netfs: Remove some extraneous directory invalidations Date: Thu, 24 Oct 2024 15:05:13 +0100 Message-ID: <20241024140539.3828093-16-dhowells@redhat.com> In-Reply-To: <20241024140539.3828093-1-dhowells@redhat.com> References: <20241024140539.3828093-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 766AF100004 X-Stat-Signature: y66j3795xgfa1boyt1dnkxkcwbj6pejn X-HE-Tag: 1729778857-878483 X-HE-Meta: U2FsdGVkX1/s0m8AO0GHn/mufUMJGSiCRwhEaYSLqF/vi6jmIso1UNPNQxmBLjx6E6DGBlDDaZcHoGzlX9GQUpiEtplxPJzA4P4we+aQddSJ1MSnrXZDDaKGxLIJ/qvK0F24DrCmIGGbC4lPWBjd+N4Dz+RlU+NHfKbQDG2zuN3OI2LdWUqC5BEqBH2RC+igYzap0gTvmSRlgDtlFxIYOiMmNhjh+9ptCvQ/wjnu2ct7/+kKcmsFon/fegd0IdXCpbIBA3T79bhWbPPBeDaOQfKHUIMC2Rk1JbTbaP1jc5AXG6ep2nmp0IafGC/A1+n64ONT24PN+W59Dcms4I5NRrpypRFHR12vfrUZWFsSxQzwzBsgggE9ra8cLIlgFVvo89IXVuuOcevetRuxYA4osgl4fsIVX0N1C6TD2hJTD56xUdtEjq5oAdRpjtE9bIIkPct3L1F+RfPUReS5aVe8xHqv31TgL7qATeOCLpe+x4aXG1yqsIcFsr+krjMV1SYy/GvqpTs/cTBRvt2njkPs+tV82LezMUMnrI2+9SrFCI/KsMYkc54QFSoWTBbY/FWMKvBbatW2n79QdKhM+11XLIOi7dk9/3rulMbDw3RGTNdtxqlFUzYJdbzY3GQMO/CpnqYjLX/YjKZy8a623GdUMJ4D51wcWbb9e+rIxNyvVUH3YTfHmDquhcv+H/P261rzT/I4SlQjlIh1+LuZJaPPXbpAzTuwc4W8EUtGcDsVPHi7011oyw6sin/yL0DXr/ngxzNKraQnGvxx4p72yKYXhrtNN0ogL2XPz5yiiD3GGzr66DV5wgSnfYL4ocfgVoSl8hIGmjKqwcOFRaKKdtR0iyQuWTlK8SIDIHomCJNIkAw3siwfaI7CsdEo7kelAMu8N42kn2u6rs0PHZkljAFY6Ll8CmqP66XUko8Tprr29stOQV82FC5RSUxPVA+Qzlsw4TgHWRHmLNGAv0mbD44 jaQp896X kO6c7BNN7uZqVoBiCCmpgMSt7z3DcaO2D8hLJuYvVRLsRcmY1y8C6cKUs3LYIVVxoYOQvyo6sFEk8aY8B3kgwOe/+7taugoi+2JRvCOhb7y6Vl/8Rdqb0QIs3chZiPjgPknliM7+v8YY1ZNPUBPlyvgDlnpwn09zEO7WofdPdeqkK9d6tJhXH+Jj3M92jvZvLGUXi7QsAhdcpOuG7ASVj9gB5CYthCbMSDc+MVtKQO9czfo5GkNAvPo7Jh7t2Hc5mCneGr0rX4x/D/lkIiWRq48s5bn8N8DJpuSILOvCM7H5cEgv9ZgNoPURtlzYd9cj50swclHtH742nKJpRmpSvM8DUovVNxy1jhzh7F9QgpXZQri/KBRSlT/5T5pWcDdqZBAZnhT3vhp7zlW1yx96TCmOg3wai3A5mcdp59xghu2Vw8Z3XdR3cPb5ehwOC1AeKZhI/ 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; }