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 4584BC25B78 for ; Tue, 4 Jun 2024 10:18:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A583D6B00B3; Tue, 4 Jun 2024 06:18:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 875626B00B6; Tue, 4 Jun 2024 06:18:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 4F39F6B00B3; Tue, 4 Jun 2024 06:18:14 -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 0D9616B00AB for ; Tue, 4 Jun 2024 06:18:14 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 6753A1A087E for ; Tue, 4 Jun 2024 10:18:13 +0000 (UTC) X-FDA: 82192806066.28.AFC36F1 Received: from out30-110.freemail.mail.aliyun.com (out30-110.freemail.mail.aliyun.com [115.124.30.110]) by imf14.hostedemail.com (Postfix) with ESMTP id 65D53100004 for ; Tue, 4 Jun 2024 10:18:10 +0000 (UTC) Authentication-Results: imf14.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=yUCcS3SE; spf=pass (imf14.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.110 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1717496290; 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=sk0VCEBLx9HEPQafud6f811f0Tz6WgnTKVbuudZtsuE=; b=SruU0dnIqtZf/2DDAqYOJIxcBZrk+iaxAVhO+S4VGGbiL5JlIBwzgkkuvbnnCTcOW3RuKV nnmPxn3bJMLXI5FMKSOPocD+Wm5xwpKlMVNIDUTa7xT5nCzWBM365YwiyX8j3KCxOv+Ksh hsPxLu0FxRFjKn+7jGUn+pimdEtSki8= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1717496290; a=rsa-sha256; cv=none; b=Wm3mym7vf4IEF0p5MdQBzOB2a8G8gZDtvkpktSPkr0jPizKBCw4k20YV3o7m8UijubZ4ju E/+PcWtayK2gWsy1W68Bq700FkuUGF2H5JY2WQ/N6qVl0ODWKt+7KrQF34yWIc+P9PHBb2 iIBWDsAaMognbLJZCZvKT6a+673mQxk= ARC-Authentication-Results: i=1; imf14.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=yUCcS3SE; spf=pass (imf14.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.110 as permitted sender) smtp.mailfrom=baolin.wang@linux.alibaba.com; dmarc=pass (policy=none) header.from=linux.alibaba.com DKIM-Signature:v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.alibaba.com; s=default; t=1717496287; h=From:To:Subject:Date:Message-Id:MIME-Version; bh=sk0VCEBLx9HEPQafud6f811f0Tz6WgnTKVbuudZtsuE=; b=yUCcS3SESu555Lqpcs5KrxI9Tg5WA2Vt0vceKC4RlaaCZ5BdHMFUMHHPXDsVH+nc9xc0BZ2CxXW17CFpsmmWnNbUBEoYnCbADQMDlNkT8geOjE+q0P9I3SaLczV4QYRnklyUs33QVLJhfX11sTUQUKZrtvSBBU4ZJ0ntAydSNco= X-Alimail-AntiSpam:AC=PASS;BC=-1|-1;BR=01201311R121e4;CH=green;DM=||false|;DS=||;FP=0|-1|-1|-1|0|-1|-1|-1;HT=maildocker-contentspam033037067109;MF=baolin.wang@linux.alibaba.com;NM=1;PH=DS;RN=16;SR=0;TI=SMTPD_---0W7qooIK_1717496285; Received: from localhost(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0W7qooIK_1717496285) by smtp.aliyun-inc.com; Tue, 04 Jun 2024 18:18:06 +0800 From: Baolin Wang To: akpm@linux-foundation.org, hughd@google.com Cc: willy@infradead.org, david@redhat.com, wangkefeng.wang@huawei.com, ying.huang@intel.com, 21cnbao@gmail.com, ryan.roberts@arm.com, shy828301@gmail.com, ziy@nvidia.com, ioworker0@gmail.com, da.gomez@samsung.com, p.raghav@samsung.com, baolin.wang@linux.alibaba.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v4 2/6] mm: shmem: add THP validation for PMD-mapped THP related statistics Date: Tue, 4 Jun 2024 18:17:46 +0800 Message-Id: <337ad58a839cbdef4ecd446c22ffcf8c9dcfd9af.1717495894.git.baolin.wang@linux.alibaba.com> X-Mailer: git-send-email 2.39.3 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 65D53100004 X-Rspam-User: X-Stat-Signature: kwbt3rfkzrpodyc7k4x5auehiw8gwrqt X-HE-Tag: 1717496290-437005 X-HE-Meta: U2FsdGVkX1+1xkrAdIjtoisYl1SQQSlsVmuJSrQ3EvQvWcyypERFcoT8OZVFWzFf/Ff+XkBtPRJTl2TGI5TgkL3EODPl0ARm0FIpIe6McEdHOUUM1RVn+LFegAcMQbib+Hmfu9zLu1PQ2MqT4GbEL1PodbRzA2PqgZmuNFAgUIeXfHq6qb/BLqAinOMEySQJS+OowPJn/ii46EeBUBIEtg6iYr9k2bO4ozu8mAljvj6+OjaCpJEHJpS+5gRHpf6k7vRmyQInUHeAS4pcCeNQtFxpM2SbEDICcPNimQlTDeMFSwO1ly9d7xYacG4Jihgo7Max3lP2iTkXr14Kc+xJQybFT/WcHuna5BOILLUmZk7b+HAIigRXY+ieo/XMzKpLYg5PvW1PvXayZKDH/XQKJ7Rd61sUJGI+cXOxCotcTWFYk0mLh6zHvk+h4lbnIKYe8qC13xelk2M/9VuNAxbcou6oG99ftylgdLyQBkpvfMaiZEhQnbMbSHo7ZRyZnGSetl8p70e2MuGDl42fdCTsUfUjScV0ptL5kQgzwKAHPpzOIb4r2jTepekEMiJ87itR7OggSs7FprCCyNQr7PFptyVPojG3X4aJK4M7gDankXNKW5APJ/7atLfWXF3338YJ2VIrpCDYVlqPjBbabKeHuT59y6n6PKSHgaKWSgQDs2Jq3NXxaUtffI+FPDK+ZsX7WNLFTJr8xt7A0+yPyT1FLcwzguYSoR7zyVn07uRmNbVSXMHD/FdLx1463Ljovj0JuauhsUlWYWFLPBsfuqyqcjU2QvsvfAf2uyGbyK1a8Hj8Ab+IHaA0zcJ1Jgt+KP6fvsVLDNmy6+iLeXlSRINTsXestyGDKi8qkvISKiReVLCcnnEXodEahlXik6sHeql4dN+hvjFbq36/bXBG0JlPPw5meQaBaExMdHqjjo5ttPHxz1/Vm0H3MSHpTO2j4KmxBBP1Cpr4PYjIN4Y0lAw 72NM3GHl X4McbyzoRLQnJPcigmcTaGOJ4c03tPb7EUSgyycRmo9TTxw6TSH/ypSXQlcFY2KxJpnUsP7n2xxz21uG5M8rKouYtqDL6E03xtCV4izyIwMwGZyvnOFp0Jsv9BBvIKdY2gdzrDm/iO00TNH286yFxf/jAw/sam33XS0ipZSSXfugHgb2N2QF0iyWQttjacvtcMSZeO20gZbOIMlM1uSVHqgtDDSOYKG0uoXz4P0nh1Oq3MmzJw1oBUAwgyDYM8i+tGLezrbsngi0zlg0TX2qpufgOhianRjX48VXj7iPj8ZJDU0s= 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 6868c0af3a69..ae358efc397a 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1647,7 +1647,7 @@ static struct folio *shmem_alloc_and_add_folio(gfp_t gfp, return ERR_PTR(-E2BIG); folio = shmem_alloc_folio(gfp, HPAGE_PMD_ORDER, info, index); - if (!folio) + if (!folio && pages == HPAGE_PMD_NR) count_vm_event(THP_FILE_FALLBACK); } else { pages = 1; @@ -1665,7 +1665,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); } @@ -2031,7 +2031,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) -- 2.39.3