Commit 20b271df authored by Ira Weiny's avatar Ira Weiny Committed by Linus Torvalds
Browse files

arch/kmap: define kmap_atomic_prot() for all arch's 



To support kmap_atomic_prot(), all architectures need to support
protections passed to their kmap_atomic_high() function.  Pass protections
into kmap_atomic_high() and change the name to kmap_atomic_high_prot() to
match.

Then define kmap_atomic_prot() as a core function which calls
kmap_atomic_high_prot() when needed.

Finally, redefine kmap_atomic() as a wrapper of kmap_atomic_prot() with
the default kmap_prot exported by the architectures.

Signed-off-by: default avatarIra Weiny <ira.weiny@intel.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Cc: Al Viro <viro@zeniv.linux.org.uk>
Cc: Andy Lutomirski <luto@kernel.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Christian König <christian.koenig@amd.com>
Cc: Chris Zankel <chris@zankel.net>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Cc: Dan Williams <dan.j.williams@intel.com>
Cc: Dave Hansen <dave.hansen@linux.intel.com>
Cc: "David S. Miller" <davem@davemloft.net>
Cc: Helge Deller <deller@gmx.de>
Cc: "H. Peter Anvin" <hpa@zytor.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: "James E.J. Bottomley" <James.Bottomley@HansenPartnership.com>
Cc: Max Filippov <jcmvbkbc@gmail.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Thomas Bogendoerfer <tsbogend@alpha.franken.de>
Cc: Thomas Gleixner <tglx@linutronix.de>
Link: http://lkml.kernel.org/r/20200507150004.1423069-11-ira.weiny@intel.com


Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent d8c25836

arch/arc/mm/highmem.c

+3 −3
Original line number Diff line number Diff line
@@ -49,7 +49,7 @@ 
extern pte_t * pkmap_page_table;

static pte_t * fixmap_page_table;



void *kmap_atomic_high(struct page *page)

void *kmap_atomic_high_prot(struct page *page, pgprot_t prot)

{

	int idx, cpu_idx;

	unsigned long vaddr;
@@ -59,11 +59,11 @@ void *kmap_atomic_high(struct page *page) 
	vaddr = FIXMAP_ADDR(idx);



	set_pte_at(&init_mm, vaddr, fixmap_page_table + idx,

		   mk_pte(page, kmap_prot));

		   mk_pte(page, prot));



	return (void *)vaddr;

}

EXPORT_SYMBOL(kmap_atomic_high);

EXPORT_SYMBOL(kmap_atomic_high_prot);



void kunmap_atomic_high(void *kv)

{

arch/arm/mm/highmem.c

+3 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ static inline pte_t get_fixmap_pte(unsigned long vaddr) 
	return *ptep;

}



void *kmap_atomic_high(struct page *page)

void *kmap_atomic_high_prot(struct page *page, pgprot_t prot)

{

	unsigned int idx;

	unsigned long vaddr;
@@ -67,11 +67,11 @@ void *kmap_atomic_high(struct page *page) 
	 * in place, so the contained TLB flush ensures the TLB is updated

	 * with the new mapping.

	 */

	set_fixmap_pte(idx, mk_pte(page, kmap_prot));

	set_fixmap_pte(idx, mk_pte(page, prot));



	return (void *)vaddr;

}

EXPORT_SYMBOL(kmap_atomic_high);

EXPORT_SYMBOL(kmap_atomic_high_prot);



void kunmap_atomic_high(void *kvaddr)

{

arch/csky/mm/highmem.c

+3 −3
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ EXPORT_SYMBOL(kmap_flush_tlb); 


EXPORT_SYMBOL(kmap);



void *kmap_atomic_high(struct page *page)

void *kmap_atomic_high_prot(struct page *page, pgprot_t prot)

{

	unsigned long vaddr;

	int idx, type;
@@ -32,12 +32,12 @@ void *kmap_atomic_high(struct page *page) 
#ifdef CONFIG_DEBUG_HIGHMEM

	BUG_ON(!pte_none(*(kmap_pte - idx)));

#endif

	set_pte(kmap_pte-idx, mk_pte(page, kmap_prot));

	set_pte(kmap_pte-idx, mk_pte(page, prot));

	flush_tlb_one((unsigned long)vaddr);



	return (void *)vaddr;

}

EXPORT_SYMBOL(kmap_atomic_high);

EXPORT_SYMBOL(kmap_atomic_high_prot);



void kunmap_atomic_high(void *kvaddr)

{

arch/microblaze/include/asm/highmem.h

+0 −16
Original line number Diff line number Diff line
@@ -51,22 +51,6 @@ extern pte_t *pkmap_page_table; 
#define PKMAP_NR(virt)  ((virt - PKMAP_BASE) >> PAGE_SHIFT)

#define PKMAP_ADDR(nr)  (PKMAP_BASE + ((nr) << PAGE_SHIFT))



extern void *kmap_atomic_high_prot(struct page *page, pgprot_t prot);

static inline void *kmap_atomic_prot(struct page *page, pgprot_t prot)

{

	preempt_disable();

	pagefault_disable();

	if (!PageHighMem(page))

		return page_address(page);



	return kmap_atomic_high_prot(page, prot);

}



static inline void *kmap_atomic_high(struct page *page)

{

	return kmap_atomic_high_prot(page, kmap_prot);

}



#define flush_cache_kmaps()	{ flush_icache(); flush_dcache(); }



#endif /* __KERNEL__ */

arch/mips/mm/highmem.c

+3 −3
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ void kmap_flush_tlb(unsigned long addr) 
}

EXPORT_SYMBOL(kmap_flush_tlb);



void *kmap_atomic_high(struct page *page)

void *kmap_atomic_high_prot(struct page *page, pgprot_t prot)

{

	unsigned long vaddr;

	int idx, type;
@@ -29,12 +29,12 @@ void *kmap_atomic_high(struct page *page) 
#ifdef CONFIG_DEBUG_HIGHMEM

	BUG_ON(!pte_none(*(kmap_pte - idx)));

#endif

	set_pte(kmap_pte-idx, mk_pte(page, kmap_prot));

	set_pte(kmap_pte-idx, mk_pte(page, prot));

	local_flush_tlb_one((unsigned long)vaddr);



	return (void*) vaddr;

}

EXPORT_SYMBOL(kmap_atomic_high);

EXPORT_SYMBOL(kmap_atomic_high_prot);



void kunmap_atomic_high(void *kvaddr)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE