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

arch/kmap: don't hard code kmap_prot values 



To support kmap_atomic_prot() on all architectures each arch must support
protections passed in to them.

Change csky, mips, nds32 and xtensa to use their global constant kmap_prot
rather than a hard coded value which was equal.

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-10-ira.weiny@intel.com


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

arch/csky/mm/highmem.c

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ 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, PAGE_KERNEL));

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

	flush_tlb_one((unsigned long)vaddr);



	return (void *)vaddr;

arch/mips/mm/highmem.c

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 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, PAGE_KERNEL));

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

	local_flush_tlb_one((unsigned long)vaddr);



	return (void*) vaddr;

arch/nds32/mm/highmem.c

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ void *kmap_atomic_high(struct page *page) 


	idx = type + KM_TYPE_NR * smp_processor_id();

	vaddr = __fix_to_virt(FIX_KMAP_BEGIN + idx);

	pte = (page_to_pfn(page) << PAGE_SHIFT) | (PAGE_KERNEL);

	pte = (page_to_pfn(page) << PAGE_SHIFT) | (kmap_prot);

	ptep = pte_offset_kernel(pmd_off_k(vaddr), vaddr);

	set_pte(ptep, pte);

arch/xtensa/mm/highmem.c

+1 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ 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, PAGE_KERNEL_EXEC));

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



	return (void *)vaddr;

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE