mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-09-29 22:02:02 +00:00
Code Issues Releases Wiki Activity

arch/kmap: remove BUG_ON()

Browse source 
Patch series "Remove duplicated kmap code", v3.

The kmap infrastructure has been copied almost verbatim to every
architecture.  This series consolidates obvious duplicated code by
defining core functions which call into the architectures only when
needed.

Some of the k[un]map_atomic() implementations have some similarities but
the similarities were not sufficient to warrant further changes.

In addition we remove a duplicate implementation of kmap() in DRM.

This patch (of 15):

Replace the use of BUG_ON(in_interrupt()) in the kmap() and kunmap() in
favor of might_sleep().

Besides the benefits of might_sleep(), this normalizes the implementations
such that they can be made generic in subsequent patches.

Signed-off-by: Ira Weiny <ira.weiny@intel.com>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Reviewed-by: Dan Williams <dan.j.williams@intel.com>
Reviewed-by: Christoph Hellwig <hch@lst.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Christian König <christian.koenig@amd.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Helge Deller <deller@gmx.de>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Paul Mackerras <paulus@samba.org>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Borislav Petkov <bp@alien8.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Chris Zankel <chris@zankel.net>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Link: http://lkml.kernel.org/r/20200507150004.1423069-1-ira.weiny@intel.com
Link: http://lkml.kernel.org/r/20200507150004.1423069-2-ira.weiny@intel.com
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Ira Weiny 2020-06-04 16:47:22 -07:00 committed by Linus Torvalds
parent 73221d8887
commit 01c4b788e0
11 changed files with 13 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
arch/arc/include/asm/highmem.h
View file

@ -45,7 +45,7 @@ static inline void flush_cache_kmaps(void)
static inline void kunmap(struct page *page)
{
BUG_ON(in_interrupt());
might_sleep();
if (!PageHighMem(page))
return;
kunmap_high(page);

2
arch/arc/mm/highmem.c
View file

@ -51,7 +51,7 @@ static pte_t * fixmap_page_table;
void *kmap(struct page *page)
{
BUG_ON(in_interrupt());
might_sleep();
if (!PageHighMem(page))
return page_address(page);

2
arch/arm/mm/highmem.c
View file

@ -42,7 +42,7 @@ EXPORT_SYMBOL(kmap);
void kunmap(struct page *page)
{
BUG_ON(in_interrupt());
might_sleep();
if (!PageHighMem(page))
return;
kunmap_high(page);

2
arch/csky/mm/highmem.c
View file

@ -29,7 +29,7 @@ EXPORT_SYMBOL(kmap);
void kunmap(struct page *page)
{
BUG_ON(in_interrupt());
might_sleep();
if (!PageHighMem(page))
return;
kunmap_high(page);

2
arch/microblaze/include/asm/highmem.h
View file

@ -66,7 +66,7 @@ static inline void *kmap(struct page *page)
static inline void kunmap(struct page *page)
{
BUG_ON(in_interrupt());
might_sleep();
if (!PageHighMem(page))
return;
kunmap_high(page);

2
arch/mips/mm/highmem.c
View file

@ -28,7 +28,7 @@ EXPORT_SYMBOL(kmap);
void kunmap(struct page *page)
{
BUG_ON(in_interrupt());
might_sleep();
if (!PageHighMem(page))
return;
kunmap_high(page);

2
arch/nds32/mm/highmem.c
View file

@ -24,7 +24,7 @@ EXPORT_SYMBOL(kmap);
void kunmap(struct page *page)
{
BUG_ON(in_interrupt());
might_sleep();
if (!PageHighMem(page))
return;
kunmap_high(page);

2
arch/powerpc/include/asm/highmem.h
View file

@ -74,7 +74,7 @@ static inline void *kmap(struct page *page)
static inline void kunmap(struct page *page)
{
BUG_ON(in_interrupt());
might_sleep();
if (!PageHighMem(page))
return;
kunmap_high(page);

4
arch/sparc/include/asm/highmem.h
View file

@ -55,7 +55,7 @@ void kunmap_high(struct page *page);
static inline void *kmap(struct page *page)
{
BUG_ON(in_interrupt());
might_sleep();
if (!PageHighMem(page))
return page_address(page);
return kmap_high(page);
@ -63,7 +63,7 @@ static inline void *kmap(struct page *page)
static inline void kunmap(struct page *page)
{
BUG_ON(in_interrupt());
might_sleep();
if (!PageHighMem(page))
return;
kunmap_high(page);

3
arch/x86/mm/highmem_32.c
View file

@ -15,8 +15,7 @@ EXPORT_SYMBOL(kmap);
void kunmap(struct page *page)
{
if (in_interrupt())
BUG();
might_sleep();
if (!PageHighMem(page))
return;
kunmap_high(page);

4
arch/xtensa/include/asm/highmem.h
View file

@ -73,7 +73,7 @@ static inline void *kmap(struct page *page)
*/
BUILD_BUG_ON(PKMAP_BASE <
TLBTEMP_BASE_1 + TLBTEMP_SIZE);
BUG_ON(in_interrupt());
might_sleep();
if (!PageHighMem(page))
return page_address(page);
return kmap_high(page);
@ -81,7 +81,7 @@ static inline void *kmap(struct page *page)
static inline void kunmap(struct page *page)
{
BUG_ON(in_interrupt());
might_sleep();
if (!PageHighMem(page))
return;
kunmap_high(page);