From nobody Mon Sep 25 11:00:56 2023 X-Original-To: dev-commits-src-all@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 4RvKfw5WtRz4vNH1; Mon, 25 Sep 2023 11:00:56 +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 4RvKfw3Xc0z3MGb; Mon, 25 Sep 2023 11:00:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695639656; 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=sMblh3KJYGmzN7URx9kwfkfle3VZ2J633Ib5yN7hPgA=; b=pxJoxxTbOAliD0EBMvSLQSOhNYgH/YiOZ/VDp49Le/HRbPZ7Up8pE8GwYM1pOeEY5LQ13D 8aXAiLaA7imBw3etkChUvosTHYiR1C6UHcuXkO8th2gCwMnzNFZjF7iP4++/sDkoopS3kj hNCgseH1ihcWQi1sag9Cjhpv6xs7HYpgwrp6AJ2mtMSCIRzkz1HOTZSwza6i3Jksh0v5ek ip8/jF08qUOXnZFwHtLqrsfVQH7webbmpeP7gv61OAVsyzKL7jmZKsWcGvvJs/L/KBhbfh CM2WmgiftV+pPwcuLjLnQZ/w9pja+mfx5zYEX4rboKc3Xi/y0BWBSzyJcAw4Sg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1695639656; a=rsa-sha256; cv=none; b=UrBR4d852rTpHCvt4HG0aQ5Kc8Ily4g9uo5rsB5dNj7hCYHA7L8DIasqIM7oEkjQ+XYAmV fDNEMHPC+UejQoxldokPjfaMeJluMdpapOFL1+hG76RWpD5B2u8sotgIikASsu9aqMf48A bcXXAY6x+g7Y4lAb4D1LP15WgnvvcejXl/suHevbQB4THj0x1Gu7s6rV5SLyJBj+XNmk5d 9icVhS8Y2vT8/bygMpREnyvWbDb34MABO1fS0WoguxXjN/frCtGeltNJ4ey0q81KDjNtn8 0xdig7n3hCxIcX0sNhWw1o34tAVd9qmnvdMqpvhdGpUUDLb4XZRdkB5wGcRTWQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1695639656; 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=sMblh3KJYGmzN7URx9kwfkfle3VZ2J633Ib5yN7hPgA=; b=br7OBCuLNkC3DHI7xEsJUmBX7Z7jJZ+Rx/YybJpn/tPGcYxiI5mYSHgZm2v1JNdzk0eGVh JtX5Vio1Ni7+awSSX0E+TOIDYDXCtDFrndeQO1L6Ipt0XbSCF6MfANcmRt5K9vhCX1OF0s 9FzHmHGuBVtONd5C35iuugAT3kLA+q4ikFklnPi2GOQQbPERMUnfVCXl4YXlp+n2F51oFW h/kzcGmoOyUloP8ZgL5c/Ql7Oja1m78n47ryMU/VddkiHrxB+YRlSSOCD9qw0yGywAB2AU ahZ2ChvHBlTnRJGM/C+5/T2YwZKyZpBsrpTz+CFbAJ54ECpctt6fs19zh3M3oA== 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 4RvKfw2bjwz1QMm; Mon, 25 Sep 2023 11:00:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 38PB0uPV052873; Mon, 25 Sep 2023 11:00:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 38PB0uL5052870; Mon, 25 Sep 2023 11:00:56 GMT (envelope-from git) Date: Mon, 25 Sep 2023 11:00:56 GMT Message-Id: <202309251100.38PB0uL5052870@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: d7c0cc9e37b5 - stable/13 - arm64: Correct a pmap unlock in pmap_stage2_fault List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@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/stable/13 X-Git-Reftype: branch X-Git-Commit: d7c0cc9e37b56b32ba6fd2a47cd97edf2c9f6465 Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=d7c0cc9e37b56b32ba6fd2a47cd97edf2c9f6465 commit d7c0cc9e37b56b32ba6fd2a47cd97edf2c9f6465 Author: Andrew Turner AuthorDate: 2023-06-02 09:58:56 +0000 Commit: Andrew Turner 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; }