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 DF4D4C3DA6D for ; Mon, 19 May 2025 08:08:53 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 4C8506B0082; Mon, 19 May 2025 04:08:49 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 450906B0083; Mon, 19 May 2025 04:08:49 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 27C706B0085; Mon, 19 May 2025 04:08:49 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0015.hostedemail.com [216.40.44.15]) by kanga.kvack.org (Postfix) with ESMTP id F2BA46B0082 for ; Mon, 19 May 2025 04:08:48 -0400 (EDT) Received: from smtpin07.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay05.hostedemail.com (Postfix) with ESMTP id 677715FA6D for ; Mon, 19 May 2025 08:08:52 +0000 (UTC) X-FDA: 83458931304.07.619D22F Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf06.hostedemail.com (Postfix) with ESMTP id D6AE9180008 for ; Mon, 19 May 2025 08:08:49 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=W4VEGgJ+; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf06.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1747642130; a=rsa-sha256; cv=none; b=Lf275Htropxt28K9nOf4iyRq8WvIHllXQMK6nkLty2mmyz8oHKRJnEqxcgvEq+27TGTe5+ JpOfSfECZq2n1efGNiDO3YKV2UpnfsPbI+VBjpz9WaY8kbw3OQ0+a6X1LmMigcoIa6/YBp 95MqfaAVMD/xTcD6FLtUb7vFUoWOukI= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=W4VEGgJ+; dmarc=pass (policy=quarantine) header.from=redhat.com; spf=pass (imf06.hostedemail.com: domain of david@redhat.com designates 170.10.129.124 as permitted sender) smtp.mailfrom=david@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1747642130; 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=FM/rxrjxuQ0BFg/Ab2gHXktIcFuldiVbhNFXhCTqZdk=; b=MJpZJ/TmwZ2YG3tj+K4czCoD73Zn2micvgHAT3Qh8Fc3TC7KqNiA3/eYiMMFx3C0kWFTdd e6CZECVTT7Z79gNzXuvtW/JJuaXpa2UGwz+fKOdgvkjIn3737c3u3xgkIzs+n51bLeRlnH sWEtFAx96lkf/ZZ3a7ItXvlC6ybApPs= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1747642129; 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=FM/rxrjxuQ0BFg/Ab2gHXktIcFuldiVbhNFXhCTqZdk=; b=W4VEGgJ+ijiHgUo41/kZMYT3sLIK4ULiFw89nazsIcYTmCAeR1uXV4c7zP8UgD3Xk2YG53 3D5y0ocAyu1zFNGZkoAsLzzlr2V0H1Xt1E6/q7jj+HJ3R6RgdilpWtmTc7ONiHrcP9ma17 n9z2hxHn51NZD3zNae0kGVMDyP+1QUA= Received: from mail-wm1-f69.google.com (mail-wm1-f69.google.com [209.85.128.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-621-W9pLuQKRPKK3PKxAQcszqA-1; Mon, 19 May 2025 04:08:47 -0400 X-MC-Unique: W9pLuQKRPKK3PKxAQcszqA-1 X-Mimecast-MFC-AGG-ID: W9pLuQKRPKK3PKxAQcszqA_1747642126 Received: by mail-wm1-f69.google.com with SMTP id 5b1f17b1804b1-43eed325461so23561755e9.3 for ; Mon, 19 May 2025 01:08:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1747642126; x=1748246926; 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=FM/rxrjxuQ0BFg/Ab2gHXktIcFuldiVbhNFXhCTqZdk=; b=jyBGqqogFyvjXGG11hrE1ShiseYYJPRSpMT0JI40WgjhImcF2qrhSjlT48IhMEguhw boftEfNx1tdDWMU4tH75LOhLDp3cLYHT9NR5ifOijb7pk/WNP0Np6aiwbl6Wx4Rc4yDA CwPoAmY4gUkcWDUK7uWjVG7RQmrlTAofUSZpDzP/TbOzZbwqOw9q/lCV+BOKRncHELfU HTMkwPqVk+Gcfw5joxeIBSj2F56t1JhiuzusmSwmzujXuCkQZo7yOU0BFAgOMVlbxgHP zjYkb67pBWAmElXGpLRlL6G55bAsf1VxIWwSF+seBzODrjh+L8JjNDx4bPOZTr6wu2CG D4+A== X-Forwarded-Encrypted: i=1; AJvYcCUSWiwxZDtMkjcKP1MIcays9KmFl2CzW3POTOYeYBe0FZyDeX4BvOHa54NwjqRPsjM0/o9feXYJ9g==@kvack.org X-Gm-Message-State: AOJu0YxHM7Pa/8Gh/RWCLAPjQ6YUHKRewEi3LHYfj4co0L9+TG/G/FJj FcMOnmpS/n5DLvQrhgGDEDHDOqyp5xOjnt7l/KsNORvEJYVA1jnFAbABIQeeH8LXIoycIQLxLRv aFRcrwgHTFc3l75dnrgZMlE66bFi6cQBSOsUJ2uhIIRiMR1RJ1jST X-Gm-Gg: ASbGncvjgvW0qyItTseZaYdYkQicDDK47/zd7jaO+v8JJoAt/5pvwgsio2pFr8jwsxK liPAS6P+rORuTnuq71Q6grSKezc3uwhtIAds3NGbX5s5hkE9ZpqatwpyWVL50qMJTUgB1tpS834 izn1Cng1VZ0gNLPZM00kzWlITGj1Q1KRmH2KjVLlQRX/Pd4K4dHQlmHd3A4o6tjEuk1FMuiEwZT pKM3xDkTJtpBIB2GUhjLr8Mj9Dc7vBpIDGhTymJXtkbI68Zn1Twa/tKPj7uj6LSI6+LSWMIBeZ0 tsfpoAYu3D3RzcVRXY9jgMEVgV8KlKugGoSYreqo8Q8UYLz5FAPbfK4MdTsljYbOGR8V+pY5sgC F8IUDMlWhgsRD7sKYLYkpT1zwBAkXA87SSw6U380= X-Received: by 2002:a05:600c:528a:b0:43b:d0fe:b8ac with SMTP id 5b1f17b1804b1-442ff03c4edmr116309445e9.30.1747642126377; Mon, 19 May 2025 01:08:46 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFduBqkH4k774EAkez9Uz8t4ojhxJFHqhqHCrtbldv3ESoFEMQq2RERfvxqRo7N9E/Y0DjOnw== X-Received: by 2002:a05:600c:528a:b0:43b:d0fe:b8ac with SMTP id 5b1f17b1804b1-442ff03c4edmr116309225e9.30.1747642125980; Mon, 19 May 2025 01:08:45 -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 ffacd0b85a97d-3a3674fed67sm7808681f8f.89.2025.05.19.01.08.44 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 19 May 2025 01:08:45 -0700 (PDT) Message-ID: <506798aa-0280-4f63-9c0e-d5f2f5d58c3c@redhat.com> Date: Mon, 19 May 2025 10:08:44 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v4 1/4] mm/page_isolation: make page isolation a standalone bit. 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-2-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-2-ziy@nvidia.com> X-Mimecast-Spam-Score: 0 X-Mimecast-MFC-PROC-ID: G90W-aG_5CtFGxwqnQriu_rEvUtAIdAqxwfbDFQVYVk_1747642126 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam07 X-Rspamd-Queue-Id: D6AE9180008 X-Stat-Signature: a3i43oqjfo9ad7cf3484kytzf7qr4tk1 X-HE-Tag: 1747642129-770833 X-HE-Meta: U2FsdGVkX18jo7/eGQqKXaeb+nLnhQRy0DqG13XP/kUAAjw24q7oI5lWqf1ziY6F7pG5GZD1nZBjHqXwlfLVwJGTTAAwYX9ig72npxtyRZWn+43Sogivmr7p9CfnLO8Tvu3ayxOnZmQgylPhqPIMx5eDz5zUwi7URc/wV+3aIUY5B4VNzm7RC2l0QlBTLmEK8z1X3Pg/2twX9AvG5/48E1wJo1p+vamZDsseMhydba2g0Tb7/cTr+OTjEK9YnxRaz6YgEsLPnK8DYlx9UzsaKkzfgQ1Uw/17kRGN/VGqa6ToqVAAo3BnyEZuV51+2nz3NTmAusY3G1etg1cfZ8hemJ+/KjXBs+wuFZe21XOctyw96R8wIkJnaVlNMfMZYqHwoG5HCkBNcXf6o7cQ3BCwO4ZmEpX/k+bIHrvv7jw/Lyw5Pg+9iOs0PRmm6Es9yL1SXfFhrSskyGLTiMSMnUBohFpYgOno/A+ybk1yMp2sVLL6Vhhna9w1WNCXBqmOgXxfE0cQw9HPANge4tKdE1e3trTaknKxWAmW9pAae27mQzIxdhl+soQJPkYxVLgRnd3hSNLj3fOZUeebx3Ychy0NoE8wESTZRQ0cjI7hfqvi30tH0jGJ7zNVVjJadzwifLSsSu0rF3lNA5qI38o15xCBJzpOAAkcfPzfdp7my3u8ujWQBlWow8kPL/VWlomIR62LuMuhtLNDdRoFzHKMtn5wtfclbjYPcg9IjR0rx5pgVwCTjEF7yA8JP4oKRJQ/1yMdkqNO1IRj2reaT7eQUWBcCrQPoEwy19BzdbK/hjWQuJrCIy1cEFTaHIeh2OZWBi9U9aO4qQovq8ZucKu1fIBIryEwb3pF73+DM/Pag9PyvHvZlzO6RfUQETqkeoXZv/cQuThg80CKwRu4LyvyMiEV33tA6FJVGr2NPz9AylVRrrcbZhmJOeyxN6NNGLa2c8m7BRcpPMKJTmcKkDeJkij 6yPMS/7k rtQLU/bqTjnZuLPryy9GfKM4HxDSuEMCRzNo6G8BASxa7LxzSzxgcpxg6cDfQCxGyOJgpLHv0u/bTP6+vuorb3nqaHMqKCPwWCicVOAtBERhlE7mJPIWS12u6LexCItdv3uyYvJv79E8/yiAB/MqT/F5FT6fTghmdI+IY9pDWDABZRzHvv9SqnGD50SKPRzm8ncmE1eEmxtCdmljdznFbBBlgKqTU0J4do+13HpEBWzLqgm90G5WaB06VFzz+Gb/s9qrMr8KTvqoZG2GJ3YFpMurO4Hn/lMj42eh5NTV0da4/i2GQ8HXDxyO2Wdk3zMaMW69QI3BIjVck1VDs/8FA+cXwR/T9UXaMmJyqvZ5oQ7rTZlPp7gJmtvdQsa/zUha1p7nBEG5eCQqMBJLQSFWx7v+FwUm1gKhEXkZ0mTcNOIwdoXKNIY0OGZyZqUo2c7WVg/Z7xlHrkmDG0rWILFkGFuzKU7PfpchmUKd8 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: > During page isolation, the original migratetype is overwritten, since > MIGRATE_* are enums and stored in pageblock bitmaps. Change > MIGRATE_ISOLATE to be stored a standalone bit, PB_migrate_isolate, like > PB_migrate_skip, so that migratetype is not lost during pageblock > isolation. pageblock bits needs to be word aligned, so expand > the number of pageblock bits from 4 to 8 and make PB_migrate_isolate bit 7. > > Signed-off-by: Zi Yan > --- > include/linux/mmzone.h | 15 ++++++++------ > include/linux/pageblock-flags.h | 9 ++++++++- > mm/page_alloc.c | 36 ++++++++++++++++++++++++++++++++- > mm/page_isolation.c | 11 ++++++++++ > 4 files changed, 63 insertions(+), 8 deletions(-) > > diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h > index b19a98c20de8..7ef01fe148ce 100644 > --- a/include/linux/mmzone.h > +++ b/include/linux/mmzone.h > @@ -106,14 +106,17 @@ static inline bool migratetype_is_mergeable(int mt) > > extern int page_group_by_mobility_disabled; > > -#define MIGRATETYPE_MASK ((1UL << PB_migratetype_bits) - 1) > +#ifdef CONFIG_MEMORY_ISOLATION > +#define MIGRATETYPE_MASK ((BIT(PB_migratetype_bits) - 1) | PB_migrate_isolate_bit) > +#else > +#define MIGRATETYPE_MASK (BIT(PB_migratetype_bits) - 1) > +#endif > + > +unsigned long get_pageblock_migratetype(const struct page *page); > > -#define get_pageblock_migratetype(page) \ > - get_pfnblock_flags_mask(page, page_to_pfn(page), MIGRATETYPE_MASK) > +#define folio_migratetype(folio) \ > + get_pageblock_migratetype(&folio->page) > > -#define folio_migratetype(folio) \ > - get_pfnblock_flags_mask(&folio->page, folio_pfn(folio), \ > - MIGRATETYPE_MASK) > struct free_area { > struct list_head free_list[MIGRATE_TYPES]; > unsigned long nr_free; > diff --git a/include/linux/pageblock-flags.h b/include/linux/pageblock-flags.h > index 0c4963339f0b..00040e7df8c8 100644 > --- a/include/linux/pageblock-flags.h > +++ b/include/linux/pageblock-flags.h > @@ -20,7 +20,10 @@ enum pageblock_bits { > PB_migrate_end = PB_migrate + PB_migratetype_bits - 1, > /* 3 bits required for migrate types */ > PB_migrate_skip,/* If set the block is skipped by compaction */ > - > +#ifdef CONFIG_MEMORY_ISOLATION > + PB_migrate_isolate = 7, /* If set the block is isolated */ > + /* set it to 7 to make pageblock bit word aligned */ I think what we want to do here is align NR_PAGEBLOCK_BITS up to 4 bits at relevant places. Or go to the next power-of-2. Could we simply to that using something like #ifdef CONFIG_MEMORY_ISOLATION PB_migrate_isolate, /* If set the block is isolated */ #endif __NR_PAGEBLOCK_BITS }; /* We always want the bits to be a power of 2. */ #define NR_PAGEBLOCK_BITS (roundup_pow_of_two(__NR_PAGEBLOCK_BITS)) Would something like that work? > +#endif > /* > * Assume the bits will always align on a word. If this assumption > * changes then get/set pageblock needs updating. > @@ -28,6 +31,10 @@ enum pageblock_bits { > NR_PAGEBLOCK_BITS > };> > +#ifdef CONFIG_MEMORY_ISOLATION > +#define PB_migrate_isolate_bit BIT(PB_migrate_isolate) > +#endif > + I assume we should first change users ot "1 << (PB_migrate_skip)" to PB_migrate_skip_bit to keep it similar. > #if defined(CONFIG_PAGE_BLOCK_ORDER) > #define PAGE_BLOCK_ORDER CONFIG_PAGE_BLOCK_ORDER > #else > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index c77592b22256..04e301fb4879 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -381,10 +381,31 @@ unsigned long get_pfnblock_flags_mask(const struct page *page, > return (word >> bitidx) & mask; > } > > +unsigned long get_pageblock_migratetype(const struct page *page) > +{ > + unsigned long flags; > + > + flags = get_pfnblock_flags_mask(page, page_to_pfn(page), > + MIGRATETYPE_MASK); When calling functions, we usually indent up to the beginning of the parameters. Same for the other cases below. ... or just exceed the 80 chars a bit in this case. :) > +#ifdef CONFIG_MEMORY_ISOLATION > + if (flags & PB_migrate_isolate_bit) > + return MIGRATE_ISOLATE; > +#endif > + return flags; > +} > + > static __always_inline int get_pfnblock_migratetype(const struct page *page, > unsigned long pfn) > { > - return get_pfnblock_flags_mask(page, pfn, MIGRATETYPE_MASK); > + unsigned long flags; > + > + flags = get_pfnblock_flags_mask(page, pfn, > + MIGRATETYPE_MASK); This should fit into a single line. > +#ifdef CONFIG_MEMORY_ISOLATION > + if (flags & PB_migrate_isolate_bit) > + return MIGRATE_ISOLATE; > +#endif If you call get_pfnblock_flags_mask() with MIGRATETYPE_MASK, how could you ever get PB_migrate_isolate_bit? I think what we should do is 1) Rename get_pfnblock_flags_mask() to get_pfnblock_flags() 2) Remove the mask parameter 3) Perform the masking in all callers. Maybe, we should convert set_pfnblock_flags_mask() to void set_clear_pfnblock_flags(struct page *page, unsigned long set_flags, unsigned long clear_flags); And better, splitting it up (or providing helpers) set_pfnblock_flags(struct page *page, unsigned long flags); clear_pfnblock_flags(struct page *page, unsigned long flags); This implies some more code cleanups first that make the code easier to extend. > + return flags; > } > > /** > @@ -402,8 +423,14 @@ void set_pfnblock_flags_mask(struct page *page, unsigned long flags, > unsigned long bitidx, word_bitidx; > unsigned long word; > > +#ifdef CONFIG_MEMORY_ISOLATION > + BUILD_BUG_ON(NR_PAGEBLOCK_BITS != 8); > + /* extra one for MIGRATE_ISOLATE */ > + BUILD_BUG_ON(MIGRATE_TYPES > (1 << PB_migratetype_bits) + 1); > +#else > BUILD_BUG_ON(NR_PAGEBLOCK_BITS != 4); > BUILD_BUG_ON(MIGRATE_TYPES > (1 << PB_migratetype_bits)); > +#endif > > bitmap = get_pageblock_bitmap(page, pfn); > bitidx = pfn_to_bitidx(page, pfn); > @@ -426,6 +453,13 @@ void set_pageblock_migratetype(struct page *page, int migratetype) > migratetype < MIGRATE_PCPTYPES)) > migratetype = MIGRATE_UNMOVABLE; > > +#ifdef CONFIG_MEMORY_ISOLATION > + if (migratetype == MIGRATE_ISOLATE) { > + set_pfnblock_flags_mask(page, PB_migrate_isolate_bit, > + page_to_pfn(page), PB_migrate_isolate_bit); > + return; > + } > +#endif > set_pfnblock_flags_mask(page, (unsigned long)migratetype, > page_to_pfn(page), MIGRATETYPE_MASK); > } > diff --git a/mm/page_isolation.c b/mm/page_isolation.c > index b2fc5266e3d2..751e21f6d85e 100644 > --- a/mm/page_isolation.c > +++ b/mm/page_isolation.c > @@ -15,6 +15,17 @@ > #define CREATE_TRACE_POINTS > #include > > +static inline bool __maybe_unused get_pageblock_isolate(struct page *page) > +{ > + return get_pfnblock_flags_mask(page, page_to_pfn(page), > + PB_migrate_isolate_bit); > +} > +static inline void clear_pageblock_isolate(struct page *page) > +{ > + set_pfnblock_flags_mask(page, 0, page_to_pfn(page), > + PB_migrate_isolate_bit); > +} Should these reside in include/linux/pageblock-flags.h, just like the CONFIG_COMPACTION "skip" variants? -- Cheers, David / dhildenb