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 9E42A3164C1; Mon, 22 Sep 2025 19:38:46 +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=1758569926; cv=none; b=EGZZ3AvYkv/oUGMICizz4cdbrCRGYHPnifn3TLU4Kkvip/SjCUnby6/owjzVJMF9R89xqndR/3fNCElWGXLUD995kezqoxxyDnZVgORxDdQF8ELBvdhwnQ4B2SWOTczojAx6qskAyCLTFVDxQKrHXXOxDT7uDEbDm38+9K/P+yM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1758569926; c=relaxed/simple; bh=Mq31xIRopZv4aJPid/Jq7LbPb9hDi4NuIhUlSBcldM8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=UM62QjaJNw8qqBLnHpYNLuyqvHoPf5BZ4TqdW62PJ5+W0WG9mi+9n2JEzaOV98dUWi8ZxxaXVMFiVpWL0IWyvqDuHX1kv10GHPV+KhsBLoQtk1c4/ExRwmPwyzbS6wwKIT3Y5te+xWi1VL8+cXbSr5wz59h4XrSpsjy7ayqmrSA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=uR4T5rjH; 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="uR4T5rjH" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 132C8C4CEF5; Mon, 22 Sep 2025 19:38:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1758569926; bh=Mq31xIRopZv4aJPid/Jq7LbPb9hDi4NuIhUlSBcldM8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uR4T5rjHwAMguMUJydHNb8fbxkycXQeF+c2m/lFkmZEzTosX/jVsFGvM8Qp5GAHE4 3pgbm8ssy1vF7RaYmGimsRc4ZSR5IxUx2Ovdu6tEuZsJsXAKI53vl/FbH49PAF3p4t 6G8yJPNLPNgSB/mQJU2f8mbka1n2GpYG+SMTHYyE= 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.12 043/105] mm: revert "mm: vmscan.c: fix OOM on swap stress test" Date: Mon, 22 Sep 2025 21:29:26 +0200 Message-ID: <20250922192410.046426847@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20250922192408.913556629@linuxfoundation.org> References: <20250922192408.913556629@linuxfoundation.org> User-Agent: quilt/0.68 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.12-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 @@ -4352,7 +4352,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;