qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Igor Mammedov <imammedo@redhat.com>
To: qemu-devel@nongnu.org
Cc: boris.ostrovsky@oracle.com, lersek@redhat.com
Subject: [PATCH 3/6] x86: cpuhp: refuse cpu hot-unplug request earlier if not supported
Date: Mon, 20 Jul 2020 10:16:07 -0400	[thread overview]
Message-ID: <20200720141610.574308-4-imammedo@redhat.com> (raw)
In-Reply-To: <20200720141610.574308-1-imammedo@redhat.com>

CPU hot-unplug with SMM requires firmware participation to prevent
guest crash (i.e. CPU can be removed only after OS _and_ firmware
were prepared for th action).
Previous patches introduced ICH9_LPC_SMI_F_CPU_HOT_UNPLUG_BIT
feature bit, which is advertised by firmware when it has support
for CPU hot-unplug. Use it to check if guest is able to handle
unplug and make device_del fail gracefully if hot-unplug feature
hasn't been negotiated.

Signed-off-by: Igor Mammedov <imammedo@redhat.com>
---
 hw/acpi/ich9.c | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/hw/acpi/ich9.c b/hw/acpi/ich9.c
index 0acc9a3107..98fc363186 100644
--- a/hw/acpi/ich9.c
+++ b/hw/acpi/ich9.c
@@ -460,6 +460,17 @@ void ich9_pm_device_unplug_request_cb(HotplugHandler *hotplug_dev,
                                       errp);
     } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU) &&
                !lpc->pm.cpu_hotplug_legacy) {
+        uint64_t negotiated = lpc->smi_negotiated_features;
+
+        if (negotiated & BIT_ULL(ICH9_LPC_SMI_F_BROADCAST_BIT) &&
+            !(negotiated & BIT_ULL(ICH9_LPC_SMI_F_CPU_HOT_UNPLUG_BIT))) {
+            error_setg(errp, "cpu hot-unplug with SMI wasn't enabled "
+                             "by firmware");
+            error_append_hint(errp, "update machine type to newer than 5.1 "
+                "and firmware that suppors CPU hot-unplug with SMM");
+            return;
+        }
+
         acpi_cpu_unplug_request_cb(hotplug_dev, &lpc->pm.cpuhp_state,
                                    dev, errp);
     } else {
-- 
2.26.2



  parent reply	other threads:[~2020-07-20 14:18 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-20 14:16 [PATCH 0/6] x86: fix cpu hotplug with secure boot Igor Mammedov
2020-07-20 14:16 ` [PATCH 1/6] x86: lpc9: let firmware negotiate 'CPU hotplug with SMI' features Igor Mammedov
2020-07-22 12:03   ` Laszlo Ersek
2020-07-22 13:26     ` Laszlo Ersek
2020-07-20 14:16 ` [PATCH 2/6] x86: cphp: prevent guest crash on CPU hotplug when broadcast SMI is in use Igor Mammedov
2020-07-22 13:16   ` Laszlo Ersek
2020-07-20 14:16 ` Igor Mammedov [this message]
2020-07-22 13:24   ` [PATCH 3/6] x86: cpuhp: refuse cpu hot-unplug request earlier if not supported Laszlo Ersek
2020-07-20 14:16 ` [PATCH 4/6] tests: acpi: mark to be changed tables in bios-tables-test-allowed-diff Igor Mammedov
2020-07-20 14:16 ` [PATCH 5/6] x68: acpi: trigger SMI before scanning for hotplugged CPUs Igor Mammedov
2020-07-22 15:30   ` Laszlo Ersek
2020-07-20 14:16 ` [PATCH 6/6] tests: acpi: update acpi blobs with new AML Igor Mammedov

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=20200720141610.574308-4-imammedo@redhat.com \
    --to=imammedo@redhat.com \
    --cc=boris.ostrovsky@oracle.com \
    --cc=lersek@redhat.com \
    --cc=qemu-devel@nongnu.org \
    /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).