From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.6 required=3.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C5B8C47E48 for ; Thu, 15 Jul 2021 04:19:49 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id E333B6128C for ; Thu, 15 Jul 2021 04:19:48 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org E333B6128C Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=owner-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix) id 3F4DF8D002E; Thu, 15 Jul 2021 00:19:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 3CB7D6B013E; Thu, 15 Jul 2021 00:19:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 293658D002E; Thu, 15 Jul 2021 00:19:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0149.hostedemail.com [216.40.44.149]) by kanga.kvack.org (Postfix) with ESMTP id 05D7C6B013D for ; Thu, 15 Jul 2021 00:19:48 -0400 (EDT) Received: from smtpin22.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay05.hostedemail.com (Postfix) with ESMTP id E7D30182056CC for ; Thu, 15 Jul 2021 04:19:47 +0000 (UTC) X-FDA: 78363518814.22.7DCDB82 Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf25.hostedemail.com (Postfix) with ESMTP id 9E780B00029D for ; Thu, 15 Jul 2021 04:19:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=casper.20170209; 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=TCeIycJ0VBmfdDjFJis4rziunkk2jYfcqWr47jM0A6w=; b=hX+LWden5mfIQEpU4c1BH7LtcA TwaU/4kB/cftZXp3G4h+JkzAY0mtabv/0MVUUEDj5zz4wis+cAGecPoIsmA7ETm/a4dc6FSBeiwgC 86Pk1sr18zn5gSbTKZLro0He5niwpR/PKwe5E01clCTD32MQywfOoqGJP2fe5XscnbXVssn7P1g4G 518vzLvh8/z9HtxRpauIzXpPtMT0pyyU17MKOfnRf6ABtAD6BNgrxdteQsRDWU+Lpw1mlPRvJjXWx 0ZKDReH4lZplNBdwPHFqm76SmM7KSP2pzSIEJiMK1OVBEQVvjkElPJIhOJIgHkQgBtiJ6L1R8kIkg wIZtk6QA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1m3spO-002wkP-1W; Thu, 15 Jul 2021 04:18:44 +0000 From: "Matthew Wilcox (Oracle)" To: linux-kernel@vger.kernel.org Cc: "Matthew Wilcox (Oracle)" , linux-mm@kvack.org, linux-fsdevel@vger.kernel.org Subject: [PATCH v14 052/138] mm: Add folio_raw_mapping() Date: Thu, 15 Jul 2021 04:35:38 +0100 Message-Id: <20210715033704.692967-53-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210715033704.692967-1-willy@infradead.org> References: <20210715033704.692967-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 9E780B00029D X-Stat-Signature: 4bqkxypzdhpgqfw5gsqm7pwuf87qdi4z Authentication-Results: imf25.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=hX+LWden; spf=none (imf25.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org; dmarc=none X-HE-Tag: 1626322787-770278 Content-Transfer-Encoding: quoted-printable 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: Convert __page_rmapping to folio_raw_mapping and move it to mm/internal.h= . It's only a couple of instructions (load and mask), so it's definitely going to be cheaper to inline it than call it. Leave page_rmapping out of line. Signed-off-by: Matthew Wilcox (Oracle) --- mm/internal.h | 7 +++++++ mm/util.c | 20 ++++---------------- 2 files changed, 11 insertions(+), 16 deletions(-) diff --git a/mm/internal.h b/mm/internal.h index 1a8851b73031..fa31a7f0ed79 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -34,6 +34,13 @@ =20 void page_writeback_init(void); =20 +static inline void *folio_raw_mapping(struct folio *folio) +{ + unsigned long mapping =3D (unsigned long)folio->mapping; + + return (void *)(mapping & ~PAGE_MAPPING_FLAGS); +} + vm_fault_t do_swap_page(struct vm_fault *vmf); void folio_rotate_reclaimable(struct folio *folio); =20 diff --git a/mm/util.c b/mm/util.c index e8c12350b3eb..d0aa1d9c811e 100644 --- a/mm/util.c +++ b/mm/util.c @@ -635,21 +635,10 @@ void kvfree_sensitive(const void *addr, size_t len) } EXPORT_SYMBOL(kvfree_sensitive); =20 -static inline void *__page_rmapping(struct page *page) -{ - unsigned long mapping; - - mapping =3D (unsigned long)page->mapping; - mapping &=3D ~PAGE_MAPPING_FLAGS; - - return (void *)mapping; -} - /* Neutral page->mapping pointer to address_space or anon_vma or other *= / void *page_rmapping(struct page *page) { - page =3D compound_head(page); - return __page_rmapping(page); + return folio_raw_mapping(page_folio(page)); } =20 /** @@ -680,13 +669,12 @@ EXPORT_SYMBOL(folio_mapped); =20 struct anon_vma *page_anon_vma(struct page *page) { - unsigned long mapping; + struct folio *folio =3D page_folio(page); + unsigned long mapping =3D (unsigned long)folio->mapping; =20 - page =3D compound_head(page); - mapping =3D (unsigned long)page->mapping; if ((mapping & PAGE_MAPPING_FLAGS) !=3D PAGE_MAPPING_ANON) return NULL; - return __page_rmapping(page); + return (void *)(mapping - PAGE_MAPPING_ANON); } =20 /** --=20 2.30.2