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 062F0C3ABDD for ; Wed, 14 May 2025 07:56:54 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id EBA0A6B00EB; Wed, 14 May 2025 03:56:42 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 85DFA6B00F0; Wed, 14 May 2025 03:56:42 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 28BE26B00F2; Wed, 14 May 2025 03:56:42 -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 4F8A86B00E6 for ; Wed, 14 May 2025 03:56:41 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id B45B2C0A46 for ; Wed, 14 May 2025 07:56:41 +0000 (UTC) X-FDA: 83440756602.06.44C4D7E Received: from dggsgout11.his.huawei.com (dggsgout11.his.huawei.com [45.249.212.51]) by imf28.hostedemail.com (Postfix) with ESMTP id 443FFC0003 for ; Wed, 14 May 2025 07:56:37 +0000 (UTC) Authentication-Results: imf28.hostedemail.com; dkim=none; spf=pass (imf28.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 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=1747209400; 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=xPEZ3Cy5jHQqQbajibx8ZpDt0K0farDT1FIy7xdsvBk=; b=Sljxbim4sM75ZIsP6azrl1pwZMaVJuLpTOULHhlJat17fDo6bFZ7rEKNJ9p/0iPi3wtJhP aBj9ZZ8ZWFFnOwV+EyAn5Ci6bpbd2jMZ3ph+QojtkgrwAAOSAQC9lAJy0dfnfDdjQEQ/Q6 IqD24scwBaTi5eowW1ubPEPLxqmYPmU= ARC-Authentication-Results: i=1; imf28.hostedemail.com; dkim=none; spf=pass (imf28.hostedemail.com: domain of shikemeng@huaweicloud.com designates 45.249.212.51 as permitted sender) smtp.mailfrom=shikemeng@huaweicloud.com; dmarc=none ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747209400; a=rsa-sha256; cv=none; b=ocKZ66dmn1jAQtzkkGzMjJexu14sF+juVQcIuaeGVgrW8VUc9bjQ12FsJ/JRD12/9KTM72 fHgfn6kFr6wih542/vf/WLKINrXLySRJpWNAqwi2jP5QHbCewez8+KboOQUv1dwHJ/pPpx gR9AUwnKZM4E9Yi22W2iYUND4OOkHPw= Received: from mail.maildlp.com (unknown [172.19.163.235]) by dggsgout11.his.huawei.com (SkyGuard) with ESMTP id 4Zy5J747cFz4f3l26 for ; Wed, 14 May 2025 15:56:07 +0800 (CST) Received: from mail02.huawei.com (unknown [10.116.40.112]) by mail.maildlp.com (Postfix) with ESMTP id CEFB81A0FCD for ; Wed, 14 May 2025 15:56:33 +0800 (CST) Received: from huaweicloud.com (unknown [10.175.101.6]) by APP1 (Coremail) with SMTP id cCh0CgDXOnuvTCRoTNWvMA--.62928S6; Wed, 14 May 2025 15:56:33 +0800 (CST) From: Kemeng Shi To: hughd@google.com, baolin.wang@linux.alibaba.com, akpm@linux-foundation.org Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] mm: shmem: keep inode in swaplist when failed to allocate swap entry in shmem_writepage() Date: Thu, 15 May 2025 00:50:46 +0800 Message-Id: <20250514165047.946884-5-shikemeng@huaweicloud.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20250514165047.946884-1-shikemeng@huaweicloud.com> References: <20250514165047.946884-1-shikemeng@huaweicloud.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-CM-TRANSID:cCh0CgDXOnuvTCRoTNWvMA--.62928S6 X-Coremail-Antispam: 1UD129KBjvdXoWrtw18Wr1rtw18WFWxJF15CFg_yoWDZwb_Xr 4Ut3W5WF43Wrs7Gw45Ka1fJrZ5Kws8Kr18CFs2yFW3Aas8tr4vyr98Aw4rXFW7Za15Xrn8 A3WkAFy7Cr1qgjkaLaAFLSUrUUUUjb8apTn2vfkv8UJUUUU8Yxn0WfASr-VFAUDa7-sFnT 9fnUUIcSsGvfJTRUUUbqkYFVCjjxCrM7AC8VAFwI0_Wr0E3s1l1xkIjI8I6I8E6xAIw20E Y4v20xvaj40_Wr0E3s1l1IIY67AEw4v_Jr0_Jr4l87I20VAvwVAaII0Ic2I_JFv_Gryl82 xGYIkIc2x26280x7IE14v26r126s0DM28IrcIa0xkI8VCY1x0267AKxVW8JVW5JwA2ocxC 64kIII0Yj41l84x0c7CEw4AK67xGY2AK021l84ACjcxK6xIIjxv20xvE14v26F1j6w1UM2 8EF7xvwVC0I7IYx2IY6xkF7I0E14v26r4UJVWxJr1l84ACjcxK6I8E87Iv67AKxVW0oVCq 3wA2z4x0Y4vEx4A2jsIEc7CjxVAFwI0_GcCE3s1le2I262IYc4CY6c8Ij28IcVAaY2xG8w Aqx4xG64xvF2IEw4CE5I8CrVC2j2WlYx0E2Ix0cI8IcVAFwI0_Jr0_Jr4lYx0Ex4A2jsIE 14v26r1j6r4UMcvjeVCFs4IE7xkEbVWUJVW8JwACjcxG0xvY0x0EwIxGrwCY1x0262kKe7 AKxVWUAVWUtwCF04k20xvY0x0EwIxGrwCFx2IqxVCFs4IE7xkEbVWUJVW8JwC20s026c02 F40E14v26r1j6r18MI8I3I0E7480Y4vE14v26r106r1rMI8E67AF67kF1VAFwI0_JF0_Jw 1lIxkGc2Ij64vIr41lIxAIcVC0I7IYx2IY67AKxVWUJVWUCwCI42IY6xIIjxv20xvEc7Cj xVAFwI0_Gr0_Cr1lIxAIcVCF04k26cxKx2IYs7xG6r1j6r1xMIIF0xvEx4A2jsIE14v26r 1j6r4UMIIF0xvEx4A2jsIEc7CjxVAFwI0_Gr0_Gr1UYxBIdaVFxhVjvjDU0xZFpf9x07jv Wl9UUUUU= X-CM-SenderInfo: 5vklyvpphqwq5kxd4v5lfo033gof0z/ X-Stat-Signature: yotbznxj7qsoq8jnrifnhp4ow4tsyteh X-Rspam-User: X-Rspamd-Server: rspam03 X-Rspamd-Queue-Id: 443FFC0003 X-HE-Tag: 1747209397-504100 X-HE-Meta: U2FsdGVkX1/9oxH3L7llHMYo9fVxcN5mqxkOfMZnrRVyqyUOz1ArG16M88LufCmjCQmAUxvMishjTfoTHodj0rqHUMoCxS3eShiEWLdbJcTEmt4urZ+xPs8/kEebGC/F3gyefFwPh9emFiqDc/YzUjeCew9MvD3OX3KgKf6rO/FUr7os0VeSwDgEjwOGs9jCX9TYZfbRa3bV2pC0qLEj2EVFHLGA6kaupU1sqUDAi4gUXcp3sL7oUeKkxwrb0JFCkWOzH3yMbgY5LuGiZHSgepuLFpEOFQnT3wxXVWhCfnY6vWbil27hCbm/pUfDP4fDOK9QrUpTD27dzPvst+6RZpc6gr38xbvB2Qe95/LbAItS+zK4hBfA5BsHFF3tXkVqGgv9oO6gFWayGgDu/gOqBBo82CdL7mgYDJVQxDdpSJI7f9WxpYSP0QN1BsXOuv6LQ8iRhUKMHOIGVSXhQm9B4PynfX0fPCZoXpCjDfJAKqxjn0n4N9wCx8fc0cpHlIprRGhlTjyH6dCmGlyNmj65jw3qjhkILk3hep7n1gt+NshZ3X4CuEfJZwwiCsNzjrXQ/kEjrNEfZ2Rq7Dhl2zkzUDkJPmGEWfwpulV0m1hFbT3KfaS6plROxko0A8p988SLlTc8V8qT3a5v24un0BfsI4oSgevPHP/ySs2cc+lABpICzWuoERXjaRL9AL50w+TJgObeDbeRUBKie4F+Aqk40U8Ro8n2mSP2ZLy37kLW4YgJOizCZy1YRbP/Zx+3MmseE7mMdUuU72abhAQWxm8KQCbKDcRRSKHcY2uGCiS3Zj0MQfHZKIRkotnQQtmrDu39Rrv48OSwbpU0WzT1PsYs3TOS7IMqo0kczete2Olrz8rFkmqJYcbf+4FE+DWI55HZ9SfmaJPHh/MmiXwp/DmF/oSKKWg7hGuLtxFi7Kl1SoEflup58v+70za9NC4bHvOH+Q1H+Bm7wUBqENQ87Qu d+mQj4Z/ u5EagRqsDZLk1L1iKgEzUs5Emzq5vsP1hVqi496RwGxH3QkEI6X/nL5WzXdCcZbzCJY/2+Kqn0wqh0NSkDlGlYWZ0LR/N22SV75+S8kxjPRM++6qHVyhCGgrEnDXWIQh7A8Kxe9z2Bv25C5ddHhrx432h+/akb8LJD7Lznq0WKp2NoNrcEGfUu+uG5IMUNtYWN3e9cecUYStqDiZK3mud0sN69w== 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. Address this by keeping inode in swaplist even if we fail to allocate swap entry as it does not pose significant problem to keep inode without swap entry in swaplist. Fixes: b487a2da3575b ("mm, swap: simplify folio swap allocation") Signed-off-by: Kemeng Shi --- mm/shmem.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/mm/shmem.c b/mm/shmem.c index 0fed94c2bc09..dfd2f730833c 100644 --- a/mm/shmem.c +++ b/mm/shmem.c @@ -1651,8 +1651,6 @@ 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); mutex_unlock(&shmem_swaplist_mutex); if (nr_pages > 1) goto try_split; -- 2.30.0