From patchwork Thu Oct 24 14:05:00 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13849096 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 EA822CE8E7A for ; Thu, 24 Oct 2024 14:06:27 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6C2D16B008C; Thu, 24 Oct 2024 10:06:27 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 647446B0092; Thu, 24 Oct 2024 10:06:27 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4C17D6B0099; Thu, 24 Oct 2024 10:06:27 -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 279246B008C for ; Thu, 24 Oct 2024 10:06:27 -0400 (EDT) Received: from smtpin25.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 99D0B1A1377 for ; Thu, 24 Oct 2024 14:05:53 +0000 (UTC) X-FDA: 82708670100.25.E7AA889 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf24.hostedemail.com (Postfix) with ESMTP id 3FA1F180028 for ; Thu, 24 Oct 2024 14:06:22 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="dOxQ/TyU"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf24.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=1729778672; a=rsa-sha256; cv=none; b=nasM17zGRBnSf+uraa4LPufZsk+SaLK5HgjA8C5NivTdbynNl+qdyrFd0En/R8tE8NjVqB xsUTWvPZEr70gJMs07sfWO6U2JO42ti45+iGd5St2p0lcrEYMQm6ey55w9G3+/J90a2W4P ccuNPGkK/maHavCi9DXnrODp0oeqVNI= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b="dOxQ/TyU"; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf24.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=1729778672; 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=dX63HoW5T5nWAadHrjsW5bClVreBrpm8JRFpnyHdge1N7/W8kMVim7JAzNTfgnS3IfiK2J ieuvX2Mvy8bwb/9sBKWtWyCTglWBe95ZMkHXHE07bD27cKY/RS5cXwGJDR3+PC85eIZYC4 LfRTL3c36fMvUri/Ls5ncnuKsgkfZjY= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729778784; 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=dOxQ/TyUswbjvl+8wQTDgDuNGtdtaFuQSuCIWBITWlqgSB7MJWW/Nl8BMo9ijbroCJaRxR vldPic9GyAxZYB+lunu5CgQTwoz1jzY77C1hq329CgazV93qmJXI+0qKtmwKFzM+RgoL6F 3DR7d5fs5cEq36dFOOZSxKDXuSVcFvs= 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-650-T5p3B-9LP26j_KvYzWMxQQ-1; Thu, 24 Oct 2024 10:06:19 -0400 X-MC-Unique: T5p3B-9LP26j_KvYzWMxQQ-1 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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 0E6101954B11; Thu, 24 Oct 2024 14:06:12 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.42.28.231]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id A35D919560A2; Thu, 24 Oct 2024 14:06:04 +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 02/27] netfs: Fix a few minor bugs in netfs_page_mkwrite() Date: Thu, 24 Oct 2024 15:05:00 +0100 Message-ID: <20241024140539.3828093-3-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.12 X-Rspamd-Queue-Id: 3FA1F180028 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: xpzcdzmeig9ub4gtotq3hpkcq9ezz8ke X-HE-Tag: 1729778782-656274 X-HE-Meta: U2FsdGVkX18VphmsyJ2cUL30PwKJdGv+vxWx4lHliFmooCWWhATrsiZAly3ib36Epn+bKhVzhqmOZZRV1Dvi+ECxQLODCVYgfv1vRnVQ6Ma9nRILTj3WTrUCX1BdODWhN/vkuLZTEQHHQAAiK9cCHevpuy4N0NniTG/kNJyMLHURp9GKTKJhoRC/Y9y4CIoHLTqd+Ss9aL7NVtOeS1JpOk9t41zVnbaY2Uj1KbC60P750znXO7inr/wSwpoqGt6rxH1lCNUTTSriG7eJAbWzIaSMGCFOn+GkWDYWX8SfoSLJNBurq9PUoGusPPPlzYBslc1YZt+VxwQPK4bZ7HGzx5t4SyKRLYy4MawChlIOASE6gO0iq6qv5mAv4pdHdT93FBi1u15M+dlADfRPQC4SBGBDvB8xLp/WcLiVJ85W1ELDh/AII8XCb/dA3l+2QNgZpKiikEL9zDvHm3xIeWDPx9U3JeKsTVqkAQtB5bFl09ODH0HUEKYJnEh9p8ISHRzTW06Yf3zSoE98TmNY73+/XzM0Y2WylUMoe5iHjee/bMAY+BZzBbqLtQYKpCYQsF6SxuHkrT5zXPe5iPHIeuE8MntYW3036c+QIZLg/P61C+C57Z0bhlvyzst/vaMdqR67ofSKD5d1zljZtPyhg9G5uxLlZelABmz79gLJqbNFekRdgsquxi9jk4NifuU6j8nriGJs3GZSsvFoQIMR+IIRmTGZn2oiGsUGpylOU0ImTvtldVLPFVA3GQdIfI3969cErev7YCP3mx8m8n1vsvfAEgjVEFiAQefDCANjkd2Nnt0rpXTcREwyEStrBAy3qPIj4/K4szkqA2SZZ8mWEXY+bUS96YBDUKDrb/YTpafkF9uTS1lzatkWOyoVNeOCdt2Dd8nKtZid5Imz34eZwOtI9JnTurTn3KQV6GhaKoGg4vz8cKmr4bDhSocinvf3Gh/5k7+Qq+XU5AKoxSPBxZh 5y6jphv4 4c/N1CfVNcWD/8l9ARkXTSNKG5JD3IFeE4NlhLZBxNCao97usgje7bYe3jQpc7jQDEb7aXlXGVqb9xSYLZOMmw6dBMLJb5Vzo0aZslzvxwADPItHPTRk4OQnuQuGgFUcjTIl1YrJG6NI9K2WVSdwjfwZqskrbr7+ktjrGY2WbsUcjJPWh/cHKx2xkLVfdkaIYRIGL2w9dOYLTkuDG3leEYgf4I2ED32vSpbMgpHAS1RSh7G2eZXvhiv9Dt+8dZg1OK/GxOW9DM2fEHSFCfPIVfl99WlErryBpedHCS2n3fvE5V+BE0WxknjfRUTIUhdr6olqweN7UNQIgqV7bePdGDqJUuUDWMgBvLws2mr7GzaqwXWdyq3PLbnwmEp2hujNT305mcBJxYett9lJ+PHVCqajXcn0DfJ5BAppMOKI7FYfRgTI= 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);