From patchwork Mon Jun 11 14:06:01 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10457937 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 221F460467 for ; Mon, 11 Jun 2018 14:09:05 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 0FC0F28434 for ; Mon, 11 Jun 2018 14:09:05 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 024232846D; Mon, 11 Jun 2018 14:09:04 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-2.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 40A1928434 for ; Mon, 11 Jun 2018 14:09:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 702C86B0281; Mon, 11 Jun 2018 10:06:57 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 636C26B0282; Mon, 11 Jun 2018 10:06:57 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4D94B6B0283; Mon, 11 Jun 2018 10:06:57 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg0-f70.google.com (mail-pg0-f70.google.com [74.125.83.70]) by kanga.kvack.org (Postfix) with ESMTP id F14286B0281 for ; Mon, 11 Jun 2018 10:06:56 -0400 (EDT) Received: by mail-pg0-f70.google.com with SMTP id z11-v6so6629596pgu.1 for ; Mon, 11 Jun 2018 07:06:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=/3YzULfexGbua07lmlYiArYoDeRyHrcgR7sKjSVOGIM=; b=nrL/7H5OKyoBL/dWMTb1xVwEGILNGzNTfFWE0kpL9Jq62ap1IyoYaboWSSlBrCxV5z ERdbzmV9YpkZwGVsZiHKItJeJL4oGpyRAcSuc3mQiF2pJyt8stXwnclrAk/f7zORmFcm 7NChmCTK4qOlsuzjJ2oTvjw5XWPRX3pocVAQuxymY2ACdxkei+7NRu73TlYVmPgN4lBb u+nwWgZK7Ov6+RNARkkmFPqlGDPCxL3Jxd47130FX2y+W4k7mjvCGeu4pgzUPDN/G96n tXR8ybI6k+I/D3a8iOVYNBBgC1Y5UurNUrdf600Lto8NPpwSJcZklO8IvqbVTMfb+77r UFtA== X-Gm-Message-State: APt69E1lANGkpkyzWOaDc6ONj5pRADuo3Bic/BNJc28kjACTMp6YlKyz 9UIGiEehbq7x1on15OWlY/iB8JYHLuykNjs4w/52NARTfMAqlqOGKRkIgYxgd07623MY6a0SG8M u5mtb/IvVnESBh0eyFz/OMJzF711tgL97acjlLSjrtb1D8NO9Q2N8XKgC15cs/USftA== X-Received: by 2002:a17:902:5409:: with SMTP id d9-v6mr19212252pli.0.1528726016665; Mon, 11 Jun 2018 07:06:56 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLCAYhQSMM1KbmAk56ozVO5uzvW5w+iznrGTVsMVg3edSpfUmXkMFiX3aYDHfqv6K/jaHYt X-Received: by 2002:a17:902:5409:: with SMTP id d9-v6mr19212201pli.0.1528726015748; Mon, 11 Jun 2018 07:06:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528726015; cv=none; d=google.com; s=arc-20160816; b=pz30ZhZoOyXM+WDxPeF7elC/vOBG6nych30E27NQxCY79zRoPxXzxLtN+t1cCKDBFX sCCIeTw2bBmVzunyuKjTx+ZsPt7OXFKgCiP6PYyBDGb4SYEVLUjvyj+1D5ZRCqzjEzeK zZ82NtexJivJXZgmOZnQw/IT+LX6H4ZMbcoY6z9ZEwr9aNAaeClsF+wAZJxRZ54qKgpf PVRR6AUSOdXdqAqKu4UO9V2LRNJJWBtIWCHxbwdJyLM01t5ALS4VnG00GOhcE7fPTw6e EQqdC1xG4Iu0TrK6m8TnGvIWmdcjnR8JaK0rfC69mz344EpB22U+YYBymGAn0t1yRr+1 5reA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=/3YzULfexGbua07lmlYiArYoDeRyHrcgR7sKjSVOGIM=; b=T/04VHvTuIiITdZ7ggj6nXp+k/+YMOj8SAjqTVAIF+Ra3ynmr7mPyaN/7r/jzAk5fi 8Cm0fAqGXzXdsaeJMsn49YAWlFUNzEA5hp1cc02G4AHHh3j1g6aE5sqb0XMx23Rn2Mim SLLpBAgMW5uOdip7yReUONZTTlOoTw/pfJchMqU6MyCb6kdi1SiljNf/ARBxs74ukqPM yYlNyaYtYE24kpPj6HeWQNa4v5iD/a3uLcssaRxwc+qIzqwmemKk6jR/aTvV1h8Eq9Tv Tl5GXTKMrec4eBdMaMp2vwH3+5RsAMTE0d0QvjXUXspxKqGPtHC+bt7b2acdgNXxOW5C /tHA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=GbtDHdqZ; spf=pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=willy@infradead.org Received: from bombadil.infradead.org (bombadil.infradead.org. [2607:7c80:54:e::133]) by mx.google.com with ESMTPS id 3-v6si40046844plc.415.2018.06.11.07.06.55 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Jun 2018 07:06:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) client-ip=2607:7c80:54:e::133; Authentication-Results: mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=GbtDHdqZ; spf=pass (google.com: best guess record for domain of willy@infradead.org designates 2607:7c80:54:e::133 as permitted sender) smtp.mailfrom=willy@infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=References:In-Reply-To:Message-Id: Date:Subject:Cc:To:From:Sender:Reply-To:MIME-Version:Content-Type: Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=/3YzULfexGbua07lmlYiArYoDeRyHrcgR7sKjSVOGIM=; b=GbtDHdqZ7IvPUTrvIL7kwS0o2 ryUEDW/nb+3VvPjFBlEqgUmHn0nwzsRpawlmmVZJEayfEzvfmdl9pgphp2tdhqKYyCTuTLNlZ9ZXw IH6DbiEocp+pxaHd49X2BsKI9TEpF6+i7dNeFILwK9nVreW1tE8JLTDLZQJS10iYeCBGw8U4JsXVC mTGYw7QX25nlx1r2/+AYu8+8VihPeX57gALAk4i4W74nhtp/QvVcszCJUIwcUYsKdUK8v024JEt1Z X4CP2ZLHB0oMMx67/xHCYX/UhTDx6JeW7vRQ1fvp8qm6uoh9Dk6DZ+j3/pQdizujEkixo/zNjqagS J+0Epbxig==; Received: from willy by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1fSNTC-0004jV-IE; Mon, 11 Jun 2018 14:06:54 +0000 From: Matthew Wilcox To: linux-mm@kvack.org, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Matthew Wilcox , Jan Kara , Jeff Layton , Lukas Czerner , Ross Zwisler , Christoph Hellwig , Goldwyn Rodrigues , Nicholas Piggin , Ryusuke Konishi , linux-nilfs@vger.kernel.org, Jaegeuk Kim , Chao Yu , linux-f2fs-devel@lists.sourceforge.net Subject: [PATCH v13 34/72] mm: Convert page-writeback to XArray Date: Mon, 11 Jun 2018 07:06:01 -0700 Message-Id: <20180611140639.17215-35-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180611140639.17215-1-willy@infradead.org> References: <20180611140639.17215-1-willy@infradead.org> 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: X-Virus-Scanned: ClamAV using ClamSMTP From: Matthew Wilcox Includes moving mapping_tagged() to fs.h as a static inline, and changing it to return bool. Signed-off-by: Matthew Wilcox --- include/linux/fs.h | 17 ++++++----- mm/page-writeback.c | 72 ++++++++++++++++----------------------------- 2 files changed, 36 insertions(+), 53 deletions(-) diff --git a/include/linux/fs.h b/include/linux/fs.h index aec2b05b056f..3f3e717e0d82 100644 --- a/include/linux/fs.h +++ b/include/linux/fs.h @@ -477,15 +477,18 @@ struct block_device { struct mutex bd_fsfreeze_mutex; } __randomize_layout; +/* XArray tags, for tagging dirty and writeback pages in the pagecache. */ +#define PAGECACHE_TAG_DIRTY XA_TAG_0 +#define PAGECACHE_TAG_WRITEBACK XA_TAG_1 +#define PAGECACHE_TAG_TOWRITE XA_TAG_2 + /* - * Radix-tree tags, for tagging dirty and writeback pages within the pagecache - * radix trees + * Returns true if any of the pages in the mapping are marked with the tag. */ -#define PAGECACHE_TAG_DIRTY 0 -#define PAGECACHE_TAG_WRITEBACK 1 -#define PAGECACHE_TAG_TOWRITE 2 - -int mapping_tagged(struct address_space *mapping, int tag); +static inline bool mapping_tagged(struct address_space *mapping, xa_tag_t tag) +{ + return xa_tagged(&mapping->i_pages, tag); +} static inline void i_mmap_lock_write(struct address_space *mapping) { diff --git a/mm/page-writeback.c b/mm/page-writeback.c index 337c6afb3345..0e502bd13ad9 100644 --- a/mm/page-writeback.c +++ b/mm/page-writeback.c @@ -2098,34 +2098,25 @@ void __init page_writeback_init(void) * dirty pages in the file (thus it is important for this function to be quick * so that it can tag pages faster than a dirtying process can create them). */ -/* - * We tag pages in batches of WRITEBACK_TAG_BATCH to reduce the i_pages lock - * latency. - */ void tag_pages_for_writeback(struct address_space *mapping, pgoff_t start, pgoff_t end) { -#define WRITEBACK_TAG_BATCH 4096 - unsigned long tagged = 0; - struct radix_tree_iter iter; - void **slot; + XA_STATE(xas, &mapping->i_pages, start); + unsigned int tagged = 0; + void *page; - xa_lock_irq(&mapping->i_pages); - radix_tree_for_each_tagged(slot, &mapping->i_pages, &iter, start, - PAGECACHE_TAG_DIRTY) { - if (iter.index > end) - break; - radix_tree_iter_tag_set(&mapping->i_pages, &iter, - PAGECACHE_TAG_TOWRITE); - tagged++; - if ((tagged % WRITEBACK_TAG_BATCH) != 0) + xas_lock_irq(&xas); + xas_for_each_tagged(&xas, page, end, PAGECACHE_TAG_DIRTY) { + xas_set_tag(&xas, PAGECACHE_TAG_TOWRITE); + if (++tagged % XA_CHECK_SCHED) continue; - slot = radix_tree_iter_resume(slot, &iter); - xa_unlock_irq(&mapping->i_pages); + + xas_pause(&xas); + xas_unlock_irq(&xas); cond_resched(); - xa_lock_irq(&mapping->i_pages); + xas_lock_irq(&xas); } - xa_unlock_irq(&mapping->i_pages); + xas_unlock_irq(&xas); } EXPORT_SYMBOL(tag_pages_for_writeback); @@ -2165,7 +2156,7 @@ int write_cache_pages(struct address_space *mapping, pgoff_t done_index; int cycled; int range_whole = 0; - int tag; + xa_tag_t tag; pagevec_init(&pvec); if (wbc->range_cyclic) { @@ -2446,7 +2437,7 @@ void account_page_cleaned(struct page *page, struct address_space *mapping, /* * For address_spaces which do not use buffers. Just tag the page as dirty in - * its radix tree. + * the xarray. * * This is also used when a single buffer is being dirtied: we want to set the * page dirty in that case, but not all the buffers. This is a "bottom-up" @@ -2472,7 +2463,7 @@ int __set_page_dirty_nobuffers(struct page *page) BUG_ON(page_mapping(page) != mapping); WARN_ON_ONCE(!PagePrivate(page) && !PageUptodate(page)); account_page_dirtied(page, mapping); - radix_tree_tag_set(&mapping->i_pages, page_index(page), + __xa_set_tag(&mapping->i_pages, page_index(page), PAGECACHE_TAG_DIRTY); xa_unlock_irqrestore(&mapping->i_pages, flags); unlock_page_memcg(page); @@ -2635,13 +2626,13 @@ EXPORT_SYMBOL(__cancel_dirty_page); * Returns true if the page was previously dirty. * * This is for preparing to put the page under writeout. We leave the page - * tagged as dirty in the radix tree so that a concurrent write-for-sync + * tagged as dirty in the xarray so that a concurrent write-for-sync * can discover it via a PAGECACHE_TAG_DIRTY walk. The ->writepage * implementation will run either set_page_writeback() or set_page_dirty(), - * at which stage we bring the page's dirty flag and radix-tree dirty tag + * at which stage we bring the page's dirty flag and xarray dirty tag * back into sync. * - * This incoherency between the page's dirty flag and radix-tree tag is + * This incoherency between the page's dirty flag and xarray tag is * unfortunate, but it only exists while the page is locked. */ int clear_page_dirty_for_io(struct page *page) @@ -2722,7 +2713,7 @@ int test_clear_page_writeback(struct page *page) xa_lock_irqsave(&mapping->i_pages, flags); ret = TestClearPageWriteback(page); if (ret) { - radix_tree_tag_clear(&mapping->i_pages, page_index(page), + __xa_clear_tag(&mapping->i_pages, page_index(page), PAGECACHE_TAG_WRITEBACK); if (bdi_cap_account_writeback(bdi)) { struct bdi_writeback *wb = inode_to_wb(inode); @@ -2762,11 +2753,13 @@ int __test_set_page_writeback(struct page *page, bool keep_write) lock_page_memcg(page); if (mapping && mapping_use_writeback_tags(mapping)) { + XA_STATE(xas, &mapping->i_pages, page_index(page)); struct inode *inode = mapping->host; struct backing_dev_info *bdi = inode_to_bdi(inode); unsigned long flags; - xa_lock_irqsave(&mapping->i_pages, flags); + xas_lock_irqsave(&xas, flags); + xas_load(&xas); ret = TestSetPageWriteback(page); if (!ret) { bool on_wblist; @@ -2774,8 +2767,7 @@ int __test_set_page_writeback(struct page *page, bool keep_write) on_wblist = mapping_tagged(mapping, PAGECACHE_TAG_WRITEBACK); - radix_tree_tag_set(&mapping->i_pages, page_index(page), - PAGECACHE_TAG_WRITEBACK); + xas_set_tag(&xas, PAGECACHE_TAG_WRITEBACK); if (bdi_cap_account_writeback(bdi)) inc_wb_stat(inode_to_wb(inode), WB_WRITEBACK); @@ -2788,12 +2780,10 @@ int __test_set_page_writeback(struct page *page, bool keep_write) sb_mark_inode_writeback(mapping->host); } if (!PageDirty(page)) - radix_tree_tag_clear(&mapping->i_pages, page_index(page), - PAGECACHE_TAG_DIRTY); + xas_clear_tag(&xas, PAGECACHE_TAG_DIRTY); if (!keep_write) - radix_tree_tag_clear(&mapping->i_pages, page_index(page), - PAGECACHE_TAG_TOWRITE); - xa_unlock_irqrestore(&mapping->i_pages, flags); + xas_clear_tag(&xas, PAGECACHE_TAG_TOWRITE); + xas_unlock_irqrestore(&xas, flags); } else { ret = TestSetPageWriteback(page); } @@ -2807,16 +2797,6 @@ int __test_set_page_writeback(struct page *page, bool keep_write) } EXPORT_SYMBOL(__test_set_page_writeback); -/* - * Return true if any of the pages in the mapping are marked with the - * passed tag. - */ -int mapping_tagged(struct address_space *mapping, int tag) -{ - return radix_tree_tagged(&mapping->i_pages, tag); -} -EXPORT_SYMBOL(mapping_tagged); - /** * wait_for_stable_page() - wait for writeback to finish, if necessary. * @page: The page to wait on.