Commit 97f31b31 authored by Ding Tianhong's avatar Ding Tianhong Committed by Yang Yingliang
Browse files

arm64/ascend: Enable DvPP mmap features for Ascend Platform 



ascend inclusion
category: feature
bugzilla: NA
CVE: NA

-------------------------------------------------

The DvPP means Davinci Video Pre-Processor, add new config
ASCEND_FEATURES and DVPP_MMAP to enable the DvPP features
for Ascend platform.

The DvPP could only use a limit range of virtual address, just like the
Ascend310/910 could only use the 4 GB range of virtual address, so add
a new mmap flag which is named MAP_DVPP to use the DvPP processor by
mmap syscall, the new flag is only valid for Ascend platform.

You should alloc the memory for dvpp like this:

addr = mmap(NULL, length, PROT_READ, MAP_ANONYMOUS | MAP_DVPP, -1, 0);

Signed-off-by: default avatarDing Tianhong <dingtianhong@huawei.com>
Reviewed-by: default avatarHanjun Guo <guohanjun@huawei.com>
Signed-off-by: default avatarYang Yingliang <yangyingliang@huawei.com>
parent 6ed1233d

arch/arm64/Kconfig

+29 −0
Original line number Diff line number Diff line
@@ -1308,6 +1308,35 @@ config RANDOMIZE_MODULE_REGION_FULL 
	  a limited range that contains the [_stext, _etext] interval of the

	  core kernel, so branch relocations are always in range.



menuconfig ASCEND_FEATURES

	bool "Support Ascend Features"

	depends on ARM64

	help

	  The Ascend chip use the Hisilicon DaVinci architecture, and mainly

	  focus on AI and machine leanring area, contains many external features.



	  Enable this config to enable selective list of these features.



	  If unsure, say Y



if ASCEND_FEATURES



config ASCEND_DVPP_MMAP

	bool "Enable support for the DvPP mmap"

	default y

	help

	  The DvPP means Davinci Video Pre-Processor, are mainly consist of VDEC

	  (Video Decode), VENC(Video Encode), JPEG D/E (Decode/Encode), PNGD

	  (PNG Decode) and VPC (Video Process) processors.



	  The DvPP could only use a limit range of virtual address, just like the

	  Ascend310/910 could only use the limit range of virtual address (default

	  4 GB), so add a new mmap flag which is named MAP_DVPP to allocate the

	  special memory for DvPP processor, the new flag is only valid for Ascend

	  platform.



endif



endmenu



menu "Boot options"

arch/arm64/mm/mmap.c

+4 −0
Original line number Diff line number Diff line
@@ -103,6 +103,10 @@ void arch_pick_mmap_layout(struct mm_struct *mm, struct rlimit *rlim_stack) 
		mm->get_unmapped_area = arch_get_unmapped_area;

	} else {

		mm->mmap_base = mmap_base(random_factor, rlim_stack);



		if (enable_map_dvpp && dvpp_mmap_zone(mm->mmap_base))

			mm->mmap_base = DVPP_MMAP_BASE;



		mm->get_unmapped_area = arch_get_unmapped_area_topdown;

	}

}

fs/hugetlbfs/inode.c

