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 3C53FC3DA6D for ; Mon, 19 May 2025 08:21:50 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A055F6B0085; Mon, 19 May 2025 04:21:46 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9B4C56B0088; Mon, 19 May 2025 04:21:46 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 82F3C6B0089; Mon, 19 May 2025 04:21:46 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id 58C2E6B0085 for ; Mon, 19 May 2025 04:21:46 -0400 (EDT) Received: from smtpin21.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 24BE512175B for ; Mon, 19 May 2025 08:21:49 +0000 (UTC) X-FDA: 83458963938.21.FCAD450 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf24.hostedemail.com (Postfix) with ESMTP id 83EA818000F for ; Mon, 19 May 2025 08:21:46 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EsKz0aCd; spf=pass (imf24.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747642906; 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-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=u+MG9y4O8ppEorrD5bhLn8mSmUVZv9zwa5Zj0IOyggI=; b=QZmQHnm057eZ4Z0ejNrRoxnd254vEnB961Kln1rQ+L99kO6bWjvpHDvA/R6IVKJnWDVoTh vXhZIIUtwUreyKKp+XwTGO8rGAV5GKwt0yANQX+LMgzJt3dJmaIdKq8q52t07eH7GeGfxf XWETKG96xLVtKCdMtfXo5SUwjhBgkgw= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747642906; a=rsa-sha256; cv=none; b=Ivy3T6NmjdZNXwDJ2tXt6PxvojOFh/Y8A5LRjb8EC31O8v8OnQ6xMoLZAKdjnPn4Tydat1 eefbiPaieQgSV/fUPFxu94x4PMkk70pRgb6B7viXWRHo6hu47WIPGcPtDWo/gTwffl3jbm cq4V1Q+vydJYpDvuNRwkwIW/Mzjanhg= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=EsKz0aCd; spf=pass (imf24.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com; dmarc=pass (policy=quarantine) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747642905; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:autocrypt:autocrypt; bh=u+MG9y4O8ppEorrD5bhLn8mSmUVZv9zwa5Zj0IOyggI=; b=EsKz0aCdujDIVCD1FTbUXocfDanVLmXdFagmcXTlr80hMsXgekdTzzZ6NrQjsIdTykBasP paPUojbtj3roBR4Se3d5jJR/+wfMAnLv+03Bw2D23n+Qo9xal49faf5wAr5imGG65b7RBj yXfTtaPmdUMs/4tZDu+w2VDxahb9ULo= Received: from mail-wm1-f71.google.com (mail-wm1-f71.google.com [209.85.128.71]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-623-sjFcke3hPG2RIcYVTLGE7g-1; Mon, 19 May 2025 04:21:44 -0400 X-MC-Unique: sjFcke3hPG2RIcYVTLGE7g-1 X-Mimecast-MFC-AGG-ID: sjFcke3hPG2RIcYVTLGE7g_1747642903 Received: by mail-wm1-f71.google.com with SMTP id 5b1f17b1804b1-445135eb689so6279745e9.2 for ; Mon, 19 May 2025 01:21:44 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747642903; x=1748247703; h=content-transfer-encoding:in-reply-to:organization:autocrypt :content-language:from:references:cc:to:subject:user-agent :mime-version:date:message-id:x-gm-message-state:from:to:cc:subject :date:message-id:reply-to; bh=u+MG9y4O8ppEorrD5bhLn8mSmUVZv9zwa5Zj0IOyggI=; b=c2pVzlIetB2W9oMY/JM8BmnA/cng+VcFzx6Z52MF6rpiOu/C7y2Evrb5HFwFhg3G16 MEye5/js7nWAnzBu6uVhCEL34+dhy1BjS0qQUHY9LIyfqU+fRpNrVGc3PLX/rgzhNvqA /OO4IF2pHieo3Bb6YAokl3fCj6/u/Weyr23dYSdsJcwkyHDcHW6u32fCTEZKomss5fC+ xNQReEr62m31HJw1YSeIdY3vqLnNfG+szKaSNxB7g6mZTaVbyWo+h8QbLxIAlldW6Smq vfp1VZk/J+8OOr1r0Lwk5sx21ABjTxD1eldbibkb7jUq27LbfWNS+7CWyAPDHztNrUIx AIFg== X-Forwarded-Encrypted: i=1; AJvYcCWrjPrbL/zEZnoMIX8mQ/d52XyPBtfcCDyvs0gfXkuOzdwomNBiq2JUCUlkFYFNiQpQhZNPkiltcQ==@kvack.org X-Gm-Message-State: AOJu0YyKigF0TPN75BjCXs1vgwCXrV3H/A5N6MNFw+EE20x19j0h8C59 ZsXRG1shOKW6bemM+TMFPOY4HMjDb8X/cAGKYGm/0ijmDG0e+BFTSREM22lYPkxlbEdOL85Xils Szou2+DX9UYFQW5Z4YzD5B23PGSUUVwotn5yL6tThFoOybvCoGkzFk22kAWKkZuQ= X-Gm-Gg: ASbGncuuIcpFVNSifWA6l2vCIuiitYCHjilWh/JGoSv88c3mJ1JJlyBXLUVqM8pvToF gtdHX1JkFphsxa1rRUxYBeJDSoNl+N3SIVoiyKAKgCNS5toBE71mrOVZDrV8D5i2JtCsrDf95SS ORYYMO8QIq51Euu7yLMUhQzDIcA3SvR9AZMloTbswphRGm3ZaQ8hc1hlCDYy+daSJWnLbwm19ei He29tWu8xquyXmGfnvJgY3XORv5y7ip1bDf8CWBb+UTmYbc9BM6dQU+DqubXjMne6QT0CUn0ohc h6tOe/XorFejkDyAG9q10UmbVezzzuT3/paEvAJL/3feiROjO+tmO63tXdVM+irXaNrN6C3s1c7 z0rqGsL2k6mY9TPLzSGgVG2AYLxv0bQ0a2mgI3+g= X-Received: by 2002:a05:600c:3114:b0:43c:fa24:8721 with SMTP id 5b1f17b1804b1-442fd6445bdmr117043895e9.17.1747642903174; Mon, 19 May 2025 01:21:43 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHSAFjAk60JdnbWGV8nMpoKRSo95W61/xKU0nMNnL2WA8IKD61o0r0m8m7GIhp6pzuiWP8kSw== X-Received: by 2002:a05:600c:3114:b0:43c:fa24:8721 with SMTP id 5b1f17b1804b1-442fd6445bdmr117043585e9.17.1747642902730; Mon, 19 May 2025 01:21:42 -0700 (PDT) Received: from ?IPV6:2003:d8:2f3c:3a00:5662:26b3:3e5d:438e? (p200300d82f3c3a00566226b33e5d438e.dip0.t-ipconnect.de. [2003:d8:2f3c:3a00:5662:26b3:3e5d:438e]) by smtp.gmail.com with ESMTPSA id 5b1f17b1804b1-442ebd46aa4sm142242045e9.1.2025.05.19.01.21.41 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 19 May 2025 01:21:42 -0700 (PDT) Message-ID: <63ba9fe3-e384-4396-bd86-fe62150ed1ab@redhat.com> Date: Mon, 19 May 2025 10:21:41 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 2/4] mm/page_isolation: remove migratetype from move_freepages_block_isolate() To: Zi Yan , Oscar Salvador , Johannes Weiner , linux-mm@kvack.org Cc: Andrew Morton , Vlastimil Babka , Baolin Wang , "Kirill A . Shutemov" , Mel Gorman , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Richard Chang , linux-kernel@vger.kernel.org References: <20250509200111.3372279-1-ziy@nvidia.com> <20250509200111.3372279-3-ziy@nvidia.com> From: David Hildenbrand Autocrypt: addr=david@redhat.com; keydata= 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 WNyWQQ== Organization: Red Hat In-Reply-To: <20250509200111.3372279-3-ziy@nvidia.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: Ki0Si0_9y2BcFkl5jcnbwaZz0fNevLBAuqJfuVJaME4_1747642903 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Stat-Signature: 9ujykut8sbqgiq5sbui9feb3uokiziao X-Rspamd-Queue-Id: 83EA818000F X-Rspam-User: X-Rspamd-Server: rspam02 X-HE-Tag: 1747642906-783692 X-HE-Meta: U2FsdGVkX19wYLqTEtLG+1pJ7UcxWMMLlVc/ZSCWkh+qBv/g+xIpUJxrHXE87519fMfSejADLKGRRwdc4Ydp70WELM6Jr+UwqgC3UQHtO3/vSfM0FKjgEsGPVd519te70wk67RTyFNnFB3gP5QlZn7SpblD8+NnqEP3LU/4iPl795N7a6UiRR2GzaKN5+IdUyFLNDOVwrqM20ZZCGdLrO9xgM7UjvZafgq8lrQHxodHFgDxj1Hof0vwvvVi24dzN4vRfkNNk298O++jg+HunAq0tZpAIyPV1N5bCI883K65MZ8v169Ml0LJHurXSIw4QQK1UVHGsR5MZh9O1cjsvUnwhMj6V5JX5wrZoXK1X+/lxmHp7Q2xGUqls/fbh67s6eORqIfTQNSDhu6HsKthM4WxBLIyZzzPVFF32nrzbwlXy63TQ5emShjpYvh/fGyj3afxGxRyhODU9iSQIgHdHHZdAjWiS2APSgHh0idiBpLmKMdagFs7BbjpATTX70HR1toUBVi0biCrdY3mC6V8B/MN0WrtCDHoMth7DV0xG8u1rMTufuiHRfErs+2S6SbG3cWrBCokXT7VmnuP540pGyPZk17TgwcKVDvDhawalCZ8ygzVSenQLnlSymb3BdK7dy9TVgpU2whkIlVg7oQZn5pJgXhF+Vgj3uRoZykBDLyUlGJaeLcSz1EmS9gBtOEtypwW6fXz4tJxAPzCj/eGYMiSEA/U/feA8s0A+0lP7c/hMHGnXJJeRcAgzI3c0H0AUc9K/l8YKHJBWBXW+Rrlg7tXkhhg659NOl/P46KZPSL20HXaYVwi/6qDHVm2adl7+OiCuHSUo/E/Ijx6LTOzxgShVacbR5MQOj1EAq7nyZsZelhez3rk0A2FSW2maCuTwQmrMVGjCeEbeJLauw2zU3uObBzfjC+ecvGfrBpsZUG9KlVzhuNh6pmDOVY40fneBSD/vu+zMZG42hSoMk0b kJ95Vm9L 4Y5+n1YiZC9L4+9CWJW2sZwHfRSx0QeNg9zamU40W3P8aQbS8s3e9s+Rd2Rp1geFJE/OiYn5WHKn7UWVeClJ/biVMSWfdA/MQ//Cqk/khCxfc17TUmogWnpRTIR8FBxPlCXylOXLHrUG+HPmVSrcshUqDIMGw2QEOXwoOwwIGZI0aWWNVE2xTyTPvJntDTdUpvxfKYwhkOTP/Zh+gG+A8Un8j43VBq57QCtpoxTHrNugfDiFWzcnH8SoaP2A7HNVzZ68ojoRWwPBbtbHC9A4sLGyPwURbltXWiwV+D/2oqkJyUDV7Qzh0C1abL1tv5f6ZMaB7y2kqbt8XUEL2vp0MQtzdG47X6GHmoG0PlYLFjApeE6uHQ72RhMnZOk8y90x3zkk9HMDXSNxlhl1Eq5ib4KgeGKKb83zVsSrPKrOAot/SLNPFDMmNyKLk7M1Bfftzs17M9AG8slbuBhdzWBmNVVv9OrvM+jpjZvRi 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: On 09.05.25 22:01, Zi Yan wrote: > Since migratetype is no longer overwritten during pageblock isolation, > moving pageblocks to and from MIGRATE_ISOLATE no longer needs migratetype. > > Add MIGRATETYPE_NO_ISO_MASK to allow read before-isolation migratetype > when a pageblock is isolated. It is used by move_freepages_block_isolate(). > > Add pageblock_isolate_and_move_free_pages() and > pageblock_unisolate_and_move_free_pages() to be explicit about the page > isolation operations. Both share the common code in > __move_freepages_block_isolate(), which is renamed from > move_freepages_block_isolate(). > > Make set_pageblock_migratetype() only accept non MIGRATE_ISOLATE types, > so that one should use set_pageblock_isolate() to isolate pageblocks. > > Two consequential changes: > 1. move pageblock migratetype code out of __move_freepages_block(). > 2. in online_pages() from mm/memory_hotplug.c, move_pfn_range_to_zone() is > called with MIGRATE_MOVABLE instead of MIGRATE_ISOLATE and all affected > pageblocks are isolated afterwards. Otherwise, all online pageblocks > will have non-determined migratetype. > > Signed-off-by: Zi Yan > --- > include/linux/mmzone.h | 4 +- > include/linux/page-isolation.h | 5 ++- > mm/memory_hotplug.c | 7 +++- > mm/page_alloc.c | 73 +++++++++++++++++++++++++--------- > mm/page_isolation.c | 27 ++++++++----- > 5 files changed, 82 insertions(+), 34 deletions(-) > > diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h > index 7ef01fe148ce..f66895456974 100644 > --- a/include/linux/mmzone.h > +++ b/include/linux/mmzone.h > @@ -107,8 +107,10 @@ static inline bool migratetype_is_mergeable(int mt) > extern int page_group_by_mobility_disabled; > > #ifdef CONFIG_MEMORY_ISOLATION > -#define MIGRATETYPE_MASK ((BIT(PB_migratetype_bits) - 1) | PB_migrate_isolate_bit) > +#define MIGRATETYPE_NO_ISO_MASK (BIT(PB_migratetype_bits) - 1) > +#define MIGRATETYPE_MASK (MIGRATETYPE_NO_ISO_MASK | PB_migrate_isolate_bit) > #else > +#define MIGRATETYPE_NO_ISO_MASK MIGRATETYPE_MASK > #define MIGRATETYPE_MASK (BIT(PB_migratetype_bits) - 1) > #endif > > diff --git a/include/linux/page-isolation.h b/include/linux/page-isolation.h > index 898bb788243b..b0a2af0a5357 100644 > --- a/include/linux/page-isolation.h > +++ b/include/linux/page-isolation.h > @@ -26,9 +26,10 @@ static inline bool is_migrate_isolate(int migratetype) > #define REPORT_FAILURE 0x2 > > void set_pageblock_migratetype(struct page *page, int migratetype); > +void set_pageblock_isolate(struct page *page); > > -bool move_freepages_block_isolate(struct zone *zone, struct page *page, > - int migratetype); > +bool pageblock_isolate_and_move_free_pages(struct zone *zone, struct page *page); > +bool pageblock_unisolate_and_move_free_pages(struct zone *zone, struct page *page); > > int start_isolate_page_range(unsigned long start_pfn, unsigned long end_pfn, > int migratetype, int flags); > diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c > index b1caedbade5b..c86c47bba019 100644 > --- a/mm/memory_hotplug.c > +++ b/mm/memory_hotplug.c > @@ -1178,6 +1178,7 @@ int online_pages(unsigned long pfn, unsigned long nr_pages, > const int nid = zone_to_nid(zone); > int ret; > struct memory_notify arg; > + unsigned long isol_pfn; > > /* > * {on,off}lining is constrained to full memory sections (or more > @@ -1192,7 +1193,11 @@ int online_pages(unsigned long pfn, unsigned long nr_pages, > > > /* associate pfn range with the zone */ > - move_pfn_range_to_zone(zone, pfn, nr_pages, NULL, MIGRATE_ISOLATE); > + move_pfn_range_to_zone(zone, pfn, nr_pages, NULL, MIGRATE_MOVABLE); > + for (isol_pfn = pfn; > + isol_pfn < pfn + nr_pages; > + isol_pfn += pageblock_nr_pages) > + set_pageblock_isolate(pfn_to_page(isol_pfn)); Can we move that all the way into memmap_init_range(), where we do the set_pageblock_migratetype()? The MIGRATE_UNMOVABLE in mhp_init_memmap_on_memory() is likely fine: all pages in that pageblock will be used for the memmap. Everything is unmovable, but no free pages so ... nobody cares? :) diff --git a/mm/internal.h b/mm/internal.h index 6b8ed20177432..bc102846fcf1f 100644 --- a/mm/internal.h +++ b/mm/internal.h @@ -821,7 +821,7 @@ extern void *memmap_alloc(phys_addr_t size, phys_addr_t align, int nid, bool exact_nid); void memmap_init_range(unsigned long, int, unsigned long, unsigned long, - unsigned long, enum meminit_context, struct vmem_altmap *, int); + unsigned long, enum meminit_context, struct vmem_altmap *, bool); #if defined CONFIG_COMPACTION || defined CONFIG_CMA diff --git a/mm/memory_hotplug.c b/mm/memory_hotplug.c index b1caedbade5b1..4b2cf20ad21fb 100644 --- a/mm/memory_hotplug.c +++ b/mm/memory_hotplug.c @@ -764,13 +764,13 @@ static inline void section_taint_zone_device(unsigned long pfn) * and resizing the pgdat/zone data to span the added pages. After this * call, all affected pages are PageOffline(). * - * All aligned pageblocks are initialized to the specified migratetype - * (usually MIGRATE_MOVABLE). Besides setting the migratetype, no related - * zone stats (e.g., nr_isolate_pageblock) are touched. + * All aligned pageblocks are initialized to MIGRATE_MOVABLE, and are isolated + * if requested. Besides setting the migratetype, no related zone stats (e.g., + * nr_isolate_pageblock) are touched. */ void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn, unsigned long nr_pages, - struct vmem_altmap *altmap, int migratetype) + struct vmem_altmap *altmap, bool isolate) { struct pglist_data *pgdat = zone->zone_pgdat; int nid = pgdat->node_id; @@ -802,7 +802,7 @@ void move_pfn_range_to_zone(struct zone *zone, unsigned long start_pfn, * are reserved so nobody should be touching them so we should be safe */ memmap_init_range(nr_pages, nid, zone_idx(zone), start_pfn, 0, - MEMINIT_HOTPLUG, altmap, migratetype); + MEMINIT_HOTPLUG, altmap, isolate); set_zone_contiguous(zone); } @@ -1127,7 +1127,7 @@ int mhp_init_memmap_on_memory(unsigned long pfn, unsigned long nr_pages, if (mhp_off_inaccessible) page_init_poison(pfn_to_page(pfn), sizeof(struct page) * nr_pages); - move_pfn_range_to_zone(zone, pfn, nr_pages, NULL, MIGRATE_UNMOVABLE); + move_pfn_range_to_zone(zone, pfn, nr_pages, NULL, false); for (i = 0; i < nr_pages; i++) { struct page *page = pfn_to_page(pfn + i); @@ -1192,7 +1192,7 @@ int online_pages(unsigned long pfn, unsigned long nr_pages, /* associate pfn range with the zone */ - move_pfn_range_to_zone(zone, pfn, nr_pages, NULL, MIGRATE_ISOLATE); + move_pfn_range_to_zone(zone, pfn, nr_pages, NULL, true); arg.start_pfn = pfn; arg.nr_pages = nr_pages; diff --git a/mm/memremap.c b/mm/memremap.c index c417c843e9b1f..e47f6809f254b 100644 --- a/mm/memremap.c +++ b/mm/memremap.c @@ -254,7 +254,7 @@ static int pagemap_range(struct dev_pagemap *pgmap, struct mhp_params *params, zone = &NODE_DATA(nid)->node_zones[ZONE_DEVICE]; move_pfn_range_to_zone(zone, PHYS_PFN(range->start), PHYS_PFN(range_len(range)), params->altmap, - MIGRATE_MOVABLE); + false); } mem_hotplug_done(); diff --git a/mm/mm_init.c b/mm/mm_init.c index 1c5444e188f82..041106fc524be 100644 --- a/mm/mm_init.c +++ b/mm/mm_init.c @@ -867,14 +867,14 @@ static void __init init_unavailable_range(unsigned long spfn, * up by memblock_free_all() once the early boot process is * done. Non-atomic initialization, single-pass. * - * All aligned pageblocks are initialized to the specified migratetype - * (usually MIGRATE_MOVABLE). Besides setting the migratetype, no related - * zone stats (e.g., nr_isolate_pageblock) are touched. + * All aligned pageblocks are initialized to MIGRATE_MOVABLE, and are isolated + * if requested. Besides setting the migratetype, no related zone stats (e.g., + * nr_isolate_pageblock) are touched. */ void __meminit memmap_init_range(unsigned long size, int nid, unsigned long zone, unsigned long start_pfn, unsigned long zone_end_pfn, enum meminit_context context, - struct vmem_altmap *altmap, int migratetype) + struct vmem_altmap *altmap, bool isolate) { unsigned long pfn, end_pfn = start_pfn + size; struct page *page; @@ -931,7 +931,9 @@ void __meminit memmap_init_range(unsigned long size, int nid, unsigned long zone * over the place during system boot. */ if (pageblock_aligned(pfn)) { - set_pageblock_migratetype(page, migratetype); + set_pageblock_migratetype(page, MIGRATE_MOVABLE); + if (isolate) + set_pageblock_isolate(page, isolate) cond_resched(); } pfn++; @@ -954,7 +956,7 @@ static void __init memmap_init_zone_range(struct zone *zone, return; memmap_init_range(end_pfn - start_pfn, nid, zone_id, start_pfn, - zone_end_pfn, MEMINIT_EARLY, NULL, MIGRATE_MOVABLE); + zone_end_pfn, MEMINIT_EARLY, NULL, false); if (*hole_pfn < start_pfn) init_unavailable_range(*hole_pfn, start_pfn, zone_id, nid); -- 2.49.0 As an alterantive, a second "isolate" parameter and make sure that migratetype is never MIGRATE_ISOLATE. [...] > --- a/mm/page_isolation.c > +++ b/mm/page_isolation.c > @@ -25,6 +25,12 @@ static inline void clear_pageblock_isolate(struct page *page) > set_pfnblock_flags_mask(page, 0, page_to_pfn(page), > PB_migrate_isolate_bit); > } > +void set_pageblock_isolate(struct page *page) > +{ > + set_pfnblock_flags_mask(page, PB_migrate_isolate_bit, > + page_to_pfn(page), > + PB_migrate_isolate_bit); > +} Probably better placed in the previous patch, and in the header (see comment to #1). -- Cheers, David / dhildenb