From patchwork Mon May 6 08:46:28 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Baolin Wang X-Patchwork-Id: 13655146 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 D9D1AC25B5C for ; Mon, 6 May 2024 08:47:00 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id ABD7B6B0088; Mon, 6 May 2024 04:46:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id A48486B0089; Mon, 6 May 2024 04:46:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 89A1A6B008A; Mon, 6 May 2024 04:46:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id 69FD36B0088 for ; Mon, 6 May 2024 04:46:55 -0400 (EDT) Received: from smtpin18.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id E7A5E1206EE for ; Mon, 6 May 2024 08:46:54 +0000 (UTC) X-FDA: 82087340748.18.670AD2F Received: from out30-110.freemail.mail.aliyun.com (out30-110.freemail.mail.aliyun.com [115.124.30.110]) by imf18.hostedemail.com (Postfix) with ESMTP id BB1041C0003 for ; Mon, 6 May 2024 08:46:52 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=IY9VGJ6D; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf18.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.110 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1714985213; 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-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=aUksnnssWSvRHZu6SVpR2z8swC3sgIQdPUjmp/ogrf0=; b=xjOU8ZMivlMi4n5eOiRb2ysPpkEWlFApqBJdw56Vx5khH7/p7yg/eNYuOndr5X5AIAFjC6 2B7QbV4kY9Bqe+M07ddWfTBqLTXLiA8WCZQb57IX1gZ5y3ncr0QsU83vfP48Ob8xrQwz8F K0w1Sc4kH/VgYKoW8h9OUI1GcB54C3k= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=IY9VGJ6D; dmarc=pass (policy=none) header.from=linux.alibaba.com; spf=pass (imf18.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.110 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1714985213; a=rsa-sha256; cv=none; b=EVAIjdfkReJ75Q6IcRzJQWSEF3dI629K8wdWIQUKbOd4zlFanJHOsOeuRxhIbi7gp47cmX reH45NcfA6eGyKLy9VluOAX5InBCXf0HsOdhfq8PWV5oavCpEabpxxyiZj778wjzuvZzS6 P0GRpT15uMiWApcDxmnBCl/xIET+QK0= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1714985210; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=aUksnnssWSvRHZu6SVpR2z8swC3sgIQdPUjmp/ogrf0=; b=IY9VGJ6DM3ecPUsrIW5sU7/DsX6UCulXdLbmY8KhuODns0Ub09PNSB9lgwqSOxnE+UR/VIC4DogAkOp+BrT1VoWPMC9XvNTMqYqD+KK3q+cThQalWqqaeymPJKcMPBuazejZ/N6eJseKjIes6n4n4fI7WRHYfkKWTbxtrF+2HX8= X-Alimail-AntiSpam: AC=PASS;BC=-1|-1;BR=01201311R101e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033068173054;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=14;SR=0;TI=SMTPD_---0W5w3v7-_1714985207; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W5w3v7-_1714985207) by smtp.aliyun-inc.com; Mon, 06 May 2024 16:46:48 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, ioworker0@gmail.com, wangkefeng.wang@huawei.com, ying.huang@intel.com, 21cnbao@gmail.com, ryan.roberts@arm.com, shy828301@gmail.com, ziy@nvidia.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/8] mm: shmem: add THP validation for PMD-mapped THP related statistics Date: Mon, 6 May 2024 16:46:28 +0800 Message-Id: X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: BB1041C0003 X-Stat-Signature: 7d5hkjkbs53cnueqitiy7yqnyxbx3giq X-Rspam-User: X-HE-Tag: 1714985212-391604 X-HE-Meta: U2FsdGVkX1/Yh3vRs8Wuvk8Dai5I32P72pH30SFaqfAv/GpS6HPP4E/hY4HVYf5B1ODKyFVU/5SeTs3dBhTDPhYdiGBFFLA+bfzClHrcnL0K1nLSCIWsjCtf23J5aE8p6QdgCuy1hOPc63c3XEVLdd0Db83jDPvyUmiHJhkKuFY+F3yHWEvIKgQkLuU2C8zGp2PsyqmQaQ/R1HepMvqOOp8MzwbvlJ2/iIINuVfbz5k5u12UOLnyJCzcZRZxDSROnV4IuW7VA+C1At8JIvRweRGksIou2UdO+A/fwud4w58o+j4Ch0wPm49tF5ugkHzYatssdeqgxEY68WMJ9znhHzswPSLLW+/ayEy88JHbSvlvnaz16pnu5H9aXqzq2fC+vUPRcMI/iKeSFDXoUSC8qU7ihE3Nyecngu+SwTSfmHMQcRV+Eh33ZFHqvxUged23IrAU52Sfs7dxX1V94StQyW4F+GnJwbmKPK+0FsPcSiG+fZwDsVTY1rVaYgszk9d+48Dog/n7+9GyoJgWhx1Wfn/CDuPyJ5c20JdTqv/XANPjWnegB0Rm/SveJDnsc6qHPiS7BbJR63MuSdkpyYUcJdAxsnceohgawPFGZTBnAIyA7P/3E1jji7MlmBAfpuOWALUKsUdNGNSFZb8c4zbzVu/mUMlk0KWgk9Tivq6g3eDyn4sDtUZwWCjJfdYYRlVWIcCN++GeNRZPj5iV/a1zit9eVrxWvr4JB/qDNEiIrYoq+41GPP5K3k+EJAPCp0eVAfU2wBBVWk8NfW+lrDLs1paLwKO6SA47cxwP6bmmrorofGkYigNnVPUtj/b4oRO24kOdoP1WlhztEzDYeDSPzH1QAB4rRAj0LZ/Zs4R5pmS2dTfCSMP18DWn5/xJfB9ZATtv6Otq12g+GKF69zHyqFHUOyLj+AATqoqcudjjdBZ5atr+NbIAqfIaIB/8ZbYqlDnPGeI0v1h0wYzUl/O FvU5kLpx lvAwfdjZw83FQf/+0rvYOtQrZyyjvz2yvVZGgViP1u9dDEwB7YdWO6rbS/6LRexvsGDzjkQTo3WCSleO3guf4my1SYv7lqKraD8QOLQdz4rw7koD+g0E2vgXf26fEp7CfyoKHANl6w9QlvHnOFYro8dBhO2yO3+4jJlpgvjJ/61Ali8d+MD7efQLiNRv/iCyLr5FTEXZNqJJcMQSHA7AZZRPcuPA0rPABBmm437WqoLHImYXMib4jOnj5Ww== 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: In order to extend support for mTHP, add THP validation for PMD-mapped THP related statistics to avoid statistical confusion. Signed-off-by: Baolin Wang Reviewed-by: Barry Song --- mm/shmem.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index e4483c4596a8..a383ea9a89a5 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1661,7 +1661,7 @@ static struct folio *shmem_alloc_and_add_folio(gfp_t gfp, return ERR_PTR(-E2BIG); folio = shmem_alloc_hugefolio(gfp, info, index, HPAGE_PMD_ORDER); - if (!folio) + if (!folio && pages == HPAGE_PMD_NR) count_vm_event(THP_FILE_FALLBACK); } else { pages = 1; @@ -1679,7 +1679,7 @@ static struct folio *shmem_alloc_and_add_folio(gfp_t gfp, if (xa_find(&mapping->i_pages, &index, index + pages - 1, XA_PRESENT)) { error = -EEXIST; - } else if (huge) { + } else if (pages == HPAGE_PMD_NR) { count_vm_event(THP_FILE_FALLBACK); count_vm_event(THP_FILE_FALLBACK_CHARGE); } @@ -2045,7 +2045,8 @@ static int shmem_get_folio_gfp(struct inode *inode, pgoff_t index, folio = shmem_alloc_and_add_folio(huge_gfp, inode, index, fault_mm, true); if (!IS_ERR(folio)) { - count_vm_event(THP_FILE_ALLOC); + if (folio_test_pmd_mappable(folio)) + count_vm_event(THP_FILE_ALLOC); goto alloced; } if (PTR_ERR(folio) == -EEXIST)