+8 −0
Original line number Diff line number Diff line
@@ -215,6 +215,10 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, 


	if (addr) {

		addr = ALIGN(addr, huge_page_size(h));



		if (dvpp_mmap_check(addr, len, flags))

			return -ENOMEM;



		vma = find_vma(mm, addr);

		if (TASK_SIZE - len >= addr &&

		    (!vma || addr + len <= vm_start_gap(vma)))
@@ -227,6 +231,10 @@ hugetlb_get_unmapped_area(struct file *file, unsigned long addr, 
	info.high_limit = TASK_SIZE;

	info.align_mask = PAGE_MASK & ~huge_page_mask(h);

	info.align_offset = 0;



	if (enable_map_dvpp)

		dvpp_mmap_get_area(info);



	return vm_unmapped_area(&info);

}

#endif

include/linux/mman.h

+42 −0
Original line number Diff line number Diff line
@@ -8,6 +8,48 @@ 
#include <linux/atomic.h>

#include <uapi/linux/mman.h>





/*

 * Enable MAP_32BIT for Ascend Platform

 */

#ifdef CONFIG_ASCEND_DVPP_MMAP



#define MAP_DVPP	0x200



#define DVPP_MMAP_BASE	(TASK_SIZE - 0x100000000UL)

#define DVPP_MMAP_SIZE	(0x100000000UL)



#define dvpp_mmap_check(addr, len, flags) \

	(((enable_map_dvpp) && (flags & MAP_DVPP) && \

	(addr < DVPP_MMAP_BASE + DVPP_MMAP_SIZE) && \

	(addr > DVPP_MMAP_BASE)) ? -EINVAL : 0)



#define dvpp_mmap_get_area(info) \

({ \

	(info.low_limit = DVPP_MMAP_BASE); \

	(info.high_limit = DVPP_MMAP_BASE + DVPP_MMAP_SIZE); \

})



#define dvpp_mmap_zone(addr) ((addr > DVPP_MMAP_BASE) ? 1 : 0)



#else



#define MAP_DVPP (0)



#define dvpp_mmap_check(addr, len, flags) (0)



#define dvpp_mmap_get_area(info)  do { } while (0)



#define dvpp_mmap_zone(addr) (0)



#define DVPP_MMAP_BASE (0)



#define DVPP_MMAP_SIZE (0)



#endif



extern int enable_map_dvpp;



/*

 * Arrange for legacy / undefined architecture specific flags to be

 * ignored by mmap handling code.

mm/mmap.c

+40 −0
Original line number Diff line number Diff line
@@ -2065,6 +2065,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, 


	if (addr) {

		addr = PAGE_ALIGN(addr);



		if (dvpp_mmap_check(addr, len, flags))

			return -ENOMEM;



		vma = find_vma_prev(mm, addr, &prev);

		if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&

		    (!vma || addr + len <= vm_start_gap(vma)) &&
@@ -2077,6 +2081,10 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr, 
	info.low_limit = mm->mmap_base;

	info.high_limit = TASK_SIZE;

	info.align_mask = 0;



	if (enable_map_dvpp)

		dvpp_mmap_get_area(info);



	return vm_unmapped_area(&info);

}

#endif
@@ -2106,6 +2114,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, 
	/* requesting a specific address */

	if (addr) {

		addr = PAGE_ALIGN(addr);



		if (dvpp_mmap_check(addr, len, flags))

			return -ENOMEM;



		vma = find_vma_prev(mm, addr, &prev);

		if (TASK_SIZE - len >= addr && addr >= mmap_min_addr &&

				(!vma || addr + len <= vm_start_gap(vma)) &&
@@ -2118,6 +2130,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, 
	info.low_limit = max(PAGE_SIZE, mmap_min_addr);

	info.high_limit = mm->mmap_base;

	info.align_mask = 0;



	if (enable_map_dvpp)

		dvpp_mmap_get_area(info);



	addr = vm_unmapped_area(&info);



	/*
@@ -2131,6 +2147,10 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0, 
		info.flags = 0;

		info.low_limit = TASK_UNMAPPED_BASE;

		info.high_limit = TASK_SIZE;



		if (enable_map_dvpp)

			dvpp_mmap_get_area(info);



		addr = vm_unmapped_area(&info);

	}
@@ -3705,3 +3725,23 @@ static int __meminit init_reserve_notifier(void) 
	return 0;

}

subsys_initcall(init_reserve_notifier);





/*

 *  Enable the MAP_32BIT (mmaps and hugetlb).

 */

int enable_map_dvpp __read_mostly = 0;



#ifdef CONFIG_ASCEND_DVPP_MMAP



static int __init ascend_enable_map_dvpp(char *s)

{

	enable_map_dvpp = 1;



	pr_info("Ascend enable dvpp mmap features\n");



	return 1;

}

__setup("enable_map_dvpp", ascend_enable_map_dvpp);



#endif