From patchwork Thu Apr 3 06:41:38 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Liu Shixin X-Patchwork-Id: 14036756 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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2ABBCC3600C for ; Thu, 3 Apr 2025 06:49:26 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id C4877280003; Thu, 3 Apr 2025 02:49:25 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id BF573280001; Thu, 3 Apr 2025 02:49:25 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id AE56D280003; Thu, 3 Apr 2025 02:49:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0010.hostedemail.com [216.40.44.10]) by kanga.kvack.org (Postfix) with ESMTP id 92013280001 for ; Thu, 3 Apr 2025 02:49:25 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id EC1C61CC769 for ; Thu, 3 Apr 2025 06:49:25 +0000 (UTC) X-FDA: 83291806290.07.6E3377F Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) by imf29.hostedemail.com (Postfix) with ESMTP id 2D87512000E for ; Thu, 3 Apr 2025 06:49:22 +0000 (UTC) Authentication-Results: imf29.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf29.hostedemail.com: domain of liushixin2@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=liushixin2@huawei.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743662964; a=rsa-sha256; cv=none; b=mbufprpoBLGSvg/Ovjb7XkH2muFjK3mcrlFbHFp/isK9j31zmiznKA0G7Q1eZcl77QWIUx xzD7Rs38yweFm7sQkxnrUs9IriifMy2w15PrqazuiI3KAx1PNV/Zpnn7YJHmRqE12ZNleD Lbv1TAjkoyaoySvOSM3kvOy7+UYX6R0= ARC-Authentication-Results: i=1; imf29.hostedemail.com; dkim=none; dmarc=pass (policy=quarantine) header.from=huawei.com; spf=pass (imf29.hostedemail.com: domain of liushixin2@huawei.com designates 45.249.212.187 as permitted sender) smtp.mailfrom=liushixin2@huawei.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743662964; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:in-reply-to: references; bh=8LpwFBF6nZWEg1SLYoywmeTphllgMNfVsiXy4sH99tA=; b=opVw7wEGk+g4p5JvfiyBJQzBhRifxbVn/2NRvuzjbJ/R71HZ3olqtq2NkgNOj0/9lWvjZx qYM0JHu+vW0ERXktu0Dbq0mbmduvoHuvFs2UM82M8JSwW/gGCgEvnO97y+xxjmy77A/LSe kubq+MUnm2k03bJoxW1Uy9cvQFJSv1s= Received: from mail.maildlp.com (unknown [172.19.163.48]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4ZSsgL5kqczvWpF; Thu, 3 Apr 2025 14:45:18 +0800 (CST) Received: from kwepemg200013.china.huawei.com (unknown [7.202.181.64]) by mail.maildlp.com (Postfix) with ESMTPS id 10B06180087; Thu, 3 Apr 2025 14:49:19 +0800 (CST) Received: from huawei.com (10.175.113.32) by kwepemg200013.china.huawei.com (7.202.181.64) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Thu, 3 Apr 2025 14:49:18 +0800 From: Liu Shixin To: Andrew Morton , Muchun Song , Kefeng Wang , David Hildenbrand , Nanyong Sun CC: , , Liu Shixin Subject: [PATCH] mm/hugetlb: fix nid mismatch in alloc_surplus_hugetlb_folio() Date: Thu, 3 Apr 2025 14:41:38 +0800 Message-ID: <20250403064138.2867929-1-liushixin2@huawei.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Originating-IP: [10.175.113.32] X-ClientProxiedBy: dggems706-chm.china.huawei.com (10.3.19.183) To kwepemg200013.china.huawei.com (7.202.181.64) X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 2D87512000E X-Stat-Signature: 8jwic44ey4m45e3556xqark9g4j8sj1w X-Rspam-User: X-HE-Tag: 1743662962-154197 X-HE-Meta: U2FsdGVkX18IYhrjT4+uDUKHghc0xfQOBo58xiMz1ieFN7O9MAmrwBvBlK34LIfi0sg+RyzT1aTAJSyMqPX4lVdgcTVs4VuiKULJhyXWPc3J20yfNlJBLC59lksM7Uqb5UmTLCiMXhzmX6hTgIUG6FET54AegsGyztfezccNvJ5e+25LE35TUqAaLuQwym7dZZLHLLX63Bovd9CDClHdlFmGNjaLG36sT/ijS5KuaP4m1bFRsEGVTcVnCZkPUJiniwr6Pm8BOJkapxMGBJLSef/qkbN5ayocfCJzAZ0FGHsuw+XchmcXkYxYVkOpn1IVUEIZ1SBYdxbs02DshF4f/1/qdWl2UPWVtdMBI4E9KP1mXUW9SDTEeoxLFtBJgaHTN0KILevyOoIMZZZ1o+0tN+dvYLs3M2ksJJXKWhcUullS2ZiLWR6loGD0t+A8kqSZ56fppo3KnjVWFV0NPmanDIPE02g5nDDBez7vdR1lJSJ74OELzBpOOYqVu6oYHjW1NwOqxF0/lh5K0bo18YHbp2VPWIJ24kh/z50gbFMpHONMk4TdKU0pH9Ehe8G+77FIDSA0ZGay26NFtymgSHssQoac0ZMBoRBT1/Il+U7E4Fz0L+wk1znfy+Z4vDjLSjPAj8LIJn8xs1JrPModZgBMHHSevQXUVGWEePEetgQflGt0qW9tiYTAWFgKdHT7RAgxSbGaahpeR9IIJebBdpneBxbtS9NV+1fH2pZLkBlN+82e3Gem0oZ7PIm8cBpQkrM1N5E2zRz/5LzammEoF8tIzTyUCxCmUShdqm+LKGeOjmDQrUa/HSlcayGkWGzfEsypKe2h6c4n9/Qrgyh2Ghb4OcyMGUdztap+3xQxWvbLt5MCbAdMONzJ7eM7TgD8wPdpbXvlb9G4MiKnl80O0IXJ+gI6I8jDNBWTRGjXu1eBKczxfALFUXBVI+OokiQc5uwbTkEMkU7x0ns8cxamJ/1 0JZnd7V4 1gfOblXub5rnUreXeyZMNT7/NlCKVsIbHPzJ+6RCiREoJWkSQ5XU3ZZZnw/usgDc7KjmedzYIFUit5tZNTD4W7CEGd1v1oGgLnI1zWFadx0ZW6HtJXPdO+W+9e8Kty/w4TcMOlNYSEfcSQ/oxc64h875ovMhiA/ImFuhEj06WC1oHwINIDwCbiMOwL6VDHgNS5N8o 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: List-Subscribe: List-Unsubscribe: It's wrong to use nid directly since the nid may be changed in allocation. Use folio_nid() to obtain the nid of folio instead. Fix: 2273dea6b1e1 ("mm/hugetlb: update nr_huge_pages and surplus_huge_pages together") Signed-off-by: Liu Shixin Acked-by: Oscar Salvador --- mm/hugetlb.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 6fccfe6d046c6..d538f8aa8203c 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -2271,7 +2271,7 @@ static struct folio *alloc_surplus_hugetlb_folio(struct hstate *h, * as surplus_pages, otherwise it might confuse * persistent_huge_pages() momentarily. */ - __prep_account_new_huge_page(h, nid); + __prep_account_new_huge_page(h, folio_nid(folio)); /* * We could have raced with the pool size change.