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 B9E1CC0218A for ; Sat, 1 Feb 2025 08:02:05 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 1ADCF6B007B; Sat, 1 Feb 2025 03:02:05 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 136C06B0082; Sat, 1 Feb 2025 03:02:05 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EA3AC6B0083; Sat, 1 Feb 2025 03:02:04 -0500 (EST) 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 C556E6B007B for ; Sat, 1 Feb 2025 03:02:04 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay04.hostedemail.com (Postfix) with ESMTP id 4AFCB1A1598 for ; Sat, 1 Feb 2025 08:02:04 +0000 (UTC) X-FDA: 83070632568.13.104330F Received: from mail-lj1-f177.google.com (mail-lj1-f177.google.com [209.85.208.177]) by imf26.hostedemail.com (Postfix) with ESMTP id 4F86A140002 for ; Sat, 1 Feb 2025 08:02:02 +0000 (UTC) Authentication-Results: imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=azZ86pne; spf=pass (imf26.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.208.177 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1738396922; 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=/s7Y7lcv+wX03gw07hpdaNCp1wCGc/zvO4UfuCtTkQM=; b=Nbj5SVQUpwZbWuIzWpXOgaMH78Lm512MO2oPgU27Xx56dWpvS+h36qe/wNFHcWswdQORme BlYcyOJSZ0LONhq2aKU2IgEWAgGRFXnfCtF3SrozW6gDqH0OKddCtHdv9bjkVic0RmvKg6 e/nt2w2Sx8o0TCyZdLkD/S/m4Mi9xuk= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1738396922; a=rsa-sha256; cv=none; b=VgkiUssGmfRNtykiV/4X+p5oEVEEjub2VhGt5eSqAHWlcm9bXkzBnfbQPqoq2dSXPGBpt8 DG/s/vcJXXSmnqkfhlPOdS7qhGnx1G8yz2pXl7BPvu72lFQm6cn5r69A974Mf/1k26hevw q5zmixHU5gRbqomeKe168n2reSn6HIU= ARC-Authentication-Results: i=1; imf26.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=azZ86pne; spf=pass (imf26.hostedemail.com: domain of ryncsn@gmail.com designates 209.85.208.177 as permitted sender) smtp.mailfrom=ryncsn@gmail.com; dmarc=pass (policy=none) header.from=gmail.com Received: by mail-lj1-f177.google.com with SMTP id 38308e7fff4ca-303548a9361so20289151fa.0 for ; Sat, 01 Feb 2025 00:02:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1738396920; x=1739001720; darn=kvack.org; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:from:to:cc:subject:date :message-id:reply-to; bh=/s7Y7lcv+wX03gw07hpdaNCp1wCGc/zvO4UfuCtTkQM=; b=azZ86pnetUwCt7rETi8zNnMNssbDw3A364rHTWAnw8KkoZ0jj1Mq1sCeAnvYwhDE8F uttdfmtAGnoZAjWupf+ulUKILbpCn5/0BkXhhffEpnYZ0xYvwCB/5PpZImLM2eVCg8W6 baEP8Snm6l9EqtN3GmqLxD35HCPK6zA9FTrAN1+TSpQsL3Fsj5kaF132EihCNE5aNlYr 9ZdLBJiJBhyyqUBbIR42vA78CWQmRUtzhaGdoEuGfCKjAEPjOBoBfTXIEoa1LWRf9mIj KzkVxBqDVqUSUPasR5ysoRUUbIkgNuHFtUQ3FRCFj3qwDxd6n2sxpEV9KYSz/n4MyQjt 07+Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738396920; x=1739001720; h=content-transfer-encoding:cc:to:subject:message-id:date:from :in-reply-to:references:mime-version:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/s7Y7lcv+wX03gw07hpdaNCp1wCGc/zvO4UfuCtTkQM=; b=PiFeIVfpcdvrJmGqyJ041Rg81HdINFAt0mTdJpS5M9IwrmQkGq6oYBvxdnQTpVeH/p Sdg9CDp9EuMP3aj9ud3pmjhQ3qPa123yxHYRG6JN2PVt4wcOTf9ybGADIKdPKuQF+37v h8z+9mrxOFXa9j9D1nKxR3wOFvGbEN8mm9t+w6RpO9VaNmsWjBLd0hSsUXuu29RyZKSo a12kGpM8taNbyrbLYTYad2deLa9ZsrKMZ7CRfX1m38fjkoPYXkd8NugQdMVEaTtFkHFG pHoQNYlHURaBMweI2AZhIVFolUYCfnHUHG/FaDSsVscbJl2kcqk9l5oDso8nW39C7dKK KBOA== X-Forwarded-Encrypted: i=1; AJvYcCWSMStrFNc/rone4wu0Xl0NkRj3I1aiL7+o49BgQifmp+BxxGOkMNxfUSbd7jO+zPHd6SMNbt7r9w==@kvack.org X-Gm-Message-State: AOJu0YwRF4D4psYAHCjXwl6HduyGuoa/8tjZC7SctwgRsBjvKNmMF8hE c3AB2Z9/ZjA0R05kBJ0O+5MTM6vmr3GYaH89hTxHehMJKLEC1IGZ3s1olpFjbBEOIVxXm2Hpy8U WEIO0ibB6i9+0lvHMxihAGmd1fEw= X-Gm-Gg: ASbGncu54tKA9lZM7BOz4xGNEgiLYOB4it5eKGvaVXOUhJaBEyB6oE3bdwWzRcofb7f MWxOh+5w7kmpzFG6e0vSSu+3UNHw9/B5wnyFrMx9QkSvCyHmlvsi50YQrMgL9DkJuS0GX6GwvRA == X-Google-Smtp-Source: AGHT+IG/LDUrHQpBVUu1qTtHu5M9AuTtw8da8QEScwhqc32vaaVE8IVKysaRIZqgRQ+M6zPPTUmWCkkjc0NlcgF/LQI= X-Received: by 2002:a05:651c:2124:b0:2ff:d3c6:9cf4 with SMTP id 38308e7fff4ca-3079681b016mr42578721fa.1.1738396920016; Sat, 01 Feb 2025 00:02:00 -0800 (PST) MIME-Version: 1.0 References: <20250130100050.1868208-1-kirill.shutemov@linux.intel.com> <20250130100050.1868208-7-kirill.shutemov@linux.intel.com> In-Reply-To: <20250130100050.1868208-7-kirill.shutemov@linux.intel.com> From: Kairui Song Date: Sat, 1 Feb 2025 16:01:43 +0800 X-Gm-Features: AWEUYZk3BKKSZ0_M6d8Z1HuwlbptqkkHnrlsuT9nC5CTCQFq-OhruTqcp8L8mlQ Message-ID: Subject: Re: [PATCHv3 06/11] mm/vmscan: Use PG_dropbehind instead of PG_reclaim To: "Kirill A. Shutemov" Cc: Andrew Morton , "Matthew Wilcox (Oracle)" , Jens Axboe , "Jason A. Donenfeld" , Andi Shyti , Chengming Zhou , Christian Brauner , Christophe Leroy , Dan Carpenter , David Airlie , David Hildenbrand , Hao Ge , Jani Nikula , Johannes Weiner , Joonas Lahtinen , Josef Bacik , Masami Hiramatsu , Mathieu Desnoyers , Miklos Szeredi , Nhat Pham , Oscar Salvador , Ran Xiaokai , Rodrigo Vivi , Simona Vetter , Steven Rostedt , Tvrtko Ursulin , Vlastimil Babka , Yosry Ahmed , Yu Zhao , intel-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, linux-trace-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Stat-Signature: raqjmgy881ox4peixa8bkamq7ppfubqh X-Rspam-User: X-Rspamd-Queue-Id: 4F86A140002 X-Rspamd-Server: rspam03 X-HE-Tag: 1738396922-834576 X-HE-Meta: U2FsdGVkX191X2UclfiutkB4rafolh+0LN5VxT1MK/ZlkTvvmogqJCHRwvPZJmf+i5rs/fdyTIFr6va3OubV8OqZdBvoM39WRiCTYpLoSJfd/M2z7uijFqrHc8WE8742hdxfv/BmwBxa0DzlcvpEye4zBH8vI4DNxjhHLkTeHJq1C+e4Rf0tkfQxS9xpYMpsWlC2U+m75rx9fum0MZQ6zKvtGnkjNY3NZZeKSf4NbZoRhuYb/Qhe7JULkFXHHYz6nuJ1Aj4Eu12Do8/nNZ4RG2X2pcv9vPT/YyfVzdoaa9mqANmIp0MBFD+rbVNBfMUfokQdvoYILyYe8vgNHEmFlpWR7qJ6DzCx/78Apn0r6xnXu0b1jJXbgO4PODuTkCZ845uXRBRFhCmEuDuLaIYadqlWHI1Rwl6VcVU5GP3VNYAG9V1Xs2+eD/bPHIpAEH4tWd6fRxMr2PykKw+jQgI4dgImwxzHfxiLipgeSoYwISB83Vagq9D9+E+SeElViV0Mp01C2OIc6RCcuBX6pU/S8sQx7nv/gi2DDNeuo82MRxGhz7XX/MdDexK/P6qJ4ZNJHHsMbgD5QLdmJpihxIsSrDqfS0qcO3BZzgmNIEgdXLcZAQ6ALZ8qPImFK57OOChZMrTx9FOo25Uz46HNYxgR/lm/p0CMhIVHGwho6tx8wIjmt09X1I6vLcXOoKw2VM0LPbvDHbo/z6rYPEnZ1TXscUzRmE7ABGFDY7000XLvk+ztNy8oqi1b9YqFy1wtVrnzBLskkTNmSXBS6aC6UzhNaftKL8L8B17X3/ia388ylc0ECVuByKb5n3aUqPh6sPUYq0EwctKvrCNZ3RlLCDnZGfY7KJKtuwcd3oKocyjBcQiPkT/6FnKRp/ZhRyRYzObOanYQd5ngV7w/V9JaqSrKIvplfC/8Jtj5glCU9Pr36tHDjUijEC4ZdK8AwvJ4yAOug1gJMMLN78Nk/3Kdwc8 t+mqdc6X BbNUUvBauydZ/vliIWa2AZO/LB9faOWy1UaofMK1y0/Z6QTrw+39Mwn82AZZazTdgPcDgeWQLqVEu81YKAXnAkE8kQeJwGG++w3pQ/APyt3SPDPowmFcwZVHzx5NCoGN2U0gKOsUzgjTwBxEt9ElHv0YIXwdYk6bFogOdTF47rXcjC1ihIsI+LRhLmi/xQPj+GPo4BzhK0qg0+0T3L1KpQXHtjRK+nBz1WrNp8b4h/Op/KWgtG9lWEOt+JI42yiO8LycX08Medu5YfolbCE8xoCr+yeX/GZ9b/YuYOPITydsZJp2NSZGxxeCxwEuZvqEDpA24Tz45ZUiJecjqDzPHV0EWhYhM6Spj4mj6SVclCiWfFxI57nJ2jJyTiCZx7idtfUpzn8Sy911T9HoCVw2imA2Lh0x6EfCBsiDD 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 Thu, Jan 30, 2025 at 6:02=E2=80=AFPM Kirill A. Shutemov wrote: > > The recently introduced PG_dropbehind allows for freeing folios > immediately after writeback. Unlike PG_reclaim, it does not need vmscan > to be involved to get the folio freed. > > Instead of using folio_set_reclaim(), use folio_set_dropbehind() in > pageout(). > > It is safe to leave PG_dropbehind on the folio if, for some reason > (bug?), the folio is not in a writeback state after ->writepage(). > In these cases, the kernel had to clear PG_reclaim as it shared a page > flag bit with PG_readahead. > > Signed-off-by: Kirill A. Shutemov > Acked-by: David Hildenbrand > --- > mm/vmscan.c | 9 +++------ > 1 file changed, 3 insertions(+), 6 deletions(-) > > diff --git a/mm/vmscan.c b/mm/vmscan.c > index bc1826020159..c97adb0fdaa4 100644 > --- a/mm/vmscan.c > +++ b/mm/vmscan.c > @@ -692,19 +692,16 @@ static pageout_t pageout(struct folio *folio, struc= t address_space *mapping, > if (shmem_mapping(mapping) && folio_test_large(folio)) > wbc.list =3D folio_list; > > - folio_set_reclaim(folio); > + folio_set_dropbehind(folio); > + > res =3D mapping->a_ops->writepage(&folio->page, &wbc); > if (res < 0) > handle_write_error(mapping, folio, res); > if (res =3D=3D AOP_WRITEPAGE_ACTIVATE) { > - folio_clear_reclaim(folio); > + folio_clear_dropbehind(folio); > return PAGE_ACTIVATE; > } > > - if (!folio_test_writeback(folio)) { > - /* synchronous write or broken a_ops? */ > - folio_clear_reclaim(folio); > - } > trace_mm_vmscan_write_folio(folio); > node_stat_add_folio(folio, NR_VMSCAN_WRITE); > return PAGE_SUCCESS; > -- > 2.47.2 > Hi, I'm seeing following panic with SWAP after this commit: [ 29.672319] Oops: general protection fault, probably for non-canonical address 0xffff88909a3be3: 0000 [#1] PREEMPT SMP NOPTI [ 29.675503] CPU: 82 UID: 0 PID: 5145 Comm: tar Kdump: loaded Not tainted 6.13.0.ptch-g1fe9ea48ec98 #917 [ 29.677508] Hardware name: Red Hat KVM/RHEL-AV, BIOS 0.0.0 02/06/2015 [ 29.678886] RIP: 0010:__lock_acquire+0x20/0x15d0 [ 29.679891] Code: 90 90 90 90 90 90 90 90 90 90 41 57 41 56 41 55 41 54 55 53 48 83 ec 30 8b 2d 10 ac f3 01 44 8b ac 24 88 00 00 00 85 ed 74 64 <48> 8b 07 49 89 ff 48 3d 20 1d bf 83 74 56 8b 1d 8c f5 b1 01 41 89 [ 29.683852] RSP: 0018:ffffc9000bea3148 EFLAGS: 00010002 [ 29.684980] RAX: ffff8890874b2940 RBX: 0000000000000200 RCX: 00000000000= 00000 [ 29.686510] RDX: 0000000000000000 RSI: 0000000000000000 RDI: 00ffff88909= a3be3 [ 29.688031] RBP: 0000000000000001 R08: 0000000000000001 R09: 00000000000= 00000 [ 29.689561] R10: 0000000000000000 R11: 0000000000000020 R12: 00ffff88909= a3be3 [ 29.691087] R13: 0000000000000000 R14: 0000000000000000 R15: 00000000000= 00000 [ 29.692613] FS: 00007fa05c2824c0(0000) GS:ffff88a03fa80000(0000) knlGS:0000000000000000 [ 29.694339] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 29.695581] CR2: 000055f9abb7fc7d CR3: 00000010932f2002 CR4: 00000000007= 70eb0 [ 29.697109] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 00000000000= 00000 [ 29.698637] DR3: 0000000000000000 DR6: 00000000fffe0ff0 DR7: 00000000000= 00400 [ 29.700161] PKRU: 55555554 [ 29.700759] Call Trace: [ 29.701296] [ 29.701770] ? __die_body+0x1e/0x60 [ 29.702540] ? die_addr+0x3c/0x60 [ 29.703267] ? exc_general_protection+0x18f/0x3c0 [ 29.704290] ? asm_exc_general_protection+0x26/0x30 [ 29.705345] ? __lock_acquire+0x20/0x15d0 [ 29.706215] ? lockdep_hardirqs_on_prepare+0xda/0x190 [ 29.707304] ? asm_sysvec_apic_timer_interrupt+0x1a/0x20 [ 29.708452] lock_acquire+0xbf/0x2e0 [ 29.709229] ? folio_unmap_invalidate+0x12f/0x220 [ 29.710257] ? __folio_end_writeback+0x15d/0x430 [ 29.711260] ? __folio_end_writeback+0x116/0x430 [ 29.712261] _raw_spin_lock+0x30/0x40 [ 29.713064] ? folio_unmap_invalidate+0x12f/0x220 [ 29.714076] folio_unmap_invalidate+0x12f/0x220 [ 29.715058] folio_end_writeback+0xdf/0x190 [ 29.715967] swap_writepage_bdev_sync+0x1e0/0x450 [ 29.716994] ? __pfx_submit_bio_wait_endio+0x10/0x10 [ 29.718074] swap_writepage+0x46b/0x6b0 [ 29.718917] pageout+0x14b/0x360 [ 29.719628] shrink_folio_list+0x67d/0xec0 [ 29.720519] ? mark_held_locks+0x48/0x80 [ 29.721375] evict_folios+0x2a7/0x9e0 [ 29.722179] try_to_shrink_lruvec+0x19a/0x270 [ 29.723130] lru_gen_shrink_lruvec+0x70/0xc0 [ 29.724060] ? __lock_acquire+0x558/0x15d0 [ 29.724954] shrink_lruvec+0x57/0x780 [ 29.725754] ? find_held_lock+0x2d/0xa0 [ 29.726588] ? rcu_read_unlock+0x17/0x60 [ 29.727449] shrink_node+0x2ad/0x930 [ 29.728229] do_try_to_free_pages+0xbd/0x4e0 [ 29.729160] try_to_free_mem_cgroup_pages+0x123/0x2c0 [ 29.730252] try_charge_memcg+0x222/0x660 [ 29.731128] charge_memcg+0x3c/0x80 [ 29.731888] __mem_cgroup_charge+0x30/0x70 [ 29.732776] shmem_alloc_and_add_folio+0x1a5/0x480 [ 29.733818] ? filemap_get_entry+0x155/0x390 [ 29.734748] shmem_get_folio_gfp+0x28c/0x6c0 [ 29.735680] shmem_write_begin+0x5a/0xc0 [ 29.736535] generic_perform_write+0x12a/0x2e0 [ 29.737503] shmem_file_write_iter+0x86/0x90 [ 29.738428] vfs_write+0x364/0x530 [ 29.739180] ksys_write+0x6c/0xe0 [ 29.739906] do_syscall_64+0x66/0x140 [ 29.740713] entry_SYSCALL_64_after_hwframe+0x76/0x7e [ 29.741800] RIP: 0033:0x7fa05c439984 [ 29.742584] Code: c7 00 16 00 00 00 b8 ff ff ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 f3 0f 1e fa 80 3d c5 06 0e 00 00 74 13 b8 01 00 00 00 0f 05 <48> 3d 00 f0 ff ff 77 54 c3 0f 1f 00 55 48 89 e5 48 83 ec 20 48 89 [ 29.746542] RSP: 002b:00007ffece7720f8 EFLAGS: 00000202 ORIG_RAX: 0000000000000001 [ 29.748157] RAX: ffffffffffffffda RBX: 0000000000002800 RCX: 00007fa05c4= 39984 [ 29.749682] RDX: 0000000000002800 RSI: 000055f9cfa08000 RDI: 00000000000= 00004 [ 29.751216] RBP: 00007ffece772140 R08: 0000000000002800 R09: 00000000000= 00007 [ 29.752743] R10: 0000000000000180 R11: 0000000000000202 R12: 000055f9cfa= 08000 [ 29.754262] R13: 0000000000000004 R14: 0000000000002800 R15: 00000000000= 009af [ 29.755797] [ 29.756285] Modules linked in: zram virtiofs I'm testing with PROVE_LOCKING on. It seems folio_unmap_invalidate is called for swapcache folio and it doesn't work well, following PATCH on top of mm-unstable seems fix it well: diff --git a/mm/filemap.c b/mm/filemap.c index 4fe551037bf7..98493443d120 100644 --- a/mm/filemap.c +++ b/mm/filemap.c @@ -1605,8 +1605,9 @@ static void folio_end_reclaim_write(struct folio *fol= io) * invalidation in that case. */ if (in_task() && folio_trylock(folio)) { - if (folio->mapping) - folio_unmap_invalidate(folio->mapping, folio, 0); + struct address_space *mapping =3D folio_mapping(folio); + if (mapping) + folio_unmap_invalidate(mapping, folio, 0); folio_unlock(folio); } } diff --git a/mm/truncate.c b/mm/truncate.c index e922ceb66c44..4f3e34c52d8b 100644 --- a/mm/truncate.c +++ b/mm/truncate.c @@ -565,23 +565,29 @@ int folio_unmap_invalidate(struct address_space *mapping, struct folio *folio, if (!filemap_release_folio(folio, gfp)) return -EBUSY; - spin_lock(&mapping->host->i_lock); + if (!folio_test_swapcache(folio)) { + spin_lock(&mapping->host->i_lock); + BUG_ON(folio_has_private(folio)); + } + xa_lock_irq(&mapping->i_pages); if (folio_test_dirty(folio)) goto failed; - BUG_ON(folio_has_private(folio)); __filemap_remove_folio(folio, NULL); xa_unlock_irq(&mapping->i_pages); if (mapping_shrinkable(mapping)) inode_add_lru(mapping->host); - spin_unlock(&mapping->host->i_lock); + + if (!folio_test_swapcache(folio)) + spin_unlock(&mapping->host->i_lock); filemap_free_folio(mapping, folio); return 1; failed: xa_unlock_irq(&mapping->i_pages); - spin_unlock(&mapping->host->i_lock); + if (!folio_test_swapcache(folio)) + spin_unlock(&mapping->host->i_lock); return -EBUSY; }