From nobody Sun Dec 28 21:18:19 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF354C10F04 for ; Tue, 5 Dec 2023 03:06:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1344177AbjLEDFz (ORCPT ); Mon, 4 Dec 2023 22:05:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51088 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344112AbjLEDFw (ORCPT ); Mon, 4 Dec 2023 22:05:52 -0500 Received: from mail-oi1-x231.google.com (mail-oi1-x231.google.com [IPv6:2607:f8b0:4864:20::231]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 89543BF for ; Mon, 4 Dec 2023 19:05:58 -0800 (PST) Received: by mail-oi1-x231.google.com with SMTP id 5614622812f47-3b9b8522d91so844283b6e.0 for ; Mon, 04 Dec 2023 19:05:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=bytedance.com; s=google; t=1701745558; x=1702350358; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=jzYDmmhRG2n20WSmvmn2jO+KOPCtoJ3u06D8mep65Xg=; b=kQg3buZvZ6F4/DpJAKZWwepxnSOd63RTxKqTyubgcJ2C6sRD36IVtMaAMyyiyXgI3n CwbjMzfJOuyuMRnSlpnpt8YBvQNIEPdCtEUNHyFG3w+MP2JwTowTzR/6KkXg7FW3m78d pYpAZQs+jOfTVOdx+yHwS/wqpU5Rinpo2TvF+n1klPzY+BLXxrWLC39H6aZuW4PH3FpG FJ27ihgtu3Hclqqluo9svJR+twpJN9OqpXWz+GM96bDGobHzl14YcRF8aetB1XWZOzUt rzJ5BUPZ18i5gdvgTwOIQwOsElshi6Zayp/Tr7m4kxoYUHFR3518th5wqG3Dz0F5Pf/L jE3g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701745558; x=1702350358; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=jzYDmmhRG2n20WSmvmn2jO+KOPCtoJ3u06D8mep65Xg=; b=n4waV/jzULCilWbVeg++B5FgZxYsH+Blihg3puDz/lzGJ2dLhxTaBVp3mS76J0cZvI tUHQ+1nZNqkRCJpuZL4hBetBQ3iJL2K73j6j5OXGvyZjdCzGP4atCV+8kNoRYP+ywQFq 5akPmhHsqh1TDNpjgRzA2QfY38CJ0Xbs9HY8uzwrdCdckpbWnGovaEjd7vhEcNYwfmBA Rv1BJdzqwFOY5hSza9CfBZ7w320QSvy15yD6uK8RrVkZILajS4XswJh0LISLwR7DMMJT YQf6YUH9EEdNOZOgfxTTv7wPpiEgU/DxrLAAzIUteL54xFrKaFNuvR8rm0l/r+Cdh5A2 skEg== X-Gm-Message-State: AOJu0Yx4zY/5RlR2934s1HpuFtp5iV9LHHoeL8PrC69siquTRO5poCdL T+0dViLT1jQQF3pIKOklj5gTY/aYDy1o0fd/QIR7XHDm X-Google-Smtp-Source: AGHT+IFBb0oP0UUkjKTxK2YQOmu7n4p4NPrrmlEXlUiLFndQCEE3Su2u+A+v5yzj06Eyu8u5+f6z9A== X-Received: by 2002:a05:6808:23cb:b0:3b8:b063:6b90 with SMTP id bq11-20020a05680823cb00b003b8b0636b90mr6290092oib.63.1701745557781; Mon, 04 Dec 2023 19:05:57 -0800 (PST) Received: from PXLDJ45XCM.bytedance.net ([61.213.176.12]) by smtp.gmail.com with ESMTPSA id ff22-20020a056a002f5600b006cbafa4b426sm92435pfb.110.2023.12.04.19.05.54 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Mon, 04 Dec 2023 19:05:56 -0800 (PST) From: Muchun Song To: mike.kravetz@oracle.com, muchun.song@linux.dev, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, Muchun Song Subject: [PATCH] mm: hugetlb_vmemmap: add check of CONFIG_MEMORY_HOTPLUG back Date: Tue, 5 Dec 2023 11:05:30 +0800 Message-Id: <20231205030530.3802-1-songmuchun@bytedance.com> X-Mailer: git-send-email 2.39.3 (Apple Git-145) MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The compiler will optimize the code as much as possible if we add the check of CONFIG_MEMORY_HOTPLUG back. Signed-off-by: Muchun Song --- mm/hugetlb_vmemmap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/hugetlb_vmemmap.c b/mm/hugetlb_vmemmap.c index eb05596662d42..be1586a114ce1 100644 --- a/mm/hugetlb_vmemmap.c +++ b/mm/hugetlb_vmemmap.c @@ -119,7 +119,7 @@ static int vmemmap_pmd_entry(pmd_t *pmd, unsigned long = addr, * +--+ | | * +------------------------+ */ - if (unlikely(!vmemmap_walk->nr_walked)) { + if (IS_ENABLED(CONFIG_MEMORY_HOTPLUG) && unlikely(!vmemmap_walk->nr_walke= d)) { struct page *page =3D head ? head + pte_index(addr) : pte_page(ptep_get(pte_offset_kernel(pmd, addr))); =20 --=20 2.20.1