From nobody Thu Jul 23 10:01:17 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 4h5RTp1Z0cz6lWPC for ; Thu, 23 Jul 2026 10:01:18 +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 "YR1" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4h5RTn6LsHz3Wpn for ; Thu, 23 Jul 2026 10:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1784800877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bk10T5qdJ0jK1eB7RKhb71A5tgeJq9Y5Tg3b+KKMfCk=; b=bVrCwq/Pfmv+CWNniebgPdOJDNYAurQSKV4mb3/nyQGcW9BV17cExpekW+tCfpEBXS+2/9 9UFBHEE+Bq6jprk6csn9WVy2g1SMSfVS1xLWVX+4gVxvD+KruIgRpqGDrMFUhoE7A87Oz7 YIouLtCDtmt79LKOIuc8/QG3aiou50nwkX1rtOkU+umHzyDC0FccqsAjLtQtc+xvokeRq/ LK9hacbW0gq0m/uWl4inNaBBJGO1nAWPMMwkjmfKasxVIZyQGbLaoeTekcMqUmYjueFqB/ lK7EQjCnKbq3GhEiTeN7JGwrflasl0Npn8wjcWr965qX6GWS5LJFGxHQ51uWgw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1784800877; a=rsa-sha256; cv=none; b=tOEVmwr3SXkXmMw8rP5KqzPgTylyZmR78zYDrSt1SuyaPhqMDRRruSYwj54RXNRJqNXleF YVLhyQSpezkdWlm/rD33CXNFZ+x1vRRNrUJ+bxrSdPOMp0aceSWydhaVb7QPFoiAKIZlyd ViNxfw8HAL6hAurkmPe4yfFuH7c48Qi8J91ldhyR/t/pKE9ihFI8onL2TT66xQwm1Yw8iW uWCyykOKCs/0vGeByUiP3Kbe6YqdD/Mh3YqTBJylj9MkFNuWq+ryYjQZUA0pZQMg31yIVC 6m6nmWnBqWtmO2wvXOVC7BBdNoAiuqw0LGRnpBa/kxV2y917z9qxM0q9/C6Ulg== 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=1784800877; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=bk10T5qdJ0jK1eB7RKhb71A5tgeJq9Y5Tg3b+KKMfCk=; b=FyeIJ7s9JuyHs8hHYSigQi30gdHIQPpjiRBviIfWnhaYyyD/8X2naPWD3NB2gSau7MLfgC S5YIbjh9Eb+LktAZZ2Do+RV4qk+yAbrJarkmXAFya7xpHyOHRR19y1YvTkTvev/DN38jfl nRGzY2PSOd78gZFfhKupI19yLv/3lnuY3009vXFZarZ6Czpxa+jtraQ5yYiQZ8vYSSkcUa GYAJ49nev7abwx1j2fvaFh+VcPTQgLpOYuDQ2LBynyDWq1c9G7PAt67UajfoLhXXqNhXy4 JVTR5DSi9hj71zjL7yAYbozgUA6hJgz/4VOkFQ9W4EXsAW6i1IuiCG8qlgjwqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4h5RTn5512z113Z for ; Thu, 23 Jul 2026 10:01:17 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 3d2b1 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Thu, 23 Jul 2026 10:01:17 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Cc: Konstantin Belousov From: Olivier Certner Subject: git: 73e58edc7caa - stable/14 - 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 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: olce X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 73e58edc7caa761d466276cc02fbe0a18f072da5 Auto-Submitted: auto-generated Date: Thu, 23 Jul 2026 10:01:17 +0000 Message-Id: <6a61e66d.3d2b1.344865c1@gitrepo.freebsd.org> The branch stable/14 has been updated by olce: URL: https://cgit.FreeBSD.org/src/commit/?id=73e58edc7caa761d466276cc02fbe0a18f072da5 commit 73e58edc7caa761d466276cc02fbe0a18f072da5 Author: Konstantin Belousov AuthorDate: 2025-12-09 02:18:21 +0000 Commit: Olivier Certner CommitDate: 2026-07-23 09:59:16 +0000 x86: mask all LAPIC vectors early, before BSP interrupts are enabled (cherry picked from commit 11f954b021a1aadde1d03d40ed5d6b529e14da98) (cherry picked from commit 2079e5864f204c552b82b63809e1b39b13ccfd3c) --- 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 4dc826bc5244..2636b87e78b3 100644 --- a/sys/x86/x86/local_apic.c +++ b/sys/x86/x86/local_apic.c @@ -434,6 +434,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 *); @@ -559,6 +560,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()); @@ -799,6 +801,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) {