From nobody Mon Jul 6 21:24:21 2026 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 4gvHRn3tJmz6kF22 for ; Mon, 06 Jul 2026 21:24: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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4gvHRn36GRz40xK for ; Mon, 06 Jul 2026 21:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1783373061; 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=Q/4VzRyGcEVGeF9mt3Wbl11tpP71md3854LEzoDHR1U=; b=QJP1TTpiTMs47FN60dd9Tg7KJ0XgPzGTtrvfFcFjHIK8rsALgWy+dxtT9+peVhMgBec/3E i59cpi7oX13ZtXpj6QiBRE55y5OVtTnqzNWBsrVntmJ92ubF8xNdStmuUN+8jtn7iUMPaI bQHzlp5tpASSQdI4JbF7TPKmICPQBPjyU7SrXaIwtiAI65UbYil/mOkIAzabzvqW0lzohx M6Cwabj00aP6LGMUvUxvEPtTOe0G7bXUVVvgYjLrDuVCQRJHWWbdeXKqYwgZ3nm6bvUflx rMEe4mbyYc7rwSFIHMy+6O3y8ud2Hgk1tv1lvSK/rIi4HK3Px/1j6Il8S8vZLA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1783373061; a=rsa-sha256; cv=none; b=BXMCitD4tPSS/5MFxzRHkcyGCPgKxL94EkDfYUDJQxAeYAXhFO7JPcF7XgTVg4MPHTyiqw HpxBOBIu0Nd3H1odrWM16m9vznbnjNHRO9ErF+Dn6WgM2pfNZKM+H2nxuN2xMSPvWtIMvi EeTrs0YRiNGZ5+RJ//hqEH+aIJlIUylBDWYDBz36gjF4GVAlFdyWhF7OSbQtucVJUSMCy4 FispKUTNZekV3n2WM5n34YxkgaTAXnfu6Dkqcs1SzAQ7O5R1CWVAa46HMMeL03wLS4Xb6o KrsuiNDWYwU53mhITYfccqOrQx0dS0UGPaLIERwP/M9q+8QRlpeXg5xDJPBQ4Q== 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=1783373061; 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=Q/4VzRyGcEVGeF9mt3Wbl11tpP71md3854LEzoDHR1U=; b=r+qHpPRO2Ewix+JoHTzK6uiRo/m3nDIW6+IOmPB4Yn6F2mPmIHbSFQdr8+I1HZ5OKjedf0 oIumgTk2XbM1EJ9orPScwZ3I6UNiI1bo56A5LY+grsCS6BAUzAm1I38u286PJUZJKC61y6 tpNy3cCjIidCo9AOkEY5VCDVdtUBUB6AIiUIDYq0v4gOdbgaORx2b+h2S4LUlGreb9zT9R 7ArX9tjbkg/oMik0fj1LBbQ72eLVnnv7AI6hW2X/iF3Mec8seBonJTtKmFBYSE3N1GzP5c KhDA1tDvqoTTEdLZ/tAqqhLevVkEab5xqjjpFqpFCchjdlX+eKGAeD/FQul25Q== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4gvHRn1zCNz1Ktb for ; Mon, 06 Jul 2026 21:24:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1a32a by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 06 Jul 2026 21:24:21 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Justin Hibbits Subject: git: dec79d2b47b3 - main - powerpc/pmap(booke): Fix TLB TID eviction 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 List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhibbits X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: dec79d2b47b3cb797d45b8bee7a1640dec85ebcc Auto-Submitted: auto-generated Date: Mon, 06 Jul 2026 21:24:21 +0000 Message-Id: <6a4c1d05.1a32a.7901b17a@gitrepo.freebsd.org> The branch main has been updated by jhibbits: URL: https://cgit.FreeBSD.org/src/commit/?id=dec79d2b47b3cb797d45b8bee7a1640dec85ebcc commit dec79d2b47b3cb797d45b8bee7a1640dec85ebcc Author: Justin Hibbits AuthorDate: 2026-07-05 23:03:31 +0000 Commit: Justin Hibbits CommitDate: 2026-07-06 21:23:55 +0000 powerpc/pmap(booke): Fix TLB TID eviction Fix tid_set_busy() for when `pmap` is NULL. Obviously a NULL pointer cannot be correctly used, so I'm not sure how it worked in testing on 64-bit. --- sys/powerpc/booke/pmap.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/sys/powerpc/booke/pmap.c b/sys/powerpc/booke/pmap.c index 310d38d5c450..545416921d09 100644 --- a/sys/powerpc/booke/pmap.c +++ b/sys/powerpc/booke/pmap.c @@ -2484,11 +2484,14 @@ mmu_booke_page_array_startup(long pages) static __inline void tid_set_busy(int cpu, int tid, pmap_t pmap) { - tidbusy[cpu * (tid_max + 1) + tid] = pmap; - if (pmap == NULL) - pmap->pm_tid[cpu] = TID_NONE; - else + volatile pmap_t *pm = &tidbusy[cpu * (tid_max + 1) + tid]; + + if (pmap == NULL) { + if (*pm != NULL) + (*pm)->pm_tid[cpu] = TID_NONE; + } else pmap->pm_tid[cpu] = tid; + *pm = pmap; } static __inline pmap_t @@ -2522,7 +2525,7 @@ tid_alloc(pmap_t pmap) /* If we are stealing TID then clear the relevant pmap's field */ if (tid_get_busy(thiscpu, tid) != NULL) { CTR2(KTR_PMAP, "%s: warning: stealing tid %d", __func__, tid); - + tid_set_busy(thiscpu, tid, NULL); /* Flush all entries from TLB0 matching this TID. */