Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1441434

[PATCH RT 07/20] mm/zsmalloc: Use get/put_cpu_light in zs_map_object()/zs_unmap_object()

Show all headers | View raw

4.1.27-rt31-rc1 stable review patch.
If anyone has any objections, please let me know.

------------------

From: Mike Galbraith <umgwanakikbuti@gmail.com>

Otherwise, we get a ___might_sleep() splat.

Signed-off-by: Mike Galbraith <umgwanakikbuti@gmail.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Steven Rostedt <rostedt@goodmis.org>
---
 mm/zsmalloc.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c
index fb1ec10ce449..e819dffd142c 100644
--- a/mm/zsmalloc.c
+++ b/mm/zsmalloc.c
@@ -1289,7 +1289,7 @@ void *zs_map_object(struct zs_pool *pool, unsigned long handle,
 	class = pool->size_class[class_idx];
 	off = obj_idx_to_offset(page, obj_idx, class->size);
 
-	area = &get_cpu_var(zs_map_area);
+	area = per_cpu_ptr(&zs_map_area, get_cpu_light());
 	area->vm_mm = mm;
 	if (off + class->size <= PAGE_SIZE) {
 		/* this object is contained entirely within a page */
@@ -1342,7 +1342,7 @@ void zs_unmap_object(struct zs_pool *pool, unsigned long handle)
 
 		__zs_unmap_object(area, pages, off, class->size);
 	}
-	put_cpu_var(zs_map_area);
+	put_cpu_light();
 	unpin_tag(handle);
 }
 EXPORT_SYMBOL_GPL(zs_unmap_object);
-- 
2.8.1

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH RT 00/20] Linux 4.1.27-rt31-rc1 Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 16:30 +0200
  [PATCH RT 18/20] mm: perform lru_add_drain_all() remotely Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 16:30 +0200
  [PATCH RT 13/20] perf/x86/intel/rapl: Make PMU lock raw Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 16:30 +0200
  [PATCH RT 08/20] net: dev: always take qdiscs busylock in __dev_xmit_skb() Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 16:40 +0200
  [PATCH RT 19/20] trace: correct off by one while recording the trace-event Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 16:40 +0200
  [PATCH RT 09/20] drivers/block/zram: Replace bit spinlocks with rtmutex for -rt Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 16:40 +0200
  [PATCH RT 07/20] mm/zsmalloc: Use get/put_cpu_light in  zs_map_object()/zs_unmap_object() Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 16:40 +0200
  [PATCH RT 15/20] kernel/printk: Dont try to print from IRQ/NMI region Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 16:40 +0200
  [PATCH RT 03/20] ARM: at91: pm: move idle functions to pm.c Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 16:40 +0200
  [PATCH RT 04/20] ARM: at91: remove useless includes and function prototypes Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 16:40 +0200
  [PATCH RT 05/20] usb: gadget: atmel: access the PMC using regmap Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 16:40 +0200
  [PATCH RT 01/20] ARM: at91: pm: simply call at91_pm_init Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 16:40 +0200
  [PATCH RT 10/20] list_bl: fixup bogus lockdep warning Steven Rostedt <rostedt@goodmis.org> - 2016-07-12 16:40 +0200
  Linux 4.1.27-rt31-rc2 Steven Rostedt <rostedt@goodmis.org> - 2016-07-13 01:20 +0200

csiph-web