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 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B79C1C433EF for ; Mon, 4 Oct 2021 15:02:05 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 3E039611CA for ; Mon, 4 Oct 2021 15:02:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 3E039611CA 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 D082B94005A; Mon, 4 Oct 2021 11:02:04 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id CB7A794000B; Mon, 4 Oct 2021 11:02:04 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id BA72F94005A; Mon, 4 Oct 2021 11:02:04 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0021.hostedemail.com [216.40.44.21]) by kanga.kvack.org (Postfix) with ESMTP id AD07894000B for ; Mon, 4 Oct 2021 11:02:04 -0400 (EDT) Received: from smtpin31.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay04.hostedemail.com (Postfix) with ESMTP id 6D6902BC39 for ; Mon, 4 Oct 2021 15:02:04 +0000 (UTC) X-FDA: 78659070168.31.44F147A Received: from casper.infradead.org (casper.infradead.org [90.155.50.34]) by imf02.hostedemail.com (Postfix) with ESMTP id 15B7D7001718 for ; Mon, 4 Oct 2021 15:02:03 +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=59s01WMgyDCSHBYY22mVOJcI96lL392acnupwVOiP60=; b=Rg7IgpZp1p0MEE/laY5zaMBe3g rfBG/5JPi2tQsVJ+98QR7MBuNLKQssf3xZKAXtyv3ivuCVaz7Q4p8EztmaAFBKDWm+kTIoiBWhpAY hrVmZaCTLNWK4scflVWASqGtKJAJCRSYasMO0u7nHFTlRODGdRs1EIJeJFWajSudyWOGP6Lm22P9A rtzo7m3tZYk0NiKgjpkqVFjYK1JufWcj+08ytlf0KrlDxhx5OyYAQjNisEBG/TCkGVti8GdwBb+TO /7IPubFXkVpWCh0Vm/dY/vbdiVieREawvEnU1/pjpmNj5u/VI0pcOKFz3kbsj3lgFD2tMcfUSLKj9 seCgSMIA==; Received: from willy by casper.infradead.org with local (Exim 4.94.2 #2 (Red Hat Linux)) id 1mXPRU-00H2H0-I9; Mon, 04 Oct 2021 15:00:32 +0000 From: "Matthew Wilcox (Oracle)" To: linux-mm@kvack.org Cc: "Matthew Wilcox (Oracle)" Subject: [PATCH 60/62] bootmem: Use page->index instead of page->freelist Date: Mon, 4 Oct 2021 14:46:48 +0100 Message-Id: <20211004134650.4031813-61-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: rspam02 X-Rspamd-Queue-Id: 15B7D7001718 X-Stat-Signature: 31whxb43dmzi69rkm7yr8t3gdwjyhfu4 Authentication-Results: imf02.hostedemail.com; dkim=pass header.d=infradead.org header.s=casper.20170209 header.b=Rg7IgpZp; spf=none (imf02.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: 1633359723-103288 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: page->freelist is for the use of slab. Using page->index is the same set of bits as page->freelist, and by using an integer instead of a pointer, we can avoid casts. Signed-off-by: Matthew Wilcox (Oracle) --- arch/x86/mm/init_64.c | 2 +- include/linux/bootmem_info.h | 2 +- mm/bootmem_info.c | 7 +++---- mm/sparse.c | 2 +- 4 files changed, 6 insertions(+), 7 deletions(-) diff --git a/arch/x86/mm/init_64.c b/arch/x86/mm/init_64.c index 36098226a957..96d34ebb20a9 100644 --- a/arch/x86/mm/init_64.c +++ b/arch/x86/mm/init_64.c @@ -981,7 +981,7 @@ static void __meminit free_pagetable(struct page *pag= e, int order) if (PageReserved(page)) { __ClearPageReserved(page); =20 - magic =3D (unsigned long)page->freelist; + magic =3D page->index; if (magic =3D=3D SECTION_INFO || magic =3D=3D MIX_SECTION_INFO) { while (nr_pages--) put_page_bootmem(page++); diff --git a/include/linux/bootmem_info.h b/include/linux/bootmem_info.h index 2bc8b1f69c93..cc35d010fa94 100644 --- a/include/linux/bootmem_info.h +++ b/include/linux/bootmem_info.h @@ -30,7 +30,7 @@ void put_page_bootmem(struct page *page); */ static inline void free_bootmem_page(struct page *page) { - unsigned long magic =3D (unsigned long)page->freelist; + unsigned long magic =3D page->index; =20 /* * The reserve_bootmem_region sets the reserved flag on bootmem diff --git a/mm/bootmem_info.c b/mm/bootmem_info.c index f03f42f426f6..f18a631e7479 100644 --- a/mm/bootmem_info.c +++ b/mm/bootmem_info.c @@ -15,7 +15,7 @@ =20 void get_page_bootmem(unsigned long info, struct page *page, unsigned lo= ng type) { - page->freelist =3D (void *)type; + page->index =3D type; SetPagePrivate(page); set_page_private(page, info); page_ref_inc(page); @@ -23,14 +23,13 @@ void get_page_bootmem(unsigned long info, struct page= *page, unsigned long type) =20 void put_page_bootmem(struct page *page) { - unsigned long type; + unsigned long type =3D page->index; =20 - type =3D (unsigned long) page->freelist; BUG_ON(type < MEMORY_HOTPLUG_MIN_BOOTMEM_TYPE || type > MEMORY_HOTPLUG_MAX_BOOTMEM_TYPE); =20 if (page_ref_dec_return(page) =3D=3D 1) { - page->freelist =3D NULL; + page->index =3D 0; ClearPagePrivate(page); set_page_private(page, 0); INIT_LIST_HEAD(&page->lru); diff --git a/mm/sparse.c b/mm/sparse.c index 818bdb84be99..d531c533ee53 100644 --- a/mm/sparse.c +++ b/mm/sparse.c @@ -722,7 +722,7 @@ static void free_map_bootmem(struct page *memmap) >> PAGE_SHIFT; =20 for (i =3D 0; i < nr_pages; i++, page++) { - magic =3D (unsigned long) page->freelist; + magic =3D page->index; =20 BUG_ON(magic =3D=3D NODE_INFO); =20 --=20 2.32.0