diff options
| author | Peter Zijlstra <peterz@infradead.org> | 2011-07-28 08:43:51 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2014-05-14 18:38:43 (GMT) |
| commit | ff45b3aafef7c71aad0bb7663ba36b8aa67ba9d8 (patch) | |
| tree | 5bddc08f04a0627fb59c741b11873a315b89f8d1 /mm | |
| parent | 9d2f60c44d79b680124e4c35a14d07051b50d2d4 (diff) | |
| download | linux-fsl-qoriq-ff45b3aafef7c71aad0bb7663ba36b8aa67ba9d8.tar.xz | |
mm, rt: kmap_atomic scheduling
In fact, with migrate_disable() existing one could play games with
kmap_atomic. You could save/restore the kmap_atomic slots on context
switch (if there are any in use of course), this should be esp easy now
that we have a kmap_atomic stack.
Something like the below.. it wants replacing all the preempt_disable()
stuff with pagefault_disable() && migrate_disable() of course, but then
you can flip kmaps around like below.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
[dvhart@linux.intel.com: build fix]
Link: http://lkml.kernel.org/r/1311842631.5890.208.camel@twins
[tglx@linutronix.de: Get rid of the per cpu variable and store the idx
and the pte content right away in the task struct.
Shortens the context switch code. ]
Diffstat (limited to 'mm')
| -rw-r--r-- | mm/highmem.c | 6 | ||||
| -rw-r--r-- | mm/memory.c | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/mm/highmem.c b/mm/highmem.c index b32b70c..b1c7d43 100644 --- a/mm/highmem.c +++ b/mm/highmem.c @@ -29,10 +29,11 @@ #include <linux/kgdb.h> #include <asm/tlbflush.h> - +#ifndef CONFIG_PREEMPT_RT_FULL #if defined(CONFIG_HIGHMEM) || defined(CONFIG_X86_32) DEFINE_PER_CPU(int, __kmap_atomic_idx); #endif +#endif /* * Virtual_count is not a pure "count". @@ -47,8 +48,9 @@ DEFINE_PER_CPU(int, __kmap_atomic_idx); unsigned long totalhigh_pages __read_mostly; EXPORT_SYMBOL(totalhigh_pages); - +#ifndef CONFIG_PREEMPT_RT_FULL EXPORT_PER_CPU_SYMBOL(__kmap_atomic_idx); +#endif unsigned int nr_free_highpages (void) { diff --git a/mm/memory.c b/mm/memory.c index 5771e09..0dcdc84 100644 --- a/mm/memory.c +++ b/mm/memory.c @@ -3745,6 +3745,7 @@ unlock: #ifdef CONFIG_PREEMPT_RT_FULL void pagefault_disable(void) { + migrate_disable(); current->pagefault_disabled++; /* * make sure to have issued the store before a pagefault @@ -3762,6 +3763,7 @@ void pagefault_enable(void) */ barrier(); current->pagefault_disabled--; + migrate_enable(); } EXPORT_SYMBOL(pagefault_enable); #endif |