During compaction isolated free pages are marked allocated so that they
can be split and/or freed. For that, post_alloc_hook() is used inside
split_map_pages() and release_free_list(). split_map_pages() marks free
pages allocated, splits the pages and then lets alloc_contig_range_noprof()
free those pages. release_free_list() marks free pages and immediately
frees them. This usage of post_alloc_hook() affect memory allocation
profiling because these functions might not be called from an instrumented
allocator, therefore current->alloc_tag is NULL and when debugging is
enabled (CONFIG_MEM_ALLOC_PROFILING_DEBUG=y) that causes warnings.
To avoid that, wrap such post_alloc_hook() calls into an instrumented
function which acts as an allocator which will be charged for these
fake allocations. Note that these allocations are very short lived until
they are freed, therefore the associated counters should usually read 0.
Signed-off-by: Suren Baghdasaryan <[email protected]>
---
mm/compaction.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/mm/compaction.c b/mm/compaction.c
index e731d45befc7..739b1bf3d637 100644
--- a/mm/compaction.c
+++ b/mm/compaction.c
@@ -79,6 +79,13 @@ static inline bool is_via_compact_memory(int order) { return false; }
#define COMPACTION_HPAGE_ORDER (PMD_SHIFT - PAGE_SHIFT)
#endif
+static struct page *mark_allocated_noprof(struct page *page, unsigned int order, gfp_t gfp_flags)
+{
+ post_alloc_hook(page, order, __GFP_MOVABLE);
+ return page;
+}
+#define mark_allocated(...) alloc_hooks(mark_allocated_noprof(__VA_ARGS__))
+
static void split_map_pages(struct list_head *freepages)
{
unsigned int i, order;
@@ -93,7 +100,7 @@ static void split_map_pages(struct list_head *freepages)
nr_pages = 1 << order;
- post_alloc_hook(page, order, __GFP_MOVABLE);
+ mark_allocated(page, order, __GFP_MOVABLE);
if (order)
split_page(page, order);
@@ -122,7 +129,7 @@ static unsigned long release_free_list(struct list_head *freepages)
* Convert free pages into post allocation pages, so
* that we can free them via __free_page.
*/
- post_alloc_hook(page, order, __GFP_MOVABLE);
+ mark_allocated(page, order, __GFP_MOVABLE);
__free_pages(page, order);
if (pfn > high_pfn)
high_pfn = pfn;
base-commit: c286c21ff94252f778515b21b6bebe749454a852
--
2.45.2.627.g7a2c4fd464-goog
On Fri, 14 Jun 2024 16:05:04 -0700 Suren Baghdasaryan <[email protected]> wrote:
> During compaction isolated free pages are marked allocated so that they
> can be split and/or freed. For that, post_alloc_hook() is used inside
> split_map_pages() and release_free_list(). split_map_pages() marks free
> pages allocated, splits the pages and then lets alloc_contig_range_noprof()
> free those pages. release_free_list() marks free pages and immediately
> frees them. This usage of post_alloc_hook() affect memory allocation
> profiling because these functions might not be called from an instrumented
> allocator, therefore current->alloc_tag is NULL and when debugging is
> enabled (CONFIG_MEM_ALLOC_PROFILING_DEBUG=y) that causes warnings.
It would be helpful to quote the warnings for the changelog. And a
Reported-by:/Closes: if appropriate.
I'm assuming we want this in 6.10-rcX?
Please help in identifying the Fixes:, for anyone who might be
backporting allocation profiling.
On Fri, Jun 14, 2024 at 6:19 PM Andrew Morton <[email protected]> wrote:
>
> On Fri, 14 Jun 2024 16:05:04 -0700 Suren Baghdasaryan <[email protected]> wrote:
>
> > During compaction isolated free pages are marked allocated so that they
> > can be split and/or freed. For that, post_alloc_hook() is used inside
> > split_map_pages() and release_free_list(). split_map_pages() marks free
> > pages allocated, splits the pages and then lets alloc_contig_range_noprof()
> > free those pages. release_free_list() marks free pages and immediately
> > frees them. This usage of post_alloc_hook() affect memory allocation
> > profiling because these functions might not be called from an instrumented
> > allocator, therefore current->alloc_tag is NULL and when debugging is
> > enabled (CONFIG_MEM_ALLOC_PROFILING_DEBUG=y) that causes warnings.
>
> It would be helpful to quote the warnings for the changelog. And a
> Reported-by:/Closes: if appropriate.
This was not really reported anywhere but if someone hit this
condition (it requires compaction to be running) then the warning
would be generated.
>
> I'm assuming we want this in 6.10-rcX?
Yes please. Otherwise someone will report that they are getting this
warning when the system is under memory pressure and
CONFIG_MEM_ALLOC_PROFILING_DEBUG is enabled.
>
> Please help in identifying the Fixes:, for anyone who might be
> backporting allocation profiling.
I think we can mark it as
Fixes: b951aaff5035 ("mm: enable page allocation tagging")
but it's really a separate patch which covers a corner case.
Please let me know if you want me to send a v2 with this tag added.
Thanks,
Suren.
>