From nobody Tue Aug 18 06:57:23 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 4hPL9b5k3jz6nd1d for ; Tue, 18 Aug 2026 06:57: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 "YR2" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4hPL9b3Gnvz3cGv for ; Tue, 18 Aug 2026 06:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1787036243; 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=RwHStps/CvPBJaTwA4dbP0bJc7EEjfrpchj7trkThSo=; b=JqUW7T8r6IYMdkw5IIkfIg63gPYhx0QbF1q4Z8lRqUz+d1LA+/AY2rKVKrHddXDScexD2f 2p5o+Ry1JB8bk47u7nDiC0YCCWZfzON8ygeq2Ka+4XS4ia3vWbMn/Xsz3Ez+UIUNbU6gx6 Zp4NNMWfxavTDy4QkeEtEGjWOamTMBkdhNBljSkceKkhBMB3Z6xTqSKhSvEy1RIpyJv0Fl I4vnM8c/i5LzlBd1fwrOja5yUeL3U0XxluH7nK2a3cvJz1fK5P3xYpQ4Wabd18PxtrNpCQ osYM3jV2uowh2iYEm7j2Hok9urR4adppc5ORlGUyVQdyjONV6F+Twdm5QGj/bA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1787036243; a=rsa-sha256; cv=none; b=W2BVnvfEC2Pd35SvasHz61LNlDHTEnyrPLSV83ZNHiobxQ/DVbgzl/wbAHSfHoBj59T4D7 wpT5Pw7fxOkaZHEVvSuE+V++ryXoa8foa3Ree4zaqkPxWiqF+FnzE/61id5XIJVyVDCerJ y4sw3h5WrmcmzqjfbnORB70BUO5g6cUG3JM/ZU6pHBgIrHI5MzJKDVxiLM6ojk6mq0Cj7b 5wZwiJiTpqhzs46/ooITO/vUencU5sWDSJjl5VPS1OLICq2saxh76/ibrKORNo6iug7X5U eyDZgNEctvI0U99LNGj7Y4NLoqJwfNzlc+TZCUhnUiaAjabqT4n3B9199w6UQA== 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=1787036243; 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=RwHStps/CvPBJaTwA4dbP0bJc7EEjfrpchj7trkThSo=; b=kd6PLMX1Q2v+KUWkf18ihZcxghzG+LMFxTG3QFiQNZitjksQNdpACIdLihmijqsO4xJN0J nNZ+PD5dMOfiCn9PitsVseewj3oiiq6ZSB+cX1bimp6p1jsDHRrTUnekvkMuQTbpzzVyDy JM/aLJjR9c+RFFLSb4Of8zKy7eMoFCsaNmjghP1rLYN/NHhjQMfdeiJJYD/j7M9n8ci+xS 2tVhaaOkAe7/2jneGDUnDZAgkNvKlVPC8IsQ+VXfVspzKCU7BiNAe/jYM6PGCdJOpetQj/ swPZO35VpavBcHKC9AIcYpJspRwKCO7RdwWh7pW+aotLz0ywTvUO/+eagMhOvg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4hPL9b265mzZj9 for ; Tue, 18 Aug 2026 06:57:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 42a46 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Tue, 18 Aug 2026 06:57:23 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Alan Cox Subject: git: 189ee41b6cc3 - main - arm64 vfp: eliminate nested critical sections 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: alc X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 189ee41b6cc3b0d92c291cc854d9781afec23ad4 Auto-Submitted: auto-generated Date: Tue, 18 Aug 2026 06:57:23 +0000 Message-Id: <6a840253.42a46.5829be49@gitrepo.freebsd.org> The branch main has been updated by alc: URL: https://cgit.FreeBSD.org/src/commit/?id=189ee41b6cc3b0d92c291cc854d9781afec23ad4 commit 189ee41b6cc3b0d92c291cc854d9781afec23ad4 Author: Alan Cox AuthorDate: 2026-08-15 06:15:36 +0000 Commit: Alan Cox CommitDate: 2026-08-18 06:55:39 +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(). Reviewed by: kib, markj MFC after: 2 weeks Differential Revision: https://reviews.freebsd.org/D58859 --- 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