From nobody Sat Nov 22 18:47:22 2025 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 4dDLg423Cgz6HN9V for ; Sat, 22 Nov 2025 18:47:28 +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 4dDLg40g3Bz3qJf for ; Sat, 22 Nov 2025 18:47:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763837248; 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=bj3HUAAogeHxwM5a7VBvqZNQ9Z4D+E6Rke7R1/U1AhLeheoUG/dpWs5nYnaMT77ibhVEaZ ps7mU3mizHEshn0nYSjYM/6JlGAb2O60AJ/04LHmLqpOtJEYJT7yu8ptXyMWK+QSjRabCD OmLzCefe51UDoCY9JDJigg/Uf7pThbkMjiDzzS4KeQZEIw8nLkOjVEmt1HlkHF4+/eNbgP 6vLzGpLzmZkb/VVhk6RE8E+1TirM0oBigI2iKPQzH1BrQV0e5AD43SYd4BDFa6Io7W+ABo t6KgJpC+ncdOpbcUT+GGc4ke3FNdNKUQ3orR5BuTjIsqKFI9rwxmjEeBkgN5zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1763837248; 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=uuVhkeV0DgL5fyOQ6jhQMeOCa4E3PubXJEDEyXv76r7d6hpYM8+y5G5C3hWFykfZwZlXPk I1a90IlVE/ZhB66a9vvddPe2ii9d9hcsX3wZy/PWvphAKZDvMXX5By9Z/jjNUxmocSQl0F JZMN4LaJetsBW1f5Fp3usDpAFKtTn2PoUWQ14ryV5vZoS6vSOpmszdLNp4jiUsjXXNmwhU cwcAj61LJq8QjRQ5I2ajXgHZUvvBv9duRCzwMgLEmn86OLGAl8EckYPClrX5Lq0NArTKhz cLzY9WyKcEMqHPBvdbSVxjA52s0hS74VpA6lkoCYNedtfKqtHD3doc0sRk0eLQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1763837248; a=rsa-sha256; cv=none; b=N9xN9mYf4/YHwgm26BuZgu+CvI0itnnzgMaf3y2uXeRgJUJ21x+NjK9QFXB/1K27BLz/MT LWeMGsr0BbZzb5YY9jBBlsCLSA6PLjBvaIPatxP0fwM2KGa8EIdvDEkVMHiCZODVvkrPTf j1C0DeroYeD/vHkTONA4ZIf3NFpR/BhWMAmBkGGIaKup9CNkqSi+kP9DkuZSmZIPkF9Pkb Ld8Ra13gnjfm6WyS/V0HCzzLSFPPWfjbMIA5lgeKeE4VSwO9xuNuv5++EUQM+5wuurLAek FWpsk78TLEahPpoh6pGANAaotlxmvc0/dR0+XnM0VSBjydKHX8UyOZ10SWB6/w== 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 4dDLg374wnz18tC for ; Sat, 22 Nov 2025 18:47:27 +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 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 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();