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 9787CC3ABC0 for ; Thu, 8 May 2025 05:24:19 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 9772E6B0085; Thu, 8 May 2025 01:24:18 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 925336B0088; Thu, 8 May 2025 01:24:18 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7C6786B0089; Thu, 8 May 2025 01:24:18 -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 5CCB16B0085 for ; Thu, 8 May 2025 01:24:18 -0400 (EDT) Received: from smtpin19.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay10.hostedemail.com (Postfix) with ESMTP id 66E7AC0897 for ; Thu, 8 May 2025 05:24:18 +0000 (UTC) X-FDA: 83418599796.19.AA14512 Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) by imf20.hostedemail.com (Postfix) with ESMTP id 53D421C0002 for ; Thu, 8 May 2025 05:24:16 +0000 (UTC) Authentication-Results: imf20.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=2eT9du74; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf20.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.219.51 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1746681856; a=rsa-sha256; cv=none; b=xRr6lWEHkbdjuvVzox07zYvrdIgolnIOKjTiug+156kSXaWdnl+TTkE6m8ThQ3zu7kxTIx xmKC8TaydDYCoV6qtlg4sN58YakhTyLoPCb6cetp4UvOYZEJMSzuzWpZhYafphOAZicAzi s5KvYsfI881qJN5FV3L61dE3wFLTlKQ= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1746681856; 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: in-reply-to:in-reply-to:references:references:dkim-signature; bh=5bWLG/G7Nb5+Ogn7HUeSKyLzxcaPVBfcIUAQJT4VbcQ=; b=iKmKTjhBrfax48Fxp3EFegHhv2i/4rb4NVsuOL2indCTuYiTe4NPPMukI4ZKNX2aPj1eRu R0I5r25rxHP3bIyEuP4yQ+0pJIaOGbmyIps6XJ7lmk69uDST/RYdbXIKvosSXl0OEefvar p981j7auI24PcUqAoXIWVx3X8Huyo10= ARC-Authentication-Results: i=1; imf20.hostedemail.com; dkim=pass header.d=cmpxchg-org.20230601.gappssmtp.com header.s=20230601 header.b=2eT9du74; dmarc=pass (policy=none) header.from=cmpxchg.org; spf=pass (imf20.hostedemail.com: domain of hannes@cmpxchg.org designates 209.85.219.51 as permitted sender) smtp.mailfrom=hannes@cmpxchg.org Received: by mail-qv1-f51.google.com with SMTP id 6a1803df08f44-6f54e964b87so2469246d6.0 for ; Wed, 07 May 2025 22:24:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cmpxchg-org.20230601.gappssmtp.com; s=20230601; t=1746681855; x=1747286655; darn=kvack.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:from:to:cc:subject:date:message-id:reply-to; bh=5bWLG/G7Nb5+Ogn7HUeSKyLzxcaPVBfcIUAQJT4VbcQ=; b=2eT9du74URPiA8tN0/XsP4+jzkmtSBYKfVtSCTVQqbPlOh71Xu7BNbWWDzbrSH/kw/ DO2wLYomND+y/LA3v1V3hpf9GDO/tNqGI3awz5Bk2529inWWBFLAEg4nLCEi15kZLTK6 kXy5nUnnaNSy1Tc0WBLKQbnclNJx1N6uRcJOKn9pqtQaL1tBFKvu2LXcRfv6FDeVXSyV zaEphbsokn0Ll3ASG9UK5Jbyzw8B8hcFcb8OhnylenR5RVBALCxiHKL4DPkM7EOLUNLX Q/hJCVuyB36GfdhFMd3lycbagjnHa6UogdJB+8Tnmw+jhnhbeRtSfyI2CNghEm3KThCm KRGw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1746681855; x=1747286655; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=5bWLG/G7Nb5+Ogn7HUeSKyLzxcaPVBfcIUAQJT4VbcQ=; b=c6pW1P33PKg4T9PpC/w1e4OrHO2llRAKB8L6BWD2f9jWeqLzaQfE7igZ+GNiBc70pk 3UgybOkYsKkcB+hTB4hmdmW6psRRMMjUZXs4P5F7LeoY+AimvkmykSgxBeLEBTLwH6qO u6JxH50IeAOscb/01AQhehSyf1zcg72YqQSpsbXDqeI4IsCBEKY6Q1RkY34zBN83YoT7 wEzd2qrXcTRj26G66hAXjZbU2kcBSugk+UMw5BQH8GAjUm6Tx5p9yMblBytfhRKx4ITA K9JEfkej1KdS1TGb8aeku2Rlti/plDc4YAM+ZPueo1gnayfDPjJDsFVuQwWc60++GC8w e89w== X-Forwarded-Encrypted: i=1; AJvYcCX3Ui5/FbT385CroQdGreQpRWfs/oCZhj41HiLPyAoSNCCl26K5k+4BscKPyjIo89CawIVANBWYAg==@kvack.org X-Gm-Message-State: AOJu0Yxy7zNXs/tTCO0jB6gV2FdeFrCvtUHccgsT5zB+nvXACZ3DJ5Df VBmAfUPEnyvZGj73bXJbaAx4gr76mBReYVS3Nr2ISoJjdy/PCYk3r2aoIL9Hx0E= X-Gm-Gg: ASbGncs0zMgNJRwfCEDQq/J7RbxD0DBldO1Poa8c2tVZc6+KqJOcNycK8OQH02DQXEs XRYpVnFvOT6SH2LAKWABTfR9HdCkX8q6iCfB4QnA/TjtAKDxrfGe7pmBCIeKXSxcJx9nO9gzc4L 8OsWE8fqP6f5zmOwgNm8edGuvaQtY3DVVSc3D1N2MWlXGLfM2Go5ygpX4AxNUa/wxyCA2uuiycJ kBb3JQnhhqHgYNqNIyh9DuVljdvkgh7CrfiUvL8FjaaOSAlazRR81bmpvN39aAovuJ6NS7Wy1Oy dW3rt71l2aXZkSB54xkB8dSWQbLzJipZXJyyvdg= X-Google-Smtp-Source: AGHT+IEKyyrg6irmELONZJ6Vl5mPpdutS1KJ3dRWIMgQj3cMBuzsQaTxGTGW/wubqGjWpUUCI3H87Q== X-Received: by 2002:a05:6214:c46:b0:6f2:b7cd:7cac with SMTP id 6a1803df08f44-6f542aedcb1mr91706416d6.31.1746681855276; Wed, 07 May 2025 22:24:15 -0700 (PDT) Received: from localhost ([2603:7000:c01:2716:365a:60ff:fe62:ff29]) by smtp.gmail.com with UTF8SMTPSA id 6a1803df08f44-6f54279544csm28048576d6.94.2025.05.07.22.24.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 May 2025 22:24:14 -0700 (PDT) Date: Thu, 8 May 2025 01:24:09 -0400 From: Johannes Weiner To: Zi Yan Cc: David Hildenbrand , linux-mm@kvack.org, Andrew Morton , Oscar Salvador , Vlastimil Babka , Baolin Wang , "Kirill A . Shutemov" , Mel Gorman , Suren Baghdasaryan , Michal Hocko , Brendan Jackman , Richard Chang , linux-kernel@vger.kernel.org Subject: Re: [PATCH v3 1/4] mm/page_isolation: make page isolation a standalone bit. Message-ID: <20250508052409.GB320498@cmpxchg.org> References: <20250507211059.2211628-1-ziy@nvidia.com> <20250507211059.2211628-2-ziy@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20250507211059.2211628-2-ziy@nvidia.com> X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: 53D421C0002 X-Stat-Signature: zbti5dzh8yce8berfn6d3ztoe3qexr8u X-Rspam-User: X-HE-Tag: 1746681856-330997 X-HE-Meta: U2FsdGVkX1/dKhZBjX+FSnd49ym976uqsjZaKfAjsVKRZ2x/rUvPWb1loFJCs4VRJfPZBvJdvoAqzREIgpDZIarWtePh45W7glaSEwjEaQ3V9ri4gqZ1uscVuGEKefwAkeYjfBbdUDYpOLdV/e1OiOMr4kGCr/Vs8CtaRslz8/D3RifL3raPY4FKykuc9zQenEx0j5xDPvlwWLpdfeyv41LVeC7JEvD8AK6lzGnybsE9qo3Xxz3awtKdRw9Gj7hBgHIo3qtyhUInNXHzN/W9T5Z+vfi0HmNRoNdm7Ja0YD5W81NYxdZOE+vLZKzaST0QGDfDgK3Hq7o9gB5BAElyJYcw310AtWpBU5pcdOJ3HAxj3A6k0IPZULus4bBRocyVXN7DIxpOq1MqWxsfnSvjqUTUO6cxp6O0fYJFDn/622Frpp0MdAp0+AlncWStDxPMVbiuJZnL/B172Nn45p88VJrgWuRwCXCHRUFLzKeP8c0EXhAagulupaiQFhg3izjr8+yDWJmZUzCx2cYodgf7ZzJQenUiHRtCdlWHdRIBJ0OJ7c/mPbAqi8/33lhn0+Ahf5mW2WiuvBS7o1jgTd/8PplTYsYKVjUzmPxQjKea5CBKntQXbPH7H/gH7pqHJKpPEoJLe9skqMK2WrrVQDUFIyH9EjSbV8bOR076Bwr+OwEJK8Ts97D/fpgN3tdv4fekdj7mfTDtRCzZb6f9Df2t3Hfbs9TShorrAI55VbmLr/g0OdYCX+SFuh+rSFLIZoYRqi5T5tQSSsrkY8ANKNfavjnP4kHvykRIO2E0ctu8YpH6E2zXD99Q5QA0GEn0qfkocCfqL17NINlzApsSeN6UHsIMduvO82xMoh8XNo4rWtGFktM64SFMjtWrG3c7qXd1nK9RAq6LjEoCHuEgC/k4GS0UXrmeiOzqezuuOkXnH5vfw1yG4JrCBun1f3GwQfIPu5V9pk6137JvOtQHbFZ Te8qfwRc VbihstXFJWLvSNnhhKEEPIp7JdRvfQNe6mldTzyONLGsz2+/dd4GZ2sElp571B2A31THYpNTUoMZ33R1lkhcjhBHA1PLYHwSbA7ME5OJbF8U/ZtREXIbAMPW/QxzvxJxSXVPR9spWqbLpAYK55KJkeH6PPq5TmoNaZWRymHKCPp/4VtdPQdREehSRf9Elg96kj3RzpHhzOIJwwpzi8P9fkK8yl7+wQeUNO6951FdrpPh881Ejfs+BobF+qGGlFBhCV3oHBERmTai4lqJOdzyksOFAMBD+7zjLlVL0P+A9bVlHtoNENTp4OkIp7R7cWIV58U/3JjZRoTISa41acKAUdve+fL1TfK4mFGs9NSFqcRMDQNBmzDHdzdgQO2tMMWDT7LqLwNeTmkfEcm/bOvCLOhrl+C4jMYEGHon1CsLUxCmwrMIJpsSxkPOZNB4TlZILXvbIS07v0X4+VVlMHb8uddl7AdbbI2NszgO2+aZfwLm09VNB9ZnEb5ez2yAuUIJdyU/KfxSqBspmDiTIdWWJ5Janfwq78Y6WK9yC 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 Wed, May 07, 2025 at 05:10:56PM -0400, 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 | 17 ++++++++++---- > include/linux/page-isolation.h | 2 +- > include/linux/pageblock-flags.h | 33 +++++++++++++++++++++++++- > mm/page_alloc.c | 41 ++++++++++++++++++++++++++++++++- > 4 files changed, 86 insertions(+), 7 deletions(-) > > diff --git a/include/linux/mmzone.h b/include/linux/mmzone.h > index b19a98c20de8..9ec022a0b826 100644 > --- a/include/linux/mmzone.h > +++ b/include/linux/mmzone.h > @@ -106,14 +106,23 @@ 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 > > +#ifdef CONFIG_MEMORY_ISOLATION > +unsigned long get_pageblock_migratetype(const struct page *page); > +#else > #define get_pageblock_migratetype(page) \ > get_pfnblock_flags_mask(page, page_to_pfn(page), MIGRATETYPE_MASK) > > -#define folio_migratetype(folio) \ > - get_pfnblock_flags_mask(&folio->page, folio_pfn(folio), \ > - MIGRATETYPE_MASK) > +#endif > + > +#define folio_migratetype(folio) \ > + get_pageblock_migratetype(&folio->page) > + > struct free_area { > struct list_head free_list[MIGRATE_TYPES]; > unsigned long nr_free; > diff --git a/include/linux/page-isolation.h b/include/linux/page-isolation.h > index 898bb788243b..51797dc39cbc 100644 > --- a/include/linux/page-isolation.h > +++ b/include/linux/page-isolation.h > @@ -5,7 +5,7 @@ > #ifdef CONFIG_MEMORY_ISOLATION > static inline bool is_migrate_isolate_page(struct page *page) > { > - return get_pageblock_migratetype(page) == MIGRATE_ISOLATE; > + return get_pageblock_isolate(page); The old version still works, right? It would match is_migrate_isolate() a bit better, but no strong feelings either way... > static inline bool is_migrate_isolate(int migratetype) > { > diff --git a/include/linux/pageblock-flags.h b/include/linux/pageblock-flags.h > index 0c4963339f0b..9fadae5892b2 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 */ > +#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 > + > #if defined(CONFIG_PAGE_BLOCK_ORDER) > #define PAGE_BLOCK_ORDER CONFIG_PAGE_BLOCK_ORDER > #else > @@ -105,4 +112,28 @@ static inline void set_pageblock_skip(struct page *page) > } > #endif /* CONFIG_COMPACTION */ > > +#ifdef CONFIG_MEMORY_ISOLATION > +#define get_pageblock_isolate(page) \ > + get_pfnblock_flags_mask(page, page_to_pfn(page), \ > + PB_migrate_isolate_bit) > +#define clear_pageblock_isolate(page) \ > + set_pfnblock_flags_mask(page, 0, page_to_pfn(page), \ > + PB_migrate_isolate_bit) > +#define set_pageblock_isolate(page) \ > + set_pfnblock_flags_mask(page, PB_migrate_isolate_bit, \ > + page_to_pfn(page), \ > + PB_migrate_isolate_bit) Would it make sense to move these to page_isolation.c? Then they wouldn't have to be macros. > +#else > +static inline bool get_pageblock_isolate(struct page *page) > +{ > + return false; > +} > +static inline void clear_pageblock_isolate(struct page *page) > +{ > +} > +static inline void set_pageblock_isolate(struct page *page) > +{ > +} > +#endif /* CONFIG_MEMORY_ISOLATION */ > + > #endif /* PAGEBLOCK_FLAGS_H */ > diff --git a/mm/page_alloc.c b/mm/page_alloc.c > index c77592b22256..acf68ef041d8 100644 > --- a/mm/page_alloc.c > +++ b/mm/page_alloc.c > @@ -381,12 +381,40 @@ unsigned long get_pfnblock_flags_mask(const struct page *page, > return (word >> bitidx) & mask; > } > > +#ifdef CONFIG_MEMORY_ISOLATION > +unsigned long get_pageblock_migratetype(const struct page *page) > +{ > + unsigned long flags; > + > + flags = get_pfnblock_flags_mask(page, page_to_pfn(page), > + MIGRATETYPE_MASK); > + if (flags & PB_migrate_isolate_bit) > + return MIGRATE_ISOLATE; > + > + return flags; > +} Since MIGRATETYPE_MASK includes the isolate bit if it exists, I think you can share the get_pfnblock_flags_mask() part: static inline get_pageblock_migratetype(const struct page *page) { unsigned long pfn = page_to_pfn(page); flags = get_pfnblock_flags_mask(page, pfn, MIGRATETYPE_MASK); #ifdef CONFIG_MEMORY_ISOLATEION 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) > +{ > + unsigned long flags; > + > + flags = get_pfnblock_flags_mask(page, pfn, > + MIGRATETYPE_MASK); > + if (flags & PB_migrate_isolate_bit) > + return MIGRATE_ISOLATE; > + > + return flags; > +} > +#else > static __always_inline int get_pfnblock_migratetype(const struct page *page, > unsigned long pfn) > { > return get_pfnblock_flags_mask(page, pfn, MIGRATETYPE_MASK); > } Same with this one. > > +#endif > + > /** > * set_pfnblock_flags_mask - Set the requested group of flags for a pageblock_nr_pages block of pages > * @page: The page within the block of interest > @@ -402,8 +430,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,7 +460,12 @@ void set_pageblock_migratetype(struct page *page, int migratetype) > migratetype < MIGRATE_PCPTYPES)) > migratetype = MIGRATE_UNMOVABLE; > > - set_pfnblock_flags_mask(page, (unsigned long)migratetype, > +#ifdef CONFIG_MEMORY_ISOLATION > + if (migratetype == MIGRATE_ISOLATE) > + set_pageblock_isolate(page); Are there paths actually doing this after the second patch? There are many instances that want to *read* the migratetype or MIGRATE_ISOLATE, but only isolation code should be manipulating that bit through the dedicated set/toggle_pageblock_isolate API. If there isn't one, it might be good to enforce this with a VM_WARN instead. > + else > +#endif > + set_pfnblock_flags_mask(page, (unsigned long)migratetype, > page_to_pfn(page), MIGRATETYPE_MASK); If the branch stays, you could add a `return' to the MIGRATE_ISOLATE leg, drop the else and indent this line normally.