From nobody Sun Jan 25 00:24:42 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 4dzC966sXkz6PtsD for ; Sun, 25 Jan 2026 00:24:42 +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 "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4dzC965C4hz3cxY for ; Sun, 25 Jan 2026 00:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300682; 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=DNjm11rehQYXMaRcL/LmIyLc1WGfkO7UZH5OoUc/NLs=; b=VHz9X8xlL7LY2R3V4OxAUGJ1ygoLR7KbpDYL52bq3NC8utj2ZNpt6EqbdslFGoERG/mt6+ HsakOqicaf/UPFT9yINfqgZhSnAdpXxC+i8IjMbwfa/Wz5TdaEacIZ8AYsZZEXdXruKflb EX7K3OrQhUn74bX9o89XG8YBy8a0sivmhBhXOtJRt3TOnkxQ+j08IeznFXDgQ9zecWqbzM ktx7O7vtF0OPL6SxzlS94Pt7SezYYMVlICsp1BSJdi4c92zdmPENTeYMYEMhvhXvudSZVp MvwChsc6ApGeVpes8TyuxprQQmNKSQlDWRNNHoRBkQWO79o/xq2SIQ9pxoC7vA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1769300682; 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=DNjm11rehQYXMaRcL/LmIyLc1WGfkO7UZH5OoUc/NLs=; b=x7qNvlO+8zW3LjH/Tt3cARp9K9OnE/xdG8vSFPeTVmWr9qYyBAUutq4M8eAoL+qGYkzFeq 0uho2tR/Jy4ri5rcjb+usBV+/xFC28v7zs0+DIO9i9H26wnJYRLGOgE4QIUiHOyNw4q+ay KTkNitJhh5TXk3GzP5U+HN6WQsE6WrhBgNPg2NlpqTh6DPGQQxsQZATTERmnaiOrw9fhvw z9PdbgVxq2e+U/VM7dXuYcIkIFbmcn8Cb5hh5LEIY7n3Ll1tVMdlNIOxw+tcIJ/8BbSoGe hguTJKqfBwXM9w7nrpJMv1JU822IP07iDHfmbXAbA6Xf7eeTwS9L/TzwiFtdrg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1769300682; a=rsa-sha256; cv=none; b=LJ9KXmpdZesLl1oBAV79wMGZBSZ1JZmor0Dq4+YP+WDT5MHVpT0DEErzB/H9vM63v0If/e C0DMdNdHHOvQ7weGopDPko8XuJ+mf3+QtBklvgMOlSzRaIreemdz/mQIqCk74iWcsuOeUj eZvT+EpSCOcjFUESLphVLXT/2RksXUBAgHUFzEd/q+Bi9EsfN4qPqrqnCmznr2IJX21e12 f/t20rSzTgOWtFhlivIKDyXINGx+BEgkRYN1+V9FemLyK5VhCuGlRzk3x3LI6O0WPNyoig DqqQ2hHOn0SJ4vy++DSpF/RqTBMQdv17NcYuFGw58TDbPtoeHqgIe5rTQFn0Dg== 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 4dzC964lkCz1Qty for ; Sun, 25 Jan 2026 00:24:42 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3fe1f by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sun, 25 Jan 2026 00:24:42 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 2079e5864f20 - stable/15 - x86: mask all LAPIC vectors early, before BSP interrupts are enabled 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: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/15 X-Git-Reftype: branch X-Git-Commit: 2079e5864f204c552b82b63809e1b39b13ccfd3c Auto-Submitted: auto-generated Date: Sun, 25 Jan 2026 00:24:42 +0000 Message-Id: <697562ca.3fe1f.4c16d866@gitrepo.freebsd.org> The branch stable/15 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=2079e5864f204c552b82b63809e1b39b13ccfd3c commit 2079e5864f204c552b82b63809e1b39b13ccfd3c Author: Konstantin Belousov AuthorDate: 2025-12-09 02:18:21 +0000 Commit: Konstantin Belousov CommitDate: 2026-01-25 00:23:34 +0000 x86: mask all LAPIC vectors early, before BSP interrupts are enabled (cherry picked from commit 11f954b021a1aadde1d03d40ed5d6b529e14da98) --- sys/x86/x86/local_apic.c | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/sys/x86/x86/local_apic.c b/sys/x86/x86/local_apic.c index aecad4cbd463..053d9814c14c 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -428,6 +428,7 @@ lapic_is_x2apic(void) (APICBASE_X2APIC | APICBASE_ENABLED)); } +static void lapic_early_mask_vecs(void); static void lapic_enable(void); static void lapic_resume(struct pic *pic, bool suspend_cancelled); static void lapic_timer_oneshot(struct lapic *); @@ -553,6 +554,7 @@ lapic_init(vm_paddr_t addr) /* Perform basic initialization of the BSP's local APIC. */ lapic_enable(); + lapic_early_mask_vecs(); /* Set BSP's per-CPU local APIC ID. */ PCPU_SET(apic_id, lapic_id()); @@ -791,6 +793,32 @@ lapic_xapic_mode(void) intr_restore(saveintr); } +static void +lapic_early_mask_vec(const struct lvt *l) +{ + uint32_t v; + + if (l->lvt_masked != 0) { + v = lapic_read32(l->lvt_reg); + v |= APIC_LVT_M; + lapic_write32(l->lvt_reg, v); + } +} + +/* Done on BSP only */ +static void +lapic_early_mask_vecs(void) +{ + int elvt_count, i; + + for (i = 0; i < APIC_LVT_MAX; i++) + lapic_early_mask_vec(&lvts[i]); + + elvt_count = amd_read_elvt_count(); + for (i = 0; i < elvt_count; i++) + lapic_early_mask_vec(&elvts[i]); +} + void lapic_setup(int boot) {