Commit 8318c404 authored by David Hildenbrand's avatar David Hildenbrand Committed by Christian Borntraeger
Browse files

s390/mm: no need for pte_alloc_map_lock() if we know the pmd is present 



pte_map_lock() is sufficient.

Signed-off-by: default avatarDavid Hildenbrand <david@redhat.com>
Acked-by: default avatarHeiko Carstens <hca@linux.ibm.com>
Link: https://lore.kernel.org/r/20210909162248.14969-8-david@redhat.com


Signed-off-by: default avatarChristian Borntraeger <borntraeger@de.ibm.com>
parent 46c22ffd

arch/s390/mm/pgtable.c

+3 −12
Original line number Diff line number Diff line
@@ -814,10 +814,7 @@ int set_guest_storage_key(struct mm_struct *mm, unsigned long addr, 
	}

	spin_unlock(ptl);



	ptep = pte_alloc_map_lock(mm, pmdp, addr, &ptl);

	if (unlikely(!ptep))

		return -EFAULT;



	ptep = pte_offset_map_lock(mm, pmdp, addr, &ptl);

	new = old = pgste_get_lock(ptep);

	pgste_val(new) &= ~(PGSTE_GR_BIT | PGSTE_GC_BIT |

			    PGSTE_ACC_BITS | PGSTE_FP_BIT);
@@ -912,10 +909,7 @@ int reset_guest_reference_bit(struct mm_struct *mm, unsigned long addr) 
	}

	spin_unlock(ptl);



	ptep = pte_alloc_map_lock(mm, pmdp, addr, &ptl);

	if (unlikely(!ptep))

		return -EFAULT;



	ptep = pte_offset_map_lock(mm, pmdp, addr, &ptl);

	new = old = pgste_get_lock(ptep);

	/* Reset guest reference bit only */

	pgste_val(new) &= ~PGSTE_GR_BIT;
@@ -977,10 +971,7 @@ int get_guest_storage_key(struct mm_struct *mm, unsigned long addr, 
	}

	spin_unlock(ptl);



	ptep = pte_alloc_map_lock(mm, pmdp, addr, &ptl);

	if (unlikely(!ptep))

		return -EFAULT;



	ptep = pte_offset_map_lock(mm, pmdp, addr, &ptl);

	pgste = pgste_get_lock(ptep);

	*key = (pgste_val(pgste) & (PGSTE_ACC_BITS | PGSTE_FP_BIT)) >> 56;

	paddr = pte_val(*ptep) & PAGE_MASK;