From nobody Wed Mar 30 21:04:39 2022 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 3DE601A3F8BE; Wed, 30 Mar 2022 21:04:40 +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 4KTJpc0q2mz4WKh; Wed, 30 Mar 2022 21:04:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648674280; 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=3MmO7wC9lF6JuMD27HH1TRHj83EYMj30LYntgyIrs6c=; b=w31DEqnGq9gd53c/r9Yu6APpHbZZ30cZlJ+VJYeOXOSsO2Zb+9ksWRFpx4yspPQO8tD8ys +fp+KJFVnPLXW4nYi9ER5cnUrHz0ktOQzUxrbb6zWpiHQv9Wuu1VqOE70UNhl9NhDlIKHU ShEX13fZc+5rA8nkQNiUk3BnZEfjMxalN1Xu5J1PH0fzs3VBW9MeL/hZgKBqUd220ad9Tq 783q155qSj9l9zsr/We85l7J9YHzmUHFf/VsD34uMwA/m1RdIDoSQ2NPU8/tfaloZolJXG bRpHOYhnAOqBcCvVCWWWApwc8ySkXFRjvd1njqsqbl7EylrFLWAS8aY0s25f5A== 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 ED1EA1A447; Wed, 30 Mar 2022 21:04:39 +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 22UL4de3052982; Wed, 30 Mar 2022 21:04:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22UL4dOm052981; Wed, 30 Mar 2022 21:04:39 GMT (envelope-from git) Date: Wed, 30 Mar 2022 21:04:39 GMT Message-Id: <202203302104.22UL4dOm052981@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: D Scott Phillips Subject: git: 33a625b1d6cd - releng/13.1 - arm64: pmap: Mask VA operand in TLBI instructions 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: scottph X-Git-Repository: src X-Git-Refname: refs/heads/releng/13.1 X-Git-Reftype: branch X-Git-Commit: 33a625b1d6cd54695e82bcb4379a88d09b3b4ada Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648674280; 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=3MmO7wC9lF6JuMD27HH1TRHj83EYMj30LYntgyIrs6c=; b=QWZ1MISn/GL0iazZjAkZavHTCpvkjTce+TeqxfffAM1G6KwfRtKk16yi2u/37RPH7l2W1O ufL73Nc3gE/Ibm+md4gHyOBalEjjM7z73GE0zUfupKf1I8HyqHH2oGy0Onyo1CY5vzfy9z b9LxXmFmaJcNuOtOipHYBbxDb2kqDrBBqutCiwIQQq+ItdIxd8tyaJMjNYGGDaV7/9TIAM Fp9uu3IAfh9laKJqUYXJz5+MUUZcxBK++HC96/0vV8jn2St55jZmHj6SLzwQXCyB3BVELJ jB1q2Xzz39xnzS3/7l0y5oOkW/AEwTylPvcUMm8zlXDtqfm5/L0MxSeqNf0SHA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648674280; a=rsa-sha256; cv=none; b=aKkdvC89fcalkq1ZOidB0CGMDmwFqzZEg3OvguYshxVZnSomtiP8SWms3fokoMa1ID4+Xb jb8/zglL635nDE/LPrhMLCZwvXXCR0ujd16piyIgN4xdzCPF9jBrRZHXWk3dmjYfKMwswa Q4nif1Rym1/c6TxmdWdrpHnb7C0h/UBC80TQrNIIvy6eNKYrgLeq4WZghqeGueFE1oMfPt us6vVHAYUeav/+ZXFsYbmGyFIc+4ApRXJQkucDt/A7sQ4Fvsbfu5oWNq7gKZaMhhjYAvK2 oD5ZmcUa/PchHRLx+GkJVf1bKPjZ0Od+Mq9SiJ4tfM5CO8dJKZ1loj6BpAOaBA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch releng/13.1 has been updated by scottph: URL: https://cgit.FreeBSD.org/src/commit/?id=33a625b1d6cd54695e82bcb4379a88d09b3b4ada commit 33a625b1d6cd54695e82bcb4379a88d09b3b4ada Author: D Scott Phillips AuthorDate: 2022-03-25 16:04:11 +0000 Commit: D Scott Phillips CommitDate: 2022-03-30 20:51:37 +0000 arm64: pmap: Mask VA operand in TLBI instructions Bits 43:0 of the TLBI operand are bits 55:12 of the VA. Leaving bits 63:55 of the VA in bits 51:44 of the operand might wind up setting the TTL field (47:44) and accidentally restricting which translation levels are flushed in the TLB. Approved by: re (gjb) Reviewed By: andrew MFC after: 3 days Sponsored by: Ampere Computing Differential Revision: https://reviews.freebsd.org/D34664 (cherry picked from commit a693a30038278b1ccd3e67b98d76e259ca1b405d) (cherry picked from commit 2c013d142b146ed42d0fe6458ee8a394161ad370) --- sys/arm64/arm64/pmap.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 26e62c9e3cbb..0183dde11847 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -361,7 +361,8 @@ void (*pmap_invalidate_vpipt_icache)(void); #define COOKIE_TO_EPOCH(cookie) ((int)((u_long)(cookie) >> 32)) #define TLBI_VA_SHIFT 12 -#define TLBI_VA(addr) ((addr) >> TLBI_VA_SHIFT) +#define TLBI_VA_MASK ((1ul << 44) - 1) +#define TLBI_VA(addr) (((addr) >> TLBI_VA_SHIFT) & TLBI_VA_MASK) #define TLBI_VA_L3_INCR (L3_SIZE >> TLBI_VA_SHIFT) static int superpages_enabled = 1;