From nobody Mon Oct 12 00:47:37 2026 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 4j2zMY4PXJz6wQbZ for ; Mon, 12 Oct 2026 00:47: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4j2zMY3bZFz4D37 for ; Mon, 12 Oct 2026 00:47:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791766057; 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=4dkS/k+aoFfIMq0y4HrLDVWxhUQbE5qI5aIH25hX1L8=; b=co2DanqWFI6VGnV2BwjBE++8lz+uhiDMvKqg6ZpzXDlNjkGTgU+qFI8WmH2+g1S2dNYMe+ 5iWLKq+/SssoL8BUitJMSpooJ4ar+1zsCTGqAxd50Dzd/otVfRvQARy1PoYlxf+//lFVrZ LX6aY4QHZH7w6BXx+OyZdnSEJnYvr37rhnvMmRkPvnCzynyVjr5QrmtI88v92FHRYMR+OA sgIOrSlui/c7AQhe2LXAEiW+vVTe3c2utA/Qr9lkYQCIBf5tBtjVz5v8FkDDYTrdcwwJF6 /GaD5CNz7LgJA7cKjZhRrpEXOdnEI+XokrtYjSiEdMlR1AOSDf1RBQ7n55Y72Q== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1791766057; b=N43/mvk4BpiZi6CwkggmPPSTerv66ZX8zwEEXmxGsll3c8UMWi+hI6g3zLhA22pXPRPkuD w5KcAIi7BFZ8gKqW/BuJvowKzRNQJ7gHvgi9JeLsdxrhNCAMD/2+HKn29ymqiVP6a7h3Q0 5qTi845tK5CStQRNUR7i/Bf0RfsgGc23ncrSIGw0kYq/wQItOX1jNa3x/78NNfNmtDoSyx JrHQO2aOVbGYXd8e3BLDBVyMCwRnz/cN3RDj2DbPv6hsQXjS2VDiaOze6auSzadBuc1lmp M0rfp4xgbatyOFz8oC/P6DvgzpPK2KnV/BW2oaL+tLgpFzm09jPcChnWdcjECw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1791766057; 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=4dkS/k+aoFfIMq0y4HrLDVWxhUQbE5qI5aIH25hX1L8=; b=Ez8pRtHmKNXsINKpVlp8sZ0MlZiBxatKqWJmkAm8TKYE3D0fdf0joj0QDE7CLTWR2oLRyK Hhr+7pMnYUk2K2agglr6p1a2IY4jFZH/vc/v5lFZfDWIhA7zqdHo1jEu5HDdzQI9TteuKy 1GGRb4UvS3R+oSOy8tbBy7I9GJd+FJY5thaQHrMVXh7WwpNJtGaaIBIuPDFQA+0zm+7X2O tS58ugtw1bhHNn8WqILpsa+gxyCWKqmhCRciP452XqmyNsVbz1KDsD6aBmgIfJdgDohOKy d6ap5X0S8DB+LqX3btif47ZeX2S/a4ESdfd9tBEDmwtmVaorB64KUHhg7xSBUg== 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 4j2zMY2gkfz15Fh for ; Mon, 12 Oct 2026 00:47:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 335c1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 12 Oct 2026 00:47:37 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Alan Cox Subject: git: db5459b4b598 - stable/15 - arm64 vfp: eliminate nested critical sections List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org List-Id: Commit messages for all branches of the src repository 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: alc X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: db5459b4b598b123b1faa7ebf50cbfebacc25e0f Auto-Submitted: auto-generated Date: Mon, 12 Oct 2026 00:47:37 +0000 Message-Id: <6acc2e29.335c1.499b3f7@gitrepo.freebsd.org> The branch stable/15 has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=db5459b4b598b123b1faa7ebf50cbfebacc25e0f commit db5459b4b598b123b1faa7ebf50cbfebacc25e0f Author: Alan Cox AuthorDate: 2026-08-15 06:15:36 +0000 Commit: Alan Cox CommitDate: 2026-10-12 00:46:29 +0000 arm64 vfp: eliminate nested critical sections At two out of three call sites to vfp_restore_state_common(), the caller must use critical_{enter,exit}() to prevent preemption between its call to vfp_restore_state_common() and other actions, notably its call to sve_enable(). So, it is arguably better to make vfp_restore_state_common()'s caller responsible for performing critical_{enter,exit}() and simply perform CRITICAL_ASSERT() inside vfp_restore_state_common(). (cherry picked from commit 189ee41b6cc3b0d92c291cc854d9781afec23ad4) --- sys/arm64/arm64/vfp.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/sys/arm64/arm64/vfp.c b/sys/arm64/arm64/vfp.c index 11faa4cc21cd..afb6d9e02107 100644 --- a/sys/arm64/arm64/vfp.c +++ b/sys/arm64/arm64/vfp.c @@ -679,8 +679,7 @@ vfp_restore_state_common(struct thread *td, int flags) KASSERT(td == curthread, ("%s: Called with non-current thread", __func__)); - - critical_enter(); + CRITICAL_ASSERT(td); cpu = PCPU_GET(cpuid); curpcb = td->td_pcb; @@ -728,8 +727,6 @@ vfp_restore_state_common(struct thread *td, int flags) PCPU_SET(fpcurthread, td); curpcb->pcb_vfpcpu = cpu; } - - critical_exit(); } void @@ -738,7 +735,9 @@ vfp_restore_state(void) struct thread *td; td = curthread; + critical_enter(); vfp_restore_state_common(td, td->td_pcb->pcb_fpflags); + critical_exit(); } bool