From patchwork Wed Nov 6 12:35:27 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13864629 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 B6760D44D58 for ; Wed, 6 Nov 2024 12:36:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4E3B56B00AF; Wed, 6 Nov 2024 07:36:46 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 493C46B00B0; Wed, 6 Nov 2024 07:36:46 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 3347B6B00B1; Wed, 6 Nov 2024 07:36:46 -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 10E196B00AF for ; Wed, 6 Nov 2024 07:36:46 -0500 (EST) Received: from smtpin10.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id AA5CCA0FA9 for ; Wed, 6 Nov 2024 12:36:45 +0000 (UTC) X-FDA: 82755618120.10.8EEBA02 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf24.hostedemail.com (Postfix) with ESMTP id 4BDCD180010 for ; Wed, 6 Nov 2024 12:36:39 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=IbbOVfRq; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf24.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=1730896544; a=rsa-sha256; cv=none; b=ELf8kuB2n97DDitX8ulLhip6bBpFgJPCATo3NkttYRv62HbT9BmoFeWqjTqT4kOHDTi6Vz tj/BFnrUukbkAkUpoau5N5FaOEC5Vvpibmv1yrDAa8fGuktb5v2eVIidOqiocLW22inRAa 5U2qyQgpopH7i7qUl2ClpuJEbGOntyI= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=IbbOVfRq; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf24.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=1730896544; 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=FVUvUT7A6faHBaOaifiF/+Yj5Cu4paB6K7Mq2i92cOhIMwk4eyhVnQyyVDnhZ6JGbaO/sl +1vVFfe52lltHqF6a6ZCqfUV8wPXi4bWrgp8m7sV3r4TC8C51WNHDMlnOffXHgOFog6xaN ftQUEisarJXFHKyvxhO0h7G6i7fK7TY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730896603; 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=IbbOVfRqlnR4WyHLJK0n7PrOVaM/zN0ftO/7sGfx0mFXZXPe4fWOTsL5O8G2VeysxFz4BO 72zQhcpPtzO2bAzn3qp8skj44/O9ELHnbGZEc0OM3uy1QEClfQoI+CigP9cLPY/z7mwb+3 PNsRjXNeylkmtPEn2SdsmSbsJFFNsA4= Received: from mx-prod-mc-05.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-193-jZ9hucjvMOiG2HNpBLXM4g-1; Wed, 06 Nov 2024 07:36:39 -0500 X-MC-Unique: jZ9hucjvMOiG2HNpBLXM4g-1 X-Mimecast-MFC-AGG-ID: jZ9hucjvMOiG2HNpBLXM4g 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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id EFF461955F56; Wed, 6 Nov 2024 12:36:36 +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 9F2A319560AA; Wed, 6 Nov 2024 12:36:30 +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 v3 03/33] netfs: Fix a few minor bugs in netfs_page_mkwrite() Date: Wed, 6 Nov 2024 12:35:27 +0000 Message-ID: <20241106123559.724888-4-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-Rspam-User: X-Rspamd-Queue-Id: 4BDCD180010 X-Rspamd-Server: rspam01 X-Stat-Signature: 4gyufuy3pyrqf631wah5kfrqqo6ihkoy X-HE-Tag: 1730896599-142619 X-HE-Meta: U2FsdGVkX18YiiPG67wZ8VewOBcRgDzaSJ1XndIaUVszJNNyX8Kk+StpPWHK09B3LufO1lbGB+c2/ndPgVTbF3wKfr5rUIhrrDuOrnjKEK/NhMUZCrFArgsp+tLFp1O3s5NlkYaspM7gdSG3xvI4gVjVUYALhG70zs6y1wEhloq0rp9r4SWmQD5vu0DdPoA7R0Jhc4rCGKuvWEJ4YxRDaHSPJvkdJwDrsxOpRpfgz5pfJ7JAgIMIdmEeCwZwtr543BtWZRH1EOHTDQvj+fdPxX3r852u4ACj33IyiIM6N+OMd00TwsbEytEMpSfH0AWb3apaHGWh0cJEjtYdBJL0T23mkOsrgMjx3LoG0Ef7QfgbnTu9MdhgDaG8FsHihbLpolyPVbjB4LutaxR0CDuibc9RCTgkunVVOcd343Yrgb7X3BjWo+RzxNtLu1klJI9Qw7vrNAY29qn/xEIqpGX6dlblLo2el6WXyq45jv2LH6dV79Z1fzM4zmqcRxKXzamkb6rodq1zfcMrLUg9PEENCznQN74f0hqFpQhQ7zx+6SNySWg4VFR0cmRrvL8KKtD6foAqdS0V3pCUGahEZCld2R9stSb2C9nl9kj2Y7yLLIrUun4o/B1DpzSGar/K7f7XDOQKznGQvSl0M1gNLuLD3zOiWyTMuyd8vPiIJDZR0wvEFMPFbaJsrz2rxq+jb4ImpxX34zG6CnVmGO2mlbicU6N5vi5VwyoQ8bRjg6kewSVqZG4u1oXx09EsWTTbLPybN9As+9tNz0GQqwyHlIV39uz/Ztz8Pr3Lp+WtlVRYeCGhcYIOLS85pHZaMkjXcB63dTBMT93nm2/axIBzMqK4n09Gk5zjX3NJOeJ83kB/k1MASVRt1rxbuCj94ZzXpvmc1ivjTiZRhByaaQSwUaUMrqcORay8dcHZiXMayxZ1rqg8JSUbKFlgvROfwIks/tJI05EC2I4rLHHEmz/1iMg gCr0uG/T b0rZUh00s0G+0yLPX6QGbL0V65KlDcu0Qrx57odndf6Z9/OzK1J5xDbCLK7c6XA7YbARlnfWG1sg9ktIYXNGhYb5TGLNg9yS63TKMdyuRgQ+CdgW8mwKhows8LO4vtpylf6JPaizEJn0HOvo962MK4+9ougOlBhzLLxPj9QAun85Y0iYjcjWwl+X+PERY8GG1aTC7z8Nc03D2qvTnPqlqYMLlQTRuUVd3UEYIbzdnSam0UmFk5HGRk2IACOywmphwnMP18dyJPFCxzHIDR2TjZW2XMuDndc+ybpxkda7bqpktzivq5HxbSeNhSdQZwbmkIAV4DUhZKGOGhQ/yWzEo6FQqCtdgtjooEFnMmAczuwLQjVerDXZzGA75V9rHHbQGp7s1kJC2h+J+3LXSSw9OY3hZH64JqUhkgx2ZZo5Uy13T7e8Ov6TWUIq+VdohcrPlIpBLmRYdQhIpNssSk3tpo4IsbQ0jt7tt4pTJppwHM2X5A0lVmtP1UEYAalIi0I1hD25r 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);