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 C2533C7EE30 for ; Thu, 26 Jun 2025 18:17:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 958176B00B0; Thu, 26 Jun 2025 14:17:24 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9082F8D0001; Thu, 26 Jun 2025 14:17:24 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 844D56B00B2; Thu, 26 Jun 2025 14:17:24 -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 7550F6B00B0 for ; Thu, 26 Jun 2025 14:17:24 -0400 (EDT) Received: from smtpin03.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 46EF2160373 for ; Thu, 26 Jun 2025 18:17:24 +0000 (UTC) X-FDA: 83598359208.03.93D6F53 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf13.hostedemail.com (Postfix) with ESMTP id 8D08020014 for ; Thu, 26 Jun 2025 18:17:22 +0000 (UTC) Authentication-Results: imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=E1mB5NUh; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf13.hostedemail.com: domain of luizcap@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=luizcap@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1750961842; a=rsa-sha256; cv=none; b=jVo2PZisIzfltRHJ9yKVSHTMzO+kVexdmmAv4u8xzKiV627GL0qXEYtciwgZXxBDEQNger PtGkUTJVpvnzboA7vk48G3zEX7Yy1tmBWRKvcJPu5Romp40TTQa4zqQZ5tvk3N19CJTitc S561WVWerTFr/epVyil+Wys3MAy6QEk= ARC-Authentication-Results: i=1; imf13.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=E1mB5NUh; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf13.hostedemail.com: domain of luizcap@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=luizcap@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1750961842; 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=KDlgrgXxAg21YzMqYW6Qh6Z/vBEV3Xdk3QnBC6RuzMQ=; b=MnzjOYRtiGJOwsIsYgFG4ZYSQrSgACv28E/BvGb37sUv9ZAboGTxmqUJwPcNox+Mzpi4RQ OvJGwa+Vps5eRsHHUnCDyTo3SLHXMj+E58+xDAbJHXLOG3mtMrybbBR0Zl4WSntL71ynTA /jvgolkK4YA9DFJfjJe7vIuXgnE7y0g= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1750961841; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=KDlgrgXxAg21YzMqYW6Qh6Z/vBEV3Xdk3QnBC6RuzMQ=; b=E1mB5NUh7eSY6yyVagz+R4j+ABJ6QRthYWIFgix1d4kL3JX2yhHRm1VYISnBB4cei1XzUp Xakc0Jrn0L1RtdBRD+ZQ8j1FcIBctLrcg7AGrdSyC0AM2ZGn0U0P7EqKlxtEfneKzL0fC7 a+P/VbCFNtg/bBP2yh4FuitptAna9sw= Received: from mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-687-Lc70jmPbMc-XsMvz3MS8cg-1; Thu, 26 Jun 2025 14:17:18 -0400 X-MC-Unique: Lc70jmPbMc-XsMvz3MS8cg-1 X-Mimecast-MFC-AGG-ID: Lc70jmPbMc-XsMvz3MS8cg_1750961837 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 094651809C80; Thu, 26 Jun 2025 18:17:17 +0000 (UTC) Received: from fedora.redhat.com (unknown [10.22.64.64]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 553BD18003FC; Thu, 26 Jun 2025 18:17:15 +0000 (UTC) From: Luiz Capitulino To: david@redhat.com, willy@infradead.org Cc: akpm@linux-foundation.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, lcapitulino@gmail.com, shivankg@amd.com Subject: [PATCH 2/3] proc: kpagecount: use snapshot_page() Date: Thu, 26 Jun 2025 14:16:52 -0400 Message-ID: <5e94d287b6174098938ddd9959cf3c0619fb610a.1750961812.git.luizcap@redhat.com> In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 X-Rspam-User: X-Rspamd-Queue-Id: 8D08020014 X-Rspamd-Server: rspam10 X-Stat-Signature: ijt3yrjn6t34tht45f83gsobkm7atfzh X-HE-Tag: 1750961842-135735 X-HE-Meta: U2FsdGVkX19MmpuYM8ZeazOuApaGnFIHrh8BdLdRzJjfGEC1JY0Q0g/kTGrhcE0VC/kzxu6oMm+0TFnLdb/nz6qV90LsgjQMqkGRypXXQVYcvdQm4CReU0qitLFVZlZ+DPrL2S271qQJ80Ze4kbG+IacV/vIRBlB75oViiCvHWQb7zVnpytGsBOrUU7wUHVguqJ9p48S8NsiXDtZ210aBMKoHCp4W6CQjbaKZlrMmNx2Wp+eu86MCebQG5SZLLKawtIgIo8lX2ltjWWIwaVzENB0fDgqkV5Q2aO2a/+cEs2YWtshWeYK2y+WxIfBmngEwJfevp0dq+S/1lGv8rtfv4+Tg03BW3F929CF1i2J4uHg6Dx3CVnSrkX2PLSd1giCmduEkKw2YNlA95VY1gwxoJ6lHlDiIeHNW4h1hfjdU+EbYZQShJJAgulVcg3TLVQByPnQUYjSc5bc38iidTPEbCxn0x3YZanP8BZqUJxqDmb4fH9eXjZMM+Nd5mJ4FY/RRnQ5ji2BTH4YU4Y7K7escV0WVQG0nr+vGMqeY8O0SZOkmadUGfl9RnJz7z93nRT94BiiXs2UOiozX+sGNQKnKg2D/IO9Ty/JRo1JzHi1fK6xL2IvWlzINWM9et+JkPIhRhU/gYSdixHiZ+2tAg9vCZo8br5sTo1C/ZDWcxNA/ScaAVOLkOuQeICi4R6uuICK9WZjVvtqULv18DZ1ti+5/r8jjB3GZOoLmMTcykQRnjpgDJBz5zH5zgXhyy3phst5dW18YHbJtxYtc1nXrxUp03AT4VqRARF4SEuZLP74W2tgYvk4hiEBIRwOH1YHQN3OUfIBuJj4kjW2PkESscc0IfmwkBtTSSgySbZvcOXX8qqyPPagbXBx/Db16D9cxuPS/wpmJFj10lEA9IU+xLd1a1PW3/j2Cpg5RJ4cVOx6CRyZuPO+LECvao4SkyHrl8JtPDWid+IYcSTyJ3H0+tz vZ+kJJmx 2E3zyeYZYfZalAEnHAftu7Nj/++t91YGK1inUN2oUhcHma6JjJKDaqKwj7jpVOcTCGEqYM5W47suBevajsfR+k7oj7PqzUs2MCsWgs4Lr3DsO6yqkyHXosIT5LddmV6BrKVlXBUocjk/sk9zOVVJBGKFMQuH0aKzKfI/zt400p86Bre1Yf9f2NnpIjusS0ICIgdNT/0d066LZMJGoIjFSR1h2D/KjBR1YDrMfIzp4tpG/6zzmbBRw2MsCP+wVD56KYWllw5bYbInbdb8fXdSvTFX8Z1nMWmrlU4QKh6+EkVspv/C4TfN7AuWUMRra99aIp2k8htNXVQVDvkrPg53ARVAU9GzV+DYnRp5mCXu8wjXTM4G40fy76vej6OMWg+V89wHp 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: Currently, the call to folio_precise_page_mapcount() from kpage_read() can race with a folio split. When the race happens we trigger a VM_BUG_ON_FOLIO() in folio_entire_mapcount() (see splat below). This commit fixes this race by using snapshot_page() so that we retreive the folio mapcount using a folio snapshot. Splat: [ 2356.558576] page: refcount:1 mapcount:1 mapping:0000000000000000 index:0xffff85200 pfn:0x6f7c00 [ 2356.558748] memcg:ffff000651775780 [ 2356.558763] anon flags: 0xafffff60020838(uptodate|dirty|lru|owner_2|swapbacked|node=1|zone=2|lastcpupid=0xfffff) [ 2356.558796] raw: 00afffff60020838 fffffdffdb5d0048 fffffdffdadf7fc8 ffff00064c1629c1 [ 2356.558817] raw: 0000000ffff85200 0000000000000000 0000000100000000 ffff000651775780 [ 2356.558839] page dumped because: VM_BUG_ON_FOLIO(!folio_test_large(folio)) [ 2356.558882] ------------[ cut here ]------------ [ 2356.558897] kernel BUG at ./include/linux/mm.h:1103! [ 2356.558982] Internal error: Oops - BUG: 00000000f2000800 [#1] SMP [ 2356.564729] CPU: 8 UID: 0 PID: 1864 Comm: folio-split-rac Tainted: G S W 6.15.0+ #3 PREEMPT(voluntary) [ 2356.566196] Tainted: [S]=CPU_OUT_OF_SPEC, [W]=WARN [ 2356.566814] Hardware name: Red Hat KVM, BIOS edk2-20241117-3.el9 11/17/2024 [ 2356.567684] pstate: 60400005 (nZCv daif +PAN -UAO -TCO -DIT -SSBS BTYPE=--) [ 2356.568563] pc : kpage_read.constprop.0+0x26c/0x290 [ 2356.569605] lr : kpage_read.constprop.0+0x26c/0x290 [ 2356.569992] sp : ffff80008fb739b0 [ 2356.570263] x29: ffff80008fb739b0 x28: ffff00064aa69580 x27: 00000000ff000000 [ 2356.570842] x26: 0000fffffffffff8 x25: ffff00064aa69580 x24: ffff80008fb73ae0 [ 2356.571411] x23: 0000000000000001 x22: 0000ffff86c6e8b8 x21: 0000000000000008 [ 2356.571978] x20: 00000000006f7c00 x19: 0000ffff86c6e8b8 x18: 0000000000000000 [ 2356.572581] x17: 3630303066666666 x16: 0000000000000003 x15: 0000000000001000 [ 2356.573217] x14: 00000000ffffffff x13: 0000000000000004 x12: 00aaaaaa00aaaaaa [ 2356.577674] x11: 0000000000000000 x10: 00aaaaaa00aaaaaa x9 : ffffbf3afca6c300 [ 2356.578332] x8 : 0000000000000002 x7 : 0000000000000001 x6 : 0000000000000001 [ 2356.578984] x5 : ffff000c79812408 x4 : 0000000000000000 x3 : 0000000000000000 [ 2356.579635] x2 : 0000000000000000 x1 : ffff00064aa69580 x0 : 000000000000003e [ 2356.580286] Call trace: [ 2356.580524] kpage_read.constprop.0+0x26c/0x290 (P) [ 2356.580982] kpagecount_read+0x28/0x40 [ 2356.581336] proc_reg_read+0x38/0x100 [ 2356.581681] vfs_read+0xcc/0x320 [ 2356.581992] ksys_read+0x74/0x118 [ 2356.582306] __arm64_sys_read+0x24/0x38 [ 2356.582668] invoke_syscall+0x70/0x100 [ 2356.583022] el0_svc_common.constprop.0+0x48/0xf8 [ 2356.583456] do_el0_svc+0x28/0x40 [ 2356.583930] el0_svc+0x38/0x118 [ 2356.584328] el0t_64_sync_handler+0x144/0x168 [ 2356.584883] el0t_64_sync+0x19c/0x1a0 [ 2356.585350] Code: aa0103e0 9003a541 91082021 97f813fc (d4210000) [ 2356.586130] ---[ end trace 0000000000000000 ]--- [ 2356.587377] note: folio-split-rac[1864] exited with irqs disabled [ 2356.588050] note: folio-split-rac[1864] exited with preempt_count 1 Signed-off-by: Luiz Capitulino --- fs/proc/page.c | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) diff --git a/fs/proc/page.c b/fs/proc/page.c index 999af26c7298..936f8bbe5a6f 100644 --- a/fs/proc/page.c +++ b/fs/proc/page.c @@ -43,6 +43,22 @@ static inline unsigned long get_max_dump_pfn(void) #endif } +static u64 get_kpage_count(const struct page *page) +{ + struct page_snapshot ps; + u64 ret; + + snapshot_page(&ps, page); + + if (IS_ENABLED(CONFIG_PAGE_MAPCOUNT)) + ret = folio_precise_page_mapcount(&ps.folio_snapshot, + &ps.page_snapshot); + else + ret = folio_average_page_mapcount(&ps.folio_snapshot); + + return ret; +} + static ssize_t kpage_read(struct file *file, char __user *buf, size_t count, loff_t *ppos, enum kpage_operation op) @@ -75,10 +91,7 @@ static ssize_t kpage_read(struct file *file, char __user *buf, info = stable_page_flags(page); break; case KPAGE_COUNT: - if (IS_ENABLED(CONFIG_PAGE_MAPCOUNT)) - info = folio_precise_page_mapcount(page_folio(page), page); - else - info = folio_average_page_mapcount(page_folio(page)); + info = get_kpage_count(page); break; case KPAGE_CGROUP: info = page_cgroup_ino(page); -- 2.49.0