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 2A7BA14B06C; Tue, 10 Sep 2024 10:36:04 +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=1725964564; cv=none; b=FY6rz72T+FBFFAy4koJFB9n9ohR+VG9vbnZ3ItLV/GJacZJDTje9YI4DPjL0KbVKXLp1byDnTpjt+s7QmloUREIk2UyO5UiDYoANaeBrEjmsSoUbH/g8ndevibksTS9+2TZGI7gF1hi6jkkLLejCRMoYwlvHXzsibfMiEdnj+UI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725964564; c=relaxed/simple; bh=cBvhDIQxMRxVqCm8Lsrw3GsKA9QKK9x3QZYIOfhk2lg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=j2tID4dtiwg6MGWn7NSoA52kD60zx0JFAE3HP/EtceCkiQk8nh6USthgRmARvMTUaWeTqTuE+ZfcTjtyUwXqPdOpXILoQejOFRqlNbF3paEwhKlx6ia4vYN6p4fAJ5fAregVWboQQekrQdpUqFz9iJrJSYYRHMAy0dVRgzhhoTI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=KiVDNJjW; 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="KiVDNJjW" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9BAB1C4CEC3; Tue, 10 Sep 2024 10:36:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1725964564; bh=cBvhDIQxMRxVqCm8Lsrw3GsKA9QKK9x3QZYIOfhk2lg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=KiVDNJjWN3pxT/ahptbbLlXlZAHW16MJMuFcMKCjz9Vab5B5Bh9FXV2xOughuIOOX LX8gsdryBNx14Sz6YuaTZ93MQTaoQ2WKtwiaWuImUF1VQOysH9egadC3OctLiDGalZ MxwmIEAlkPzN/6gSWpzhIc4bWl25Hjei/40AT0dM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Vern Hao , David Hildenbrand , Zhaoyang Huang , Andrew Morton , Sasha Levin Subject: [PATCH 6.6 225/269] mm/vmscan: use folio_migratetype() instead of get_pageblock_migratetype() Date: Tue, 10 Sep 2024 11:33:32 +0200 Message-ID: <20240910092615.969587034@linuxfoundation.org> X-Mailer: git-send-email 2.46.0 In-Reply-To: <20240910092608.225137854@linuxfoundation.org> References: <20240910092608.225137854@linuxfoundation.org> User-Agent: quilt/0.67 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.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Vern Hao [ Upstream commit 97144ce008f918249fa7275ee1d29f6f27665c34 ] In skip_cma(), we can use folio_migratetype() to replace get_pageblock_migratetype(). Link: https://lkml.kernel.org/r/20230825075735.52436-1-user@VERNHAO-MC1 Signed-off-by: Vern Hao Reviewed-by: David Hildenbrand Cc: Zhaoyang Huang Signed-off-by: Andrew Morton Stable-dep-of: bfe0857c20c6 ("Revert "mm: skip CMA pages when they are not available"") Signed-off-by: Sasha Levin --- mm/vmscan.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mm/vmscan.c b/mm/vmscan.c index 83fa8e924f8a..7175ff9b97d9 100644 --- a/mm/vmscan.c +++ b/mm/vmscan.c @@ -2271,7 +2271,7 @@ static bool skip_cma(struct folio *folio, struct scan_control *sc) { return !current_is_kswapd() && gfp_migratetype(sc->gfp_mask) != MIGRATE_MOVABLE && - get_pageblock_migratetype(&folio->page) == MIGRATE_CMA; + folio_migratetype(folio) == MIGRATE_CMA; } #else static bool skip_cma(struct folio *folio, struct scan_control *sc) -- 2.43.0