From 102a0743326a03cd1a1202ceda21e175b7d3575c Mon Sep 17 00:00:00 2001
From: hc <hc@nodka.com>
Date: Tue, 20 Feb 2024 01:20:52 +0000
Subject: [PATCH] add new system file
---
kernel/mm/page_alloc.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
1 files changed, 50 insertions(+), 1 deletions(-)
diff --git a/kernel/mm/page_alloc.c b/kernel/mm/page_alloc.c
index 3868586..3bcee27 100644
--- a/kernel/mm/page_alloc.c
+++ b/kernel/mm/page_alloc.c
@@ -1614,11 +1614,16 @@
unsigned long flags;
int migratetype;
unsigned long pfn = page_to_pfn(page);
+ bool skip_free_unref_page = false;
if (!free_pages_prepare(page, order, true, fpi_flags))
return;
migratetype = get_pfnblock_migratetype(page, pfn);
+ trace_android_vh_free_unref_page_bypass(page, order, migratetype, &skip_free_unref_page);
+ if (skip_free_unref_page)
+ return;
+
local_irq_save(flags);
__count_vm_events(PGFREE, 1 << order);
free_one_page(page_zone(page), page, pfn, order, migratetype,
@@ -2797,6 +2802,7 @@
struct page *page;
int order;
bool ret;
+ bool skip_unreserve_highatomic = false;
for_each_zone_zonelist_nodemask(zone, z, zonelist, ac->highest_zoneidx,
ac->nodemask) {
@@ -2806,6 +2812,11 @@
*/
if (!force && zone->nr_reserved_highatomic <=
pageblock_nr_pages)
+ continue;
+
+ trace_android_vh_unreserve_highatomic_bypass(force, zone,
+ &skip_unreserve_highatomic);
+ if (skip_unreserve_highatomic)
continue;
spin_lock_irqsave(&zone->lock, flags);
@@ -3053,6 +3064,10 @@
struct list_head *list = &pcp->lists[migratetype];
if (list_empty(list)) {
+ trace_android_vh_rmqueue_bulk_bypass(order, pcp, migratetype, list);
+ if (!list_empty(list))
+ return list;
+
pcp->count += rmqueue_bulk(zone, order,
pcp->batch, list,
migratetype, alloc_flags);
@@ -3349,8 +3364,15 @@
{
unsigned long flags;
unsigned long pfn = page_to_pfn(page);
+ int migratetype;
+ bool skip_free_unref_page = false;
if (!free_unref_page_prepare(page, pfn))
+ return;
+
+ migratetype = get_pfnblock_migratetype(page, pfn);
+ trace_android_vh_free_unref_page_bypass(page, 0, migratetype, &skip_free_unref_page);
+ if (skip_free_unref_page)
return;
local_irq_save(flags);
@@ -4828,6 +4850,7 @@
unsigned int zonelist_iter_cookie;
int reserve_flags;
unsigned long vh_record;
+ bool should_alloc_retry = false;
trace_android_vh_alloc_pages_slowpath_begin(gfp_mask, order, &vh_record);
/*
@@ -4967,6 +4990,12 @@
if (page)
goto got_pg;
+
+ trace_android_vh_should_alloc_pages_retry(gfp_mask, order,
+ &alloc_flags, ac->migratetype, ac->preferred_zoneref->zone,
+ &page, &should_alloc_retry);
+ if (should_alloc_retry)
+ goto retry;
/* Try direct reclaim and then allocating */
page = __alloc_pages_direct_reclaim(gfp_mask, order, alloc_flags, ac,
@@ -5240,10 +5269,13 @@
void __free_pages(struct page *page, unsigned int order)
{
+ /* get PageHead before we drop reference */
+ int head = PageHead(page);
+
trace_android_vh_free_pages(page, order);
if (put_page_testzero(page))
free_the_page(page, order);
- else if (!PageHead(page))
+ else if (!head)
while (order-- > 0)
free_the_page(page + (1 << order), order);
}
@@ -6158,7 +6190,21 @@
int nid;
int __maybe_unused cpu;
pg_data_t *self = data;
+ unsigned long flags;
+ /*
+ * Explicitly disable this CPU's interrupts before taking seqlock
+ * to prevent any IRQ handler from calling into the page allocator
+ * (e.g. GFP_ATOMIC) that could hit zonelist_iter_begin and livelock.
+ */
+ local_irq_save(flags);
+ /*
+ * Explicitly disable this CPU's synchronous printk() before taking
+ * seqlock to prevent any printk() from trying to hold port->lock, for
+ * tty_insert_flip_string_and_push_buffer() on other CPU might be
+ * calling kmalloc(GFP_ATOMIC | __GFP_NOWARN) with port->lock held.
+ */
+ printk_deferred_enter();
write_seqlock(&zonelist_update_seq);
#ifdef CONFIG_NUMA
@@ -6193,6 +6239,8 @@
}
write_sequnlock(&zonelist_update_seq);
+ printk_deferred_exit();
+ local_irq_restore(flags);
}
static noinline void __init
@@ -6612,6 +6660,7 @@
static void pageset_update(struct per_cpu_pages *pcp, unsigned long high,
unsigned long batch)
{
+ trace_android_vh_pageset_update(&high, &batch);
/* start with a fail safe value for batch */
pcp->batch = 1;
smp_wmb();
--
Gitblit v1.6.2