From nobody Sat Nov 22 18:47:22 2025 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 4dDLfz1Y1fz6HN6x for ; Sat, 22 Nov 2025 18:47:23 +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 "R12" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dDLfz0QQPz3q08 for ; Sat, 22 Nov 2025 18:47:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763837243; 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=eS7NowYl0ceGY8S5/wj/Sc3cTeycpYNKXbZ+CwPHq+U=; b=n4QrfL1DCOCcxBPrCI48Sr/3Y4Pn2KITDxz/sdpdmR4oOJWeCR9iV+yKGagxUuf3IcVZMr vPxOxy4CsqCTWP3tQQz2iaTUhNGiK2HEshFdraSuql+PMyVFT4XXfY0ufuDbrNVfS+F/ju XxQUcdUL9CtW1qsgkJB0FVA+mOWRA7P4dSR50EZloIJ/vdl3QPBUrj4fjUWY7X84fYUAdK 7GHZlR+GKWhE4Lot+m3cF8Bh//zkkMLl9TjrZXOBw7jv/fuhYTqFabv74/gw5t9nnDffT1 8O8+A242vgO+Evz05Z+xdKdUeyzenmdODx/wXLmctXhrzgpfE/yTSvz2EfzgqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763837243; 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=eS7NowYl0ceGY8S5/wj/Sc3cTeycpYNKXbZ+CwPHq+U=; b=XlXWMnz9igMHQVxa+KJXSKCtevdZBmtuwpLpiJl6lB6pM8LQ0TVXzYlJYFQvA+ufQuOrnU uzuiMfyGXaKYqpBtSbxs0RDTHvANPAoKcQFxhz4TNY4nZVkjsLGXiNQ9GSR5hdJ8aKq+g0 r8osZ7s2W8xy5xJ99oWKIhXPPElWe+6Q5VTakt9HE8sYq5RrL0HI+GzyHpHAffGiC4hJTo MI9qCM50e0LE+OZsoUnKb0Z/iLf5n+PBtCJfuqlsGGgKnEiof0m9p3xbuPTWJFQXRB0hFG h5EX16yQULNFNARKr3/KFFe1005L3s8CU6QYjOb/Elnmu4tiR+qx64jGU20phA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763837243; a=rsa-sha256; cv=none; b=MRKCATxuwR4+FUiaeJoY8UG4YbVDpy4nSWQ1u80e/Krq+1QA9jRTp8QxZH6XOV9GqNfiSc FDoqMwWl64IhvYPj5wiofmQxDBd4EBHQxrv9WvErQEykDQsnvmMZiqKyLBwGCn9rx95TWG bVptPc9BtTXs77UsdgsT30xIW75ci8OP5nktYjxKQccI5O59NCRseYhlan6yK0LLzXuRQh FK33VKlCmSaOMqsKebkEcCB0cow4QbHFSjTEXHIYKqeDkPd+lC6A/z8SIvqWw2aGVrIOOX BjbhtjF7BGJ0LvU/127aa95MjoYwHHR5gbIF90Kd2N9tRWLIhiPu9FMDbVZTmg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4dDLfy72zqz18Q1 for ; Sat, 22 Nov 2025 18:47:22 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 2271c by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 22 Nov 2025 18:47:22 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Jessica Clarke Subject: git: 9128380511de - main - Revert "arm64: Move intr_pic_init_secondary earlier" 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrtc27 X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9128380511de3db9bd4d62d58c6a6dfcd1094079 Auto-Submitted: auto-generated Date: Sat, 22 Nov 2025 18:47:22 +0000 Message-Id: <6922053a.2271c.37b703ae@gitrepo.freebsd.org> The branch main has been updated by jrtc27: URL: https://cgit.FreeBSD.org/src/commit/?id=9128380511de3db9bd4d62d58c6a6dfcd1094079 commit 9128380511de3db9bd4d62d58c6a6dfcd1094079 Author: Jessica Clarke AuthorDate: 2025-11-22 18:46:04 +0000 Commit: Jessica Clarke CommitDate: 2025-11-22 18:46:04 +0000 Revert "arm64: Move intr_pic_init_secondary earlier" It's not clear what the race described in the commit actually is, nor how it could arise, but this commit is definitely wrong; curthread is no longer set for intr_pic_init_secondary, and gic_v3's pic_init_secondary uses mutex(9) in some places, which requires curthread, so it has led to panics. Revert this change until the original issue this was intended to be fixed can be more thorougly investigated and a better fix made. Reported by: Herbert J. Skuhra , jhb This reverts commit a695ac2ce8bc8e8b989359002659063f2e056dcf. --- sys/arm64/arm64/mp_machdep.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/mp_machdep.c b/sys/arm64/arm64/mp_machdep.c index ba673ce9d6ee..0bdd2ecfd8a7 100644 --- a/sys/arm64/arm64/mp_machdep.c +++ b/sys/arm64/arm64/mp_machdep.c @@ -270,8 +270,6 @@ init_secondary(uint64_t cpu) install_cpu_errata(); enable_cpu_feat(CPU_FEAT_AFTER_DEV); - intr_pic_init_secondary(); - /* Signal we are done */ atomic_add_int(&aps_started, 1); @@ -290,6 +288,8 @@ init_secondary(uint64_t cpu) ("pmap0 doesn't match cpu %ld's ttbr0", cpu)); pcpup->pc_curpmap = pmap0; + intr_pic_init_secondary(); + /* Start per-CPU event timers. */ cpu_initclocks_ap();