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 296B4C3ABBC for ; Tue, 6 May 2025 18:42:28 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 15C1F6B0085; Tue, 6 May 2025 14:42:26 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 10B276B0088; Tue, 6 May 2025 14:42:26 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id EEF346B0089; Tue, 6 May 2025 14:42:25 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id CD11D6B0085 for ; Tue, 6 May 2025 14:42:25 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay08.hostedemail.com (Postfix) with ESMTP id 104951401F6 for ; Tue, 6 May 2025 18:42:27 +0000 (UTC) X-FDA: 83413353534.21.F470AE7 Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by imf11.hostedemail.com (Postfix) with ESMTP id 2C20F40008 for ; Tue, 6 May 2025 18:42:24 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=JeCrDo8s; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf11.hostedemail.com: domain of nifan.cxl@gmail.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=nifan.cxl@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746556945; a=rsa-sha256; cv=none; b=ohggdNo9nvJ4EQGu/43tCsoQeELpezZWpGJBwvou9gTru46SCaqiSNjrdrpsD+7zcxafhC MVxdBHg722OORCLd+wIEO8EJZtNLgTkC3+blSJ+zAbvMKp2rsg7E1nUbsRSXyFhoCJXd0E Eha19q/IBDLddDX89oIm/tsomAuOAbo= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746556945; 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:dkim-signature; bh=+m15uQBeVQPdewXvmB4QLyqFgU0mGzfzgZouKlqrZ1s=; b=tuvl3XfuheDIciVJklBgnszzJjoIzl3PUKHztlJJPX4KSCrMw9NPIPIZd6vFjOCU3OwPQd jR2/ecOy274lc1VmPGM1M73tvhF06mQ8BBWLIXoxny+jYzHwc2SOAk+wdxCYD9lQOLNe7H JFaRggZ+NvkQlI9HRp55336VEL1UWUg= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=gmail.com header.s=20230601 header.b=JeCrDo8s; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf11.hostedemail.com: domain of nifan.cxl@gmail.com designates 209.85.214.180 as permitted sender) smtp.mailfrom=nifan.cxl@gmail.com Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-22d95f0dda4so86859985ad.2 for ; Tue, 06 May 2025 11:42:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1746556944; x=1747161744; darn=kvack.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=+m15uQBeVQPdewXvmB4QLyqFgU0mGzfzgZouKlqrZ1s=; b=JeCrDo8s7025ekY8qg9tS45R8LlhJyYUkcfVda+KP8TRAYtTlXy7IUHscg2o4FNWrW O2Y8cgRWBY5CGoo+jnr/CdxyDjgbotmecnipIfR96sMyC/RlgT8+70IFlXjWMDyJewO4 i1uOh5gEAHALlzuH7I1OXPdXFB2q4D9Sb8XzHDMi1F3uziPoRXkl2wfXNXNtrLCNuCgT BYiqEeoKKWLmMgoEcHU457dabpXg1RoB9fkfno2GbMcnfyv3hw7RslSnEdrXsk7Af5n1 Ucvre43BRAK4J2B7o/up/H9WriADuFLYxzI9CIG8Fj5+ilup7z1OQErkBNgkzTjK58Yw KKaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746556944; x=1747161744; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=+m15uQBeVQPdewXvmB4QLyqFgU0mGzfzgZouKlqrZ1s=; b=hBv8II2KNG6P5WYn5Rv0HfpKQnHMv+05LN7GJeh+smy8Ax26gKCCxzLcN71N33wpCq JqxafkMLZw+ZDPK4A/K+xO/7RlWgi1CAJs/vrF8xPT2DVmOu9xEV7uY9e7ldRYSy5OaT YgOaTZLDGfMn5xnzkB2zBaoa9Yd5n9Jdlwt4Z5eBa3DpenbiZlzaEp4LY9KTbmy4uvbK mtyJ7sweOZ7rDckGR9x0eqmltKFX5darwdJKYI2yXcTqVtw7apDj9w80D2LQiQD5viqw 8SxcBa2CiFuvBLMqOpZwQoNuAlpbBLsD8VGF0p+s7dfkPP2eXtjibvmjKDUY7YzzFRhi gPwQ== X-Forwarded-Encrypted: i=1; AJvYcCU0k84HGu7K0jvP1T2pHStJDkyT3aVSvXQAbBy7xGzJ389prpP77ee0BiMecrQOyhz7m4gVeyaCjg==@kvack.org X-Gm-Message-State: AOJu0Yw9rbWDegzH0msJ5YR2o05gw+qRaISjRdMR0grHp5gCAGz+zUFe vnUqe9kWDNVnCwnkYpXoI799xon8lzTueOZ88ff+BJ3+DslHhRwo X-Gm-Gg: ASbGncvRNlE2kdEGXsx+R0ZtgxaQkViMM2WjWqarpMyymaA7W+oW2mQ9qSYX6flTm3e JHa2s1mQ0UXucyK47xOPclS0mxrsc15twfdRYzJLo5VHqPhIxlafQqGsla0CI+NCkd5ANu20RAn 0KyBrnRKfSbVYPEC7MAYfUHzDy7ZmA9JPpiCwm6T3TbJR89ppovBAO0pEFysZoNGPwDLUi2tFN6 Eb85WdqOiyRryBnt1Ez1jGvn4tys2uxttZHq8g8F3YDpO+DCDGPFxeKO7QaHWGbyuocDkfUTiWe 0cshG8mSSyVwZ8xZsBCL19eKE6Su2hOb1Ea+kxIT+6bSGqriptYr5yRDmw== X-Google-Smtp-Source: AGHT+IFQ0vcwVFy4rK7z5BBMvzaubjAF3VgjiO2fWAYIJGyaUwJ63OUwKjKlnMXaXQZtgTez5wHCaw== X-Received: by 2002:a17:902:d543:b0:21f:35fd:1b7b with SMTP id d9443c01a7336-22e5edfd12emr3323075ad.50.1746556943998; Tue, 06 May 2025 11:42:23 -0700 (PDT) Received: from localhost.localdomain ([2601:646:8f03:9fee:3afe:d39d:8565:ed44]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-22e15228a1asm77527685ad.173.2025.05.06.11.42.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 06 May 2025 11:42:23 -0700 (PDT) From: nifan.cxl@gmail.com To: muchun.song@linux.dev, willy@infradead.org, osalvador@suse.de Cc: mcgrof@kernel.org, a.manzanares@samsung.com, dave@stgolabs.net, akpm@linux-foundation.org, david@redhat.com, linux-mm@kvack.org, linux-kernel@vger.kernel.org, nifan.cxl@gmail.com, Fan Ni Subject: [RFC 1/1] mm: Convert is_migrate_isolate_page() to is_migrate_isolate_folio() Date: Tue, 6 May 2025 11:38:29 -0700 Message-ID: <20250506184155.587070-2-nifan.cxl@gmail.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250506184155.587070-1-nifan.cxl@gmail.com> References: <20250506184155.587070-1-nifan.cxl@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 2C20F40008 X-Stat-Signature: ztmcjw8k3ms7mpssb9yqsejuy8j34ny8 X-Rspam-User: X-HE-Tag: 1746556944-911900 X-HE-Meta: U2FsdGVkX1/FsKvex6Plvuw2H/Jc/RzMMnj5mQIpJMzRCcOp6AgL1C0Qnhw+vhGUvZFyRdhyjpU2SH8TSockGC95a8G+HWckurgTiZvuQptvnpa6MIYW+kzeVNzk5mx89inB56Z7gcyHDfRdTRyTqe/SsNr+p8vylcJqow3M1xamImPkpzu0E9iiyl7LxJHFUz5Wd+Kk7dnhcFd7NHlkvqXa2RiS0vl4i8H1cvtmaAHGNAHrjd2EciDP6wtFIgkVZzxBMsFaLL5AiJp7dO6cQQxmm93JWZYNxnaqgIE0yKD9H29BdTR+Ffc9zfT/M4abSm/uJgEEVLYVGFdmeqn1gtYPzdSbIfxA9YfEFpGO6hk1Xy6FWKwZqx4OdBZb7mGQ1ir8dHdgpUak4H4bAxuU7SpyG3Vo4dOHF4t4QJ7VlRya8NKe9RQO5MEQvSZwekuxWu2dj1p4/rr8j0gNQ47Ghtlxq0uoV77QqbajfpMP2pQIOfiItSTzqrKolGqvCKQsAO4s6zjYBc8a95cPXth4G7w2lU8N4kUUTkQXpRdpDcZFbIox+ypcVBdXXtSpUIU6jx3hWII5LDx9cowQdfq/Oiava/FlDO8o5AQ2G4utRmYalfg8CIuxvx/uVK2WAw23Lt5oUXMaVYNMZpZOLXNmUkYfVr0tbSXDjg3hftIXG5yL7JW01e3vmlim5gGS3vWVLiopwbmoXxqg7dd+1DUTaw8LwLDDgXCF99IuDGTj0iDW0gxxOCfn6WSbcxmNNkV/3tdmedq8AoygLSmlrSvAKGx5ttpnFlvyE4ce8QKrFHfyznFZqJqG/PTlpJwlgeihpjk57P4AdWe/fu+juPHMkdsxcyeyeu82DnJuPZu/oHoCXv1NzK34J5mx3KNtf0+zEfaVXUVz5P8ohy4SaA0W3Ay1pWZsRKxlnHnhZPC/VhSYpFuhAtl2eFTO1AIOzySgr9qXXppO+WySz9RvsTD nRuaXuaJ lGrsQI+x+vLrPB9Vx15xJjr/fVZYnyWEL4MJqfIXHpScMpAQI9hxvPdWWDrUkO4tGe0D6QCXgb7iM1rT0A0+HQRl574lMGjrzy+GqA7T4CoSegMvAFDUbLinHrL8R4PeqBBp3vQLSeIRxMhetssmpwq7S1mPv2y7pVUK6CRG0bhEE1fWG/c/283ksN+g2IT4/D80BTGi5lvEbyToE8XRK/2qOV39s+YWrNel/NN3ZlmFA17psimp2X2twsK0gzk3QyidaTVG7dUjuw+iBMbGHm1g9zUAZUe7GFnHlQvCpNPvTKuavoAcyBJh6MFlpv6KBcJa/niBHLyvFLsfkJLXAbNslCPD7goG7aRqZt/4vk1j2NvZtkti6SH62NRkZs9MexRlEmAyIbUq9RX96iWMyX5tVNAZ2GqqBDx4ZEOyXnXpBxoTCvky8RS7hTOAWyETE8sS++bBbDEJI9dqsZlkV5Ng/YHpTa90eIzQNYSsTp6PCokHgDSRAmJxriwOx9I7UhKI/KAVmQ+MlRGxVxzuoxWou5hhIlBHCBKpQYjDwTLY+SA8RuKV8voPY6Cvvpn0Y6cp2 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: From: Fan Ni Convert is_migrate_isolate_page() to is_migrate_isolate_folio() to take folio directly. Signed-off-by: Fan Ni --- include/linux/page-isolation.h | 6 +++--- mm/hugetlb.c | 2 +- mm/page_isolation.c | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/include/linux/page-isolation.h b/include/linux/page-isolation.h index 898bb788243b..74d6a8cf4960 100644 --- a/include/linux/page-isolation.h +++ b/include/linux/page-isolation.h @@ -3,16 +3,16 @@ #define __LINUX_PAGEISOLATION_H #ifdef CONFIG_MEMORY_ISOLATION -static inline bool is_migrate_isolate_page(struct page *page) +static inline bool is_migrate_isolate_folio(struct folio *folio) { - return get_pageblock_migratetype(page) == MIGRATE_ISOLATE; + return folio_migratetype(folio) == MIGRATE_ISOLATE; } static inline bool is_migrate_isolate(int migratetype) { return migratetype == MIGRATE_ISOLATE; } #else -static inline bool is_migrate_isolate_page(struct page *page) +static inline bool is_migrate_isolate_folio(struct folio *folio) { return false; } diff --git a/mm/hugetlb.c b/mm/hugetlb.c index 0057d1f1dc9a..1e712dc4783a 100644 --- a/mm/hugetlb.c +++ b/mm/hugetlb.c @@ -1306,7 +1306,7 @@ static struct folio *dequeue_hugetlb_folio_node_exact(struct hstate *h, if (folio_test_hwpoison(folio)) continue; - if (is_migrate_isolate_page(&folio->page)) + if (is_migrate_isolate_folio(folio)) continue; list_move(&folio->lru, &h->hugepage_activelist); diff --git a/mm/page_isolation.c b/mm/page_isolation.c index b2fc5266e3d2..540d2add4834 100644 --- a/mm/page_isolation.c +++ b/mm/page_isolation.c @@ -169,7 +169,7 @@ static int set_migratetype_isolate(struct page *page, int migratetype, int isol_ * If it is already set, then someone else must have raced and * set it before us. */ - if (is_migrate_isolate_page(page)) { + if (is_migrate_isolate_folio(page_folio(page))) { spin_unlock_irqrestore(&zone->lock, flags); return -EBUSY; } @@ -219,7 +219,7 @@ static void unset_migratetype_isolate(struct page *page, int migratetype) zone = page_zone(page); spin_lock_irqsave(&zone->lock, flags); - if (!is_migrate_isolate_page(page)) + if (!is_migrate_isolate_folio(page_folio(page))) goto out; /* @@ -235,7 +235,7 @@ static void unset_migratetype_isolate(struct page *page, int migratetype) if (order >= pageblock_order && order < MAX_PAGE_ORDER) { buddy = find_buddy_page_pfn(page, page_to_pfn(page), order, NULL); - if (buddy && !is_migrate_isolate_page(buddy)) { + if (buddy && !is_migrate_isolate_folio(page_folio(buddy))) { isolated_page = !!__isolate_free_page(page, order); /* * Isolating a free page in an isolated pageblock @@ -546,7 +546,7 @@ void undo_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn, pfn < isolate_end; pfn += pageblock_nr_pages) { page = __first_valid_page(pfn, pageblock_nr_pages); - if (!page || !is_migrate_isolate_page(page)) + if (!page || !is_migrate_isolate_folio(page_folio(page))) continue; unset_migratetype_isolate(page, migratetype); } @@ -631,7 +631,7 @@ int test_pages_isolated(unsigned long start_pfn, unsigned long end_pfn, */ for (pfn = start_pfn; pfn < end_pfn; pfn += pageblock_nr_pages) { page = __first_valid_page(pfn, pageblock_nr_pages); - if (page && !is_migrate_isolate_page(page)) + if (page && !is_migrate_isolate_folio(page_folio(page))) break; } page = __first_valid_page(start_pfn, end_pfn - start_pfn); -- 2.47.2