From nobody Sat Mar 28 05:56:27 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 4fjRbH73kFz6XbRX for ; Sat, 28 Mar 2026 05:56:27 +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 "R12" (not verified)) by mx1.freebsd.org (Postfix) with ESMTPS id 4fjRbH5qGgz3qbb for ; Sat, 28 Mar 2026 05:56:27 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1774677387; 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=BBnhLDoZIIXmsZCP5v+noBAROCbYvbl92DTjV/HlzKM=; b=ouV8Jb2/EzAP8tpW6dHkmoICoPBFERPSi6Wu1XU52TX8Qae34PaSbv3FYhEKSdzTxT7TME HThUhqkhjsezYAnbTIYonP6T9EacEcuM+Tagw7icpxDnG3YoAdFQ/SgIqnTvcY4NY5Pccl AZ0pDk6pN5GZXgbRv1m95l5g1PbqKRr/YqvHY1C9ruE+DUlHjmTy2y+prEUhu9TqoAxuXs 3xxwwpyiGTNYvBeK1NB8kQYciZZrKDOdOUP1Oev2pSSVrzwnPZ/2BlxL9UbKr37MxnvXU9 R0KpMosTQojQ181y7oxNuKzjJLS0JdPYxoxONcTBsoicG1te2v8Eg2ayDvNb9Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1774677387; a=rsa-sha256; cv=none; b=q0Yz7BwaEgAWbYfgRACQ428kYJ2axieP0u65AHaRYNcg7vBmtSA7HRnmOslUiEkwWN5Fmn 5dFdgBVjcroe+tbRZaWsqLHSXOyQZl713iadOEddVz0XCzU7Diq31NUdvZm+Gse6PupTaF rbqN1/v+D/jBaGm1VBV/cHX5QUxNK9JqpL8Xl4vjyYv6rUwBbYEVMqMjYWABnXZA0mhIsv zjtHtrKcN/ozJDLW+gK7Aa++9igDiY3KKMnIRAb9s3KpHf9KMBnZ9s59KjPkcrVTQhXR8M RJwMe6W94ebUtXaCeyOaRZMAQkHo0mIq/Q8+krgcqcziUea/lVgKTHCb5eF3IQ== 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=1774677387; 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=BBnhLDoZIIXmsZCP5v+noBAROCbYvbl92DTjV/HlzKM=; b=ecFgWMlyVbamGvm7M2LawqFySID8tl28jbUkvKdj2YVOrAks7eFnWvjopta0UVT37LmoqV S7EFI45D8Fur97/KhuZDvF5B45B8q5+N138f2gLpKsZmSLtAg4OxktxXUhqWAHwvRom5MD bLAel/8dmt2hD4M3Qfnbk2LXB1E/eEVrv0f+OhSqz6xFG11Cr8ItPXoVoOScSQtAnn24r+ 9JlnDVrCpsPVm0Qwyi+DgxphJWugDFqyRg7LEdJqqBK8jl3LUzR8i6jtNJPQvi2rkCnh+6 Kn2ti17O6XkC9MmkpoGoxKiC7m3FySqKsMV23nYjFJzsQyCwzYGTVylxN8fSbg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4fjRbH56Mdz1BDt for ; Sat, 28 Mar 2026 05:56:27 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 40425 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Sat, 28 Mar 2026 05:56:27 +0000 To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 5809c9a77b2d - main - io_apic: Don't route to APIC ID > 255 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: cperciva X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5809c9a77b2d3b83c056ba3ac5ba4e261c0af595 Auto-Submitted: auto-generated Date: Sat, 28 Mar 2026 05:56:27 +0000 Message-Id: <69c76d8b.40425.6f5ee91e@gitrepo.freebsd.org> The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=5809c9a77b2d3b83c056ba3ac5ba4e261c0af595 commit 5809c9a77b2d3b83c056ba3ac5ba4e261c0af595 Author: Colin Percival AuthorDate: 2026-03-14 05:51:04 +0000 Commit: Colin Percival CommitDate: 2026-03-28 05:53:42 +0000 io_apic: Don't route to APIC ID > 255 I/O APIC Redirection Table Entries use 8 bits to encode the Destination ID. Attempting to route an IRQ to a higher APIC ID would result in it being silently routed to the value reduced modulo 256, causing a panic if the IRQ fired since the receiving CPU would not expect that IRQ. Instead, print a warning and mark the interrupt as invalid, resulting in it being forcibly masked. Reviewed by: kib Tested on: EC2 r8i.96xlarge MFC after: 3 weeks Sponsored by: Amazon Differential Revision: https://reviews.freebsd.org/D55857 --- sys/x86/x86/io_apic.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/sys/x86/x86/io_apic.c b/sys/x86/x86/io_apic.c index 03d85acabb1a..5d28b7e8c611 100644 --- a/sys/x86/x86/io_apic.c +++ b/sys/x86/x86/io_apic.c @@ -364,10 +364,20 @@ ioapic_program_intpin(struct ioapic_intsrc *intpin) /* * Set the destination. Note that with Intel interrupt remapping, * the previously reserved bits 55:48 now have a purpose so ensure - * these are zero. + * these are zero. If the CPU number (in fact, APIC ID) is too + * large, mark the interrupt as invalid, and target CPU #0. */ - low = IOART_DESTPHY; - high = intpin->io_cpu << APIC_ID_SHIFT; + if (intpin->io_cpu <= IOAPIC_MAX_ID) { + low = IOART_DESTPHY; + high = intpin->io_cpu << APIC_ID_SHIFT; + intpin->io_valid = 1; + } else { + printf("%s: unsupported destination APIC ID %u for pin %u\n", + __func__, intpin->io_cpu, intpin->io_intpin); + low = IOART_DESTPHY; + high = 0 << APIC_ID_SHIFT; + intpin->io_valid = 0; + } /* Program the rest of the low word. */ if (intpin->io_edgetrigger)