From nobody Tue Mar 29 15:53:36 2022 X-Original-To: dev-commits-src-branches@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 044081A34489; Tue, 29 Mar 2022 15:53:37 +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 4KSYy86S3Zz3t4s; Tue, 29 Mar 2022 15:53:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648569216; 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=3WJ2uHYRZEVPN/rb6/hg8065+rZtdbBvyNp8CBpzBBQ=; b=A3tk0XRmocqNhjVgEzASqLXYI+EeHeNn9mBV/e93U2xSaETIif+SJBQZR/UwAy1abN1ao5 N1z6hwQGLgS9DCMwxp7KvcYUPaU/5kev+RSF0u3LvYu3equIk3XxeoxVhi7Gut5Ht89Gka kLGu/lj/Gv2osADdhGYOvO55kYk+iPiIeY1EKMUbMFMbnpOI+zQBdlFPSY/Ps/szeKeofF IqLCXaLVHjXoPuLsZE/2jpCgTEVbKAfgtrfSRe9CXdqCLPEGRHZeF+BFl5mqcqK9cHjeZc +97HxEZq+n+s40m92AckJs8jsQfS94a7SMOF6Ok7hBTkAYJ6ba8bR1snpP+v7g== 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 BDC6321814; Tue, 29 Mar 2022 15:53:36 +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 22TFraVa071322; Tue, 29 Mar 2022 15:53:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22TFraRw071321; Tue, 29 Mar 2022 15:53:36 GMT (envelope-from git) Date: Tue, 29 Mar 2022 15:53:36 GMT Message-Id: <202203291553.22TFraRw071321@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: 89166c063a9a - stable/13 - Fix arm64 TLB invalidation with non-4k pages List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 89166c063a9a136ba3780bb069e03e6049c53fd5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1648569216; 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=3WJ2uHYRZEVPN/rb6/hg8065+rZtdbBvyNp8CBpzBBQ=; b=Dyb34VL2LSIfKXYbPbqlbdIJhOOW3j8GiwtnynbmlkbZ3nkDYHgmgEO8KILZE9ULhHPcti svSh/9E3yntcyxUCva5VmZ4KwJU3swdEvsPudkkB5QUhULFW8C8kTMEI8tKTHuLWYC2slH jow1ECrFIynMF5CLDW359CGgdp0oCMoXh5d/7fxNg1uHewu+5M84fyhJn8lGr8ZLQARz4X uSzm9ccEWy4Vr+ICtWbiO9V+5kHy1EvDvaIs+vrwAE1cjI7ixtLWuRFNq4Cg0NMbSKL/lx PF8YHRXk8cR4di+6ZF0fXv/sUeIMGexjMIrpeLkkP9ejv6betSJI1NgIZ1/gZA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1648569216; a=rsa-sha256; cv=none; b=Uc6PcvQtKhO6mrzxFz1I3kUqbE3Lz/BTyMijE1sETkpSjlBZs0PgknAI7rWGNycm8F/G6v U5xCEkx0VATCH+zVXtKysxTlBww3kcuXyfoKWLyOArokV3fnieEzq2FxT3ojD8LYvWLHBQ dsYVWgaR5tl6HQcY42Rvnug0u31zyNnQDz9NgEd2HkiEvCWTHDP4TSOEieyd4nuvSF/WCC 7Mtwvll5h1aGwS9YVGOuu9gD5cqyIQ8TIy69esE/+cRZfhKBYvFFb4hGifVHX5+3JrHY8+ V/gy2CoQrWrG2HqLy9gsxkqmNaYIek28vv3DrHO1xTE1RZe5VZHzi4GEIFAA6w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by scottph: URL: https://cgit.FreeBSD.org/src/commit/?id=89166c063a9a136ba3780bb069e03e6049c53fd5 commit 89166c063a9a136ba3780bb069e03e6049c53fd5 Author: Andrew Turner AuthorDate: 2022-03-10 14:39:03 +0000 Commit: D Scott Phillips CommitDate: 2022-03-29 15:47:43 +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 (cherry picked from commit 813738fabaaea43503724b8371faf5bab73a3047) --- 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 c105e7cae16b..26e62c9e3cbb 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, @@ -1186,11 +1190,11 @@ pmap_invalidate_page(pmap_t pmap, vm_offset_t va) PMAP_ASSERT_STAGE1(pmap); dsb(ishst); + r = TLBI_VA(va); if (pmap == kernel_pmap) { - r = atop(va); __asm __volatile("tlbi vaae1is, %0" : : "r" (r)); } else { - r = ASID_TO_OPERAND(COOKIE_TO_ASID(pmap->pm_cookie)) | atop(va); + r |= ASID_TO_OPERAND(COOKIE_TO_ASID(pmap->pm_cookie)); __asm __volatile("tlbi vae1is, %0" : : "r" (r)); } dsb(ish); @@ -1206,15 +1210,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) __asm __volatile("tlbi vaae1is, %0" : : "r" (r)); } 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) __asm __volatile("tlbi vae1is, %0" : : "r" (r)); } dsb(ish);