Commit c4c6044d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm 

Pull ARM updates from Russell King:

 - add missing neon instructions for the neon support hook

 - arrange for davinci to select PINCTRL

 - try VMA lock-base page fault handling first

 - use memblock_alloc_try_nid_raw() for kasan shadow page

 - dma: use kvzalloc() rather than kzalloc()/vzalloc()

* tag 'for-linus' of git://git.armlinux.org.uk/~rmk/linux-arm:
  ARM: 9331/1: ARM/dma-mapping: replace kzalloc() and vzalloc() with kvzalloc()
  ARM: 9329/1: kasan: Use memblock_alloc_try_nid_raw for shadow page
  ARM: 9328/1: mm: try VMA lock-based page fault handling first
  ARM: 9330/1: davinci: also select PINCTRL
  ARM: 9327/1: vfp: Add missing VFP instructions to neon_support_hook
parents 284a4dde 8790fade

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ config ARM 
	select ARCH_OPTIONAL_KERNEL_RWX_DEFAULT if CPU_V7

	select ARCH_SUPPORTS_ATOMIC_RMW

	select ARCH_SUPPORTS_HUGETLBFS if ARM_LPAE

	select ARCH_SUPPORTS_PER_VMA_LOCK

	select ARCH_USE_BUILTIN_BSWAP

	select ARCH_USE_CMPXCHG_LOCKREF

	select ARCH_USE_MEMTEST

arch/arm/mach-davinci/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ menuconfig ARCH_DAVINCI 
	select PM_GENERIC_DOMAINS_OF if PM && OF

	select REGMAP_MMIO

	select RESET_CONTROLLER

	select PINCTRL

	select PINCTRL_SINGLE



if ARCH_DAVINCI

arch/arm/mm/dma-mapping.c

+1 −4
Original line number Diff line number Diff line
@@ -859,10 +859,7 @@ static struct page **__iommu_alloc_buffer(struct device *dev, size_t size, 
	int i = 0;

	int order_idx = 0;



	if (array_size <= PAGE_SIZE)

		pages = kzalloc(array_size, GFP_KERNEL);

	else

		pages = vzalloc(array_size);

	pages = kvzalloc(array_size, GFP_KERNEL);

	if (!pages)

		return NULL;

arch/arm/mm/fault.c

+30 −0
Original line number Diff line number Diff line
@@ -278,6 +278,35 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) 


	perf_sw_event(PERF_COUNT_SW_PAGE_FAULTS, 1, regs, addr);



	if (!(flags & FAULT_FLAG_USER))

		goto lock_mmap;



	vma = lock_vma_under_rcu(mm, addr);

	if (!vma)

		goto lock_mmap;



	if (!(vma->vm_flags & vm_flags)) {

		vma_end_read(vma);

		goto lock_mmap;

	}

	fault = handle_mm_fault(vma, addr, flags | FAULT_FLAG_VMA_LOCK, regs);

	if (!(fault & (VM_FAULT_RETRY | VM_FAULT_COMPLETED)))

		vma_end_read(vma);



	if (!(fault & VM_FAULT_RETRY)) {

		count_vm_vma_lock_event(VMA_LOCK_SUCCESS);

		goto done;

	}

	count_vm_vma_lock_event(VMA_LOCK_RETRY);



	/* Quick path to respond to signals */

	if (fault_signal_pending(fault, regs)) {

		if (!user_mode(regs))

			goto no_context;

		return 0;

	}

lock_mmap:



retry:

	vma = lock_mm_and_find_vma(mm, addr, regs);

	if (unlikely(!vma)) {
@@ -316,6 +345,7 @@ do_page_fault(unsigned long addr, unsigned int fsr, struct pt_regs *regs) 
	}



	mmap_read_unlock(mm);

done:



	/*

	 * Handle the "normal" case first - VM_FAULT_MAJOR

arch/arm/mm/kasan_init.c

+7 −1
Original line number Diff line number Diff line
@@ -28,6 +28,12 @@ static pgd_t tmp_pgd_table[PTRS_PER_PGD] __initdata __aligned(PGD_SIZE); 


pmd_t tmp_pmd_table[PTRS_PER_PMD] __page_aligned_bss;



static __init void *kasan_alloc_block_raw(size_t size)

{

	return memblock_alloc_try_nid_raw(size, size, __pa(MAX_DMA_ADDRESS),

				      MEMBLOCK_ALLOC_NOLEAKTRACE, NUMA_NO_NODE);

}



static __init void *kasan_alloc_block(size_t size)

{

	return memblock_alloc_try_nid(size, size, __pa(MAX_DMA_ADDRESS),
@@ -50,7 +56,7 @@ static void __init kasan_pte_populate(pmd_t *pmdp, unsigned long addr, 
			if (!pte_none(READ_ONCE(*ptep)))

				continue;



			p = kasan_alloc_block(PAGE_SIZE);

			p = kasan_alloc_block_raw(PAGE_SIZE);

			if (!p) {

				panic("%s failed to allocate shadow page for address 0x%lx\n",

				      __func__, addr);