From nobody Fri Oct 30 13:47:47 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 4jGMqS2HRgz6wtMy for ; Fri, 30 Oct 2026 13:47:48 +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) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 4jGMqS0CV3z4gsT for ; Fri, 30 Oct 2026 13:47:48 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793368068; 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=wWKAGoEd0vQwNYfgqnI7VlVRQFP1p7MWHjavnCmXkpU=; b=RGHpjR2WicHn++vVFa5yneeXVZ9m7dVx5+SV89mlVJzi7lRPngeHlYzGGT+DWQ7E0gjLMR ixOEIjCA3/EVyUl3gqyrpvDbIw6Cw6o3w3hQ5XAetDiOTyCulC5c5icyjB40ZxuL3mQUtN 8kpSqo2Tc57nXD9hIAYqCIO+jX9kDV/wYgv1kx4dbTIR+wiHyh4c1rKaEnAvPB5GPK6RRl Y6TnDbBO8eaGf4geX+vlRZffOZKW5cATaDM2Pct/YVgghCLTT100HDZNOk9k3oKgEx/Hq/ dcME2znBBenVt3qlnGPLz8Qy6Ip5YOMzqYXxdLT9CB/byrQfOiWhqvXGImtrNg== ARC-Seal: i=1; a=rsa-sha256; d=freebsd.org; s=dkim; cv=none; t=1793368068; b=D3R7uUtLr1J49I3iTq1cKQ4ZANpMUeZbQ20yhIRDT+bVh/9ojiqp7VTDshbLTn/RauN3OP iwkMbfr7kO9zhfxt296Cau2y0NES2x4TdWRSYNVG1AWLvwCT090fh75HtoPlEVA9517Er8 sSLVv8QEJcgozqDc9cT8vVktrqUjvDRT8zTmwk/lvScoG4echiL2tvk9JVMnqbzltRxVOE xHZj+1eX9Pfu8CXkrjSF/CiK8nUYoazUev84SM4O8MXLqiqk3UDYvuEq4FEZMD8WUI5Ixl fwRfOI6iAr5qZFZEW5Rv7ymnQ5sxQ4VRQaBCvblimhi3xxNrwIuwFMSDJzO7dQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1793368068; 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=wWKAGoEd0vQwNYfgqnI7VlVRQFP1p7MWHjavnCmXkpU=; b=gA1tqUtQ8nmJaOXOWPiYRgoskGhq/BGCNBQZMMb2qlcj/ioPJF4HIhYTeJ80t9w7MZ8hWH 7C8i7MONsoqdDS086WLh+wvZQfRIndS9GdxcDv+dv3ycqAjjSkWsBM/dALLuT5XMHjzGd/ +lBj30klc7Lb7qFmxO3iFX5j8rpSr0bxkFOQc9fyyNf6+wQNLc4COTsXnt+NtEeG+G8poO 4HMckkko4jyCBS7BKUh4/IMkdk3ps7nsVfzwk6oPv+Obk5FYg3TlyL6Hnhji6kvJJcUJ2x FiaTt4qU6sWiAFTnQfsoGhOiDzj1Xlm4mR7Gair3U/5XfXwsibYcLvgB5H5fRA== 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 4jGMqR6PZCzT6p for ; Fri, 30 Oct 2026 13:47:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 1f1c2 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Fri, 30 Oct 2026 13:47:47 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: 91d9fbb6e153 - main - amd64 FRED: enable interrupts after user EXTINTs and NMIs 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 91d9fbb6e1537009c35ec0c1c37ca09b28c0b31d Auto-Submitted: auto-generated Date: Fri, 30 Oct 2026 13:47:47 +0000 Message-Id: <6ae4a003.1f1c2.35dd5fba@gitrepo.freebsd.org> The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=91d9fbb6e1537009c35ec0c1c37ca09b28c0b31d commit 91d9fbb6e1537009c35ec0c1c37ca09b28c0b31d Author: Konstantin Belousov AuthorDate: 2026-10-30 13:01:15 +0000 Commit: Konstantin Belousov CommitDate: 2026-10-30 13:47:12 +0000 amd64 FRED: enable interrupts after user EXTINTs and NMIs This is needed to run userret() with interrupts enabled. Sponsored by: The FreeBSD Foundation MFC after: 1 week --- sys/amd64/amd64/trap.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 534768abcd59..ff426a8995e1 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -1639,20 +1639,20 @@ trap_fred_u(struct trapframe_fred *frame) switch (type) { case TF_FRED_EVINFO2_TYPE_EXTINT: trap_fred_extint(frame, vec); + enable_intr(); break; case TF_FRED_EVINFO2_TYPE_NMI: frame->tf_idt.tf_trapno = T_NMI; nmi_handle_intr(&frame->tf_idt); fred_out_of_nmi(); + enable_intr(); #ifdef HWPMC_HOOKS if ((td->td_pflags & TDP_CALLCHAIN) != 0) { int (*ph)(struct thread *, int, void *); ph = atomic_load_ptr(&pmc_hook); - if (ph != NULL) { - enable_intr(); + if (ph != NULL) ph(td, PMC_FN_USER_CALLCHAIN, &frame->tf_idt); - } } #endif break;