From nobody Fri Jun 02 15:52:29 2023 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4QXnZP4l03z4YsBT; Fri, 2 Jun 2023 15:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4QXnZP4Kmcz3C1w; Fri, 2 Jun 2023 15:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685721149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YNSqe82R01C7OApMnqd3pGqvNG3SmJ2dK+LH4YNt6bA=; b=djMoP+dQ87h9kHXgFgZKPGxfZNkEVzCpIep0ufnWChwpacaRbQXZluPn9nVAhUXrzcb+XP 8u57HJKICrp+m7GYLpIhyPIYLOCNvBBjqTrtytk5S0a5a0Ge++VCUsFzH3dPjCF8MtvT36 4e6YBHJIJrW2yb0AniB/rBqQEnJfuOA8IFmVDKhuLZ3xAboJabokrX7teDFIvzSgJ9id09 zsNNYiFQ8QxIO0Q8A2WwaBMRC2PJmzs2MKm5KfjCfPpkjXI6zJu/HeU7V32nINSxfwYjIG Kj9AuCmboTvlTAw02mKbMI0mGsMkrulyCTT/HwWFvjofu+4Ofl92uRjYDewV9w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685721149; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=YNSqe82R01C7OApMnqd3pGqvNG3SmJ2dK+LH4YNt6bA=; b=KZiL9qWeHo+2W6FgNFy0hH8O0VA2FRYFcmC0Q286x7FecXk1OJ5Kn3yyf54BbxXgwS0yxw nzcNayI+AAfDE6LSt4B2T8pbg6oOpxC99tm/YuORvHTkVGe6D0uVbNAhBdGTtcfiG376HU v6RZPrRDcwhzqcqylOGCiYVlf16bPwyodcNrbYaGGHcPNKMY4J4pQuvqJQBlYUIuLITKSi Q8NVoLhAOK8acKGT4FWLrFEMmyrWEVEYZByHOgjhqYyDCyFtHRPjaZDJ8lZW+nI8nd5RvA f8Bl2eJtJRogNbUJsTEbRSlg+ECHGHJ0/dPyj5ktBk0btTu17fiKhbZNqG3D0w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685721149; a=rsa-sha256; cv=none; b=J2cnNNQXwjZLQ3JDmUMbfnaEjtCwSwmDkajqS0KZWtE7Bny5S35VbhZ5QG73ZzLvuDHu7P 7rLp2UxGa64wyhLWjw4eNrXHE+SNrDLHzfJMW2XNj0tIx2SgPn6JQPJoFbjKhAP0BvytQA LiFzh49LyQ/H7taqHqA1xPNYrEGLLn+wg/HR1MnDzrINBA9jCoVOpbvIdqjC5JUYgTEj3j LMzlES0UgREzX5SyElbzOI/t3MA7VXtcW+390U5DYycIdt4FYWilXDF34UkOW/RLmAnAYR f//fkgGsqbfUKhhp9s6qXlQS/PzbG2sqHsIZvGtrt1q/B1oy4G2+SWM9L44tPA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4QXnZP3PbRz14XQ; Fri, 2 Jun 2023 15:52:29 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 352FqTHQ024783; Fri, 2 Jun 2023 15:52:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 352FqTt1024782; Fri, 2 Jun 2023 15:52:29 GMT (envelope-from git) Date: Fri, 2 Jun 2023 15:52:29 GMT Message-Id: <202306021552.352FqTt1024782@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: 8cca8e248fb7 - main - arm64: Correct a pmap unlock in pmap_stage2_fault List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 8cca8e248fb7f5fb475544a08d8cdb24d26bf4b3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=8cca8e248fb7f5fb475544a08d8cdb24d26bf4b3 commit 8cca8e248fb7f5fb475544a08d8cdb24d26bf4b3 Author: Andrew Turner AuthorDate: 2023-06-02 09:58:56 +0000 Commit: Andrew Turner CommitDate: 2023-06-02 15:24:15 +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 --- 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 150532b68c75..75175a102499 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -7446,7 +7446,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; }