From nobody Wed Apr 24 18:31:41 2024 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 4VPndB2zpkz5J6Tp; Wed, 24 Apr 2024 18:31:42 +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 4VPndB1NsNz42ts; Wed, 24 Apr 2024 18:31:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713983502; 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=ypHKyiVeQc09yMjLYI0V+mIKx4BjPJYhNEbTqWpLc+w=; b=mV4PDq4H0jh5XC60njgKffrfvqGKuoK7KAKMFnfwVPc1PKV0cgGRuFnm+Fs5wzWBo3BBZX yWXKx8181TD9T/krCnbVGu5FEcclKxjEn0K2YQFrpqOj5FjuWf/ZxAp/hGNolSzAo/wxCB gbX6U9AFYIJfXsQy/DieMaAKowwaI7bIuDi/GppZiEcfwXf2R81a9pLemIXhYxGAkTyzDt MN+E65W5yjEnqjlnK9qXieMCxBGhC7IjMN2c7ng3YzBnvmDJG9QXCM0gdu8PY2z8ZlBHmW PeO40lMKC4N2dbekWgRjpL9K+UCvJco47btPlBl6udGCFMO7Xvin8RZgzh7vEg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713983502; a=rsa-sha256; cv=none; b=ivTZp/+CdmC07q2weWWJF4mda8E+7eIQGFi6lSF07wGpmbFm7WH2T3TAMERnfdoVHTPJkf CEo3u8Xz0PNugqUgFPa3b6iH3tjTaGOVYOQu5LJB33Y2nzs6tSs/pRGXVKxwT5YUMPKnFY M0x5UpWd5Q0j7SL5akX1JWBuLHmITpq51Zq/AI0tZEHAxpXjrz3OAJbDprLHoIDtKcv/EA ZLuxzMvz0j6aMn2PbBzPcL/EDP8XHwt5XCyt6qPpT3TFVm1C7OINGld8d9oYnbfO4Thk2D +4jtouHM0blv81mgqX4nL3Bp2nJawEUFblKljaylUxGoBPnIt5FLZLHfxf7Aqw== 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=1713983502; 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=ypHKyiVeQc09yMjLYI0V+mIKx4BjPJYhNEbTqWpLc+w=; b=mcjg6m+DwnXVvC3xo3EDvQp3RPdgeSYlwFTrfNnZV4mNcITRTFhCWfEhRb0ZM3hENTbM2S nfa8E4ki99JjUc9mEv0Chzd0ddOcunx75GAouzv7ypSkfUk1eT2SOc//KXe9GGZ5dKQoet zidoey1Xk+dYAgmR49UdD7VEIwBVrCI+A62iyEOhi8idVTPBhyKXflFGq7ImMNl4iR3Q1A D0LbgQ0DLWpOewwHC/tOvd901NOEE+TxOvzX0tgWDfW2gwv6c66VOsNcDwVp6bLwMCwHsd /f+LUJQZNqSNS9NQI+VCzhpj1Gwt34MzkBDMmlF/wBU0zMZXTq17w/Go0D4Zvw== 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 4VPndB0jddzQMQ; Wed, 24 Apr 2024 18:31:42 +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 43OIVgeI091188; Wed, 24 Apr 2024 18:31:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43OIVfGT091185; Wed, 24 Apr 2024 18:31:41 GMT (envelope-from git) Date: Wed, 24 Apr 2024 18:31:41 GMT Message-Id: <202404241831.43OIVfGT091185@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: ef80df0a7191 - main - arm64/vmm: Ensure the tlbi has completed 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: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-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: ef80df0a71912500ad84060334a24e903869f00b Auto-Submitted: auto-generated The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=ef80df0a71912500ad84060334a24e903869f00b commit ef80df0a71912500ad84060334a24e903869f00b Author: Andrew Turner AuthorDate: 2024-04-15 14:36:20 +0000 Commit: Andrew Turner CommitDate: 2024-04-24 18:17:19 +0000 arm64/vmm: Ensure the tlbi has completed Ensure the TLB is invalidated before enabling the EL2 MMU. Without this the TLB may be in an inconsistant state leading to a possible exception when enabling the MMU. PR: 277559 Reviewed by: markj Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D44799 --- sys/arm64/vmm/vmm_hyp_exception.S | 3 +++ 1 file changed, 3 insertions(+) diff --git a/sys/arm64/vmm/vmm_hyp_exception.S b/sys/arm64/vmm/vmm_hyp_exception.S index 77cb8cfd6cd7..0e8b31ae8b12 100644 --- a/sys/arm64/vmm/vmm_hyp_exception.S +++ b/sys/arm64/vmm/vmm_hyp_exception.S @@ -215,7 +215,10 @@ LENTRY(handle_hyp_init) /* Load the base address for the translation tables */ msr ttbr0_el2, x0 /* Invalidate the TLB */ + dsb ish tlbi alle2 + dsb ishst + isb /* Use the same memory attributes as EL1 */ mrs x9, mair_el1 msr mair_el2, x9