git: d7c0cc9e37b5 - stable/13 - arm64: Correct a pmap unlock in pmap_stage2_fault
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 25 Sep 2023 11:00:56 UTC
The branch stable/13 has been updated by andrew:
URL: https://cgit.FreeBSD.org/src/commit/?id=d7c0cc9e37b56b32ba6fd2a47cd97edf2c9f6465
commit d7c0cc9e37b56b32ba6fd2a47cd97edf2c9f6465
Author: Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2023-06-02 09:58:56 +0000
Commit: Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2023-09-25 08:41:16 +0000
arm64: Correct a pmap unlock in pmap_stage2_fault
This is used by bhyve so was not an issue as it is still in development.
Sponsored by: Arm Ltd
(cherry picked from commit 8cca8e248fb7f5fb475544a08d8cdb24d26bf4b3)
---
sys/arm64/arm64/pmap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c
index 037f1d5a805f..49ca89135883 100644
--- a/sys/arm64/arm64/pmap.c
+++ b/sys/arm64/arm64/pmap.c
@@ -7179,7 +7179,7 @@ pmap_stage2_fault(pmap_t pmap, uint64_t esr, uint64_t far)
PMAP_LOCK(pmap);
pdep = pmap_pde(pmap, far, &lvl);
if (pdep == NULL || lvl != (dfsc - ISS_DATA_DFSC_TF_L1)) {
- PMAP_LOCK(pmap);
+ PMAP_UNLOCK(pmap);
break;
}