2019-03-01 12:24:39

by Andrey Ryabinin

Subject: [PATCH] mm-remove-zone_lru_lock-function-access-lru_lock-directly-fix

A slightly better version of __split_huge_page();

Signed-off-by: Andrey Ryabinin <[email protected]>
Cc: Vlastimil Babka <[email protected]>
Cc: Mel Gorman <[email protected]>
Cc: Johannes Weiner <[email protected]>
Cc: Michal Hocko <[email protected]>
Cc: Rik van Riel <[email protected]>
Cc: William Kucharski <[email protected]>
Cc: John Hubbard <[email protected]>
---
mm/huge_memory.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/mm/huge_memory.c b/mm/huge_memory.c
index 4ccac6b32d49..fcf657886b4b 100644
--- a/mm/huge_memory.c
+++ b/mm/huge_memory.c
@@ -2440,11 +2440,11 @@ static void __split_huge_page(struct page *page, struct list_head *list,
pgoff_t end, unsigned long flags)
{
struct page *head = compound_head(page);
- struct zone *zone = page_zone(head);
+ pg_data_t *pgdat = page_pgdat(head);
struct lruvec *lruvec;
int i;

- lruvec = mem_cgroup_page_lruvec(head, zone->zone_pgdat);
+ lruvec = mem_cgroup_page_lruvec(head, pgdat);

/* complete memcg works before add pages to LRU */
mem_cgroup_split_huge_fixup(head);
@@ -2475,7 +2475,7 @@ static void __split_huge_page(struct page *page, struct list_head *list,
xa_unlock(&head->mapping->i_pages);
}

- spin_unlock_irqrestore(&page_pgdat(head)->lru_lock, flags);
+ spin_unlock_irqrestore(&pgdat->lru_lock, flags);

remap_page(head);

--
2.19.2

2019-03-01 12:53:58

by Vlastimil Babka

Subject: Re: [PATCH] mm-remove-zone_lru_lock-function-access-lru_lock-directly-fix

On 3/1/19 1:16 PM, Andrey Ryabinin wrote:
> A slightly better version of __split_huge_page();
>
> Signed-off-by: Andrey Ryabinin <[email protected]>

Ack.

> Cc: Vlastimil Babka <[email protected]>
> Cc: Mel Gorman <[email protected]>
> Cc: Johannes Weiner <[email protected]>
> Cc: Michal Hocko <[email protected]>
> Cc: Rik van Riel <[email protected]>
> Cc: William Kucharski <[email protected]>
> Cc: John Hubbard <[email protected]>
> ---
> mm/huge_memory.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
> diff --git a/mm/huge_memory.c b/mm/huge_memory.c
> index 4ccac6b32d49..fcf657886b4b 100644
> --- a/mm/huge_memory.c
> +++ b/mm/huge_memory.c
> @@ -2440,11 +2440,11 @@ static void __split_huge_page(struct page *page, struct list_head *list,
> pgoff_t end, unsigned long flags)
> {
> struct page *head = compound_head(page);
> - struct zone *zone = page_zone(head);
> + pg_data_t *pgdat = page_pgdat(head);
> struct lruvec *lruvec;
> int i;
>
> - lruvec = mem_cgroup_page_lruvec(head, zone->zone_pgdat);
> + lruvec = mem_cgroup_page_lruvec(head, pgdat);
>
> /* complete memcg works before add pages to LRU */
> mem_cgroup_split_huge_fixup(head);
> @@ -2475,7 +2475,7 @@ static void __split_huge_page(struct page *page, struct list_head *list,
> xa_unlock(&head->mapping->i_pages);
> }
>
> - spin_unlock_irqrestore(&page_pgdat(head)->lru_lock, flags);
> + spin_unlock_irqrestore(&pgdat->lru_lock, flags);
>
> remap_page(head);
>
>