From patchwork Mon Jun 11 14:06:04 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10457941 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 A32B860467 for ; Mon, 11 Jun 2018 14:09:14 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9123328451 for ; Mon, 11 Jun 2018 14:09:14 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8589228471; Mon, 11 Jun 2018 14:09:14 +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 D7C6428451 for ; Mon, 11 Jun 2018 14:09:13 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 2903A6B0288; Mon, 11 Jun 2018 10:06:59 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 153A66B0283; Mon, 11 Jun 2018 10:06:59 -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 F3ECA6B0286; Mon, 11 Jun 2018 10:06:58 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg0-f71.google.com (mail-pg0-f71.google.com [74.125.83.71]) by kanga.kvack.org (Postfix) with ESMTP id A13E36B0283 for ; Mon, 11 Jun 2018 10:06:58 -0400 (EDT) Received: by mail-pg0-f71.google.com with SMTP id e2-v6so6625339pgq.4 for ; Mon, 11 Jun 2018 07:06:58 -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=zyhH5+bVh3EAsMsHVZxgQbY7nD/2huoeYClE42xj+rQ=; b=NFYMS37uSY6VcaQzc6VVP38RIIcfG9POsPnY6Yy5jpwhRQNaPC4/2h4HGftaiAf/m5 yIducHo/ZQbOWOjIzpySIxGY1SVUQWHKzr5eyB+h6HixpCvm3j4GsDQcTaC7v3DKqPy0 zJf8leE88X7K6k2LgshkVyDBFljRcvbTagXhdTCRqzi9SlzPfXCBucIM7RP7KfFw65n4 NBFggRIQgOb8d2+V0fNVV52hPk6dIgbjxs2Cjst0ywWiQ8KubrBtoLPOIO04gsQIn6UA XqJO02+ubNNxLF9R+Tnf2Io0DNXCB6nKb9xOgtBfgeVEysVGR/j31UvZuvXn06sWety3 5LxQ== X-Gm-Message-State: APt69E1ASkUQ86kz9deQmazQMt+28np0ax4R2d3+ScwD8KOgjXeAkXL7 1Gc9Zv4taWPs1OLZYkF5Uyg+CvVKfCDEmnYa4/Hhv/3PwHAfpO7y7ZX8l6N83n9siRLE1nu8N+3 v2joT1uBv5d2n0Ryc8TSK71X8ucl/VyH7rJ1mMtAUoy8G3sqFYZyTeHYlFp3TDktpNw== X-Received: by 2002:a63:3759:: with SMTP id g25-v6mr15197590pgn.59.1528726018314; Mon, 11 Jun 2018 07:06:58 -0700 (PDT) X-Google-Smtp-Source: ADUXVKKp4nYmXleTgkuL5ZvG0J4J9EKQFMdChZBxZiKHELSy85NWljoyWg8OVM1PafohXxt6IJto X-Received: by 2002:a63:3759:: with SMTP id g25-v6mr15197532pgn.59.1528726017223; Mon, 11 Jun 2018 07:06:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1528726017; cv=none; d=google.com; s=arc-20160816; b=DPN8Ci8u55W48qJ7Zoiid1Apy+fwAFQX1DMJXdmkXfuXbtH51HdQJr9LZclqKfJJ3u WEpAhMAR2izDDkIky1geC/a1pBWW206MHWkeLpM/lE7QR4aKVgPHWx3Fa6q8mfvYjVCV 96O/3dYf/Deppn8eigTK3X54zqgCyPCNYGi1H3nmEaPrH5FQJszBUgyG7RoRytsy9VLt YcWovMy2Y4ppu8b5vBt2ozg3YoNKZpTtiMSAvqqJwL5TvlyC+yqisbuwVMOv2udCuYsl vNwTpjGdsJQFbyEd6iBauJBiopASwWZ4yWgxDGOiFT5sEix2fpOFx7qx7pipbNDrq+B9 VWuQ== 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=zyhH5+bVh3EAsMsHVZxgQbY7nD/2huoeYClE42xj+rQ=; b=uOPiwyQzNe5zAgmLjv7jEtZOZkgbDHDq5BTaKJYoj2/cSbcPBlC4S1DeyNxyScfXK+ iuUTQ4ktfcfjacB1yLfkrbQOZrpdN8Yj39hj3hEniZU5VMp/j4YTCux/VFTZyioKyOnJ sm9sE1DgyJaP+3yy/tKhwNujgiYhValVmbnaoPu/mwiwieph0VjdbWWSpzjHLOKcBImY Oz1gbI7WpEZZCHdN73zgTa/jxgkzCz8CfAd/s04wAQ0QFIJWKO2mDPnepfPkshl5L/8p +pdUjL+DIeeVj6+3H/7lPeFyoaKLP5czcpDIEABDBG3nvzm48ZAMI8q7ntpc4Ok/mECb ZPLw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=hN/yJqA7; 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 x70-v6si32969430pgx.576.2018.06.11.07.06.56 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 11 Jun 2018 07:06:57 -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=hN/yJqA7; 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=zyhH5+bVh3EAsMsHVZxgQbY7nD/2huoeYClE42xj+rQ=; b=hN/yJqA7082+vh18/gZhykbjF EUvxAlpaZUrJr546BQrmvwPPjaP92lyOTfiGd/cfSIzWbV4UzHdYVwzEr1q9sIYvuY4doxC/14fb7 witrHGPbQa8EP4fDzev2uBbdIbGn458R8zwCD+2/nqOsbQ12TMxk/Lv4NNLUdv3fn8/bSHEUSYzlK Rapc7nEH1t0UMkGVIvnYahj8pR8n9gIf6flMa63zCCoB4q9hgPbhrpiCn963prsMKttdFeYLLcXTC V9DzGBiNCS5zDLS2lRSAwe3womNHnI5zjHUiF4T50A2h6tqvrVp773nbHLSlsorDdF/9gtyc5FiKL JDRbgS95g==; Received: from willy by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1fSNTE-0004lB-0w; Mon, 11 Jun 2018 14:06:56 +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 37/72] mm: Convert add_to_swap_cache to XArray Date: Mon, 11 Jun 2018 07:06:04 -0700 Message-Id: <20180611140639.17215-38-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 Combine __add_to_swap_cache and add_to_swap_cache into one function since there is no more need to preload. Signed-off-by: Matthew Wilcox --- mm/swap_state.c | 93 +++++++++++++++---------------------------------- 1 file changed, 29 insertions(+), 64 deletions(-) diff --git a/mm/swap_state.c b/mm/swap_state.c index c6b3eab73fde..ac07db436c15 100644 --- a/mm/swap_state.c +++ b/mm/swap_state.c @@ -107,14 +107,15 @@ void show_swap_cache_info(void) } /* - * __add_to_swap_cache resembles add_to_page_cache_locked on swapper_space, + * add_to_swap_cache resembles add_to_page_cache_locked on swapper_space, * but sets SwapCache flag and private instead of mapping and index. */ -int __add_to_swap_cache(struct page *page, swp_entry_t entry) +int add_to_swap_cache(struct page *page, swp_entry_t entry, gfp_t gfp) { - int error, i, nr = hpage_nr_pages(page); - struct address_space *address_space; + struct address_space *address_space = swap_address_space(entry); pgoff_t idx = swp_offset(entry); + XA_STATE(xas, &address_space->i_pages, idx); + unsigned long i, nr = 1UL << compound_order(page); VM_BUG_ON_PAGE(!PageLocked(page), page); VM_BUG_ON_PAGE(PageSwapCache(page), page); @@ -123,50 +124,30 @@ int __add_to_swap_cache(struct page *page, swp_entry_t entry) page_ref_add(page, nr); SetPageSwapCache(page); - address_space = swap_address_space(entry); - xa_lock_irq(&address_space->i_pages); - for (i = 0; i < nr; i++) { - set_page_private(page + i, entry.val + i); - error = radix_tree_insert(&address_space->i_pages, - idx + i, page + i); - if (unlikely(error)) - break; - } - if (likely(!error)) { + do { + xas_lock_irq(&xas); + xas_create_range(&xas, idx + nr - 1); + if (xas_error(&xas)) + goto unlock; + for (i = 0; i < nr; i++) { + VM_BUG_ON_PAGE(xas.xa_index != idx + i, page); + set_page_private(page + i, entry.val + i); + xas_store(&xas, page + i); + xas_next(&xas); + } address_space->nrpages += nr; __mod_node_page_state(page_pgdat(page), NR_FILE_PAGES, nr); ADD_CACHE_INFO(add_total, nr); - } else { - /* - * Only the context which have set SWAP_HAS_CACHE flag - * would call add_to_swap_cache(). - * So add_to_swap_cache() doesn't returns -EEXIST. - */ - VM_BUG_ON(error == -EEXIST); - set_page_private(page + i, 0UL); - while (i--) { - radix_tree_delete(&address_space->i_pages, idx + i); - set_page_private(page + i, 0UL); - } - ClearPageSwapCache(page); - page_ref_sub(page, nr); - } - xa_unlock_irq(&address_space->i_pages); +unlock: + xas_unlock_irq(&xas); + } while (xas_nomem(&xas, gfp)); - return error; -} - - -int add_to_swap_cache(struct page *page, swp_entry_t entry, gfp_t gfp_mask) -{ - int error; + if (!xas_error(&xas)) + return 0; - error = radix_tree_maybe_preload_order(gfp_mask, compound_order(page)); - if (!error) { - error = __add_to_swap_cache(page, entry); - radix_tree_preload_end(); - } - return error; + ClearPageSwapCache(page); + page_ref_sub(page, nr); + return xas_error(&xas); } /* @@ -217,7 +198,7 @@ int add_to_swap(struct page *page) return 0; /* - * Radix-tree node allocations from PF_MEMALLOC contexts could + * XArray node allocations from PF_MEMALLOC contexts could * completely exhaust the page allocator. __GFP_NOMEMALLOC * stops emergency reserves from being allocated. * @@ -229,7 +210,6 @@ int add_to_swap(struct page *page) */ err = add_to_swap_cache(page, entry, __GFP_HIGH|__GFP_NOMEMALLOC|__GFP_NOWARN); - /* -ENOMEM radix-tree allocation failure */ if (err) /* * add_to_swap_cache() doesn't return -EEXIST, so we can safely @@ -423,19 +403,11 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, break; /* Out of memory */ } - /* - * call radix_tree_preload() while we can wait. - */ - err = radix_tree_maybe_preload(gfp_mask & GFP_KERNEL); - if (err) - break; - /* * Swap entry may have been freed since our caller observed it. */ err = swapcache_prepare(entry); if (err == -EEXIST) { - radix_tree_preload_end(); /* * We might race against get_swap_page() and stumble * across a SWAP_HAS_CACHE swap_map entry whose page @@ -443,26 +415,19 @@ struct page *__read_swap_cache_async(swp_entry_t entry, gfp_t gfp_mask, */ cond_resched(); continue; - } - if (err) { /* swp entry is obsolete ? */ - radix_tree_preload_end(); + } else if (err) /* swp entry is obsolete ? */ break; - } - /* May fail (-ENOMEM) if radix-tree node allocation failed. */ + /* May fail (-ENOMEM) if XArray node allocation failed. */ __SetPageLocked(new_page); __SetPageSwapBacked(new_page); - err = __add_to_swap_cache(new_page, entry); + err = add_to_swap_cache(new_page, entry, gfp_mask & GFP_KERNEL); if (likely(!err)) { - radix_tree_preload_end(); - /* - * Initiate read into locked page and return. - */ + /* Initiate read into locked page */ lru_cache_add_anon(new_page); *new_page_allocated = true; return new_page; } - radix_tree_preload_end(); __ClearPageLocked(new_page); /* * add_to_swap_cache() doesn't return -EEXIST, so we can safely