From patchwork Sun Jun 17 02:00:02 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 10468189 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 D675E603B4 for ; Sun, 17 Jun 2018 02:01:18 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C754B28BC1 for ; Sun, 17 Jun 2018 02:01:18 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BBF8328BDB; Sun, 17 Jun 2018 02:01:18 +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 5359B28BC1 for ; Sun, 17 Jun 2018 02:01:18 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 25DF86B000A; Sat, 16 Jun 2018 22:01:02 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id E59E66B000D; Sat, 16 Jun 2018 22:01:01 -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 AFF446B026A; Sat, 16 Jun 2018 22:01:01 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pl0-f69.google.com (mail-pl0-f69.google.com [209.85.160.69]) by kanga.kvack.org (Postfix) with ESMTP id 505EE6B000D for ; Sat, 16 Jun 2018 22:01:01 -0400 (EDT) Received: by mail-pl0-f69.google.com with SMTP id c3-v6so7678518plz.7 for ; Sat, 16 Jun 2018 19:01:01 -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=rCVZhsdA5Rcv4AP6f/xRevR0MXpf3pzSs7BrlelCiww=; b=jcom/727PFZOhupZePzXFe27o1pJUbw4aD1bHNhi/QtdxLnn1wq9fTi+fWAxoXoPcm fO0g6ddZNqqgi0dnBidyU0jP/5DJXfzmIuBWoPMUJLocw1RDAtoXRpIUxcfjekaaMkZu dsgkxPxdHGRI9mx9o16PFm3oTWedId7t/SdKqWy/2CAJDcfIAePQ0Kfs0slk8l0w4ZQu T4N4feHyLVUIjkmB3fKU4j5N2qMa/jrWCJa31341szE84OVcTHIBpTHE5KSu3j2mGH5h gRqo3hhR5H/RgsDTE7NKXlHa2dIWWicLyZCsoUs4hjpiWuYi82qC4Mer/PYr0M+ffmyU MAeg== X-Gm-Message-State: APt69E1aMheMF3/FMqyrscnXi/8VkDk63b7QPE28w8Gi0X+Le3zlkgJt Z45LhH26QTz3p9T5xO++tukiZ/KA5Dt9WLIb8KurM+aghxlStHH1cMLuYKqCvkpydrURFgk5y0W waiNA90X4soYfbbqKRanJHGSfA/LVvMVhTlhUzlaVNqj9GPy2T4DxjTPLU9BAPsx0bw== X-Received: by 2002:a65:608c:: with SMTP id t12-v6mr6749248pgu.159.1529200861001; Sat, 16 Jun 2018 19:01:01 -0700 (PDT) X-Google-Smtp-Source: ADUXVKJrO2yuCgrPdPjoLUTadT5XDFqCZoBRaLCi9OZj9a9Mk+XXnqIBQC4OpmzNxQ5Bujk/qaJU X-Received: by 2002:a65:608c:: with SMTP id t12-v6mr6749224pgu.159.1529200860143; Sat, 16 Jun 2018 19:01:00 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529200860; cv=none; d=google.com; s=arc-20160816; b=ogk97dnJCBuFqHNRqpYOQGSs0sEQzsfQ2JNp5zPNXuTlklzTb7aBMBzWUW7QE+ZBps Y6YescadJKntBO+YCXX/kgKorYtKejKc7v6Wsd0HIWoELvNaZgWx/D8pjsz/1M6w8bzk 9AjaJwmMxxAU4pKlYc2jWySmksO1JeTnnBe15Hj98hxvdGVRMge3VH2eSzeHeFaaqy6L B+d/ClKgJA33OFbm86SVtLphDME9pC7Xyp0WTvPZOV3HEv4pp303cMRhTN6S1iAvJTZ4 O0AFOplNiH4ypLGhqA1GvhAh/RhIUA2aUHyJvlz/otBnlPUwc1+AAL/BHABj9jLvEubW 2Lrg== 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=rCVZhsdA5Rcv4AP6f/xRevR0MXpf3pzSs7BrlelCiww=; b=R4uH3h0SI/9G0PSdrHikI8SfHCsqC97gcxt9EuuoWQgiZRJHKIIGDf6Edf90Xr4pDU jwhQX7SNCLWeJwOjBzfckJeeiys3f/Nb3mFXkgx36Qc+JHnHjfgdzAq7xxdJ7wmmkk72 uOXG0jpOty445SXitPfT9rluPHaUZ2mT+5vTryhDFEJPDlRCXNB7qMeQLCRIlRR1NDCG 4TWPkL0QswtcAD3Mbt8bxzDSf6/TBm6SJPAK+IUi2kXzdWDhsrY4fVdSsR0Va9cGA+9I ZcK3udkwT8z4qMr6Zg0XNkwwzITYkmFK2Z2ayxF8fFrlJTl7XX1l6xtkPhZudRQIUZFu h/gQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@infradead.org header.s=bombadil.20170209 header.b=VxIvapti; 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 189-v6si10661884pfg.163.2018.06.16.19.01.00 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sat, 16 Jun 2018 19:01:00 -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=VxIvapti; 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=rCVZhsdA5Rcv4AP6f/xRevR0MXpf3pzSs7BrlelCiww=; b=VxIvaptiWu8tJwy+XJHfCIOXP MlUg//TobYXZ5kWc/JgUmaVxvrp6Xte7PsHNVLQpRT/7yfkBgQQuDKyGnWpz8u98uKgSRW4Pg9JUa 9n1nAwOYkWsTXjvQWKqiedWyc5YPBv3wKfpcIvGZ4WuRQBkHd7MzKv3I/00i8XqjLh8g1eOAVSxs9 rys5B1SZIEgjYOlnzqQ+5ClJfNLVKsRvBMs3PWjhaJbYg4JkmGH3zjyKpsBEMWbZ2q8Dqk+9t/4uj b8BRCgDQY1ZiFm7i+71AFpDKHoGAiIRQ1aQs804+JK26qziy3gf2fKALzC6pgd6VB631LXxT+9WAE UL8RGJ+Lg==; Received: from willy by bombadil.infradead.org with local (Exim 4.90_1 #2 (Red Hat Linux)) id 1fUMzz-0001I5-HF; Sun, 17 Jun 2018 02:00:59 +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 v14 24/74] page cache: Convert find_get_entry to XArray Date: Sat, 16 Jun 2018 19:00:02 -0700 Message-Id: <20180617020052.4759-25-willy@infradead.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180617020052.4759-1-willy@infradead.org> References: <20180617020052.4759-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 Slightly shorter and simpler code. Signed-off-by: Matthew Wilcox --- mm/filemap.c | 63 +++++++++++++++++++++++----------------------------- 1 file changed, 28 insertions(+), 35 deletions(-) diff --git a/mm/filemap.c b/mm/filemap.c index 7cdb1d4b8117..6db3d35ff5f6 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1382,47 +1382,40 @@ EXPORT_SYMBOL(page_cache_prev_gap); */ struct page *find_get_entry(struct address_space *mapping, pgoff_t offset) { - void **pagep; + XA_STATE(xas, &mapping->i_pages, offset); struct page *head, *page; rcu_read_lock(); repeat: - page = NULL; - pagep = radix_tree_lookup_slot(&mapping->i_pages, offset); - if (pagep) { - page = radix_tree_deref_slot(pagep); - if (unlikely(!page)) - goto out; - if (radix_tree_exception(page)) { - if (radix_tree_deref_retry(page)) - goto repeat; - /* - * A shadow entry of a recently evicted page, - * or a swap entry from shmem/tmpfs. Return - * it without attempting to raise page count. - */ - goto out; - } + xas_reset(&xas); + page = xas_load(&xas); + if (xas_retry(&xas, page)) + goto repeat; + /* + * A shadow entry of a recently evicted page, or a swap entry from + * shmem/tmpfs. Return it without attempting to raise page count. + */ + if (!page || xa_is_value(page)) + goto out; - head = compound_head(page); - if (!page_cache_get_speculative(head)) - goto repeat; + head = compound_head(page); + if (!page_cache_get_speculative(head)) + goto repeat; - /* The page was split under us? */ - if (compound_head(page) != head) { - put_page(head); - goto repeat; - } + /* The page was split under us? */ + if (compound_head(page) != head) { + put_page(head); + goto repeat; + } - /* - * Has the page moved? - * This is part of the lockless pagecache protocol. See - * include/linux/pagemap.h for details. - */ - if (unlikely(page != *pagep)) { - put_page(head); - goto repeat; - } + /* + * Has the page moved? + * This is part of the lockless pagecache protocol. See + * include/linux/pagemap.h for details. + */ + if (unlikely(page != xas_reload(&xas))) { + put_page(head); + goto repeat; } out: rcu_read_unlock(); @@ -1453,7 +1446,7 @@ struct page *find_lock_entry(struct address_space *mapping, pgoff_t offset) repeat: page = find_get_entry(mapping, offset); - if (page && !radix_tree_exception(page)) { + if (page && !xa_is_value(page)) { lock_page(page); /* Has the page been truncated? */ if (unlikely(page_mapping(page) != mapping)) {