forked from mirrors/linux
		
	mm: use vma_init() to initialize VMAs on stack and data segments
Make sure to initialize all VMAs properly, not only those which come from vm_area_cachep. Link: http://lkml.kernel.org/r/20180724121139.62570-3-kirill.shutemov@linux.intel.com Signed-off-by: Kirill A. Shutemov <kirill.shutemov@linux.intel.com> Acked-by: Linus Torvalds <torvalds@linux-foundation.org> Reviewed-by: Andrew Morton <akpm@linux-foundation.org> Cc: Dmitry Vyukov <dvyukov@google.com> Cc: Oleg Nesterov <oleg@redhat.com> Cc: Andrea Arcangeli <aarcange@redhat.com> Cc: <stable@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
		
							parent
							
								
									027232da7c
								
							
						
					
					
						commit
						2c4541e24c
					
				
					 10 changed files with 17 additions and 7 deletions
				
			
		|  | @ -338,6 +338,7 @@ static struct vm_area_struct gate_vma = { | ||||||
| 
 | 
 | ||||||
| static int __init gate_vma_init(void) | static int __init gate_vma_init(void) | ||||||
| { | { | ||||||
|  | 	vma_init(&gate_vma, NULL); | ||||||
| 	gate_vma.vm_page_prot = PAGE_READONLY_EXEC; | 	gate_vma.vm_page_prot = PAGE_READONLY_EXEC; | ||||||
| 	return 0; | 	return 0; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | @ -237,8 +237,8 @@ static void ecard_init_pgtables(struct mm_struct *mm) | ||||||
| 
 | 
 | ||||||
| 	memcpy(dst_pgd, src_pgd, sizeof(pgd_t) * (EASI_SIZE / PGDIR_SIZE)); | 	memcpy(dst_pgd, src_pgd, sizeof(pgd_t) * (EASI_SIZE / PGDIR_SIZE)); | ||||||
| 
 | 
 | ||||||
|  | 	vma_init(&vma, mm); | ||||||
| 	vma.vm_flags = VM_EXEC; | 	vma.vm_flags = VM_EXEC; | ||||||
| 	vma.vm_mm = mm; |  | ||||||
| 
 | 
 | ||||||
| 	flush_tlb_range(&vma, IO_START, IO_START + IO_SIZE); | 	flush_tlb_range(&vma, IO_START, IO_START + IO_SIZE); | ||||||
| 	flush_tlb_range(&vma, EASI_START, EASI_START + EASI_SIZE); | 	flush_tlb_range(&vma, EASI_START, EASI_START + EASI_SIZE); | ||||||
|  |  | ||||||
|  | @ -37,7 +37,9 @@ static inline void __tlb_remove_table(void *_table) | ||||||
| 
 | 
 | ||||||
| static inline void tlb_flush(struct mmu_gather *tlb) | static inline void tlb_flush(struct mmu_gather *tlb) | ||||||
| { | { | ||||||
| 	struct vm_area_struct vma = { .vm_mm = tlb->mm, }; | 	struct vm_area_struct vma; | ||||||
|  | 
 | ||||||
|  | 	vma_init(&vma, tlb->mm); | ||||||
| 
 | 
 | ||||||
| 	/*
 | 	/*
 | ||||||
| 	 * The ASID allocator will either invalidate the ASID or mark | 	 * The ASID allocator will either invalidate the ASID or mark | ||||||
|  |  | ||||||
|  | @ -108,11 +108,13 @@ static pte_t get_clear_flush(struct mm_struct *mm, | ||||||
| 			     unsigned long pgsize, | 			     unsigned long pgsize, | ||||||
| 			     unsigned long ncontig) | 			     unsigned long ncontig) | ||||||
| { | { | ||||||
| 	struct vm_area_struct vma = { .vm_mm = mm }; | 	struct vm_area_struct vma; | ||||||
| 	pte_t orig_pte = huge_ptep_get(ptep); | 	pte_t orig_pte = huge_ptep_get(ptep); | ||||||
| 	bool valid = pte_valid(orig_pte); | 	bool valid = pte_valid(orig_pte); | ||||||
| 	unsigned long i, saddr = addr; | 	unsigned long i, saddr = addr; | ||||||
| 
 | 
 | ||||||
|  | 	vma_init(&vma, mm); | ||||||
|  | 
 | ||||||
| 	for (i = 0; i < ncontig; i++, addr += pgsize, ptep++) { | 	for (i = 0; i < ncontig; i++, addr += pgsize, ptep++) { | ||||||
| 		pte_t pte = ptep_get_and_clear(mm, addr, ptep); | 		pte_t pte = ptep_get_and_clear(mm, addr, ptep); | ||||||
| 
 | 
 | ||||||
|  | @ -145,9 +147,10 @@ static void clear_flush(struct mm_struct *mm, | ||||||
| 			     unsigned long pgsize, | 			     unsigned long pgsize, | ||||||
| 			     unsigned long ncontig) | 			     unsigned long ncontig) | ||||||
| { | { | ||||||
| 	struct vm_area_struct vma = { .vm_mm = mm }; | 	struct vm_area_struct vma; | ||||||
| 	unsigned long i, saddr = addr; | 	unsigned long i, saddr = addr; | ||||||
| 
 | 
 | ||||||
|  | 	vma_init(&vma, mm); | ||||||
| 	for (i = 0; i < ncontig; i++, addr += pgsize, ptep++) | 	for (i = 0; i < ncontig; i++, addr += pgsize, ptep++) | ||||||
| 		pte_clear(mm, addr, ptep); | 		pte_clear(mm, addr, ptep); | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -120,7 +120,7 @@ ia64_tlb_flush_mmu_tlbonly(struct mmu_gather *tlb, unsigned long start, unsigned | ||||||
| 		 */ | 		 */ | ||||||
| 		struct vm_area_struct vma; | 		struct vm_area_struct vma; | ||||||
| 
 | 
 | ||||||
| 		vma.vm_mm = tlb->mm; | 		vma_init(&vma, tlb->mm); | ||||||
| 		/* flush the address range from the tlb: */ | 		/* flush the address range from the tlb: */ | ||||||
| 		flush_tlb_range(&vma, start, end); | 		flush_tlb_range(&vma, start, end); | ||||||
| 		/* now flush the virt. page-table area mapping the address range: */ | 		/* now flush the virt. page-table area mapping the address range: */ | ||||||
|  |  | ||||||
|  | @ -273,7 +273,7 @@ static struct vm_area_struct gate_vma; | ||||||
| 
 | 
 | ||||||
| static int __init gate_vma_init(void) | static int __init gate_vma_init(void) | ||||||
| { | { | ||||||
| 	gate_vma.vm_mm = NULL; | 	vma_init(&gate_vma, NULL); | ||||||
| 	gate_vma.vm_start = FIXADDR_USER_START; | 	gate_vma.vm_start = FIXADDR_USER_START; | ||||||
| 	gate_vma.vm_end = FIXADDR_USER_END; | 	gate_vma.vm_end = FIXADDR_USER_END; | ||||||
| 	gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC; | 	gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC; | ||||||
|  |  | ||||||
|  | @ -16,7 +16,7 @@ static int __init gate_vma_init(void) | ||||||
| 	if (!FIXADDR_USER_START) | 	if (!FIXADDR_USER_START) | ||||||
| 		return 0; | 		return 0; | ||||||
| 
 | 
 | ||||||
| 	gate_vma.vm_mm = NULL; | 	vma_init(&gate_vma, NULL); | ||||||
| 	gate_vma.vm_start = FIXADDR_USER_START; | 	gate_vma.vm_start = FIXADDR_USER_START; | ||||||
| 	gate_vma.vm_end = FIXADDR_USER_END; | 	gate_vma.vm_end = FIXADDR_USER_END; | ||||||
| 	gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC; | 	gate_vma.vm_flags = VM_READ | VM_MAYREAD | VM_EXEC | VM_MAYEXEC; | ||||||
|  |  | ||||||
|  | @ -411,6 +411,7 @@ static void remove_inode_hugepages(struct inode *inode, loff_t lstart, | ||||||
| 	bool truncate_op = (lend == LLONG_MAX); | 	bool truncate_op = (lend == LLONG_MAX); | ||||||
| 
 | 
 | ||||||
| 	memset(&pseudo_vma, 0, sizeof(struct vm_area_struct)); | 	memset(&pseudo_vma, 0, sizeof(struct vm_area_struct)); | ||||||
|  | 	vma_init(&pseudo_vma, current->mm); | ||||||
| 	pseudo_vma.vm_flags = (VM_HUGETLB | VM_MAYSHARE | VM_SHARED); | 	pseudo_vma.vm_flags = (VM_HUGETLB | VM_MAYSHARE | VM_SHARED); | ||||||
| 	pagevec_init(&pvec); | 	pagevec_init(&pvec); | ||||||
| 	next = start; | 	next = start; | ||||||
|  | @ -595,6 +596,7 @@ static long hugetlbfs_fallocate(struct file *file, int mode, loff_t offset, | ||||||
| 	 * as input to create an allocation policy. | 	 * as input to create an allocation policy. | ||||||
| 	 */ | 	 */ | ||||||
| 	memset(&pseudo_vma, 0, sizeof(struct vm_area_struct)); | 	memset(&pseudo_vma, 0, sizeof(struct vm_area_struct)); | ||||||
|  | 	vma_init(&pseudo_vma, mm); | ||||||
| 	pseudo_vma.vm_flags = (VM_HUGETLB | VM_MAYSHARE | VM_SHARED); | 	pseudo_vma.vm_flags = (VM_HUGETLB | VM_MAYSHARE | VM_SHARED); | ||||||
| 	pseudo_vma.vm_file = file; | 	pseudo_vma.vm_file = file; | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -2505,6 +2505,7 @@ void mpol_shared_policy_init(struct shared_policy *sp, struct mempolicy *mpol) | ||||||
| 
 | 
 | ||||||
| 		/* Create pseudo-vma that contains just the policy */ | 		/* Create pseudo-vma that contains just the policy */ | ||||||
| 		memset(&pvma, 0, sizeof(struct vm_area_struct)); | 		memset(&pvma, 0, sizeof(struct vm_area_struct)); | ||||||
|  | 		vma_init(&pvma, NULL); | ||||||
| 		pvma.vm_end = TASK_SIZE;	/* policy covers entire file */ | 		pvma.vm_end = TASK_SIZE;	/* policy covers entire file */ | ||||||
| 		mpol_set_shared_policy(sp, &pvma, new); /* adds ref */ | 		mpol_set_shared_policy(sp, &pvma, new); /* adds ref */ | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
|  | @ -1421,6 +1421,7 @@ static void shmem_pseudo_vma_init(struct vm_area_struct *vma, | ||||||
| { | { | ||||||
| 	/* Create a pseudo vma that just contains the policy */ | 	/* Create a pseudo vma that just contains the policy */ | ||||||
| 	memset(vma, 0, sizeof(*vma)); | 	memset(vma, 0, sizeof(*vma)); | ||||||
|  | 	vma_init(vma, NULL); | ||||||
| 	/* Bias interleave by inode number to distribute better across nodes */ | 	/* Bias interleave by inode number to distribute better across nodes */ | ||||||
| 	vma->vm_pgoff = index + info->vfs_inode.i_ino; | 	vma->vm_pgoff = index + info->vfs_inode.i_ino; | ||||||
| 	vma->vm_policy = mpol_shared_policy_lookup(&info->policy, index); | 	vma->vm_policy = mpol_shared_policy_lookup(&info->policy, index); | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue
	
	 Kirill A. Shutemov
						Kirill A. Shutemov