samsung_sm8750/android_kernel_samsung_sm8750
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "BACKPORT: mm/page_alloc: keep track of free highatomic"

Browse Source 
This reverts commit 9743210ec0.

Change-Id: Ie0b7d0b75d671f2b17829af99b9dbf67bb1f6a32
Bug: 420771453
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
This commit is contained in:
Kalesh Singh
2025-05-27 21:07:37 -07:00
parent a7a0d95bca
commit bbc65a78d2
1 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mm/page_alloc.c
View File

@@ -323,8 +323,6 @@ const char * const migratetype_names[MIGRATE_TYPES] = {
#endif #endif
}; };
unsigned long free_highatomics[MAX_NR_ZONES] = {0};
int min_free_kbytes = 1024; int min_free_kbytes = 1024;
int user_min_free_kbytes = -1; int user_min_free_kbytes = -1;
static int watermark_boost_factor __read_mostly = 15000; static int watermark_boost_factor __read_mostly = 15000;
@@ -761,8 +759,6 @@ compaction_capture(struct capture_control *capc, struct page *page,
static inline void account_freepages(struct zone *zone, int nr_pages, static inline void account_freepages(struct zone *zone, int nr_pages,
int migratetype) int migratetype)
{ {
lockdep_assert_held(&zone->lock);
if (is_migrate_isolate(migratetype)) if (is_migrate_isolate(migratetype))
return; return;
@@ -770,9 +766,6 @@ static inline void account_freepages(struct zone *zone, int nr_pages,
if (is_migrate_cma(migratetype)) if (is_migrate_cma(migratetype))
__mod_zone_page_state(zone, NR_FREE_CMA_PAGES, nr_pages); __mod_zone_page_state(zone, NR_FREE_CMA_PAGES, nr_pages);
else if (is_migrate_highatomic(migratetype))
WRITE_ONCE(free_highatomics[zone_idx(zone)],
free_highatomics[zone_idx(zone)] + nr_pages);
} }
/* Used for pages not on another list */ /* Used for pages not on another list */
@@ -3214,10 +3207,11 @@ static inline long __zone_watermark_unusable_free(struct zone *z,
/* /*
* If the caller does not have rights to reserves below the min * If the caller does not have rights to reserves below the min
* watermark then subtract the free pages reserved for highatomic. * watermark then subtract the high-atomic reserves. This will
* over-estimate the size of the atomic reserve but it avoids a search.
*/ */
if (likely(!(alloc_flags & ALLOC_RESERVES))) if (likely(!(alloc_flags & ALLOC_RESERVES)))
unusable_free += READ_ONCE(free_highatomics[zone_idx(z)]); unusable_free += z->nr_reserved_highatomic;
#ifdef CONFIG_CMA #ifdef CONFIG_CMA
/* If allocation can't use CMA areas don't use free CMA pages */ /* If allocation can't use CMA areas don't use free CMA pages */