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 kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id AF36EC3600C for ; Thu, 3 Apr 2025 03:53:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E12CA280003; Wed, 2 Apr 2025 23:53:07 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D9AC9280001; Wed, 2 Apr 2025 23:53:07 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C3AB9280003; Wed, 2 Apr 2025 23:53:07 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id A178A280001 for ; Wed, 2 Apr 2025 23:53:07 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id ACA8F1411C7 for ; Thu, 3 Apr 2025 03:53:07 +0000 (UTC) X-FDA: 83291362014.28.32A7592 Received: from sea.source.kernel.org (sea.source.kernel.org [172.234.252.31]) by imf26.hostedemail.com (Postfix) with ESMTP id EE9A5140009 for ; Thu, 3 Apr 2025 03:53:05 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b="f/g8ECLL"; spf=pass (imf26.hostedemail.com: domain of akpm@linux-foundation.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1743652386; 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:in-reply-to:references:references:dkim-signature; bh=TiVHUvN9soDWuPM3T4RSCBHM4I3/Gn9J4qi7O2N6Xj0=; b=GR2IA+YAxPrE1U7KloX//DPVdkUPA/YnKP+lmCAgt/zDRyJQnt8P0T9emFPKPDpFjC7M2E TBT3ktXsY/9uOa84oB2e9AOj9Ltz7yUZMEQMnEhxU1PGYHOv4WnLvYEWQtBBG/gIweJC6M IVewPBLu6KC204SiGmHgLVdBcF1TIn8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1743652386; a=rsa-sha256; cv=none; b=bH6UPqD4qISL2Et/peeRpkPgGN2E6Lj6qVLVF4OnagEe9c2pdw+zIpx4kv59mqIfgNXfG4 6dYg5MkysypiJzl0RsotM3bTiio9mW8u77pCgxbUvU/hOzGKgAfA1XAJpUyrP93Trqkhwm ksvIZIujFQ62MfJkM1ngaHKQGvpMqaQ= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=linux-foundation.org header.s=korg header.b="f/g8ECLL"; spf=pass (imf26.hostedemail.com: domain of akpm@linux-foundation.org designates 172.234.252.31 as permitted sender) smtp.mailfrom=akpm@linux-foundation.org; dmarc=none Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sea.source.kernel.org (Postfix) with ESMTP id 3D171443C2; Thu, 3 Apr 2025 03:53:04 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 5618DC4CEE3; Thu, 3 Apr 2025 03:53:04 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linux-foundation.org; s=korg; t=1743652384; bh=+bKOBr6oJ3CIXEd1XQ1fLFlp76U82a9LBBJ6ao3VyMY=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=f/g8ECLLssdRV6tGolsPoTRy7IWzCpgWUBDHNBdbTWeMblM2kypdLGk4uI0xsFOQI gQ9Vm7u1fq1I59V/0yVYB2EPUYCzu6Pxnbr82KYvqLQmeY2TS7Mmqihe7P/G+7Z4hZ /XxXTE2RvcqyqNqC37G+FTn1EtWdj7A3Tie58pTg= Date: Wed, 2 Apr 2025 20:53:03 -0700 From: Andrew Morton To: Liu Shixin Cc: Muchun Song , David Hildenbrand , Oscar Salvador , Kefeng Wang , Peter Xu , , Subject: Re: [PATCH v3] mm/hugetlb: update nr_huge_pages and surplus_huge_pages together Message-Id: <20250402205303.17846a389ee2ec2a9ee7ae13@linux-foundation.org> In-Reply-To: <8f63f6bd-41ab-c819-291c-f66c239da27b@huawei.com> References: <20250305035409.2391344-1-liushixin2@huawei.com> <8f63f6bd-41ab-c819-291c-f66c239da27b@huawei.com> X-Mailer: Sylpheed 3.8.0beta1 (GTK+ 2.24.33; x86_64-pc-linux-gnu) Mime-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam10 X-Rspamd-Queue-Id: EE9A5140009 X-Stat-Signature: a4s4rkz5o679qkhstt1qjw41p93w5ncy X-HE-Tag: 1743652385-453047 X-HE-Meta: U2FsdGVkX18ESOsDTe63Yq7ve95qsYDKuoCTmzPF/UKr8sDmoTno9NACvaLF8bYUg1L4EL6g60VZwouGBhoOwhKSAX+CTAW4Si5mGqF9a0VLiPi7/XwTWYCb2WghXlg6aqCod+r/6AUMKrV5VpLqjG0CaoIPTtV+ZVl+Z+3QAR2DrAmUHOMR+vcuSsJCdMI+55vdusRGLCQjUd0zdTp/Wap5aT9qS+nm8Az2PipTouHF6zfuAcAmei7c7TTLAflKrknNoOvjtU/+GA9MTSKpuWhjc3KrJ/2B/re1Pfw0HURWIjwzvdmmpi8cP1g9S1P71OFiJo1xoPVyaPxRUvQDFKt1KLzL6z4Fbzla2YNhBpJRzL7n7gn7kls/P5FA0M6jRLF0sBVWQXOsT1NWUd2VhDhq0xf0LDAq10mqAfHKMjdIbCf6ZQ8r7XXXzDqIbrU6/x4AUKh4Tg8JmD2K6YyAB7rt41R/egYlY59xUJldFb095UGfSykFI1N74CN34JcmbkuhdotsvxjBN7iVSBtmGFuKA8qxN5A79oZiGz21JItgc2J8FIk2tuSLaq42IvuB7Rr0pza/jKDIlyVLRdoAG0fKdIC3acIph2ltsyzM82VXq5LzpyhU4BjasFoimosfwDnNZuwlRhV1KxDa8exq9m+kJ/Am3hn5UQUvp7/bkz06NCD6QmJHoMj385yuu8p/nfoNoBRmidnNdwfRcHybaE2RQyazn8eFPcBPUt210C5PBZIBCeJ18QojnABu9v0nXphpXLNLt4/k4q72kY8aH1cZpj4SyCjNk6vs9LXHqKZn/KibiBoKpCW2Fo6OcOghZsOzQ4Y79AhIhCQReHVS33QBBhCpNXBGbvlYkX0KGCjEBlgbJBsW3b6Cq3Kfdzyr6E3zam4/Vjt11VA9ba3U0/Wc6tIhcyT7wmHBofqiL4BA5pgw81GTtk2e/Q9VPrEho+X7aqyldY/D44nTvTv Zd+uKuRh xYliFGeO1xGo/hyAi0ritn/P3WNt1XyXRMe3/EzpMhpsq1u5fiPdraR8zVMVjW/4QDYKs35sqhb8lcs5pzPu+hSOxELmZ4NlB67OERUkCwGBfw/VASBiswtApihQpkpfNaBcc6SQXuDFP7NMCbPxGZt6E6S3jEbQcLSGRQO2ObcE3WPQ6t26o0D+U9PUfEcLb4ydw/jNFDUVcnweyUok7mauh0ToVzNg0YJ7r+g2VopUYl6gtlpalEv22a/QwgkCQJcs1XN8ySmGoOOBTIwImhZLKBWAHzrKDPUOvKqH6qVjAbCAyJWg/k9C6U9pDjCwIR1sO 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: On Tue, 1 Apr 2025 16:12:29 +0800 Liu Shixin wrote: > > + /* > > + * nr_huge_pages needs to be adjusted within the same lock cycle > > + * as surplus_pages, otherwise it might confuse > > + * persistent_huge_pages() momentarily. > > + */ > > + __prep_account_new_huge_page(h, nid); > > + > > /* > > * We could have raced with the pool size change. > > * Double check that and simply deallocate the new page > > Hi, > > Sorry, there's a mistake that the nid may be mismatch. > Please use the following code to fix it, or should I send a fix patch ? > > diff --git a/mm/hugetlb.c b/mm/hugetlb.c > index 39f92aad7bd1..6670f9b9e07a 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. Yes, please send a formal patch, with Fixes: 2273dea6b1e1 ("mm/hugetlb: update nr_huge_pages and surplus_huge_pages together")