Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a92212ef authored by Mike Kravetz's avatar Mike Kravetz Committed by Greg Kroah-Hartman
Browse files

hugetlbfs: hugetlb_fault_mutex_hash() cleanup 

commit 552546366a30d88bd1d6f5efe848b2ab50fd57e5 upstream.

A new clang diagnostic (-Wsizeof-array-div) warns about the calculation
to determine the number of u32's in an array of unsigned longs.
Suppress warning by adding parentheses.

While looking at the above issue, noticed that the 'address' parameter
to hugetlb_fault_mutex_hash is no longer used.  So, remove it from the
definition and all callers.

No functional change.

Link: http://lkml.kernel.org/r/20190919011847.18400-1-mike.kravetz@oracle.com


Signed-off-by: default avatarMike Kravetz <mike.kravetz@oracle.com>
Reported-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Reviewed-by: default avatarNathan Chancellor <natechancellor@gmail.com>
Reviewed-by: default avatarDavidlohr Bueso <dbueso@suse.de>
Reviewed-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Cc: Nick Desaulniers <ndesaulniers@google.com>
Cc: Ilie Halip <ilie.halip@gmail.com>
Cc: David Bolvansky <david.bolvansky@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 84a98863

fs/hugetlbfs/inode.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -426,7 +426,7 @@ static void remove_inode_hugepages(struct inode *inode, loff_t lstart, 
			u32 hash;

			u32 hash;





			index = page->index;

			index = page->index;

			hash = hugetlb_fault_mutex_hash(h, mapping, index, 0);

			hash = hugetlb_fault_mutex_hash(h, mapping, index);

			mutex_lock(&hugetlb_fault_mutex_table[hash]);

			mutex_lock(&hugetlb_fault_mutex_table[hash]);





			/*

			/*
@@ -623,7 +623,7 @@ static long hugetlbfs_fallocate(struct file *file, int mode, loff_t offset, 
		addr = index * hpage_size;

		addr = index * hpage_size;





		/* mutex taken here, fault path and hole punch */

		/* mutex taken here, fault path and hole punch */

		hash = hugetlb_fault_mutex_hash(h, mapping, index, addr);

		hash = hugetlb_fault_mutex_hash(h, mapping, index);

		mutex_lock(&hugetlb_fault_mutex_table[hash]);

		mutex_lock(&hugetlb_fault_mutex_table[hash]);





		/* See if already present in mapping to avoid alloc/free */

		/* See if already present in mapping to avoid alloc/free */

include/linux/hugetlb.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -124,7 +124,7 @@ void free_huge_page(struct page *page); 
void hugetlb_fix_reserve_counts(struct inode *inode);

void hugetlb_fix_reserve_counts(struct inode *inode);

extern struct mutex *hugetlb_fault_mutex_table;

extern struct mutex *hugetlb_fault_mutex_table;

u32 hugetlb_fault_mutex_hash(struct hstate *h, struct address_space *mapping,

u32 hugetlb_fault_mutex_hash(struct hstate *h, struct address_space *mapping,

				pgoff_t idx, unsigned long address);

				pgoff_t idx);





pte_t *huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud);

pte_t *huge_pmd_share(struct mm_struct *mm, unsigned long addr, pud_t *pud);

mm/hugetlb.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -3862,7 +3862,7 @@ static vm_fault_t hugetlb_no_page(struct mm_struct *mm, 
			 * handling userfault.  Reacquire after handling

			 * handling userfault.  Reacquire after handling

			 * fault to make calling code simpler.

			 * fault to make calling code simpler.

			 */

			 */

			hash = hugetlb_fault_mutex_hash(h, mapping, idx, haddr);

			hash = hugetlb_fault_mutex_hash(h, mapping, idx);

			mutex_unlock(&hugetlb_fault_mutex_table[hash]);

			mutex_unlock(&hugetlb_fault_mutex_table[hash]);

			ret = handle_userfault(&vmf, VM_UFFD_MISSING);

			ret = handle_userfault(&vmf, VM_UFFD_MISSING);

			mutex_lock(&hugetlb_fault_mutex_table[hash]);

			mutex_lock(&hugetlb_fault_mutex_table[hash]);
@@ -3971,7 +3971,7 @@ static vm_fault_t hugetlb_no_page(struct mm_struct *mm, 




#ifdef CONFIG_SMP

#ifdef CONFIG_SMP

u32 hugetlb_fault_mutex_hash(struct hstate *h, struct address_space *mapping,

u32 hugetlb_fault_mutex_hash(struct hstate *h, struct address_space *mapping,

			    pgoff_t idx, unsigned long address)

			    pgoff_t idx)

{

{

	unsigned long key[2];

	unsigned long key[2];

	u32 hash;

	u32 hash;
@@ -3979,7 +3979,7 @@ u32 hugetlb_fault_mutex_hash(struct hstate *h, struct address_space *mapping, 
	key[0] = (unsigned long) mapping;

	key[0] = (unsigned long) mapping;

	key[1] = idx;

	key[1] = idx;





	hash = jhash2((u32 *)&key, sizeof(key)/sizeof(u32), 0);

	hash = jhash2((u32 *)&key, sizeof(key)/(sizeof(u32)), 0);





	return hash & (num_fault_mutexes - 1);

	return hash & (num_fault_mutexes - 1);

}

}
@@ -3989,7 +3989,7 @@ u32 hugetlb_fault_mutex_hash(struct hstate *h, struct address_space *mapping, 
 * return 0 and avoid the hashing overhead.

 * return 0 and avoid the hashing overhead.

 */

 */

u32 hugetlb_fault_mutex_hash(struct hstate *h, struct address_space *mapping,

u32 hugetlb_fault_mutex_hash(struct hstate *h, struct address_space *mapping,

			    pgoff_t idx, unsigned long address)

			    pgoff_t idx)

{

{

	return 0;

	return 0;

}

}
@@ -4033,7 +4033,7 @@ vm_fault_t hugetlb_fault(struct mm_struct *mm, struct vm_area_struct *vma, 
	 * get spurious allocation failures if two CPUs race to instantiate

	 * get spurious allocation failures if two CPUs race to instantiate

	 * the same page in the page cache.

	 * the same page in the page cache.

	 */

	 */

	hash = hugetlb_fault_mutex_hash(h, mapping, idx, haddr);

	hash = hugetlb_fault_mutex_hash(h, mapping, idx);

	mutex_lock(&hugetlb_fault_mutex_table[hash]);

	mutex_lock(&hugetlb_fault_mutex_table[hash]);





	entry = huge_ptep_get(ptep);

	entry = huge_ptep_get(ptep);

mm/userfaultfd.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -271,7 +271,7 @@ static __always_inline ssize_t __mcopy_atomic_hugetlb(struct mm_struct *dst_mm, 
		 */

		 */

		idx = linear_page_index(dst_vma, dst_addr);

		idx = linear_page_index(dst_vma, dst_addr);

		mapping = dst_vma->vm_file->f_mapping;

		mapping = dst_vma->vm_file->f_mapping;

		hash = hugetlb_fault_mutex_hash(h, mapping, idx, dst_addr);

		hash = hugetlb_fault_mutex_hash(h, mapping, idx);

		mutex_lock(&hugetlb_fault_mutex_table[hash]);

		mutex_lock(&hugetlb_fault_mutex_table[hash]);





		err = -ENOMEM;

		err = -ENOMEM;