Push down the locking in pmap_fault to just be around the calls to

arm64_address_translate_*. There is no need to lock around the switch
statement as we only care about a few cases.

Sponsored by:	DARPA, AFRL

1 files changed, 3 insertions, 5 deletions

diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c
index dd9e112843c9..acd1b05469b4 100644
--- a/sys/arm64/arm64/pmap.c
+++ b/sys/arm64/arm64/pmap.c
@@ -4964,12 +4964,12 @@ pmap_fault(pmap_t pmap, uint64_t esr, uint64_t far)
 	}
 
 	/* Data and insn aborts use same encoding for FCS field. */
-	PMAP_LOCK(pmap);
 	switch (esr & ISS_DATA_DFSC_MASK) {
 	case ISS_DATA_DFSC_TF_L0:
 	case ISS_DATA_DFSC_TF_L1:
 	case ISS_DATA_DFSC_TF_L2:
 	case ISS_DATA_DFSC_TF_L3:
+		PMAP_LOCK(pmap);
 		/* Ask the MMU to check the address */
 		intr = intr_disable();
 		if (pmap == kernel_pmap)
@@ -4977,21 +4977,19 @@ pmap_fault(pmap_t pmap, uint64_t esr, uint64_t far)
 		else
 			par = arm64_address_translate_s1e0r(far);
 		intr_restore(intr);
+		PMAP_UNLOCK(pmap);
 
 		/*
 		 * If the translation was successful the address was invalid
 		 * due to a break-before-make sequence. We can unlock and
 		 * return success to the trap handler.
 		 */
-		if (PAR_SUCCESS(par)) {
-			PMAP_UNLOCK(pmap);
+		if (PAR_SUCCESS(par))
 			return (KERN_SUCCESS);
-		}
 		break;
 	default:
 		break;
 	}
-	PMAP_UNLOCK(pmap);
 #endif
 
 	return (KERN_FAILURE);