From patchwork Tue Oct 24 06:44:14 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13433972 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 DCED4C25B6D for ; Tue, 24 Oct 2023 06:44:34 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5E7F86B0180; Tue, 24 Oct 2023 02:44:31 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 547AE6B0181; Tue, 24 Oct 2023 02:44:31 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 25A016B0184; Tue, 24 Oct 2023 02:44:31 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 087D26B0181 for ; Tue, 24 Oct 2023 02:44:31 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay09.hostedemail.com (Postfix) with ESMTP id D03AF8075C for ; Tue, 24 Oct 2023 06:44:30 +0000 (UTC) X-FDA: 81379416300.09.52AB82B Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf25.hostedemail.com (Postfix) with ESMTP id D2316A0005 for ; Tue, 24 Oct 2023 06:44:27 +0000 (UTC) Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=5ABpqDa1; spf=none (imf25.hostedemail.com: domain of BATV+e19589c3639214e6c3cb+7366+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+e19589c3639214e6c3cb+7366+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1698129868; 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=SRYZHQ04hacwuEwpWKzRe5AbE87Phgtpy62POhugK7g=; b=nhoQE8U4GyHV7pUDBS5r7rPY8vzi8Z38cDwBCSY5tfTPM8X4HDXTDbKYcecyaQSHHOuLzg TzmWFvnrKDKfOC+dPQPdLAQR4lj4cIn2VCrufNWFSu3wGlVXpYl9Kb0aLBJQIjKGomSJaZ 7x8yHR9jgjGxKWx3Tpei1DrBbMAr0n8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1698129868; a=rsa-sha256; cv=none; b=zar6YGwW07lL7nS43i0fDHxUsGUbLQccxfTA4Ede29oZySPSLOauMI2rRHtEJQ5lIAfFxQ OaSC6/ceM8VEIkDuasDkp2mEtllU9hWU5wQgqOtD1RlJNgi19o/uYF1uzPss6GpnKarrKv 4CbH6lrt+hpejhrxpmxf/n2r2MPywMc= ARC-Authentication-Results: i=1; imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=5ABpqDa1; spf=none (imf25.hostedemail.com: domain of BATV+e19589c3639214e6c3cb+7366+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+e19589c3639214e6c3cb+7366+infradead.org+hch@bombadil.srs.infradead.org; dmarc=none DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20210309; h=Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-Id:Date:Subject:Cc:To:From:Sender :Reply-To:Content-Type:Content-ID:Content-Description; bh=SRYZHQ04hacwuEwpWKzRe5AbE87Phgtpy62POhugK7g=; b=5ABpqDa1lh0phh7GpUJ2sCEBTX euFvql4TUCV/4em6WAf5iTj1UtDv9YFIM77swuiFHaaJtPUr6D31ivY+9UgDgRmHxWEyXVkHgnPJw MHbflhwJZYn4ZQZGt1ZJgsg94+XN27VjVlwZnEBem3BKEPUjPtKfmPs4YYGz8XFw6nL7qrBQvCVYg tfDSE8HmNOIwHYS+yN694/z9224F69MJ/AcbYVUUx1E9gcspA4wQK7jxQ9ojSlFF/AqBK8kg9pev8 XIsk4eYKOlpr7BGIyPvNwFWqAwZWh9L7/h5o6inPZQJsuzHt/XwR0n8PoPG/yTzSKjREQhC9Z+xjl HWg+mOVw==; Received: from 2a02-8389-2341-5b80-39d3-4735-9a3c-88d8.cable.dynamic.v6.surfer.at ([2a02:8389:2341:5b80:39d3:4735:9a3c:88d8] helo=localhost) by bombadil.infradead.org with esmtpsa (Exim 4.96 #2 (Red Hat Linux)) id 1qvB9K-0090RZ-2f; Tue, 24 Oct 2023 06:44:23 +0000 From: Christoph Hellwig To: Jens Axboe , Matthew Wilcox Cc: Ilya Dryomov , Andrew Morton , linux-block@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-xfs@vger.kernel.org, linux-mm@kvack.org Subject: [PATCH 1/3] filemap: add a per-mapping stable writes flag Date: Tue, 24 Oct 2023 08:44:14 +0200 Message-Id: <20231024064416.897956-2-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20231024064416.897956-1-hch@lst.de> References: <20231024064416.897956-1-hch@lst.de> MIME-Version: 1.0 X-SRS-Rewrite: SMTP reverse-path rewritten from by bombadil.infradead.org. See http://www.infradead.org/rpr.html X-Rspamd-Queue-Id: D2316A0005 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: 58c77q53nceqjgtrgztyzrynb7ehkxpi X-HE-Tag: 1698129867-973205 X-HE-Meta: U2FsdGVkX19eVdgmVelxXA1umiqeMLl4+kIo2SncxMzTR4CVigYtexXGDq5G2sl6KyWqgpwntD1vNTPEobS0Dcnz1r08QcOr06U1qvYVx1w37zR5Mi/yiG1ZQBiMEbOAsicoV8E59gu8pOCB3MZ+J7ghraoAb771UEnLUYqfsuL+9xoa8QP86m91Fk6u8tCzlz7KVt+IkfRwQ/IjkVjmdOxuQjRcd7Walz68kAtHVgpPzjWQ2XhElJCywnOaZ8LEauQrISIhLn4JUwyXM3TfeSTmG9Dtg4SzOeW/H01rYASjXTEWdne5pzDfn77IbNd11Bq0x5KXJrB4LibR8lDJb8E4yEcp0N/z2l7EG8k/Bi7WaHvYk/a30Y+ebtERp6a+i+FXPxfyJeOEmQlqWcQ/lBcOMOlkbprqw0nMNSvPSK6tNkdazK6UY2h+x4uBnAJ7NyBIMv7zBcJvVnv9HnEfX5/l3C2wyJKn0j4RR14jVht6ee4Z+QqpRBggRsEdUEJMKoDLXQco/QNn5kuLDlvKJAgFWQjZuyZ2gHlIDf22J/FvIL6mFM2YzDIVfuLd6atX/3DS6fdEoblpcCzEcLBJ90pQ/TP74OOe0iJTtSGodbIq9DpL3wxcnD/pEFUmqe+ukPADORrVzEawuLNYuIOWOFwFpOYAs8L6oJlKziNzntFGgcdTGFGDz60IwG3AkQ6swcDRd6h/VdacwOXVFu04BAx+Cnl0lfY0WomtU9RJuTK2QKHYvkCzCx1VVlQ1UmNBE0UnRnYTHAcwbo/P+jrYhOzGqaEA6ZU1RO/yl0ScJqcjp5u7d4CP2ANypUWSbTXl5D4UHXcA4ECaYis4Db6oShGcoRvZC9tQVK1nfdgNS9DC5EVUaD9eMpKnY1ivoP/sc8E2lc6/YvyIn7eFlx59vY7a0R/ioWDvbSKO7fibRPaWtnprnnlw88h9O8BCdAySeZ75nC8sxNR8JpzGlnI sawm/gJM Wn7nzMfKhM3lHOGkLLvn+VClqQPibJzLXlqVUt05OzvSUVLkqP7igWfVaEZbO+IXD+ATXsMvqnOXJY11C6H3yCWBbBZWAam8pXbj473s/bhW99LYGOHUv8rqJUeqFnrL75TVdIIM4mDazAu2fEz/qmUiwIN5zDvAqZju+HCUBA2sK5+w9CCUHQDCbDk15ZOD7me7uflctDv0EkInXDiP+ujHDsv7wLpTqwPjlQvld3qTr6NcccSPTOKymyjnIdfn781xfpIwYqhrppsfi2Z6jERUt7ulZfRYMawMfYEicd/2F4ahzNvwScz7Ug9Rth2m6YyDP6zW1cKhNZ1RsA6XjB/OOUurdbka4aDQl7E37lts8rlgv8C25ApSYG+xLDEYIeKx3SHXebZp2+6Rz99UtLJqVWKwRxTG+Fqk8 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: folio_wait_stable waits for writeback to finish before modifying the contents of a folio again, e.g. to support check summing of the data in the block integrity code. Currently this behavior is controlled by the SB_I_STABLE_WRITES flag on the super_block, which means it is uniform for the entire file system. This is wrong for the block device pseudofs which is shared by all block devices, or file systems that can use multiple devices like XFS witht the RT subvolume or btrfs (although btrfs currently reimplements folio_wait_stable anyway). Add a per-address_space AS_STABLE_WRITES flag to control the behavior in a more fine grained way. The existing SB_I_STABLE_WRITES is kept to initialize AS_STABLE_WRITES to the existing default which covers most cases. Signed-off-by: Christoph Hellwig Reviewed-by: Matthew Wilcox (Oracle) Tested-by: Ilya Dryomov Reviewed-by: Darrick J. Wong --- fs/inode.c | 2 ++ include/linux/pagemap.h | 17 +++++++++++++++++ mm/page-writeback.c | 2 +- 3 files changed, 20 insertions(+), 1 deletion(-) diff --git a/fs/inode.c b/fs/inode.c index 84bc3c76e5ccb5..ae1a6410b53d7e 100644 --- a/fs/inode.c +++ b/fs/inode.c @@ -215,6 +215,8 @@ int inode_init_always(struct super_block *sb, struct inode *inode) lockdep_set_class_and_name(&mapping->invalidate_lock, &sb->s_type->invalidate_lock_key, "mapping.invalidate_lock"); + if (sb->s_iflags & SB_I_STABLE_WRITES) + mapping_set_stable_writes(mapping); inode->i_private = NULL; inode->i_mapping = mapping; INIT_HLIST_HEAD(&inode->i_dentry); /* buggered by rcu freeing */ diff --git a/include/linux/pagemap.h b/include/linux/pagemap.h index 351c3b7f93a14e..8c9608b217b000 100644 --- a/include/linux/pagemap.h +++ b/include/linux/pagemap.h @@ -204,6 +204,8 @@ enum mapping_flags { AS_NO_WRITEBACK_TAGS = 5, AS_LARGE_FOLIO_SUPPORT = 6, AS_RELEASE_ALWAYS, /* Call ->release_folio(), even if no private data */ + AS_STABLE_WRITES, /* must wait for writeback before modifying + folio contents */ }; /** @@ -289,6 +291,21 @@ static inline void mapping_clear_release_always(struct address_space *mapping) clear_bit(AS_RELEASE_ALWAYS, &mapping->flags); } +static inline bool mapping_stable_writes(const struct address_space *mapping) +{ + return test_bit(AS_STABLE_WRITES, &mapping->flags); +} + +static inline void mapping_set_stable_writes(struct address_space *mapping) +{ + set_bit(AS_STABLE_WRITES, &mapping->flags); +} + +static inline void mapping_clear_stable_writes(struct address_space *mapping) +{ + clear_bit(AS_STABLE_WRITES, &mapping->flags); +} + static inline gfp_t mapping_gfp_mask(struct address_space * mapping) { return mapping->gfp_mask; diff --git a/mm/page-writeback.c b/mm/page-writeback.c index b8d3d7040a506a..4656534b8f5cc6 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -3110,7 +3110,7 @@ EXPORT_SYMBOL_GPL(folio_wait_writeback_killable); */ void folio_wait_stable(struct folio *folio) { - if (folio_inode(folio)->i_sb->s_iflags & SB_I_STABLE_WRITES) + if (mapping_stable_writes(folio_mapping(folio))) folio_wait_writeback(folio); } EXPORT_SYMBOL_GPL(folio_wait_stable);