From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755029AbcGLQsY (ORCPT ); Tue, 12 Jul 2016 12:48:24 -0400 Received: from mail.kernel.org ([198.145.29.136]:42704 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750922AbcGLQsV (ORCPT ); Tue, 12 Jul 2016 12:48:21 -0400 Message-Id: <20160712164817.890894808@goodmis.org> User-Agent: quilt/0.61-1 Date: Tue, 12 Jul 2016 12:48:01 -0400 From: Steven Rostedt To: linux-kernel@vger.kernel.org, linux-rt-users Cc: Thomas Gleixner , Carsten Emde , Sebastian Andrzej Siewior , John Kacur , Paul Gortmaker , Mike Galbraith Subject: [PATCH RT 02/14] mm/zsmalloc: Use get/put_cpu_light in zs_map_object()/zs_unmap_object() References: <20160712164759.154249453@goodmis.org> MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Content-Disposition: inline; filename=0002-mm-zsmalloc-Use-get-put_cpu_light-in-zs_map_object-z.patch Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 3.14.72-rt76-rc1 stable review patch. If anyone has any objections, please let me know. ------------------ From: Mike Galbraith Otherwise, we get a ___might_sleep() splat. Signed-off-by: Mike Galbraith Signed-off-by: Sebastian Andrzej Siewior Signed-off-by: Steven Rostedt --- mm/zsmalloc.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/mm/zsmalloc.c b/mm/zsmalloc.c index c03ca5e9fe15..df9c7a189118 100644 --- a/mm/zsmalloc.c +++ b/mm/zsmalloc.c @@ -1037,7 +1037,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 */ @@ -1083,7 +1083,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(); } EXPORT_SYMBOL_GPL(zs_unmap_object); -- 2.8.1