From: isaku.yamahata@gmail.com
To: qemu-devel@nongnu.org, pbonzini@redhat.com,
alistair@alistair23.me, ehabkost@redhat.com,
marcel.apfelbaum@gmail.com, mst@redhat.com, cohuck@redhat.com,
mtosatti@redhat.com, xiaoyao.li@intel.com, seanjc@google.com,
erdemaktas@google.com
Cc: isaku.yamahata@intel.com, isaku.yamahata@gmail.com, kvm@vger.kernel.org
Subject: [RFC PATCH v2 39/44] ioapic: add property to disallow SMI delivery mode
Date: Wed, 7 Jul 2021 17:55:09 -0700 [thread overview]
Message-ID: <0855fc584f8ffe862760bc7ef076984b1f2c48a2.1625704981.git.isaku.yamahata@intel.com> (raw)
In-Reply-To: <cover.1625704980.git.isaku.yamahata@intel.com>
From: Isaku Yamahata <isaku.yamahata@intel.com>
Add a property to prevent ioapic from setting SMI delivery mode. Without
this guard, qemu can result in unexpected behavior.
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
---
hw/intc/ioapic.c | 18 ++++++++++++++++++
hw/intc/ioapic_common.c | 20 ++++++++++++++++++++
include/hw/i386/ioapic_internal.h | 1 +
3 files changed, 39 insertions(+)
diff --git a/hw/intc/ioapic.c b/hw/intc/ioapic.c
index 6d61744961..1815fbd282 100644
--- a/hw/intc/ioapic.c
+++ b/hw/intc/ioapic.c
@@ -381,6 +381,21 @@ ioapic_fix_level_trigger_unsupported(uint64_t *entry)
}
}
+static inline void
+ioapic_fix_smi_unsupported(uint64_t *entry)
+{
+ if ((*entry & IOAPIC_LVT_DELIV_MODE) ==
+ IOAPIC_DM_PMI << IOAPIC_LVT_DELIV_MODE_SHIFT) {
+ /*
+ * ignore a request for delivery mode of lowest SMI
+ */
+ warn_report_once("attempting to set delivery mode to SMI"
+ "which is not supported");
+ *entry &= ~IOAPIC_LVT_DELIV_MODE;
+ *entry |= IOAPIC_DM_FIXED << IOAPIC_LVT_DELIV_MODE_SHIFT;
+ }
+}
+
static void
ioapic_mem_write(void *opaque, hwaddr addr, uint64_t val,
unsigned int size)
@@ -424,6 +439,9 @@ ioapic_mem_write(void *opaque, hwaddr addr, uint64_t val,
if (s->level_trigger_unsupported) {
ioapic_fix_level_trigger_unsupported(&s->ioredtbl[index]);
}
+ if (s->smi_unsupported) {
+ ioapic_fix_smi_unsupported(&s->ioredtbl[index]);
+ }
ioapic_fix_edge_remote_irr(&s->ioredtbl[index]);
ioapic_service(s);
}
diff --git a/hw/intc/ioapic_common.c b/hw/intc/ioapic_common.c
index 07ee142470..b8ef7efbad 100644
--- a/hw/intc/ioapic_common.c
+++ b/hw/intc/ioapic_common.c
@@ -168,12 +168,32 @@ static void ioapic_common_set_level_trigger_unsupported(Object *obj, bool value,
s->level_trigger_unsupported = value;
}
+static bool ioapic_common_get_smi_unsupported(Object *obj, Error **errp)
+{
+ IOAPICCommonState *s = IOAPIC_COMMON(obj);
+ return s->smi_unsupported;
+}
+
+static void ioapic_common_set_smi_unsupported(Object *obj, bool value,
+ Error **errp)
+{
+ DeviceState *dev = DEVICE(obj);
+ IOAPICCommonState *s = IOAPIC_COMMON(obj);
+ /* only disabling before realize is allowed */
+ assert(!dev->realized);
+ assert(!s->smi_unsupported);
+ s->smi_unsupported = value;
+}
+
static void ioapic_common_init(Object *obj)
{
object_property_add_bool(obj, "level_trigger_unsupported",
ioapic_common_get_level_trigger_unsupported,
ioapic_common_set_level_trigger_unsupported);
+ object_property_add_bool(obj, "smi_unsupported",
+ ioapic_common_get_smi_unsupported,
+ ioapic_common_set_smi_unsupported);
}
static void ioapic_common_realize(DeviceState *dev, Error **errp)
diff --git a/include/hw/i386/ioapic_internal.h b/include/hw/i386/ioapic_internal.h
index 20f2fc7897..46f22a4f85 100644
--- a/include/hw/i386/ioapic_internal.h
+++ b/include/hw/i386/ioapic_internal.h
@@ -104,6 +104,7 @@ struct IOAPICCommonState {
uint64_t ioredtbl[IOAPIC_NUM_PINS];
Notifier machine_done;
bool level_trigger_unsupported;
+ bool smi_unsupported;
uint8_t version;
uint64_t irq_count[IOAPIC_NUM_PINS];
int irq_level[IOAPIC_NUM_PINS];
--
2.25.1
next prev parent reply other threads:[~2021-07-08 1:15 UTC|newest]
Thread overview: 92+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-08 0:54 [RFC PATCH v2 00/44] TDX support isaku.yamahata
2021-07-08 0:54 ` [RFC PATCH v2 01/44] target/i386: Expose x86_cpu_get_supported_feature_word() for TDX isaku.yamahata
2021-07-22 17:52 ` Connor Kuehl
2021-07-08 0:54 ` [RFC PATCH v2 02/44] kvm: Switch KVM_CAP_READONLY_MEM to a per-VM ioctl() isaku.yamahata
2021-07-22 17:52 ` Connor Kuehl
2021-07-08 0:54 ` [RFC PATCH v2 03/44] i386/kvm: Move architectural CPUID leaf generation to separarte helper isaku.yamahata
2021-07-08 0:54 ` [RFC PATCH v2 04/44] vl: Introduce machine_init_done_late notifier isaku.yamahata
2021-07-22 17:52 ` Connor Kuehl
2021-08-26 10:13 ` Gerd Hoffmann
2021-07-08 0:54 ` [RFC PATCH v2 05/44] linux-headers: Update headers to pull in TDX API changes isaku.yamahata
2021-07-08 0:54 ` [RFC PATCH v2 06/44] hw/i386: Introduce kvm-type for TDX guest isaku.yamahata
2021-07-22 17:53 ` Connor Kuehl
2021-08-26 10:22 ` Gerd Hoffmann
2021-11-24 7:31 ` Xiaoyao Li
2022-01-10 11:18 ` Daniel P. Berrangé
2022-01-10 12:01 ` Xiaoyao Li
2022-01-10 12:05 ` Daniel P. Berrangé
2021-07-08 0:54 ` [RFC PATCH v2 07/44] i386/kvm: Squash getting/putting guest state for TDX VMs isaku.yamahata
2021-08-26 10:24 ` Gerd Hoffmann
2021-12-09 3:33 ` Xiaoyao Li
2021-07-08 0:54 ` [RFC PATCH v2 08/44] i386/kvm: Skip KVM_X86_SETUP_MCE for TDX guests isaku.yamahata
2021-07-08 0:54 ` [RFC PATCH v2 09/44] target/i386: kvm: don't synchronize guest tsc for TD guest isaku.yamahata
2021-07-22 17:53 ` Connor Kuehl
2021-07-08 0:54 ` [RFC PATCH v2 10/44] hw/i386: Initialize TDX via KVM ioctl() when kvm_type is TDX isaku.yamahata
2021-08-26 10:27 ` Gerd Hoffmann
2021-08-26 15:06 ` Eric Blake
2021-07-08 0:54 ` [RFC PATCH v2 11/44] i386/tdx: Implement user specified tsc frequency isaku.yamahata
2021-07-22 17:53 ` Connor Kuehl
2021-12-02 8:56 ` Xiaoyao Li
2021-07-08 0:54 ` [RFC PATCH v2 12/44] target/i386/tdx: Finalize the TD's measurement when machine is done isaku.yamahata
2021-07-22 17:53 ` Connor Kuehl
2021-07-08 0:54 ` [RFC PATCH v2 13/44] i386/tdx: Frame in tdx_get_supported_cpuid with KVM_TDX_CAPABILITIES isaku.yamahata
2021-07-08 0:54 ` [RFC PATCH v2 14/44] i386/tdx: Frame in the call for KVM_TDX_INIT_VCPU isaku.yamahata
2021-07-08 0:54 ` [RFC PATCH v2 15/44] i386/tdx: Add hook to require generic device loader isaku.yamahata
2021-08-26 10:41 ` Gerd Hoffmann
2021-07-08 0:54 ` [RFC PATCH v2 16/44] hw/i386: Add definitions from UEFI spec for volumes, resources, etc isaku.yamahata
2021-08-26 10:46 ` Gerd Hoffmann
2021-07-08 0:54 ` [RFC PATCH v2 17/44] i386/tdx: Add definitions for TDVF metadata isaku.yamahata
2021-07-08 0:54 ` [RFC PATCH v2 18/44] hw/i386: refactor e820_add_entry() isaku.yamahata
2021-08-26 10:49 ` Gerd Hoffmann
2021-07-08 0:54 ` [RFC PATCH v2 19/44] hw/i386/e820: introduce a helper function to change type of e820 isaku.yamahata
2021-08-26 11:22 ` Gerd Hoffmann
2021-07-08 0:54 ` [RFC PATCH v2 20/44] i386/tdx: Parse tdx metadata and store the result into TdxGuestState isaku.yamahata
2021-08-26 11:18 ` Gerd Hoffmann
2022-01-04 13:08 ` Xiaoyao Li
2022-01-06 16:06 ` Laszlo Ersek
2022-01-07 7:05 ` Xiaoyao Li
2022-01-10 11:01 ` Gerd Hoffmann
2022-01-10 12:09 ` Xiaoyao Li
2022-01-11 8:19 ` Laszlo Ersek
2022-01-11 8:48 ` Laszlo Ersek
2022-01-24 6:22 ` Xiaoyao Li
2022-01-25 7:42 ` Gerd Hoffmann
2022-01-25 8:22 ` Xiaoyao Li
2021-07-08 0:54 ` [RFC PATCH v2 21/44] i386/tdx: Create the TD HOB list upon machine init done isaku.yamahata
2021-08-26 11:29 ` Gerd Hoffmann
2021-07-08 0:54 ` [RFC PATCH v2 22/44] i386/tdx: Add TDVF memory via INIT_MEM_REGION isaku.yamahata
2021-07-08 0:54 ` [RFC PATCH v2 23/44] i386/tdx: Use KVM_TDX_INIT_VCPU to pass HOB to TDVF isaku.yamahata
2021-07-08 0:54 ` [RFC PATCH v2 24/44] i386/tdx: Add MMIO HOB entries isaku.yamahata
2021-08-26 12:17 ` Gerd Hoffmann
2021-07-08 0:54 ` [RFC PATCH v2 25/44] q35: Move PCIe BAR check above PAM check in mch_write_config() isaku.yamahata
2021-07-08 0:54 ` [RFC PATCH v2 26/44] pci-host/q35: Move PAM initialization above SMRAM initialization isaku.yamahata
2021-07-08 0:54 ` [RFC PATCH v2 27/44] q35: Introduce smm_ranges property for q35-pci-host isaku.yamahata
2021-08-26 11:38 ` Gerd Hoffmann
2021-07-08 0:54 ` [RFC PATCH v2 28/44] i386/tdx: Force x2apic mode and routing for TDs isaku.yamahata
2021-08-26 11:42 ` Gerd Hoffmann
2021-07-08 0:54 ` [RFC PATCH v2 29/44] target/i386: Add machine option to disable PIC/8259 isaku.yamahata
2021-08-26 11:50 ` Gerd Hoffmann
2021-07-08 0:55 ` [RFC PATCH v2 30/44] qom: implement property helper for sha384 isaku.yamahata
2021-07-08 0:55 ` [RFC PATCH v2 31/44] target/i386/tdx: Allows mrconfigid/mrowner/mrownerconfig for TDX_INIT_VM isaku.yamahata
2021-08-26 15:13 ` Eric Blake
2021-07-08 0:55 ` [RFC PATCH v2 32/44] tdx: add kvm_tdx_enabled() accessor for later use isaku.yamahata
2021-07-22 17:53 ` Connor Kuehl
2021-12-09 14:31 ` Xiaoyao Li
2021-07-08 0:55 ` [RFC PATCH v2 33/44] qmp: add query-tdx-capabilities query-tdx command isaku.yamahata
2021-08-26 11:59 ` Gerd Hoffmann
2021-08-26 15:21 ` Eric Blake
2021-07-08 0:55 ` [RFC PATCH v2 34/44] target/i386/tdx: set reboot action to shutdown when tdx isaku.yamahata
2021-07-22 17:54 ` Connor Kuehl
2021-12-10 9:54 ` Xiaoyao Li
2021-08-26 12:01 ` Gerd Hoffmann
2021-07-08 0:55 ` [RFC PATCH v2 35/44] ioapic: add property to disable level interrupt isaku.yamahata
2021-07-08 0:55 ` [RFC PATCH v2 36/44] hw/i386: add eoi_intercept_unsupported member to X86MachineState isaku.yamahata
2021-07-08 0:55 ` [RFC PATCH v2 37/44] hw/i386: add option to forcibly report edge trigger in acpi tables isaku.yamahata
2021-07-08 0:55 ` [RFC PATCH v2 38/44] hw/i386: plug eoi_intercept_unsupported to ioapic isaku.yamahata
2021-07-08 0:55 ` isaku.yamahata [this message]
2021-07-08 0:55 ` [RFC PATCH v2 40/44] hw/i386: add a flag to disallow SMI isaku.yamahata
2021-07-08 0:55 ` [RFC PATCH v2 41/44] ioapic: add property to disallow INIT/SIPI delivery mode isaku.yamahata
2021-07-08 0:55 ` [RFC PATCH v2 42/44] hw/i386: add a flag to disable init/sipi delivery mode of interrupt isaku.yamahata
2021-08-26 12:15 ` Gerd Hoffmann
2021-07-08 0:55 ` [RFC PATCH v2 43/44] i386/tdx: disallow level interrupt and SMI/INIT/SIPI delivery mode isaku.yamahata
2021-07-08 0:55 ` [RFC PATCH v2 44/44] i386/tdx: disable S3/S4 unconditionally isaku.yamahata
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0855fc584f8ffe862760bc7ef076984b1f2c48a2.1625704981.git.isaku.yamahata@intel.com \
--to=isaku.yamahata@gmail.com \
--cc=alistair@alistair23.me \
--cc=cohuck@redhat.com \
--cc=ehabkost@redhat.com \
--cc=erdemaktas@google.com \
--cc=isaku.yamahata@intel.com \
--cc=kvm@vger.kernel.org \
--cc=marcel.apfelbaum@gmail.com \
--cc=mst@redhat.com \
--cc=mtosatti@redhat.com \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=seanjc@google.com \
--cc=xiaoyao.li@intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).