Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
From:   Mike Kravetz <mike.kravetz@oracle.com>
To:     linux-mm@kvack.org, linux-kernel@vger.kernel.org
Cc:     Jann Horn <jannh@google.com>,
        Youquan Song <youquan.song@intel.com>,
        Andrea Arcangeli <aarcange@redhat.com>,
        Jan Kara <jack@suse.cz>, John Hubbard <jhubbard@nvidia.com>,
        "Kirill A . Shutemov" <kirill@shutemov.name>,
        Matthew Wilcox <willy@infradead.org>,
        Michal Hocko <mhocko@kernel.org>,
        Andrew Morton <akpm@linux-foundation.org>,
        Mike Kravetz <mike.kravetz@oracle.com>
Subject: [PATCH 1/2] hugetlb: remove prep_compound_huge_page cleanup
Date:   Mon, 21 Jun 2021 19:14:22 -0700
Message-Id: <20210622021423.154662-2-mike.kravetz@oracle.com>
In-Reply-To: <20210622021423.154662-1-mike.kravetz@oracle.com>
References: <20210622021423.154662-1-mike.kravetz@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
Received: from monkey.oracle.com (50.38.35.18) by MW4PR03CA0072.namprd03.prod.outlook.com (2603:10b6:303:b6::17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4242.19 via Frontend Transport; Tue, 22 Jun 2021 02:14:40 +0000
X-MS-PublicTrafficType: Email
X-MS-Office365-Filtering-Correlation-Id: faa9ffb4-9b44-4605-dad4-08d935237e27
X-MS-TrafficTypeDiagnostic: BYAPR10MB2664:
X-MS-Exchange-Transport-Forked: True
X-Microsoft-Antispam-PRVS: <BYAPR10MB266406EFB70101280C0AE270E2099@BYAPR10MB2664.namprd10.prod.outlook.com>
X-MS-Oob-TLC-OOBClassifiers: OLM:8273;
X-MS-Exchange-SenderADCheck: 1
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: O3rp7unXtC3bFcY1KxIDhojrgTXFW6SowawVG8l3cWoShs1hfxNFQyJTWP2vEDVtFT/Ubw3RyNTP2cla20PIUlkh9nMs8IbDhc0CqdpMvA4simjyjx38YeBsUckiJDccxjcU0nkvCKl5dAgHa+9PnK7+to7yDinD5RZfCfizpPokXR9Pdu9+uomCJPzXNRLU7X/JwplNq9Bifm+mABJBwcAzmY3IcwUmni5XbomA+sgOSjDhAgC1UR2ec0SQdN4OCl+9yPFAdowx1qjpoLmndFyrF8zq1UVmP8AhwoiHgHsk/eM4U41xhyMkzsxCG1WCfSEJ8ySQaFTKsHqBfnywDZ/c4eUWEoM6N1CKRQTbgo5KsqSOXzlKrIKtpHEiZnrIiMA95JKDsAr5+VPpJkIkfsEcclQJ6eBVE9WcnpgE7RWy7wIEGC6cfakk3zSiSz3dJUJfNNh3bdbPiv03rnUYqVsxm6DeY9c//nvVp9JlAuJE72r5CsTn6iOjTQ+Rwdp9kAB/4HFvMgM2WkVE4Tfg/6J0+bYc6qXnEe5grCpPMwQz8tqAYUW9NUxZdE33fFK1tgzAc69fYqb17q07/wB4Up3cnz43ODXSLGt8loRbX2ygXKiMmDAtgLxt79dJ/20ToPBOUUeemCx6QjzvkuEBxBgAq1Lg+GFlG5JE9qCaN7k=
X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:BY5PR10MB4196.namprd10.prod.outlook.com;PTR:;CAT:NONE;SFS:(376002)(396003)(136003)(39860400002)(366004)(346002)(52116002)(16526019)(186003)(66946007)(86362001)(66556008)(5660300002)(66476007)(8936002)(7696005)(2906002)(7416002)(1076003)(26005)(8676002)(36756003)(478600001)(44832011)(107886003)(38350700002)(38100700002)(54906003)(316002)(6486002)(2616005)(4326008)(83380400001)(956004)(6666004)(14583001);DIR:OUT;SFP:1101;
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Ma1Eb6OlMV5TC/AH1DAFvIG3Sn/xwKwNmYGHgLQ9wspkbLxVTjV+cNVE1eDe?=
 =?us-ascii?Q?aNODVT1nsWtHpYgVtiEdWPaGzdXpBnpuvbyQKhx2RJdd0qlcL5zFUmktJI8E?=
 =?us-ascii?Q?8Y+Wt/c64rdfSz4HudpIGk8KJngfPnQYB5R9Ditk0Vhh1XCeXLqvf1f9cW7C?=
 =?us-ascii?Q?P2mlSuo85dvQwwJeanTr9L+ug35GH5MHlC9J9gu6AaMdvPaTRQ5IOc09cZ0n?=
 =?us-ascii?Q?IHTTBcVAeCDqba4GcnZD+5W5SfDZjh9Xxe1yr4hASyCrYqfdwZ1RUSOw7vRd?=
 =?us-ascii?Q?JGf7JNxR8quYfjwQsY4hQ77OB747WOBMtW/MR8s9a3hWFX+UjzJpdDGFVA/h?=
 =?us-ascii?Q?bE/dymP4T/qPuRmf/0QSGgwWiPllV3CvVEWFqdEeEhP2UOAAA4Zbr5sW77iP?=
 =?us-ascii?Q?dov9U25HJAp3C1R9mXkOB/dCOBMObB5Fk21gHFoAt98RZaguYMdZENTa+rea?=
 =?us-ascii?Q?II8ftkmFnKK+23eJ5JSDxxVw9Ar+IIgArelGWPcKURJJ1VJ7tZbtfo+PdqKi?=
 =?us-ascii?Q?CXe7pDsrijTaRgIqrtCyiC34KCdMd4OzyDPwDVTSqLruyn16CcQrssTGbvUO?=
 =?us-ascii?Q?gmxQmNnDAUhT2qMfUUjYX7eYIibQlVlHocG6dZJZH3AwWnc4C/D9qVVmMCFd?=
 =?us-ascii?Q?3Uf3vh7ZfL0mWmQCVtZjZ3tFqwbzbwxeOCm8gJCOy/pfmRHIWWWG6SfEAh5u?=
 =?us-ascii?Q?FOW8GsMBbhrPgz/hjDsFd18tATafWnWQF7lBsU5wKTJ+qlsjk6xDxufIIPl5?=
 =?us-ascii?Q?9mzzEx8EvXe+GQueBTwK2wWwFYr/DikEBUWPl5Ebw+9QRFH9xOGvx75EVXbA?=
 =?us-ascii?Q?GqxLpEo0R/mexk1tM5561t6cphdNL/sry3rjcLZSDGVdxR9HMQ7OeJv9XHbE?=
 =?us-ascii?Q?3vK68Mp9ptBBXGKvDwu5m6cTf1qyQFKIxTqsTLQxIyZpRkDdrBkCJhnlbKaF?=
 =?us-ascii?Q?AhVDtzINNdXIeOgVAYSeaogO+g6yNDb5A8kV+pycDQk5dwub0SUnj/TBZ2lv?=
 =?us-ascii?Q?09y+jC+Km3+YfjTfOLHvzRaCu7qDCtUyy2IiWIthseDP4pwUVCsp/wHutV/r?=
 =?us-ascii?Q?SHBLlDOdNUUp7uR7d+pTjgb2sjm7wXclFocDSx9kndDhx6YfDOz+KqY5ekJ6?=
 =?us-ascii?Q?IpOYawvhX3JQn1Pal2VwXMIOkRz5d7Rv518PP1df9umyAoACD9RBLQU7isCb?=
 =?us-ascii?Q?xNifELldJkSlUTa4TldRZIJh+D19/QN4Hf6ygmWeZz48RQIlz7c8yrc2l8o/?=
 =?us-ascii?Q?0CkxABA/KTuF192UmZa7/Yz4K7KrF8jpyfpg8tEBRmBJIkyzw2e7fZzRZN6R?=
 =?us-ascii?Q?Elh6Sdopigakim29a73bnmyD?=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: faa9ffb4-9b44-4605-dad4-08d935237e27
X-MS-Exchange-CrossTenant-AuthSource: BY5PR10MB4196.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Jun 2021 02:14:40.7837
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: YtGxJ11Q4S8m5O0rRsTWVtg99LWdDhe07bYKaBOfZKggApy7jUJLNoqBwL0VcSTlsNwrm4oZ5pdA4zTRwEImVA==
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR10MB2664
X-Proofpoint-Virus-Version: vendor=nai engine=6200 definitions=10022 signatures=668682
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 suspectscore=0 malwarescore=0
 mlxscore=0 mlxlogscore=999 adultscore=0 phishscore=0 spamscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2104190000 definitions=main-2106220012
X-Proofpoint-GUID: BMyGzsjoWissqy57CebtcF3mvCvYrhgn
X-Proofpoint-ORIG-GUID: BMyGzsjoWissqy57CebtcF3mvCvYrhgn
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

The routine prep_compound_huge_page is a simple wrapper to call either
prep_compound_gigantic_page or prep_compound_page.  However, it is only
called from gather_bootmem_prealloc which only processes gigantic pages.
Eliminate the routine and call prep_compound_gigantic_page directly.

Signed-off-by: Mike Kravetz <mike.kravetz@oracle.com>
---
 mm/hugetlb.c | 29 ++++++++++-------------------
 1 file changed, 10 insertions(+), 19 deletions(-)

diff --git a/mm/hugetlb.c b/mm/hugetlb.c
index 760b5fb836b8..50596b7d6da9 100644
--- a/mm/hugetlb.c
+++ b/mm/hugetlb.c
@@ -1320,8 +1320,6 @@ static struct page *alloc_gigantic_page(struct hstate *h, gfp_t gfp_mask,
 	return alloc_contig_pages(nr_pages, gfp_mask, nid, nodemask);
 }
 
-static void prep_new_huge_page(struct hstate *h, struct page *page, int nid);
-static void prep_compound_gigantic_page(struct page *page, unsigned int order);
 #else /* !CONFIG_CONTIG_ALLOC */
 static struct page *alloc_gigantic_page(struct hstate *h, gfp_t gfp_mask,
 					int nid, nodemask_t *nodemask)
@@ -2759,16 +2757,10 @@ int __alloc_bootmem_huge_page(struct hstate *h)
 	return 1;
 }
 
