From nobody Wed Aug 13 20:32:20 2025 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 4c2Kmh3zQVz64Tb1; Wed, 13 Aug 2025 20:32:20 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4c2Kmh1Qpyz3QP6; Wed, 13 Aug 2025 20:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755117140; 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=cgQiP+brOMuckZz608CPmNDMFa017ZaSgqoSMU/AwJg=; b=V7BeBGwWubrsLdEGZyGfa36+EThhxEXMZS3Vx4MI1jioO18570Kv4Tn9OMAnFxnb4llIZV oAtVno/Zp/TZhwE76GQcSMmFyAIda4TLakicGxsYDL0zR+lQpS4xdUpmf9xzVVTm6FesZu n2fES6WT+WNHc+PHRePLl6cpnmfTvKAmXj3fI452rlJSgj45IP/GHLRPbhUt7K0yHhaEW+ wFhCq9NaJiVxcIsd4BP08i0lTVRiUqG4Lnw6VwcQQJHXgZLTVb0o5A7FdIkRxm70/xTWlw moRqjZxT1/5DaPaHgc45TCaM2UEs1JxBlGMgnkZ3dH3nDZhc0tpYAnhtDmhKyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1755117140; 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=cgQiP+brOMuckZz608CPmNDMFa017ZaSgqoSMU/AwJg=; b=wOP6NWFi8fMziEdagRzOyIzY93pG1OgY/Wm6mKWBVhe/jf0L3RnN0XMd7i/eWlKlp8l4VA 0nO0/ziad+jF+Ggh2WIMGY0CBW8ellKPJ8fIuhcmKki+8WY6Fyf8/dXQJ84BbSwu6z1xYw W1W8r5oVQA0gu9hcjb97NQ+FwigvI4had/TqtOdXoGNvc/QS7oMHFbI+PoN+8n1ePXCPhG 6CcFkYzTN62tKZHN7U+IViNinfCrfriPRmbF3UhSFPkXywaehRzCbxyITXrbQPWDp/V4pC jSWf993fYkP3hbCZ4a3Ot/jIZpQEqCyVAErjQvssKzVx7IIhzoFEaSwwDMJ89A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1755117140; a=rsa-sha256; cv=none; b=QdBgqzdQxBjF2wViTjmfiXcQ7kz45OV39wt0CIZ9XDuNmx6frsPvF1VStzyrAR8k7b6mDq jL6YWYAaMmuHZH6cf7QpaNDek5g6Trch1v+XplcBD7mCuB0ukoJnD76rYybd83wbKYR4dh UxYiPa/IEksRIW/wBiKCQPw1vBJXgwjc4BUjMZmUwSf0CpJ95yQfNRuCeo5SpCUHSHCGTR C8Gi8EU2upIao7NOOf8JtSiCNE6qirYnlMnFvawOYVqHqYk1XsgGnObt4Czj6IFXql8JEC qd/+UCB0kvE42FRfHHFr39fkOlsHWDRoe8EiCgdXlaOSrZpTXQnVqpzEgzXAow== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4c2Kmh0vcbz7b2; Wed, 13 Aug 2025 20:32:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 57DKWKVC075638; Wed, 13 Aug 2025 20:32:20 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 57DKWKmf075635; Wed, 13 Aug 2025 20:32:20 GMT (envelope-from git) Date: Wed, 13 Aug 2025 20:32:20 GMT Message-Id: <202508132032.57DKWKmf075635@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Colin Percival Subject: git: 4322d597453d - main - bhyve: Support and advertise 15-bit MSI Extended Destination ID 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: 4322d597453d63d638675b8612d7aaabd65dcadd Auto-Submitted: auto-generated The branch main has been updated by cperciva: URL: https://cgit.FreeBSD.org/src/commit/?id=4322d597453d63d638675b8612d7aaabd65dcadd commit 4322d597453d63d638675b8612d7aaabd65dcadd Author: David Woodhouse AuthorDate: 2025-07-31 07:33:54 +0000 Commit: Colin Percival CommitDate: 2025-08-13 20:31:15 +0000 bhyve: Support and advertise 15-bit MSI Extended Destination ID To support guests with more than 255 vCPUs, allow bits 5-11 of the MSI address to be used as additional destination ID bits. This is compatible with Hyper-V, KVM and Xen's implementation of the same enlightenment, as documented at http://david.woodhou.se/ExtDestId.pdf Reviewed by: kib Pull Request: https://github.com/freebsd/freebsd-src/pull/1797 Signed-off-by: David Woodhouse --- sys/amd64/vmm/io/vioapic.c | 9 +++++++++ sys/amd64/vmm/vmm_lapic.c | 5 +++++ sys/amd64/vmm/x86.c | 2 +- sys/x86/include/apicreg.h | 2 ++ 4 files changed, 17 insertions(+), 1 deletion(-) diff --git a/sys/amd64/vmm/io/vioapic.c b/sys/amd64/vmm/io/vioapic.c index 8869dc1383e6..7df6193d6dc0 100644 --- a/sys/amd64/vmm/io/vioapic.c +++ b/sys/amd64/vmm/io/vioapic.c @@ -130,6 +130,15 @@ vioapic_send_intr(struct vioapic *vioapic, int pin) vector = low & IOART_INTVEC; dest = high >> APIC_ID_SHIFT; + /* + * Ideally we'd just call lapic_intr_msi() here with the + * constructed MSI instead of interpreting it for ourselves. + * But until/unless we support emulated IOMMUs with interrupt + * remapping, interpretation is simple. We just need to mask + * in the Extended Destination ID bits for the 15-bit + * enlightenment (http://david.woodhou.se/ExtDestId.pdf) + */ + dest |= ((high & APIC_EXT_ID_MASK) >> APIC_EXT_ID_SHIFT) << 8; vlapic_deliver_intr(vioapic->vm, level, dest, phys, delmode, vector); } diff --git a/sys/amd64/vmm/vmm_lapic.c b/sys/amd64/vmm/vmm_lapic.c index fd511733492e..0cae01f172ec 100644 --- a/sys/amd64/vmm/vmm_lapic.c +++ b/sys/amd64/vmm/vmm_lapic.c @@ -115,6 +115,11 @@ lapic_intr_msi(struct vm *vm, uint64_t addr, uint64_t msg) * physical otherwise. */ dest = (addr >> 12) & 0xff; + /* + * Extended Destination ID support uses bits 5-11 of the address: + * http://david.woodhou.se/ExtDestId.pdf + */ + dest |= ((addr >> 5) & 0x7f) << 8; phys = ((addr & (MSI_X86_ADDR_RH | MSI_X86_ADDR_LOG)) != (MSI_X86_ADDR_RH | MSI_X86_ADDR_LOG)); delmode = msg & APIC_DELMODE_MASK; diff --git a/sys/amd64/vmm/x86.c b/sys/amd64/vmm/x86.c index 9c2fdac11a81..2e2224595ab4 100644 --- a/sys/amd64/vmm/x86.c +++ b/sys/amd64/vmm/x86.c @@ -614,7 +614,7 @@ x86_emulate_cpuid(struct vcpu *vcpu, uint64_t *rax, uint64_t *rbx, break; case CPUID_BHYVE_FEATURES: - regs[0] = 0; /* No features to advertise yet */ + regs[0] = CPUID_BHYVE_FEAT_EXT_DEST_ID; regs[1] = 0; regs[2] = 0; regs[3] = 0; diff --git a/sys/x86/include/apicreg.h b/sys/x86/include/apicreg.h index d610d7f11a1c..1252647fbab3 100644 --- a/sys/x86/include/apicreg.h +++ b/sys/x86/include/apicreg.h @@ -296,6 +296,8 @@ typedef struct IOAPIC ioapic_t; /* constants relating to APIC ID registers */ #define APIC_ID_MASK 0xff000000 #define APIC_ID_SHIFT 24 +#define APIC_EXT_ID_MASK 0x00fe0000 +#define APIC_EXT_ID_SHIFT 17 #define APIC_ID_CLUSTER 0xf0 #define APIC_ID_CLUSTER_ID 0x0f #define APIC_MAX_CLUSTER 0xe