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 01F2AC5AE59 for ; Thu, 5 Jun 2025 13:17:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 5CB956B00A3; Thu, 5 Jun 2025 09:17:08 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5A2EE6B009D; Thu, 5 Jun 2025 09:17:08 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 493626B04EC; Thu, 5 Jun 2025 09:17:08 -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 253DE6B009D for ; Thu, 5 Jun 2025 09:17:08 -0400 (EDT) Received: from smtpin28.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id A8C1C1D6027 for ; Thu, 5 Jun 2025 13:17:07 +0000 (UTC) X-FDA: 83521397694.28.2A4BBDB Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by imf19.hostedemail.com (Postfix) with ESMTP id 61DBD1A0014 for ; Thu, 5 Jun 2025 13:17:01 +0000 (UTC) Authentication-Results: imf19.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf19.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1749129426; 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; bh=JXI0nFSOGUACbwiTX4zy5jg9GKsJLQPmYxz4hvo9H4o=; b=HHTL8AbgJCt7YN2xAy7ss6ph7uCbZecOpxnLWl65qY1CAwZv7hJf2iFHcArGAbR1Iv4f7i 7SjG4PUHNtIlE9WBEtV+c0vCcLMEBBFQvKHhy8NO7bW2UYIG/GmFcVxrDKCQxh9v7fv5BW TAlXoSHc+LjO8t/5syxVWhSC4BKwMnA= ARC-Authentication-Results: i=1; imf19.hostedemail.com; dkim=none; dmarc=none; spf=pass (imf19.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1749129426; a=rsa-sha256; cv=none; b=bMZsS724bTpJosD6Mlu/lEKj8hss6jm3V6FF43dYkVro+8DZyNiwzRZC9lLq/VSwXJ52/Z RHzgNPDkqOZceNsH1145xI21ZGHM1zXmZExR850+MlrF5oM86llJIlsTSPzVVTRVM8WtHr tnwxgwjBmYZCnhPXyN2lzK9s4nmpwoY= Received: from mail.maildlp.com (unknown [172.19.163.216]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTPS id 4bClNC22vHzKHN91 for ; Thu, 5 Jun 2025 21:16:59 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id A66C91A16C2 for ; Thu, 5 Jun 2025 21:16:57 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP1 (Coremail) with SMTP id cCh0CgDnTH3HmEFobD9lOQ--.29489S3; Thu, 05 Jun 2025 21:16:57 +0800 (CST) From: Kemeng Shi To: hughd@google.com, baolin.wang@linux.alibaba.com, willy@infradead.org, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org Subject: [PATCH 1/7] mm: shmem: correctly pass alloced parameter to shmem_recalc_inode() to avoid WARN_ON() Date: Fri, 6 Jun 2025 06:10:31 +0800 Message-Id: <20250605221037.7872-2-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20250605221037.7872-1-shikemeng@huaweicloud.com> References: <20250605221037.7872-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:cCh0CgDnTH3HmEFobD9lOQ--.29489S3 X-Coremail-Antispam: 1UD129KBjvdXoW7JFW8ZrWxAr1rtr1fAr1rCrg_yoWDAwc_XF 4Iy3y7Gry8WFsrZa1DZw4fXFZY9w48Wr4qqrWaqFyxAr15XF1qkr4DXrnavryxZa15KrZx Cw1xXw15Kr1agjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbDAYFVCjjxCrM7AC8VAFwI0_Gr0_Xr1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r18M28IrcIa0xkI8VCY1x0267AKxVWUCVW8JwA2ocxC64kI II0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM28EF7 xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq3wA2 z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8wAqx4 xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE14v2 6r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCY1x0262kKe7AKxV WUAVWUtwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02F40E 14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw1lIx kGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7CjxVAF wI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r1j6r 4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jfAwsU UUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Rspamd-Server: rspam12 X-Rspamd-Queue-Id: 61DBD1A0014 X-Stat-Signature: jubyg9p41sepbiqoeq4bky6pd4gredeq X-Rspam-User: X-HE-Tag: 1749129421-317001 X-HE-Meta: U2FsdGVkX19deDsxKaHyZLO4uslvjYYIpYc9uyiDdaWX/jxQNVnAJ6N8c5A24FBPD1AFTo8nKVjgIIK76iYSY3pvhXt8s3jvlCHPdOzkf2mqmt/qaxre+w9jpQA0KQEK3vyHVWtB2MXBSZcYDOa/gGiajc1dugxi3v17GoJNJAN9Etqua20f98VCtd53VFfxQnfjzOhixvxhfUfkEPn7IxI4qKMgPJ/ZduPYufuadmECDm0TrGHneSpiSkc0IoYis7Kd0zaJNb99gTR3y3M0CNTYVZi1oxleIuiMd2oKszsOlEJAKoRD/8Q+DcPVu8PnqDETYsJfT+1PN4gS3NefvNOxPKq59m6R/av2QtD3LUk2Pp9mp5kXzeiOEykckdmO3KmoxMlf3Li8zMXsbEr9pj4s/va4bWTJvisaL7cDOi4NznTB7gJoAfXSgYPkNVBMxfJT+gSfIAna5TgUMRG7X1V3X4fw8p0vWKMfFprX8EgsLLLyDreRwrb5f4U7PhwrOI1kf9cArt+cLBvsQiU8JakIgEabhq6bd3O1i36JiBBgffBqrqI+aeEwRJzIi7pKjx9FrAQUeT8ImkkDVyHmtCGxTbBateMc/+fo4AxsY3tCfSsFcbQlH4zDVtMHEW2PGXdNX0U2iDWvN9hUBwSgJu7n9VQbUJGo636eSscpYymPLWIWOIE7b286ZLJdXTA/P41EK1ulxufQ3FOljLu0H3fN7SBk1t7dS5oAJK4OvXnkRRYFaT6Dju/FNX741T5xXqwGc3OwfUdi2L7Dh2A7S1hqFa8wLQk3UdaCws2is5DeGHF2olMfrPk29XuJMtiVlpkMpS988DkqUKMDPNya0Fgwy56ClvHfvdyvyHdwys6X8kQECxmOPw/dzrlrHPr5kRjitExs+Q3tqW1LSLAbaWhYYGUen7h3dbIXHUYlXoRRHujjdQvo8CqrTauGQTvs0hXEEULaAiKH/VWuzc9 CnFGv2Qq /UXj5RrSoVQK67uiBHQr9nxdy95sesQHbgxqXVd0n265OztTvinuP0URw24iTngFLtu2TpInuQ97E8yhEPTq2Mi1SkzEKhWJjHpXM1KyNrLlxY6pcl2R+omEG/9/+/MFbyup7fFz2c7THn4h2ZQ7SNHsJM5v5FVhTQLDOUpGVj3f9iuk6Bbo/aakSb+UdWGfP9OtDrxlnS5xvaG+ys9SzyevtAQ== 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: 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); } -- 2.30.0