-static void __init prep_compound_huge_page(struct page *page,
-		unsigned int order)
-{
-	if (unlikely(order > (MAX_ORDER - 1)))
-		prep_compound_gigantic_page(page, order);
-	else
-		prep_compound_page(page, order);
-}
-
-/* Put bootmem huge pages into the standard lists after mem_map is up */
+/*
+ * Put bootmem huge pages into the standard lists after mem_map is up.
+ * Note: This only applies to gigantic (order > MAX_ORDER) pages.
+ */
 static void __init gather_bootmem_prealloc(void)
 {
 	struct huge_bootmem_page *m;
@@ -2777,20 +2769,19 @@ static void __init gather_bootmem_prealloc(void)
 		struct page *page = virt_to_page(m);
 		struct hstate *h = m->hstate;
 
+		VM_BUG_ON(!hstate_is_gigantic(h));
 		WARN_ON(page_count(page) != 1);
-		prep_compound_huge_page(page, huge_page_order(h));
+		prep_compound_gigantic_page(page, huge_page_order(h));
 		WARN_ON(PageReserved(page));
 		prep_new_huge_page(h, page, page_to_nid(page));
 		put_page(page); /* free it into the hugepage allocator */
 
 		/*
-		 * If we had gigantic hugepages allocated at boot time, we need
-		 * to restore the 'stolen' pages to totalram_pages in order to
-		 * fix confusing memory reports from free(1) and another
-		 * side-effects, like CommitLimit going negative.
+		 * We need to restore the 'stolen' pages to totalram_pages
+		 * in order to fix confusing memory reports from free(1) and
+		 * other side-effects, like CommitLimit going negative.
 		 */
-		if (hstate_is_gigantic(h))
-			adjust_managed_page_count(page, pages_per_huge_page(h));
+		adjust_managed_page_count(page, pages_per_huge_page(h));
 		cond_resched();
 	}
 }
-- 
2.31.1