From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:35710 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758920AbcDISae (ORCPT ); Sat, 9 Apr 2016 14:30:34 -0400 Subject: Patch "sched/preempt, sh: kmap_coherent relies on disabled preemption" has been added to the 4.4-stable tree To: dahi@linux.vnet.ibm.com, dalias@libc.org, gregkh@linuxfoundation.org, hans.verkuil@cisco.com, hverkuil@xs4all.nl Cc: , From: Date: Sat, 09 Apr 2016 11:30:33 -0700 Message-ID: <1460226633184218@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled sched/preempt, sh: kmap_coherent relies on disabled preemption to the 4.4-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: sched-preempt-sh-kmap_coherent-relies-on-disabled-preemption.patch and it can be found in the queue-4.4 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From b15d53d009558d14c4f394a6d1fa2039c7f45c43 Mon Sep 17 00:00:00 2001 From: David Hildenbrand Date: Mon, 29 Feb 2016 09:19:24 +0100 Subject: sched/preempt, sh: kmap_coherent relies on disabled preemption From: David Hildenbrand commit b15d53d009558d14c4f394a6d1fa2039c7f45c43 upstream. kmap_coherent needs disabled preemption to not schedule in the critical section, just like kmap_coherent on mips and kmap_atomic in general. Fixes: 8222dbe21e79 "sched/preempt, mm/fault: Decouple preemption from the page fault logic" Reported-by: Hans Verkuil Signed-off-by: David Hildenbrand Tested-by: Hans Verkuil Signed-off-by: Rich Felker Signed-off-by: Greg Kroah-Hartman --- arch/sh/mm/kmap.c | 2 ++ 1 file changed, 2 insertions(+) --- a/arch/sh/mm/kmap.c +++ b/arch/sh/mm/kmap.c @@ -36,6 +36,7 @@ void *kmap_coherent(struct page *page, u BUG_ON(!test_bit(PG_dcache_clean, &page->flags)); + preempt_disable(); pagefault_disable(); idx = FIX_CMAP_END - @@ -64,4 +65,5 @@ void kunmap_coherent(void *kvaddr) } pagefault_enable(); + preempt_enable(); } Patches currently in stable-queue which might be from dahi@linux.vnet.ibm.com are queue-4.4/sched-preempt-sh-kmap_coherent-relies-on-disabled-preemption.patch