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 X-Spam-Level: X-Spam-Status: No, score=-16.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C826C4338F for ; Wed, 25 Aug 2021 08:37:13 +0000 (UTC) Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.kernel.org (Postfix) with ESMTP id 00C4361181 for ; Wed, 25 Aug 2021 08:37:12 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.4.1 mail.kernel.org 00C4361181 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=huawei.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvack.org Received: by kanga.kvack.org (Postfix) id 62D108D0001; Wed, 25 Aug 2021 04:37:12 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5DD426B0071; Wed, 25 Aug 2021 04:37:12 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4CBA48D0001; Wed, 25 Aug 2021 04:37:12 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from forelay.hostedemail.com (smtprelay0063.hostedemail.com [216.40.44.63]) by kanga.kvack.org (Postfix) with ESMTP id 303376B006C for ; Wed, 25 Aug 2021 04:37:12 -0400 (EDT) Received: from smtpin32.hostedemail.com (10.5.19.251.rfc1918.com [10.5.19.251]) by forelay02.hostedemail.com (Postfix) with ESMTP id 9E73A253DC for ; Wed, 25 Aug 2021 08:37:11 +0000 (UTC) X-FDA: 78512948262.32.B724C93 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) by imf14.hostedemail.com (Postfix) with ESMTP id 62FD6600198F for ; Wed, 25 Aug 2021 08:37:10 +0000 (UTC) Received: from dggemv704-chm.china.huawei.com (unknown [172.30.72.54]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4GvfTt3LPQz89GF; Wed, 25 Aug 2021 16:36:50 +0800 (CST) Received: from dggpemm000001.china.huawei.com (7.185.36.245) by dggemv704-chm.china.huawei.com (10.3.19.47) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 25 Aug 2021 16:37:05 +0800 Received: from huawei.com (10.174.179.35) by dggpemm000001.china.huawei.com (7.185.36.245) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2176.2; Wed, 25 Aug 2021 16:37:04 +0800 From: Liu Zixian To: , CC: , Subject: [PATCH] mm/hugetlb: initialize hugetlb_usage in mm_init Date: Wed, 25 Aug 2021 16:37:04 +0800 Message-ID: <20210825083704.744-1-liuzixian4@huawei.com> X-Mailer: git-send-email 2.29.2.windows.3 MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.174.179.35] X-ClientProxiedBy: dggems704-chm.china.huawei.com (10.3.19.181) To dggpemm000001.china.huawei.com (7.185.36.245) X-CFilter-Loop: Reflected Authentication-Results: imf14.hostedemail.com; dkim=none; spf=pass (imf14.hostedemail.com: domain of liuzixian4@huawei.com designates 45.249.212.189 as permitted sender) smtp.mailfrom=liuzixian4@huawei.com; dmarc=pass (policy=none) header.from=huawei.com X-Rspamd-Server: rspam05 X-Rspamd-Queue-Id: 62FD6600198F X-Stat-Signature: fdcmrzpin6zfj18k5dq4s4qbnmgi7dwj X-HE-Tag: 1629880630-640077 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: After fork, the new process will get incorrect hugetlb_usage. The reason is dup_mm copies old_mm to the new one and mm_init does not init hugetlb_usage. Fix this by adding hugetlb_count_init in mm_init. Signed-off-by: Liu Zixian --- include/linux/hugetlb.h | 5 +++++ kernel/fork.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/include/linux/hugetlb.h b/include/linux/hugetlb.h index f7ca1a387..66ceabd66 100644 --- a/include/linux/hugetlb.h +++ b/include/linux/hugetlb.h @@ -858,6 +858,11 @@ static inline spinlock_t *huge_pte_lockptr(struct hs= tate *h, =20 void hugetlb_report_usage(struct seq_file *m, struct mm_struct *mm); =20 +static inline void hugetlb_count_init(struct mm_struct *mm) +{ + atomic_long_set(&mm->hugetlb_usage, 0); +} + static inline void hugetlb_count_add(long l, struct mm_struct *mm) { atomic_long_add(l, &mm->hugetlb_usage); diff --git a/kernel/fork.c b/kernel/fork.c index bc94b2cc5..a9380081a 100644 --- a/kernel/fork.c +++ b/kernel/fork.c @@ -1050,6 +1050,9 @@ static struct mm_struct *mm_init(struct mm_struct *= mm, struct task_struct *p, mm->pmd_huge_pte =3D NULL; #endif mm_init_uprobes_state(mm); +#ifdef CONFIG_HUGETLB_PAGE + hugetlb_count_init(mm); +#endif =20 if (current->mm) { mm->flags =3D current->mm->flags & MMF_INIT_MASK; --=20 2.18.1