From nobody Tue Mar 15 17:29:20 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 330531A171D8; Tue, 15 Mar 2022 17:29:21 +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 4KJ0l43hRsz503F; Tue, 15 Mar 2022 17:29:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647365360; 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=X9TXNf7mPuSU3guSQJi9vDRnDOaHPMlx6i1ZzJUi5P4=; b=r0OPdGNHAHkBo5mgGoVxr02dc+2Ye3MWPNxgDztTBUNe8WwMScZzNHoA3UqdfpjNwt2gR8 fWY3jignZbBEyHXTC1gB1TOQ8WTfXqijP+n5Jd2DXvhx4rap5WlTDWNsi0bIStVCfT8PfT nkMVonez3ygmNnL7T/R9fN6J5halAp9hJG3pAPTm/eyK6IxXWjce/iZKSlf9rO7VZAApDH T9XKn/mXv3Wc14YQ6k9SpGyfkVakWNepyPxVPQcR9oAEyBqvW80rvsdMeg8kD9PJ+VXnxh 5GIFXQNvuHGohz1o4FMcfxFeT8p2EhWkIohAwvkLMx7ONuwxukd3GXyLah8wLQ== 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 57A8E25F68; Tue, 15 Mar 2022 17:29:20 +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 22FHTKjp006520; Tue, 15 Mar 2022 17:29:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FHTK8a006519; Tue, 15 Mar 2022 17:29:20 GMT (envelope-from git) Date: Tue, 15 Mar 2022 17:29:20 GMT Message-Id: <202203151729.22FHTK8a006519@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: 813738fabaae - main - Fix arm64 TLB invalidation with non-4k pages 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/main X-Git-Reftype: branch X-Git-Commit: 813738fabaaea43503724b8371faf5bab73a3047 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647365360; 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=X9TXNf7mPuSU3guSQJi9vDRnDOaHPMlx6i1ZzJUi5P4=; b=X1PzTlfVHQ6bHjj+KzDi7Jie3elizVDt5KQTES6F/sgQesSFj6Ee/IUQMIXm5y7NVVVFVu VpkU9nVm6DG3A/k1WpWwrChKYmx9cM9/nBDk7+KuZHFhAVDfutvfTNpwZtyQA2y4xlSeYk DDcMV96ugWrq01036sz755iVfZZlV8iqaSmJbcYKBZ//k0A1UK3g5WLlXA7mjxDIZeuh04 vZ+PYoNgJej/SpOKE9LwKwOMaJusD2zPapYaXoSDd+KBue+5XbhEGq1QBqWcRJWrEueqxP XQfEp/bjB8QOlLC5NIjalwzwzYacaBFJJWR9OBychk5oUrhAbE3WBw4q7OJFbg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647365360; a=rsa-sha256; cv=none; b=TXNfdtHq4txf/KWSf83+ywBV/ZGvNjtF48920VKTDiE1uCXPqK89Z0hWLx/gY4v0ADDVAk 2FPhggnQyfEjH2er+HQhcEcpPm8+tKjgbV/9wDtg4ap8nJNbuW9DnGSoOKJmvgT3fdJ+Rs gximdMkdP7YCKGMg+EkJvxEfeevzTd0o7uRlHgz9Muqpgv5v2ddSIYnGjOHdwm2VgSVdAo JUMhmJqTR9S40lLU5ZEnFpoEZAcfgeKImmDs7CyX4ENn+9Jy0Jp9m21jvLSSwhfS8zsojU WjRQCyFrXuYbiFtz5HHwkgsrxF9I2RGrUaq5ffe+5Scww5KaG0PxSGPIkB7gTQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=813738fabaaea43503724b8371faf5bab73a3047 commit 813738fabaaea43503724b8371faf5bab73a3047 Author: Andrew Turner AuthorDate: 2022-03-10 14:39:03 +0000 Commit: Andrew Turner CommitDate: 2022-03-15 17:25:28 +0000 Fix arm64 TLB invalidation with non-4k pages When using 16k or 64k pages atop will shift the address by more than the needed amount for a tlbi instruction. Replace this with a new macro to shift the address by 12 and use PAGE_SIZE in the for loop to let the code work with any page size. Reviewed by: alc, markj Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D34516 --- sys/arm64/arm64/pmap.c | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/sys/arm64/arm64/pmap.c b/sys/arm64/arm64/pmap.c index 12b3bed7cb72..0ab27e0a7b53 100644 --- a/sys/arm64/arm64/pmap.c +++ b/sys/arm64/arm64/pmap.c @@ -360,6 +360,10 @@ void (*pmap_invalidate_vpipt_icache)(void); #define COOKIE_TO_ASID(cookie) ((int)(cookie)) #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_L3_INCR (L3_SIZE >> TLBI_VA_SHIFT) + static int superpages_enabled = 1; SYSCTL_INT(_vm_pmap, OID_AUTO, superpages_enabled, CTLFLAG_RDTUN | CTLFLAG_NOFETCH, &superpages_enabled, 0, @@ -1248,11 +1252,11 @@ pmap_invalidate_page(pmap_t pmap, vm_offset_t va, bool final_only) PMAP_ASSERT_STAGE1(pmap); dsb(ishst); + r = TLBI_VA(va); if (pmap == kernel_pmap) { - r = atop(va); pmap_invalidate_kernel(r, final_only); } else { - r = ASID_TO_OPERAND(COOKIE_TO_ASID(pmap->pm_cookie)) | atop(va); + r |= ASID_TO_OPERAND(COOKIE_TO_ASID(pmap->pm_cookie)); pmap_invalidate_user(r, final_only); } dsb(ish); @@ -1273,15 +1277,15 @@ pmap_invalidate_range(pmap_t pmap, vm_offset_t sva, vm_offset_t eva, dsb(ishst); if (pmap == kernel_pmap) { - start = atop(sva); - end = atop(eva); - for (r = start; r < end; r++) + start = TLBI_VA(sva); + end = TLBI_VA(eva); + for (r = start; r < end; r += TLBI_VA_L3_INCR) pmap_invalidate_kernel(r, final_only); } else { start = end = ASID_TO_OPERAND(COOKIE_TO_ASID(pmap->pm_cookie)); - start |= atop(sva); - end |= atop(eva); - for (r = start; r < end; r++) + start |= TLBI_VA(sva); + end |= TLBI_VA(eva); + for (r = start; r < end; r += TLBI_VA_L3_INCR) pmap_invalidate_user(r, final_only); } dsb(ish);