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 B9747C3ABD8 for ; Fri, 16 May 2025 08:15:46 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 6BCC56B00FE; Fri, 16 May 2025 04:15:36 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 036926B00FA; Fri, 16 May 2025 04:15:35 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C8F826B00FF; Fri, 16 May 2025 04:15:35 -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 3EB296B00F6 for ; Fri, 16 May 2025 04:15:35 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 0007F14190F for ; Fri, 16 May 2025 08:15:35 +0000 (UTC) X-FDA: 83448061830.07.06AF491 Received: from dggsgout12.his.huawei.com (dggsgout12.his.huawei.com [45.249.212.56]) by imf18.hostedemail.com (Postfix) with ESMTP id 9C5471C0002 for ; Fri, 16 May 2025 08:15:33 +0000 (UTC) Authentication-Results: imf18.hostedemail.com; dkim=none; spf=pass (imf18.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747383334; 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=HH4wlJUqmL9MEZXMsDYiWmmihNfKjFXAkU4+2Pldwus=; b=rj0iajVoPRMhesLSupCM4iBz+aRLzqFjTvkBLWudYWgn7mu2sc1NzXVUBw5OwDQ/xEJgu+ 1/0we0j0vdqK0GONsyFK5HvlmLn5vV2R810Frc4uP43UR3ALQ82AaGfAZaNvJR4XVfRdA7 +cBGq1w35uDlM2jPOZ4sGq9ZAYFWudQ= ARC-Authentication-Results: i=1; imf18.hostedemail.com; dkim=none; spf=pass (imf18.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.56 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747383334; a=rsa-sha256; cv=none; b=4I8+eQAx6r//yAXZRM7ISbZYihn+FCuc1Z/kxN/J/7ZHxB6eNnBefcu7fhWzXoC3JBbzxe SnaSWr8vK/i2ubWOqUCWu6BEO0YG11H12PP/9/FuMKVKNE8Bvu6ZxFfaE3mzgOA8R7ZSyF Y1dWW9twk6Sv5DyuCzoLUkOiPIMJjfQ= Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout12.his.huawei.com (SkyGuard) with ESMTPS id 4ZzKdZ5cJMzKHMnH for ; Fri, 16 May 2025 16:15:30 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.252]) by mail.maildlp.com (Postfix) with ESMTP id 642181A106E for ; Fri, 16 May 2025 16:15:29 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP3 (Coremail) with SMTP id _Ch0CgDnOsUe9CZo9fSDMQ--.49450S6; Fri, 16 May 2025 16:15:29 +0800 (CST) From: Kemeng Shi To: hughd@google.com, baolin.wang@linux.alibaba.com, akpm@linux-foundation.org Cc: ryncsn@gmail.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 4/5] mm: shmem: only remove inode from swaplist when it's swapped page count is 0 Date: Sat, 17 May 2025 01:09:38 +0800 Message-Id: <20250516170939.965736-5-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20250516170939.965736-1-shikemeng@huaweicloud.com> References: <20250516170939.965736-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:_Ch0CgDnOsUe9CZo9fSDMQ--.49450S6 X-Coremail-Antispam: 1UD129KBjvJXoW7AFy5ZFWrXF1kuryfZFW5Wrg_yoW8Jw15p3 97G34DJrWrAry0kFWxAanI9w1Ygws5Wa1UKFWakw1rZFsIvw48Krnaqr95Xr97CFZxGFy2 qrnF9F12ya1jy3DanT9S1TB71UUUUU7qnTZGkaVYY2UrUUUUjbIjqfuFe4nvWSU5nxnvy2 9KBjDU0xBIdaVrnRJUUUPab4IE77IF4wAFF20E14v26rWj6s0DM7CY07I20VC2zVCF04k2 6cxKx2IYs7xG6rWj6s0DM7CIcVAFz4kK6r1j6r18M280x2IEY4vEnII2IxkI6r1a6r45M2 8IrcIa0xkI8VA2jI8067AKxVWUAVCq3wA2048vs2IY020Ec7CjxVAFwI0_Xr0E3s1l8cAv FVAK0II2c7xJM28CjxkF64kEwVA0rcxSw2x7M28EF7xvwVC0I7IYx2IY67AKxVWDJVCq3w A2z4x0Y4vE2Ix0cI8IcVCY1x0267AKxVW8Jr0_Cr1UM28EF7xvwVC2z280aVAFwI0_GcCE 3s1l84ACjcxK6I8E87Iv6xkF7I0E14v26rxl6s0DM2AIxVAIcxkEcVAq07x20xvEncxIr2 1l5I8CrVACY4xI64kE6c02F40Ex7xfMcIj6xIIjxv20xvE14v26r1j6r18McIj6I8E87Iv 67AKxVWUJVW8JwAm72CE4IkC6x0Yz7v_Jr0_Gr1lF7xvr2IYc2Ij64vIr41lc7CjxVAaw2 AFwI0_JF0_Jw1l42xK82IYc2Ij64vIr41l4I8I3I0E4IkC6x0Yz7v_Jr0_Gr1lx2IqxVAq x4xG67AKxVWUJVWUGwC20s026x8GjcxK67AKxVWUGVWUWwC2zVAF1VAY17CE14v26r126r 1DMIIYrxkI7VAKI48JMIIF0xvE2Ix0cI8IcVAFwI0_JFI_Gr1lIxAIcVC0I7IYx2IY6xkF 7I0E14v26r4j6F4UMIIF0xvE42xK8VAvwI8IcIk0rVWUJVWUCwCI42IY6I8E87Iv67AKxV WUJVW8JwCI42IY6I8E87Iv6xkF7I0E14v26r4j6r4UJbIYCTnIWIevJa73UjIFyTuYvjxU s3kuDUUUU X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Stat-Signature: w3icgff8yfjtgsx9xxsujjtm1bttofqw X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 9C5471C0002 X-HE-Tag: 1747383333-721685 X-HE-Meta: U2FsdGVkX1/FqVJRG6e1d4VXe6qvJLJbnfWf9a4aGSCaH4/z6t9ZC4V/ZPgm7mdQ/ZWpZ+/a/y/CAtO6AEVEEk569gj2EXfLj8cjDnw8QSiueELqeBXIOuEVA2hiUcRQy/amu5jpwXszYXBa+ADSd77z3igkG26lSJZ/85QV+GodYhLz3vnofCP6jD8uFBkGZF74uqWa3Ow0BBR+YkuG23fDorMWme2hAq3uYJUR6zNU2jjQcddbHd722To/YFB/8FLGcat6XAW0CrnB4CJVlmsbmlXXrFM4HFQ3FBbgSsOa2lSTIx64gLC9kM1X7HUtJvXScEm1Mwq9ZT3QCf37STyzXCXX8hEinl42MH1PjzQ6jXvLsGf9igtwgSE3gHuXD65ydg9KgcglK7PS9EuWQDv5JRSODYqFC1N2QHSM9Q445CNewv2nyfdgRlVs+dmjDDRvEX9oeG+WMoEfoe/YMF1uQmfWo3A/2JIJS6fD5vnSoHb+rnRIhXJqwy1YoF5Ss6UqymhNB02bc21axV4+FhKBJL0lXEwFNfgF07iV6m3UOUkuyGvONxqboFD72bpCcs91I/R+6xDduwvyA3nohjgnYcxCs5uN8YwSDkqkaUU5ySdG98dB30daRwX0G4JtX2RhK8mAOaPAsCUeAO1qskRPjfyPG2frfFmmsCrhBm1vG0gIBNGVn7NgXbsXqMB68TtN3nNjQQJs6bojbuRvV+56f1Cis7DGhI35uQR6iwjfDr1ynA2O43LTYSjWOF1yCE3x7LLN5kxZTxu7DZ2RERK0Po3PK5+6cDwCiVINgoF+QCqa6xNdtLoS53/TmslyhCLOJSX7rkQVKpAr46ux9pKi/Rh3Bxf8AhFRrGzMXwjh2vtxYvlaY/NxITPBWVwMKfiItk83ZYy6prj3u8+owfAdA/WTKHrku6Ubwto8xpO9oFZw/JIleMrwXwaa65GaFyMWnsqSfggXKpCMRgi 5adJC+rD rk9faeO0DurorBY3ATwaaeJE/A1EN437wEJ2V5/AoJEzyxUc+u0wJCobVUw6kE6hJDXRGSZqBvOAHCUSFIFRCai479IWXmjkVGBFFf3bEMv0xt42NX5thnWsBt5IGiftW6Ok5efMW1+07FIgyyZgrRtLRRUr2L1gcPTvQcKhYe+77NuAVH7xW8xM+24GuxtfJaYr7qe9alt8j3EyWact2SS8B/a1ApyOC9RZ+HLryPsB/FNeZB8t+Fb0nUBT5Ay1V+4h4 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: Even if we fail to allocate a swap entry, the inode might have previously allocated entry and we might take inode containing swap entry off swaplist. As a result, try_to_unuse() may enter a potential dead loop to repeatedly look for inode and clean it's swap entry. Only take inode off swaplist when it's swapped page count is 0 to fix the issue. Fixes: b487a2da3575b ("mm, swap: simplify folio swap allocation") Signed-off-by: Kemeng Shi Reviewed-by: Baolin Wang Reviewed-by: Kairui Song Reported-by: kernel test robot Closes: https://lore.kernel.org/oe-lkp/202505161438.9009cf47-lkp@intel.com --- mm/shmem.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index aeeddf612baa..07b8e1400c67 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1651,8 +1651,8 @@ static int shmem_writepage(struct page *page, struct writeback_control *wbc) BUG_ON(folio_mapped(folio)); return swap_writepage(&folio->page, wbc); } - - list_del_init(&info->swaplist); + if (!info->swapped) + list_del_init(&info->swaplist); mutex_unlock(&shmem_swaplist_mutex); if (nr_pages > 1) goto try_split; -- 2.30.0