s390/mm: cleanup arch_get_unmapped_area() and friends (712fa5f2) · Commits · 戴 / test

arch/s390/include/asm/pgalloc.h

+14 −0

Original line number	Diff line number	Diff line
		@@ -48,6 +48,20 @@ static inline unsigned long pgd_entry_type(struct mm_struct *mm)
		int crst_table_upgrade(struct mm_struct *mm, unsigned long limit);
		void crst_table_downgrade(struct mm_struct *);

		static inline unsigned long check_asce_limit(struct mm_struct *mm, unsigned long addr,
		unsigned long len)
		{
		int rc;

		if (addr + len > mm->context.asce_limit &&
		addr + len <= TASK_SIZE) {
		rc = crst_table_upgrade(mm, addr + len);
		if (rc)
		return (unsigned long) rc;
		}
		return addr;
		}

		static inline p4d_t p4d_alloc_one(struct mm_struct mm, unsigned long address)
		{
		unsigned long *table = crst_table_alloc(mm);

arch/s390/mm/hugetlbpage.c

+2 −9

Original line number	Diff line number	Diff line
		@@ -326,7 +326,6 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
		struct hstate *h = hstate_file(file);
		struct mm_struct *mm = current->mm;
		struct vm_area_struct *vma;
		int rc;

		if (len & ~huge_page_mask(h))
		return -EINVAL;
		@@ -353,15 +352,9 @@ unsigned long hugetlb_get_unmapped_area(struct file *file, unsigned long addr,
		else
		addr = hugetlb_get_unmapped_area_topdown(file, addr, len,
		pgoff, flags);
		if (addr & ~PAGE_MASK)
		if (offset_in_page(addr))
		return addr;

		check_asce_limit:
		if (addr + len > current->mm->context.asce_limit &&
		addr + len <= TASK_SIZE) {
		rc = crst_table_upgrade(mm, addr + len);
		if (rc)
		return (unsigned long) rc;
		}
		return addr;
		return check_asce_limit(mm, addr, len);
		}

arch/s390/mm/mmap.c

+11 −29

Original line number	Diff line number	Diff line
		@@ -72,14 +72,13 @@ static inline unsigned long mmap_base(unsigned long rnd,
		return PAGE_ALIGN(STACK_TOP - gap - rnd);
		}

		unsigned long
		arch_get_unmapped_area(struct file *filp, unsigned long addr,
		unsigned long len, unsigned long pgoff, unsigned long flags)
		unsigned long arch_get_unmapped_area(struct file *filp, unsigned long addr,
		unsigned long len, unsigned long pgoff,
		unsigned long flags)
		{
		struct mm_struct *mm = current->mm;
		struct vm_area_struct *vma;
		struct vm_unmapped_area_info info;
		int rc;

		if (len > TASK_SIZE - mmap_min_addr)
		return -ENOMEM;
		@@ -105,30 +104,20 @@ arch_get_unmapped_area(struct file *filp, unsigned long addr,
		info.align_mask = 0;
		info.align_offset = pgoff << PAGE_SHIFT;
		addr = vm_unmapped_area(&info);
		if (addr & ~PAGE_MASK)
		if (offset_in_page(addr))
		return addr;

		check_asce_limit:
		if (addr + len > current->mm->context.asce_limit &&
		addr + len <= TASK_SIZE) {
		rc = crst_table_upgrade(mm, addr + len);
		if (rc)
		return (unsigned long) rc;
		return check_asce_limit(mm, addr, len);
		}

		return addr;
		}

		unsigned long
		arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
		const unsigned long len, const unsigned long pgoff,
		const unsigned long flags)
		unsigned long arch_get_unmapped_area_topdown(struct file *filp, unsigned long addr,
		unsigned long len, unsigned long pgoff,
		unsigned long flags)
		{
		struct vm_area_struct *vma;
		struct mm_struct *mm = current->mm;
		unsigned long addr = addr0;
		struct vm_unmapped_area_info info;
		int rc;

		/* requested length too big for entire address space */
		if (len > TASK_SIZE - mmap_min_addr)
		@@ -163,25 +152,18 @@ arch_get_unmapped_area_topdown(struct file *filp, const unsigned long addr0,
		* can happen with large stack limits and large mmap()
		* allocations.
		*/
		if (addr & ~PAGE_MASK) {
		if (offset_in_page(addr)) {
		VM_BUG_ON(addr != -ENOMEM);
		info.flags = 0;
		info.low_limit = TASK_UNMAPPED_BASE;
		info.high_limit = TASK_SIZE;
		addr = vm_unmapped_area(&info);
		if (addr & ~PAGE_MASK)
		if (offset_in_page(addr))
		return addr;
		}

		check_asce_limit:
		if (addr + len > current->mm->context.asce_limit &&
		addr + len <= TASK_SIZE) {
		rc = crst_table_upgrade(mm, addr + len);
		if (rc)
		return (unsigned long) rc;
		}

		return addr;
		return check_asce_limit(mm, addr, len);
		}

		/*

Admin message