From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id CC32E2F2909; Mon, 22 Sep 2025 19:44:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758570243; cv=none; b=s97xrh7UB3EtMpQ2kQhArTcmrESWvXAiZDUEGqWHHX5cCp+1IDV+7BUpmbt5SH+pNQgocfli9fXiPjpK22zC1LImY2nTA3fUdCh6dnFxKrt9KvmUDncpL0RUHFrGw/tX30Dm2jvNUh7eT+rv1P3C9Hery44NodKEAtcauw6X3fA= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758570243; c=relaxed/simple; bh=Fte7vkDdIQrq3psNyhJHNM5RGqsw0khzh4N1KkyolQU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rLOIvOjoJP7Piq3XtrVF48NCXYggLz+mwaSTRnIAUCrC4010oUOMi2uA3J+wwUWrDi0/f2zLn2vWktDjUDiHobjNSXl5M47vPbqkBUyg6F1wRyzEVVQ6V0RFQrc0DSBtluX0/znHRRSIGECEArVuan9b/SgZqjA1uiEMB5ezYO8= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=HLZPouzj; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="HLZPouzj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3EC89C4CEF0; Mon, 22 Sep 2025 19:44:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1758570243; bh=Fte7vkDdIQrq3psNyhJHNM5RGqsw0khzh4N1KkyolQU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HLZPouzjUonUkAG5kirOSa6ciubtJf0AxgMfXrU3CJMXZNQSnwk50uw1Wcc2PpCoX q58xWjHSHbK4a7DWws/QERHjpo6Ys1DCiin+Nf5/1/zf7tIlMlV32JmNir5H2113mv VENaSVaG16gpG4O6RDSkiRdEv+um551FmvqhMk9s= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Hugh Dickins , David Hildenbrand , "Aneesh Kumar K.V" , Axel Rasmussen , Chris Li , Christoph Hellwig , Jason Gunthorpe , Johannes Weiner , John Hubbard , Keir Fraser , Konstantin Khlebnikov , Li Zhe , "Matthew Wilcox (Oracle)" , Peter Xu , Rik van Riel , Shivank Garg , Vlastimil Babka , Wei Xu , Will Deacon , yangge , Yuanchu Xie , Yu Zhao , Andrew Morton Subject: [PATCH 6.16 062/149] mm: revert "mm: vmscan.c: fix OOM on swap stress test" Date: Mon, 22 Sep 2025 21:29:22 +0200 Message-ID: <20250922192414.447705571@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250922192412.885919229@linuxfoundation.org> References: <20250922192412.885919229@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.16-stable review patch. If anyone has any objections, please let me know. ------------------ From: Hugh Dickins commit 8d79ed36bfc83d0583ab72216b7980340478cdfb upstream. This reverts commit 0885ef470560: that was a fix to the reverted 33dfe9204f29b415bbc0abb1a50642d1ba94f5e9. Link: https://lkml.kernel.org/r/aa0e9d67-fbcd-9d79-88a1-641dfbe1d9d1@google.com Signed-off-by: Hugh Dickins Acked-by: David Hildenbrand Cc: "Aneesh Kumar K.V" Cc: Axel Rasmussen Cc: Chris Li Cc: Christoph Hellwig Cc: Jason Gunthorpe Cc: Johannes Weiner Cc: John Hubbard Cc: Keir Fraser Cc: Konstantin Khlebnikov Cc: Li Zhe Cc: Matthew Wilcox (Oracle) Cc: Peter Xu Cc: Rik van Riel Cc: Shivank Garg Cc: Vlastimil Babka Cc: Wei Xu Cc: Will Deacon Cc: yangge Cc: Yuanchu Xie Cc: Yu Zhao Cc: Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -4505,7 +4505,7 @@ static bool sort_folio(struct lruvec *lr } /* ineligible */ - if (!folio_test_lru(folio) || zone > sc->reclaim_idx) { + if (zone > sc->reclaim_idx) { gen = folio_inc_gen(lruvec, folio, false); list_move_tail(&folio->lru, &lrugen->folios[gen][type][zone]); return true;