119 lines
3.8 KiB
Diff
119 lines
3.8 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.14/older/patches-4.14.1-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>
|
|
[bwh: Adjust context after 4.14.4]
|
|
---
|
|
mm/memcontrol.c | 24 ++++++++++++++++--------
|
|
1 file changed, 16 insertions(+), 8 deletions(-)
|
|
|
|
--- a/mm/memcontrol.c
|
|
+++ b/mm/memcontrol.c
|
|
@@ -69,6 +69,7 @@
|
|
#include <net/sock.h>
|
|
#include <net/ip.h>
|
|
#include "slab.h"
|
|
+#include <linux/locallock.h>
|
|
|
|
#include <linux/uaccess.h>
|
|
|
|
@@ -94,6 +95,8 @@ int do_swap_account __read_mostly;
|
|
#define do_swap_account 0
|
|
#endif
|
|
|
|
+static DEFINE_LOCAL_IRQ_LOCK(event_lock);
|
|
+
|
|
/* Whether legacy memory+swap accounting is active */
|
|
static bool do_memsw_account(void)
|
|
{
|
|
@@ -4621,12 +4624,12 @@ static int mem_cgroup_move_account(struc
|
|
|
|
ret = 0;
|
|
|
|
- local_irq_disable();
|
|
+ local_lock_irq(event_lock);
|
|
mem_cgroup_charge_statistics(to, page, compound, nr_pages);
|
|
memcg_check_events(to, page);
|
|
mem_cgroup_charge_statistics(from, page, compound, -nr_pages);
|
|
memcg_check_events(from, page);
|
|
- local_irq_enable();
|
|
+ local_unlock_irq(event_lock);
|
|
out_unlock:
|
|
unlock_page(page);
|
|
out:
|
|
@@ -5569,10 +5572,10 @@ void mem_cgroup_commit_charge(struct pag
|
|
|
|
commit_charge(page, memcg, lrucare);
|
|
|
|
- local_irq_disable();
|
|
+ local_lock_irq(event_lock);
|
|
mem_cgroup_charge_statistics(memcg, page, compound, nr_pages);
|
|
memcg_check_events(memcg, page);
|
|
- local_irq_enable();
|
|
+ local_unlock_irq(event_lock);
|
|
|
|
if (do_memsw_account() && PageSwapCache(page)) {
|
|
swp_entry_t entry = { .val = page_private(page) };
|
|
@@ -5641,7 +5644,7 @@ static void uncharge_batch(const struct
|
|
memcg_oom_recover(ug->memcg);
|
|
}
|
|
|
|
- local_irq_save(flags);
|
|
+ local_lock_irqsave(event_lock, flags);
|
|
__this_cpu_sub(ug->memcg->stat->count[MEMCG_RSS], ug->nr_anon);
|
|
__this_cpu_sub(ug->memcg->stat->count[MEMCG_CACHE], ug->nr_file);
|
|
__this_cpu_sub(ug->memcg->stat->count[MEMCG_RSS_HUGE], ug->nr_huge);
|
|
@@ -5649,7 +5652,7 @@ static void uncharge_batch(const struct
|
|
__this_cpu_add(ug->memcg->stat->events[PGPGOUT], ug->pgpgout);
|
|
__this_cpu_add(ug->memcg->stat->nr_page_events, nr_pages);
|
|
memcg_check_events(ug->memcg, ug->dummy_page);
|
|
- local_irq_restore(flags);
|
|
+ local_unlock_irqrestore(event_lock, flags);
|
|
|
|
if (!mem_cgroup_is_root(ug->memcg))
|
|
css_put_many(&ug->memcg->css, nr_pages);
|
|
@@ -5812,10 +5815,10 @@ void mem_cgroup_migrate(struct page *old
|
|
|
|
commit_charge(newpage, memcg, false);
|
|
|
|
- local_irq_save(flags);
|
|
+ local_lock_irqsave(event_lock, flags);
|
|
mem_cgroup_charge_statistics(memcg, newpage, compound, nr_pages);
|
|
memcg_check_events(memcg, newpage);
|
|
- local_irq_restore(flags);
|
|
+ local_unlock_irqrestore(event_lock, flags);
|
|
}
|
|
|
|
DEFINE_STATIC_KEY_FALSE(memcg_sockets_enabled_key);
|
|
@@ -5993,6 +5996,7 @@ void mem_cgroup_swapout(struct page *pag
|
|
struct mem_cgroup *memcg, *swap_memcg;
|
|
unsigned int nr_entries;
|
|
unsigned short oldid;
|
|
+ unsigned long flags;
|
|
|
|
VM_BUG_ON_PAGE(PageLRU(page), page);
|
|
VM_BUG_ON_PAGE(page_count(page), page);
|
|
@@ -6038,13 +6042,17 @@ 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, PageTransHuge(page),
|
|
-nr_entries);
|
|
memcg_check_events(memcg, page);
|
|
|
|
if (!mem_cgroup_is_root(memcg))
|
|
css_put_many(&memcg->css, nr_entries);
|
|
+ local_unlock_irqrestore(event_lock, flags);
|
|
}
|
|
|
|
/**
|