shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-03-25 20:10:23 +09:00
Code Issues Packages Projects Releases Wiki Activity

UPSTREAM: mm/swap.c: don't pass "enum lru_list" to trace_mm_lru_insertion()

Browse Source 
The parameter is redundant in the sense that it can be extracted
from the "struct page" parameter by page_lru() correctly.

Link: https://lore.kernel.org/linux-mm/20201207220949.830352-5-yuzhao@google.com/
Link: https://lkml.kernel.org/r/20210122220600.906146-5-yuzhao@google.com
Signed-off-by: Yu Zhao <yuzhao@google.com>
Reviewed-by: Alex Shi <alex.shi@linux.alibaba.com>
Cc: Hugh Dickins <hughd@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Cc: Matthew Wilcox <willy@infradead.org>
Cc: Michal Hocko <mhocko@kernel.org>
Cc: Roman Gushchin <guro@fb.com>
Cc: Vladimir Davydov <vdavydov.dev@gmail.com>
Cc: Vlastimil Babka <vbabka@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
(cherry picked from commit 861404536a)
Bug: 227651406
Signed-off-by: Kalesh Singh <kaleshsingh@google.com>
Change-Id: Ia02c0c65dd427a98ffa39e9dc3e2ae701e85fad8
This commit is contained in:
Yu Zhao
2021-02-24 12:08:21 -08:00
committed by Todd Kjos
parent c18b4f50ce
commit 10899adee3
2 changed files with 5 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
include/trace/events/pagemap.h
View File

@@ -27,24 +27,21 @@
TRACE_EVENT(mm_lru_insertion,
TP_PROTO(
struct page *page,
int lru
),
TP_PROTO(struct page *page),
TP_ARGS(page, lru),
TP_ARGS(page),
TP_STRUCT__entry(
__field(struct page *, page )
__field(unsigned long, pfn )
__field(int, lru )
__field(enum lru_list, lru )
__field(unsigned long, flags )
),
TP_fast_assign(
__entry->page = page;
__entry->pfn = page_to_pfn(page);
__entry->lru = lru;
__entry->lru = page_lru(page);
__entry->flags = trace_pagemap_flags(page);
),

5
mm/swap.c
View File

@@ -1124,7 +1124,6 @@ void lru_add_page_tail(struct page *page, struct page *page_tail,
static void __pagevec_lru_add_fn(struct page *page, struct lruvec *lruvec,
void *arg)
{
enum lru_list lru;
int was_unevictable = TestClearPageUnevictable(page);
int nr_pages = thp_nr_pages(page);
@@ -1160,11 +1159,9 @@ static void __pagevec_lru_add_fn(struct page *page, struct lruvec *lruvec,
smp_mb__after_atomic();
if (page_evictable(page)) {
lru = page_lru(page);
if (was_unevictable)
__count_vm_events(UNEVICTABLE_PGRESCUED, nr_pages);
} else {
lru = LRU_UNEVICTABLE;
ClearPageActive(page);
SetPageUnevictable(page);
if (!was_unevictable)
@@ -1172,7 +1169,7 @@ static void __pagevec_lru_add_fn(struct page *page, struct lruvec *lruvec,
}
add_page_to_lru_list(page, lruvec);
trace_mm_lru_insertion(page, lru);
trace_mm_lru_insertion(page);
}
/*