From patchwork Fri Nov 8 17:32:04 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13868561 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 6AAE6D64073 for ; Fri, 8 Nov 2024 17:33:17 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7A6D46B009B; Fri, 8 Nov 2024 12:33:15 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 70FCA6B00A0; Fri, 8 Nov 2024 12:33:15 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 423A26B009D; Fri, 8 Nov 2024 12:33:15 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id 1CB276B009C for ; Fri, 8 Nov 2024 12:33:15 -0500 (EST) Received: from smtpin04.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id BA46D1A0EB0 for ; Fri, 8 Nov 2024 17:33:14 +0000 (UTC) X-FDA: 82763623194.04.2721A34 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf22.hostedemail.com (Postfix) with ESMTP id 07C1AC0018 for ; Fri, 8 Nov 2024 17:32:26 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CMlkRisx; spf=pass (imf22.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=1731087141; 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=TRktXy0njOtGduc146rNPLaeznRZ8wjmjmNrqe7WMw8=; b=VBXLCkqnAjxmiIns0yKZ5qIzeu4Pcqg3P8kFD8LtBkWBU3ynApNTejNy66X8B2ijbmJ8QG 6mTpGB3XkiDNFsdHmNf5bJOkmNQfgj+3Yh74eGGl5uFBEdZeU7rXFJkC6MlF87ywoFsr+o w7gn3rudhkFvku85sXUKHjMvYeDRt5s= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1731087141; a=rsa-sha256; cv=none; b=MBHTGmcXLgzLapANMwMePPWcsqhVcWAPazM8NCQwV7j5r0sOgM036G0L8VvdjR1VghkxiN Bc8nvRPowryjRHXNkup+W0/L3IqynpjWUiAGmpK9EWaJX5sy+dsH+i8JKELUltPHi+US6t Wk3xBSh9uAR9P82DcX0zILbKjmGLlgA= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=CMlkRisx; spf=pass (imf22.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=1731087192; 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=TRktXy0njOtGduc146rNPLaeznRZ8wjmjmNrqe7WMw8=; b=CMlkRisxSv8Yp9/DWq3Q1/DdUQdzfgQeuMLwR0f0L1Sj6aYCtFKcBMzXj/MZS8rNPfpyHG IOOoSLn53BpWatW8wRlec7CpKb8vvOESazLeixg/es7K9GImzj5dxajQuQzwpsY8Id7JY9 s7hm2O7lE7UFM8SZkGqzAcL7522Juxw= 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-43-uCukTaVKP9aVL2dtzxjKJg-1; Fri, 08 Nov 2024 12:33:11 -0500 X-MC-Unique: uCukTaVKP9aVL2dtzxjKJg-1 X-Mimecast-MFC-AGG-ID: uCukTaVKP9aVL2dtzxjKJg 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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4876819540F1; Fri, 8 Nov 2024 17:33:08 +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 7704E300019E; Fri, 8 Nov 2024 17:33:02 +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, Christian Brauner Subject: [PATCH v4 03/33] netfs: Fix a few minor bugs in netfs_page_mkwrite() Date: Fri, 8 Nov 2024 17:32:04 +0000 Message-ID: <20241108173236.1382366-4-dhowells@redhat.com> In-Reply-To: <20241108173236.1382366-1-dhowells@redhat.com> References: <20241108173236.1382366-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.4 X-Stat-Signature: s7jjeya4jaztsiwcpg69arpokmixc4by X-Rspam-User: X-Rspamd-Queue-Id: 07C1AC0018 X-Rspamd-Server: rspam02 X-HE-Tag: 1731087146-338638 X-HE-Meta: U2FsdGVkX1/KuacbnlCXflqZjLVTFou5tqnwP8tRh/JidzXgAXYrqJyoek+fivLXobxjCITz7uuoFIasX0I2twG3Cqk48jM4JjsfjQBPLSSQsN0wPc/PFfEYdpXRU0tIDOQkkcuF63Z9j1Bdbz/cAWXousUakAg9EKY5ECQIJkg2UkzscGzzSBVXbWURK53ybnx0zYGemreLV8iTD/IvAJrVr4n7mP6+mRN/86/NCeiojhr13M7XApqztoX+qNu/id8zNQIVfRdnzS+hY6sQU5fnZMgv+CJOPedXhpSMvt9jbDg2mQMeOrrOfxOdJnSpmZECV8zKwFcIYHQ9og88z9rO4HYdXAo/Fcwj/wQXTVw9g31IdJCUJgKOydfS0PK57mPKUsw85XbcG5jtcOLofnieH1WuW8SuATWKdk29SLxiv8vawoS7sosL7m78rGb5N42GPBup6YD7RnZkraDx5BUPN1JNy74i/msDc/SjrGXaCifjpJ2QEgFmGaAc2o5Dgz5VcD19i0GzjQjcZn32iwiIlHCYGztl3DDEho+Bnap1oyiVPe14osOUE9OBpD6K0bCJaD024i6TBD/HQq8WZejHpnypRW7LV9UP1690dLzhOQ09CydW2yKG61Zj/piKlJeCLVoYQHfG1S8EQaE9tuHal7SI/nIFSS6PJ7DC0/DONBb848yqFFtCtO3dpOZMiWG6IYlbSX7QkIFcFm+lRbZLIjaaNG2iBIWE8fSV4oI2ZOVDb+ieVkQmgX6Qn0duvxc3ebhWna77RzfBPVSl3MZTwGTv2iGTZoIS23Y5AN6wpaIRTRFYzuldNry3pYwgbAgokCtAsghQesEMh8GvPiN0bvUxFpH/EhngUkcnr2sgQ4Rz6dToR7LuiJSeO1wSNxjZAxXXNV5c2Y05Mdk0Q848QY0ZHTx+UVurBAmRtwW4W0teeR5Dn0VwzNvYUnikBVc9DvIKHj3aFsFmcdc vTB4tLdj x0wRhZDEQa9GGO24kjNPtD9p2iVz+gQmkDVka7Ocj1WAdZsulyXBmbQLJ9lF4rYbUrB8fqoIs2cXceUqMgmyV1Ek7hpiarwbY3AW0Qv6fLFgH/9LhSVyistMglSNdIKJ8AOXvFrhti1PGYlS9SU5eZxOYD1RI3C7Xq7mdgP1FLWlH9ed/zeOdcm+rQgYFhZXPdA72pVEDF8BxErhlHAIciFidv06l7ob8Tmk+DyRMINmUwMdseGJMgkEYZ7UNAPAN4UBiXI5rbxE4jTknWC6G54I0wE04S+EIf527W4uG4glk/YAkwW7U11X/KnMNVIZryBSfxsIMhFJV423m3Btzm3+Iv5QukGSwBqdCCEancYugbKhYgA5U/nhdWhVET+Ug0+wPPGorvTFxyuDWwyS0QbKtxd0oCgYHh08pmh1tijkrjxyWFZ974ojrJa2GI1KXZmXkQXN3xKo6fFOnrQb4iCj+uvk1ct95Olxb9I4IyIkTd2uBXuRA4KQaUlR9zQTLiz5z 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: From: "Matthew Wilcox (Oracle)" We can't return with VM_FAULT_SIGBUS | VM_FAULT_LOCKED; the core code will not unlock the folio in this instance. Introduce a new "unlock" error exit to handle this case. Use it to handle the "folio is truncated" check, and change the "writeback interrupted by a fatal signal" to do a NOPAGE exit instead of letting the core code install the folio currently under writeback before killing the process. Signed-off-by: Matthew Wilcox (Oracle) Link: https://lore.kernel.org/r/20241005182307.3190401-3-willy@infradead.org Signed-off-by: Christian Brauner --- fs/netfs/buffered_write.c | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/fs/netfs/buffered_write.c b/fs/netfs/buffered_write.c index b3910dfcb56d..ff2814da88b1 100644 --- a/fs/netfs/buffered_write.c +++ b/fs/netfs/buffered_write.c @@ -491,7 +491,9 @@ EXPORT_SYMBOL(netfs_file_write_iter); /* * Notification that a previously read-only page is about to become writable. - * Note that the caller indicates a single page of a multipage folio. + * The caller indicates the precise page that needs to be written to, but + * we only track group on a per-folio basis, so we block more often than + * we might otherwise. */ vm_fault_t netfs_page_mkwrite(struct vm_fault *vmf, struct netfs_group *netfs_group) { @@ -501,7 +503,7 @@ vm_fault_t netfs_page_mkwrite(struct vm_fault *vmf, struct netfs_group *netfs_gr struct address_space *mapping = file->f_mapping; struct inode *inode = file_inode(file); struct netfs_inode *ictx = netfs_inode(inode); - vm_fault_t ret = VM_FAULT_RETRY; + vm_fault_t ret = VM_FAULT_NOPAGE; int err; _enter("%lx", folio->index); @@ -510,21 +512,15 @@ vm_fault_t netfs_page_mkwrite(struct vm_fault *vmf, struct netfs_group *netfs_gr if (folio_lock_killable(folio) < 0) goto out; - if (folio->mapping != mapping) { - folio_unlock(folio); - ret = VM_FAULT_NOPAGE; - goto out; - } - - if (folio_wait_writeback_killable(folio)) { - ret = VM_FAULT_LOCKED; - goto out; - } + if (folio->mapping != mapping) + goto unlock; + if (folio_wait_writeback_killable(folio) < 0) + goto unlock; /* Can we see a streaming write here? */ if (WARN_ON(!folio_test_uptodate(folio))) { - ret = VM_FAULT_SIGBUS | VM_FAULT_LOCKED; - goto out; + ret = VM_FAULT_SIGBUS; + goto unlock; } group = netfs_folio_group(folio); @@ -559,5 +555,8 @@ vm_fault_t netfs_page_mkwrite(struct vm_fault *vmf, struct netfs_group *netfs_gr out: sb_end_pagefault(inode->i_sb); return ret; +unlock: + folio_unlock(folio); + goto out; } EXPORT_SYMBOL(netfs_page_mkwrite);