141 lines
4.4 KiB
Diff
141 lines
4.4 KiB
Diff
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
Subject: mm/memcontrol: Replace local_irq_disable with local locks
|
|
Date: Wed, 28 Jan 2015 17:14:16 +0100
|
|
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.4/patches-4.4-rt3.tar.xz
|
|
|
|
There are a few local_irq_disable() which then take sleeping locks. This
|
|
patch converts them local locks.
|
|
|
|
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
|
|
---
|
|
include/linux/swap.h | 1 +
|
|
mm/compaction.c | 6 ++++--
|
|
mm/memcontrol.c | 20 ++++++++++++++------
|
|
mm/swap.c | 2 +-
|
|
4 files changed, 20 insertions(+), 9 deletions(-)
|
|
|
|
--- a/include/linux/swap.h
|
|
+++ b/include/linux/swap.h
|
|
@@ -298,6 +298,7 @@ extern unsigned long nr_free_pagecache_p
|
|
|
|
|
|
/* linux/mm/swap.c */
|
|
+DECLARE_LOCAL_IRQ_LOCK(swapvec_lock);
|
|
extern void lru_cache_add(struct page *);
|
|
extern void lru_cache_add_anon(struct page *page);
|
|
extern void lru_cache_add_file(struct page *page);
|
|
--- a/mm/compaction.c
|
|
+++ b/mm/compaction.c
|
|
@@ -1443,10 +1443,12 @@ static int compact_zone(struct zone *zon
|
|
cc->migrate_pfn & ~((1UL << cc->order) - 1);
|
|
|
|
if (cc->last_migrated_pfn < current_block_start) {
|
|
- cpu = get_cpu();
|
|
+ cpu = get_cpu_light();
|
|
+ local_lock_irq(swapvec_lock);
|
|
lru_add_drain_cpu(cpu);
|
|
+ local_unlock_irq(swapvec_lock);
|
|
drain_local_pages(zone);
|
|
- put_cpu();
|
|
+ put_cpu_light();
|
|
/* No more flushing until we migrate again */
|
|
cc->last_migrated_pfn = 0;
|
|
}
|
|
--- a/mm/memcontrol.c
|
|
+++ b/mm/memcontrol.c
|
|
@@ -67,6 +67,8 @@
|
|
#include <net/sock.h>
|
|
#include <net/ip.h>
|
|
#include <net/tcp_memcontrol.h>
|
|
+#include <linux/locallock.h>
|
|
+
|
|
#include "slab.h"
|
|
|
|
#include <asm/uaccess.h>
|
|
@@ -87,6 +89,7 @@ int do_swap_account __read_mostly;
|
|
#define do_swap_account 0
|
|
#endif
|
|
|
|
+static DEFINE_LOCAL_IRQ_LOCK(event_lock);
|
|
static const char * const mem_cgroup_stat_names[] = {
|
|
"cache",
|
|
"rss",
|
|
@@ -4615,12 +4618,12 @@ static int mem_cgroup_move_account(struc
|
|
|
|
ret = 0;
|
|
|
|
- local_irq_disable();
|
|
+ local_lock_irq(event_lock);
|
|
mem_cgroup_charge_statistics(to, page, nr_pages);
|
|
memcg_check_events(to, page);
|
|
mem_cgroup_charge_statistics(from, page, -nr_pages);
|
|
memcg_check_events(from, page);
|
|
- local_irq_enable();
|
|
+ local_unlock_irq(event_lock);
|
|
out_unlock:
|
|
unlock_page(page);
|
|
out:
|
|
@@ -5373,10 +5376,10 @@ void mem_cgroup_commit_charge(struct pag
|
|
VM_BUG_ON_PAGE(!PageTransHuge(page), page);
|
|
}
|
|
|
|
- local_irq_disable();
|
|
+ local_lock_irq(event_lock);
|
|
mem_cgroup_charge_statistics(memcg, page, nr_pages);
|
|
memcg_check_events(memcg, page);
|
|
- local_irq_enable();
|
|
+ local_unlock_irq(event_lock);
|
|
|
|
if (do_swap_account && PageSwapCache(page)) {
|
|
swp_entry_t entry = { .val = page_private(page) };
|
|
@@ -5432,14 +5435,14 @@ static void uncharge_batch(struct mem_cg
|
|
memcg_oom_recover(memcg);
|
|
}
|
|
|
|
- local_irq_save(flags);
|
|
+ local_lock_irqsave(event_lock, flags);
|
|
__this_cpu_sub(memcg->stat->count[MEM_CGROUP_STAT_RSS], nr_anon);
|
|
__this_cpu_sub(memcg->stat->count[MEM_CGROUP_STAT_CACHE], nr_file);
|
|
__this_cpu_sub(memcg->stat->count[MEM_CGROUP_STAT_RSS_HUGE], nr_huge);
|
|
__this_cpu_add(memcg->stat->events[MEM_CGROUP_EVENTS_PGPGOUT], pgpgout);
|
|
__this_cpu_add(memcg->stat->nr_page_events, nr_pages);
|
|
memcg_check_events(memcg, dummy_page);
|
|
- local_irq_restore(flags);
|
|
+ local_unlock_irqrestore(event_lock, flags);
|
|
|
|
if (!mem_cgroup_is_root(memcg))
|
|
css_put_many(&memcg->css, nr_pages);
|
|
@@ -5631,6 +5634,7 @@ void mem_cgroup_swapout(struct page *pag
|
|
{
|
|
struct mem_cgroup *memcg;
|
|
unsigned short oldid;
|
|
+ unsigned long flags;
|
|
|
|
VM_BUG_ON_PAGE(PageLRU(page), page);
|
|
VM_BUG_ON_PAGE(page_count(page), page);
|
|
@@ -5659,9 +5663,13 @@ void mem_cgroup_swapout(struct page *pag
|
|
* important here to have the interrupts disabled because it is the
|
|
* only synchronisation we have for udpating the per-CPU variables.
|
|
*/
|
|
+ local_lock_irqsave(event_lock, flags);
|
|
+#ifndef CONFIG_PREEMPT_RT_BASE
|
|
VM_BUG_ON(!irqs_disabled());
|
|
+#endif
|
|
mem_cgroup_charge_statistics(memcg, page, -1);
|
|
memcg_check_events(memcg, page);
|
|
+ local_unlock_irqrestore(event_lock, flags);
|
|
}
|
|
|
|
/**
|
|
--- a/mm/swap.c
|
|
+++ b/mm/swap.c
|
|
@@ -48,7 +48,7 @@ static DEFINE_PER_CPU(struct pagevec, lr
|
|
static DEFINE_PER_CPU(struct pagevec, lru_deactivate_file_pvecs);
|
|
|
|
static DEFINE_LOCAL_IRQ_LOCK(rotate_lock);
|
|
-static DEFINE_LOCAL_IRQ_LOCK(swapvec_lock);
|
|
+DEFINE_LOCAL_IRQ_LOCK(swapvec_lock);
|
|
|
|
/*
|
|
* This path almost never happens for VM activity - pages are normally
|