From patchwork Thu Jan 25 08:57:47 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Christoph Hellwig X-Patchwork-Id: 13530263 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 04AA4C47258 for ; Thu, 25 Jan 2024 08:58:36 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 91A116B0087; Thu, 25 Jan 2024 03:58:35 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 8CA6F6B0089; Thu, 25 Jan 2024 03:58:35 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 743566B0093; Thu, 25 Jan 2024 03:58:35 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id 5F21A6B0087 for ; Thu, 25 Jan 2024 03:58:35 -0500 (EST) Received: from smtpin17.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 4128E407EF for ; Thu, 25 Jan 2024 08:58:35 +0000 (UTC) X-FDA: 81717232590.17.6F17406 Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) by imf07.hostedemail.com (Postfix) with ESMTP id AAEFD40016 for ; Thu, 25 Jan 2024 08:58:33 +0000 (UTC) Authentication-Results: imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=U9NfiMtZ; dmarc=none; spf=none (imf07.hostedemail.com: domain of BATV+b97a0fc658bf3e588113+7459+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+b97a0fc658bf3e588113+7459+infradead.org+hch@bombadil.srs.infradead.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1706173113; 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=MhbOOusfwIyRDrId1i1glf9YHzO3PaLh+M9tTsTFsQo=; b=kgNG76yBbEheAt/03qo7g6JTpi2O3/hD3DXHDkcAFQbloIKtwyFZ1RuCfi/Shlx/VlXJCm 3K8rQPxZuMnV0TGitEs8/pfWJ5XOVMmW6pXWjmkyfyvQOxIyEI0fpYrjEYNYtMetfm/L41 LRPeA0JW/sGHXHx/8PxQmXSWDzOqZ24= ARC-Authentication-Results: i=1; imf07.hostedemail.com; dkim=pass header.d=infradead.org header.s=bombadil.20210309 header.b=U9NfiMtZ; dmarc=none; spf=none (imf07.hostedemail.com: domain of BATV+b97a0fc658bf3e588113+7459+infradead.org+hch@bombadil.srs.infradead.org has no SPF policy when checking 198.137.202.133) smtp.mailfrom=BATV+b97a0fc658bf3e588113+7459+infradead.org+hch@bombadil.srs.infradead.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1706173113; a=rsa-sha256; cv=none; b=LFIYtJEuZu25EwCS4/oqRodFnfDpiH3uxCrAE+5L9CSUkDeuHifPoPgRQOQkjqPaINCEtV NXp20XtCuuDz8UmBeOCkpdX81GB9TVH1z8aPcYvi79Ionshx1YBHwwHgYl3vYznvr2eMFe ApgDLdF3lN4i/vrq0XlccqZHgaIwvUs= 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=MhbOOusfwIyRDrId1i1glf9YHzO3PaLh+M9tTsTFsQo=; b=U9NfiMtZibO0s0QeoA5Pg1gJ5C rwwipdwF3Yn3mroMwF8qnFXyn5wCHy3BqYKg+BCIcX6hOa1gQqLQnK17/j3HVJFACNTRbYVxreETo FoHGqXvJjMgcyt8QKXxryhIxQgTHmkmXz6pB2L0XcO+XaHUxXg2MAKxMQtr2HLZj86MKZqMfxBeYN veKzugZU0wuKWSfKTTlfHMFKuaujyn4wB47NCJc4dPXOGbPd5X5Ymzp8ioS9tD1mEIvXDZvHkdkks 8DEWuOOCs+emJnWaZ1PQRPsF5CGm3a8HBqC9G4V1PCe72r2mNpd4fxHNaD3GgVSOSBIgJM4qal1vG lCzYLbVw==; 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 1rSvZA-007QIu-0t; Thu, 25 Jan 2024 08:58:32 +0000 From: Christoph Hellwig To: linux-mm@kvack.org Cc: Matthew Wilcox , Jan Kara , David Howells , Brian Foster , Christian Brauner , "Darrick J. Wong" , linux-xfs@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, Jan Kara , Dave Chinner Subject: [PATCH 08/19] writeback: Factor folio_prepare_writeback() out of write_cache_pages() Date: Thu, 25 Jan 2024 09:57:47 +0100 Message-Id: <20240125085758.2393327-9-hch@lst.de> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240125085758.2393327-1-hch@lst.de> References: <20240125085758.2393327-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-Rspam-User: X-Stat-Signature: ywdfus4y4dpjgcmk4odzcg5n4cbhhroc X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: AAEFD40016 X-HE-Tag: 1706173113-162152 X-HE-Meta: U2FsdGVkX1/ylFTzrTHZ0jZ98aqeJVB7H4QgnMsOx8yPxSWBu2sxk0HQ2Bvty7Ez6/GvG3xR07UNndiQQTUNlFflvvIEIW+L7evPO6XW3ARHpqKzUGySxT2egyDqnG5gPgNXFUvS4owefL3Ur0m6ksGHsczZrBWImEwasD21CCaMM2fG50U54WcOi8ZkANrb4bkGqvUxec17Z8Ic2lt+Er9AW1lT9hEsiBOK2Xb7c1a/DywdISB20Y3Q88Xw0kl5fjgxBvuOJ9W2obiaah/9sWao8yP+5zQprABFFHmI/QjwFEdwUUqegSqJPTR8DI7pTtFUERtLc97XH3w57h2Js/riUQWmo1qUpeDbCYaR0ZnQWl7RLjuhjRpD1FLSnjyTf+flooxdPhC/bjS+STQ3ERsbuG/dxOYzQrlnhG3SF9WxWzIGVPnm5ELy50wxpPa5oscHXodtUgADDju0nJS7u8hj1jiUbh8UUkqe0FqY/vfsZMNHNY4YC/4dJgiUUOVTmkRzHuVf9E9Z2EsZ5eoQ3mJHXiyyeoshjBYxW2VHRsyg99rSh3X2FiO7wxDrPva+Q6s7eTZNTFwVXxEWmbr0dfdYKtgfm9OhQLROoCp3jtMdJ5tH6jDddNGO0di4IoMJUfJQX/Os+63QSA97wePb6z+obx/LOj3X8PJo0LonlmJIUbzxpl1irwmRcPfPmzSGPzphxSIsI978CYDZOhoDMDnJhmZMaF8OftYqKc8I+SaI71+w9D6hBbqHDt9aJImJAuurYVad2/Wk2Q0AT78HG7EYxT4NI1taDKs2lckRJowx8I44VPHRtdSMS7KH7+jYAzaJYwngiL+5XQubo9P1Ue1XCf+XoAkzi5OiZov27tK3r85mTatQyJOdne4ZtHmcKZga39xZWVUOiEXovLiqFWoNA4I0QtNxKgLvpIF3RKs3e7+2oG/gu+kzkskpPS8rXClotzpapVieVBy7DmQ 5tbU9Tga /C3MG9AaaDn9xFoAlA2o+0/MPxUfkS9HWzkecRs5idqVItTcC0dkn6Ka9bZgHBHlN78P72YC8JYEn/pQQhnUizMp6rCGBR3r9RywY5/VXJsoCOkTAWOvJ4X1CfZn98PZCszR/lXTBBTN79zJOl6ASHg9VLVALSBXDFM4lEz+3LZoKlzD4e8elE8GJY5SDhdicXEvnXwzs2P4zOTSEpKgQOiWBCuwOlTq5yJiaFvVDGR/3CJPNmnvteYJILWvOeW2Vs8wXnSMpiWu9SBDleIv+4Omjx/Aoq1wi4XtwJRS23bqNjn+uPAFSW/ZiawZkTNsiwRYTxWKS4T5ypf/jo1gTS+GuxPlLIk+HQCmm81LUAqiUk7+ScQMDQlnhJP+3LY7n0S67B0w9IL7KvfE71ujdELVfw/evc/02KKnDhwbuTJLFV5a4i9/4kTFYUHVsgMNJt40yIP99rotN0HaeNAdnNoUVSVdAnGyd69QNR4LIVmAuAOnmzAYoyhpqoXolSH9PyQBmIC07LZUgkvnenHH+c31JBdZbN13ZtNic 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)" Reduce write_cache_pages() by about 30 lines; much of it is commentary, but it all bundles nicely into an obvious function. Signed-off-by: Matthew Wilcox (Oracle) [hch: rename should_writeback_folio to folio_prepare_writeback based on a comment from Jan Kara] Signed-off-by: Christoph Hellwig Reviewed-by: Jan Kara Acked-by: Dave Chinner --- mm/page-writeback.c | 61 +++++++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 27 deletions(-) diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 426d929741e46e..cec683c7217d2e 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2397,6 +2397,38 @@ static pgoff_t wbc_end(struct writeback_control *wbc) return wbc->range_end >> PAGE_SHIFT; } +static bool folio_prepare_writeback(struct address_space *mapping, + struct writeback_control *wbc, struct folio *folio) +{ + /* + * Folio truncated or invalidated. We can freely skip it then, + * even for data integrity operations: the folio has disappeared + * concurrently, so there could be no real expectation of this + * data integrity operation even if there is now a new, dirty + * folio at the same pagecache index. + */ + if (unlikely(folio->mapping != mapping)) + return false; + + /* + * Did somebody else write it for us? + */ + if (!folio_test_dirty(folio)) + return false; + + if (folio_test_writeback(folio)) { + if (wbc->sync_mode == WB_SYNC_NONE) + return false; + folio_wait_writeback(folio); + } + BUG_ON(folio_test_writeback(folio)); + + if (!folio_clear_dirty_for_io(folio)) + return false; + + return true; +} + static void writeback_get_batch(struct address_space *mapping, struct writeback_control *wbc) { @@ -2470,38 +2502,13 @@ int write_cache_pages(struct address_space *mapping, unsigned long nr; folio_lock(folio); - - /* - * Page truncated or invalidated. We can freely skip it - * then, even for data integrity operations: the page - * has disappeared concurrently, so there could be no - * real expectation of this data integrity operation - * even if there is now a new, dirty page at the same - * pagecache address. - */ - if (unlikely(folio->mapping != mapping)) { -continue_unlock: + if (!folio_prepare_writeback(mapping, wbc, folio)) { folio_unlock(folio); continue; } - if (!folio_test_dirty(folio)) { - /* someone wrote it for us */ - goto continue_unlock; - } - - if (folio_test_writeback(folio)) { - if (wbc->sync_mode != WB_SYNC_NONE) - folio_wait_writeback(folio); - else - goto continue_unlock; - } - - BUG_ON(folio_test_writeback(folio)); - if (!folio_clear_dirty_for_io(folio)) - goto continue_unlock; - trace_wbc_writepage(wbc, inode_to_bdi(mapping->host)); + error = writepage(folio, wbc, data); nr = folio_nr_pages(folio); wbc->nr_to_write -= nr;