From patchwork Mon Oct 4 13:45:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Matthew Wilcox X-Patchwork-Id: 12533967 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E72BBC433F5 for ; Mon, 4 Oct 2021 13:51:53 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 8487B60E76 for ; Mon, 4 Oct 2021 13:51:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 8487B60E76 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=infradead.org Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 25EE2940017; Mon, 4 Oct 2021 09:51:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 20E9094000B; Mon, 4 Oct 2021 09:51:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 0FF40940017; Mon, 4 Oct 2021 09:51:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0209.hostedemail.com [216.40.44.209]) by kanga.kvack.org (Postfix) with ESMTP id 01DFB94000B for ; Mon, 4 Oct 2021 09:51:53 -0400 (EDT) Received: from smtpin24.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id B089027DF5 for ; Mon, 4 Oct 2021 13:51:52 +0000 (UTC) X-FDA: 78658893264.24.4FBE37B Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf18.hostedemail.com (Postfix) with ESMTP id 601AB4002A4D for ; Mon, 4 Oct 2021 13:51:52 +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=1s4N3zyFn2JcQrlJ7Fi5ajWzvyhcI8O2Gr+gvhoj994=; b=DQA24qNttaFr1weQaaV60DE9B2 Iw8dJXTCQhFVPJB9cc+Wjs1QO83YLuLZ6+MBt4xMQZBqPHH+d1o3WUFKx7/BJkIm7nBDAaE1A7JKi IfjXr1IqkD7TaPhZRbTNrlK88iojlaBVwesZd60qRCNJhBfUlPxSUWKKDAJmpcWrtMODSJiJTtSjH u9Mhl9mVSCqaS6NIO5hEotZeSEgZmjngkV19aXQUXyx6t8+jbPbMnSzz+FURaoRwzg6qK+r4q0HVJ BCpFvD0JT89dQ9fnDffEDz9sMF12Lw6/TDgZFOx1xbqTT4IcJH6t7ZNdAYfjSDkEY2k7HWa3Gqgpd sxvmlENQ==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mXOLe-00GvBK-Cy; Mon, 04 Oct 2021 13:50:08 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 02/62] mm: Add pgflags_nid() Date: Mon, 4 Oct 2021 14:45:50 +0100 Message-Id: <20211004134650.4031813-3-willy@infradead.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20211004134650.4031813-1-willy@infradead.org> References: <20211004134650.4031813-1-willy@infradead.org> MIME-Version: 1.0 X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 601AB4002A4D X-Stat-Signature: 7e51myxt44a83zbumfbmk843perak4tb Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=DQA24qNt; dmarc=none; spf=none (imf18.hostedemail.com: domain of willy@infradead.org has no SPF policy when checking 90.155.50.34) smtp.mailfrom=willy@infradead.org X-HE-Tag: 1633355512-897077 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_to_nid() into a wrapper around pgflags_nid(). This is in preparation for splitting struct page into separate types. Signed-off-by: Matthew Wilcox (Oracle) --- include/linux/mm.h | 12 ++++++++---- mm/sparse.c | 6 +++--- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/include/linux/mm.h b/include/linux/mm.h index db63653f403c..adc7e843148b 100644 --- a/include/linux/mm.h +++ b/include/linux/mm.h @@ -1369,16 +1369,20 @@ static inline int page_zone_id(struct page *page) } #ifdef NODE_NOT_IN_PAGE_FLAGS -extern int page_to_nid(const struct page *page); +extern int pgflags_nid(unsigned long pgflags); #else +static inline int pgflags_nid(unsigned long pgflags) +{ + return (pgflags >> NODES_PGSHIFT) & NODES_MASK; +} +#endif + static inline int page_to_nid(const struct page *page) { struct page *p = (struct page *)page; - return (PF_POISONED_CHECK(p)->flags >> NODES_PGSHIFT) & NODES_MASK; + return pgflags_nid(PF_POISONED_CHECK(p)->flags); } -#endif - #ifdef CONFIG_NUMA_BALANCING static inline int cpu_pid_to_cpupid(int cpu, int pid) { diff --git a/mm/sparse.c b/mm/sparse.c index 4c59ed8c1d5a..818bdb84be99 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -43,11 +43,11 @@ static u8 section_to_node_table[NR_MEM_SECTIONS] __cacheline_aligned; static u16 section_to_node_table[NR_MEM_SECTIONS] __cacheline_aligned; #endif -int page_to_nid(const struct page *page) +int pgflags_nid(unsigned long pgflags) { - return section_to_node_table[pgflags_section(page->flags)]; + return section_to_node_table[pgflags_section(pgflags)]; } -EXPORT_SYMBOL(page_to_nid); +EXPORT_SYMBOL(pgflags_nid); static void set_section_nid(unsigned long section_nr, int nid) {