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 4C922C61CE8 for ; Sat, 7 Jun 2025 06:11:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 661616B0088; Sat, 7 Jun 2025 02:11:53 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 611DE6B0089; Sat, 7 Jun 2025 02:11:53 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 527D06B008A; Sat, 7 Jun 2025 02:11:53 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 34C536B0088 for ; Sat, 7 Jun 2025 02:11:53 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 48A48161459 for ; Sat, 7 Jun 2025 06:11:52 +0000 (UTC) X-FDA: 83527583664.28.68EE95B Received: from out30-113.freemail.mail.aliyun.com (out30-113.freemail.mail.aliyun.com [115.124.30.113]) by imf10.hostedemail.com (Postfix) with ESMTP id 5B0EEC0007 for ; Sat, 7 Jun 2025 06:11:48 +0000 (UTC) Authentication-Results: imf10.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=XlMcSfpd; spf=pass (imf10.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.113 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=1749276710; 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=tv8Qd186a+YUGmKNnjp0VaSDu0lYv/4ErZQgFy9v7GI=; b=M4Bnhd+bUtSf8+j3d8pew1BUVb7Rsps4M1OX+bC7JGH7T5rCSTFNI29KWMVHW16jDOpEnM EI2F2cZX/tpUGR7lANaW17S0CSqq4pm8gtu+pVq/88Xdzk6RrlaNT1LcHgAnm7aS6KkdB7 pIvhaSgCkfjyc1xjWOXJE3WadVNku5k= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749276710; a=rsa-sha256; cv=none; b=2GPoZrAooqznJAX4nizUPJtFvbNrmfRJy3XZ93G8QXEvV3+drnDqiNV9heLH8MBb5oHMWs 12+wxJhHAHok+bAdo1vUVvy881DpRa2V30IjCVbT9C+IEFhsQBNdPAoRdZDg3B+ggbw0R9 x90MQfp9shm5s1RBR3h8R/5xRymgBBU= ARC-Authentication-Results: i=1; imf10.hostedemail.com; dkim=pass header.d=linux.alibaba.com header.s=default header.b=XlMcSfpd; spf=pass (imf10.hostedemail.com: domain of baolin.wang@linux.alibaba.com designates 115.124.30.113 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=1749276705; h=Message-ID:Date:MIME-Version:Subject:To:From:Content-Type; bh=tv8Qd186a+YUGmKNnjp0VaSDu0lYv/4ErZQgFy9v7GI=; b=XlMcSfpdlrUf4Iz0MbY6izVhtb9PyUBlEBCMtAAI42GklkSUeg2fwL8jC08Y5KHLC+AB2ApltacVrGNaIsXW/CQrOcmSbmtpdH53q/9JWXeruq6mnKlV+ZzLO/sGw2kKnUJcqdovD1yAwNUgg8lwJ1pmzP+0p39twF4gfIUvLSk= Received: from 30.39.161.173(mailfrom:baolin.wang@linux.alibaba.com fp:SMTPD_---0WdEKcKv_1749276701 cluster:ay36) by smtp.aliyun-inc.com; Sat, 07 Jun 2025 14:11:42 +0800 Message-ID: <3d07c68f-da11-43d8-a2da-6b200b2fa40a@linux.alibaba.com> Date: Sat, 7 Jun 2025 14:11:41 +0800 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 1/7] mm: shmem: correctly pass alloced parameter to shmem_recalc_inode() to avoid WARN_ON() To: Kemeng Shi , hughd@google.com, willy@infradead.org, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org References: <20250605221037.7872-1-shikemeng@huaweicloud.com> <20250605221037.7872-2-shikemeng@huaweicloud.com> From: Baolin Wang In-Reply-To: <20250605221037.7872-2-shikemeng@huaweicloud.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 5B0EEC0007 X-Stat-Signature: upieb7auihq16hzwmwk9t4e6jum3kn74 X-Rspam-User: X-HE-Tag: 1749276708-176056 X-HE-Meta: U2FsdGVkX1+6z7eNfKagYc4L9Opn+/BO36fq3m9dbm+fKJWO05InrrjmdsDMnWk1h/W9idUTY+g/9wM4rF0VOfre8CE3o0jW1pyvT32vSl8hvoqN0ii2I0x8Va65sNwTdNh1SDxHJ6q/GdJajzRAMd4P60idSgtn6z2s2rh4b59doPesIDGC9RjrKqSXJDQsEFt3svLAIlQOCZEiDWl+RFCL9uvWDnhGIEUiWARfFNYzVaF2ufkq9WMkLLJV/RAWpwz9bWWTwyBkj5ZjvWtePyjDNefZbDbo2hBhWYUBUi25ZVKrUYX0p5MeLs8zJzW2JPoeZZJmm8Mvbt/QPnJUJSTlb1Y/mbkV0olxN7ZLUtjaX4eyCwhxC2foXeAUgEVkuAT/L1oRjovO7nEXmlr4qOl8MRKErAEQz9q8mPzORFMNUeG06kc3AIzwb6zoAB1fb7omEjGHk3QlXr5D5nspXj++3DIYZt0kTCyKzltkQxpifoSE3KTEr4+SKbLQjpHZsCQoLGTJqRqIXvwt/NZfp43lDMweWwykdz1IAFDEOkGIH8sfaBdwHrh909A+Pl8d/Ys+QVdvYOCK4qD8M9MjWmUGc8cv+LfMWHphKRvzKblZVUAliWf8A7SX5AT0WcV/TUUR/F9RKxGUFJWVBrdupcpI1L+X2GZFU75UWqW72hmJFymRFhE7USlrWKoesNMzk3K2SsbMLbr4E8hIkRze2PD4l0hZen0RUlaCPmjWor4I/Q3kL7HlIbUP8CykXaVNRX0dH3n148+lZhe3w0DK8qn4K5d5wO8AKJVMhGFY151Hd34tl2oAfojH2/jWnOFKul5rIrKlQnJcXPQtns8RwawVaJ0beke/PRuh3WF1KUsqcdQDjXmgj+5WwnjUOJspgH48cBvlB5WL2/H6quZxGxH7RnDuo7YgI9FmEwrO+GFiPYRX0o7kZplUqmlVx1BkrCsLF0gxy1yG60gVPDV 5Eg/i0FC 7bplH82nUW8ekQ5Cthu1ktER5brGRN05InOf0gwKrBoPitnMTVE79bvnYuqI+tYvRvaKBiaw1WkMbOHUi839q8OSNRGHK6kFxJrd6C/fKZcxboMZGkdxAPX5wG/FAsQOTj3oVuFBPLIzbAAHOnND+EgCwfuwi+LWoGwXoTldwDPsylo7FhNljxkUEe31FKrqSSEPaoJy0C/8dypytTY+VzfgpcKrcV8fmAl2k77K44zZwcubQ8OXMZd1HboQzA4HY9RcOlqUO166jRlVkSdUF5Xi/vCeByOYif/mcRUlvOqJ9iZBm3ZjJnrwfbaaPHfv3jG2b7Y7BsXfdMxw6/yFxUWegsGlQ5c3VuMYCuXdr5xedYiKhCXpYbdEQwlsmtaeDEEnlrtTw+mN49VE= 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 2025/6/6 06:10, Kemeng Shi wrote: > As noted in the comments, we need to release block usage for swap entry > which was replaced with poisoned swap entry. However, no block usage is > actually freed by calling shmem_recalc_inode(inode, -nr_pages, -nr_pages). > Instead, call shmem_recalc_inode(inode, 0, -nr_pages) can correctly release > the block usage. > > Fixes: 6cec2b95dadf7 ("mm/shmem: fix infinite loop when swap in shmem error at swapoff time") > Signed-off-by: Kemeng Shi > --- > mm/shmem.c | 2 +- > 1 file changed, 1 insertion(+), 1 deletion(-) > > diff --git a/mm/shmem.c b/mm/shmem.c > index 4b42419ce6b2..e27d19867e03 100644 > --- a/mm/shmem.c > +++ b/mm/shmem.c > @@ -2145,7 +2145,7 @@ static void shmem_set_folio_swapin_error(struct inode *inode, pgoff_t index, > * won't be 0 when inode is released and thus trigger WARN_ON(i_blocks) > * in shmem_evict_inode(). > */ > - shmem_recalc_inode(inode, -nr_pages, -nr_pages); > + shmem_recalc_inode(inode, 0, -nr_pages); > swap_free_nr(swap, nr_pages); > } Have you tested your patch? When I inject an error to test your patch, the following issue will be triggered: [ 127.173330] ------------[ cut here ]------------ [ 127.173331] WARNING: CPU: 13 PID: 6860 at mm/shmem.c:1388 shmem_evict_inode+0xf0/0x348 [ 127.173920] CPU: 13 UID: 0 PID: 6860 Comm: shmem_swapin_er Kdump: loaded Tainted: G E 6.15.0-rc6+ #54 VOLUNTARY [ 127.173925] pstate: 63401005 (nZCv daif +PAN -UAO +TCO +DIT +SSBS BTYPE=--) [ 127.173927] pc : shmem_evict_inode+0xf0/0x348 [ 127.173929] lr : shmem_evict_inode+0x68/0x348 [ 127.173931] sp : ffff8000895639e0 [ 127.173932] x29: ffff8000895639e0 x28: 0000000000000006 x27: ffff00013754bfc0 [ 127.173935] x26: ffff800080d8f160 x25: 0000000000000006 x24: ffff0000c0aab440 [ 127.173937] x23: ffff00013754b780 x22: ffff00013754b780 x21: ffff0000cbc9c6b0 [ 127.173940] x20: ffff0000c0aab440 x19: ffff0000cbc9c700 x18: 0000000000000030 [ 127.173942] x17: 0000ffffa1f4cfff x16: 0000000000000003 x15: 0000000000001000 [ 127.173945] x14: 00000000ffffffff x13: 0000000000000004 x12: ffff800089563108 [ 127.173947] x11: 0000000000000000 x10: 0000000000000002 x9 : ffff800080352080 [ 127.173949] x8 : fffffffffffffffe x7 : ffff800089563700 x6 : 0000000000000001 [ 127.173952] x5 : 0000000000000004 x4 : 0000000000000002 x3 : 0000000000000002 [ 127.173954] x2 : 0000000000000000 x1 : 0000000000000000 x0 : ffffffffffffff80 [ 127.173957] Call trace: [ 127.173958] shmem_evict_inode+0xf0/0x348 (P) [ 127.173961] evict+0x1c8/0x2c8 [ 127.173964] iput_final+0x84/0x1a0 [ 127.173966] iput.part.0+0xd0/0xf0 [ 127.173968] iput+0x20/0x38 [ 127.173971] dentry_unlink_inode+0xc0/0x158 [ 127.173973] __dentry_kill+0x80/0x248 [ 127.173974] dput+0xf0/0x240 [ 127.173976] __fput+0x120/0x2f0 [ 127.173978] ____fput+0x18/0x28 [ 127.173980] task_work_run+0x88/0x120 [ 127.173983] do_exit+0x198/0x3c0 [ 127.173986] do_group_exit+0x38/0xa0 [ 127.173987] get_signal+0x6ac/0x6b8 [ 127.173990] do_signal+0x100/0x208 [ 127.173991] do_notify_resume+0xc8/0x158 [ 127.173994] el0_da+0xbc/0xc0 [ 127.173997] el0t_64_sync_handler+0x70/0xc8 [ 127.173999] el0t_64_sync+0x154/0x158 [ 127.174001] ---[ end trace 0000000000000000 ]---