From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 2002:a17:504:1dd4:b0:1be9:327d:8ee3 with SMTP id b20csp2264370nji; Mon, 15 Jul 2024 06:55:57 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXdvW8caj5rx5U+gpuCi+iMcBfRpAQTZfgEdyK/eP0Hj+88HzAUp2OIw9GDMPGpNxazFuULCViVhpbR1WPtVFe3zCuIRQY0 X-Google-Smtp-Source: AGHT+IHKU4atTWOIAoq9in5FFnD0rtlxvR16ChQJJh0u3CXnmtnfvnIgRnkKxjXcO52XE0ETAtLa X-Received: by 2002:adf:f6c2:0:b0:367:9c46:19c with SMTP id ffacd0b85a97d-367cea91cefmr12050949f8f.31.1721051757097; Mon, 15 Jul 2024 06:55:57 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1721051757; cv=none; d=google.com; s=arc-20160816; b=cO7tweRwsrDWk8niWitQXJWn0zclTkY75uJ4FL9+YEoNlUPsyfrMMhUYEkIBjtlBTT 82pbKnMsrxUeZYa9st3XgmsRTE34mxQ2wMAfmVfXHUd4UubMQepqmmuuAaG0JvrTmgOW kCuEm6I1Bi5y0u8nYHyE0JuZOeLhu0gwTE5dSypvNzA3O5cbMcDJDLgxORPHNBMDwY65 g37qJVyr8Xssn8Hb+SG2+xOvNqQVdnfhZHDj9aK2gWDXmE+62MqmF+LcMPnNdFljcuoq X0gN9/I3RmbSuODTNQsKKpPVChpKoQMnvUf4dUvgzXuBpWgaKevrwvZzSBs5OGyviQ9m NuOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:content-transfer-encoding:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from; bh=KFwhpKMt80ZNXbJUdTkfJlxlH5AGPAZ0Q3L6KpvAqt0=; fh=DtExAIOPRLt+BKYSUlzGTbHJwEPb3rSjaXOd9OZV96Y=; b=y5QLHl9810Ab77jZHUlSnigpoFrbFoJG7kS8n6LDt5nZuRQwgabuYkzHEHvUHWDOVY HOPEFEKmjaJEbpikvlocXYzmJZSK8vySlVXL8dYZISxO31/KTUdwvsp43YSXN4Um/fQY vtj6u9H4snC77R2JMgA7mVJRimlXnn0AKq0JnJU4nGk7q+oyxs9O4oQIe6TELE4edwey 3bedofOJDAX7Oi1hgdXYCMvMLUCnYORMvcID0osy07lolphuiNKgXAcZoKfI0dVtJdou T7WFHyA2B30hQofiHed5AbyqIrSrjR375tJFOtPnDZZ5FigJnJycYpaV4AGQtb1Z+WOH XWTA==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of salil.mehta@huawei.com designates 185.176.79.56 as permitted sender) smtp.mailfrom=salil.mehta@huawei.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Return-Path: Received: from frasgout.his.huawei.com (frasgout.his.huawei.com. [185.176.79.56]) by mx.google.com with ESMTPS id ffacd0b85a97d-3680daf68c1si2985748f8f.468.2024.07.15.06.55.56 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 15 Jul 2024 06:55:57 -0700 (PDT) Received-SPF: pass (google.com: domain of salil.mehta@huawei.com designates 185.176.79.56 as permitted sender) client-ip=185.176.79.56; Authentication-Results: mx.google.com; spf=pass (google.com: domain of salil.mehta@huawei.com designates 185.176.79.56 as permitted sender) smtp.mailfrom=salil.mehta@huawei.com; dmarc=pass (p=QUARANTINE sp=QUARANTINE dis=NONE) header.from=huawei.com Received: from mail.maildlp.com (unknown [172.18.186.231]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4WN3bB2vJCz6K6Dx; Mon, 15 Jul 2024 21:54:14 +0800 (CST) Received: from lhrpeml100001.china.huawei.com (unknown [7.191.160.183]) by mail.maildlp.com (Postfix) with ESMTPS id E092B140CB1; Mon, 15 Jul 2024 21:55:55 +0800 (CST) Received: from lhrpeml500001.china.huawei.com (7.191.163.213) by lhrpeml100001.china.huawei.com (7.191.160.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Mon, 15 Jul 2024 14:55:55 +0100 Received: from lhrpeml500001.china.huawei.com ([7.191.163.213]) by lhrpeml500001.china.huawei.com ([7.191.163.213]) with mapi id 15.01.2507.039; Mon, 15 Jul 2024 14:55:55 +0100 From: Salil Mehta To: Igor Mammedov CC: "qemu-devel@nongnu.org" , "qemu-arm@nongnu.org" , "maz@kernel.org" , "jean-philippe@linaro.org" , Jonathan Cameron , "lpieralisi@kernel.org" , "peter.maydell@linaro.org" , "richard.henderson@linaro.org" , "andrew.jones@linux.dev" , "david@redhat.com" , "philmd@linaro.org" , "eric.auger@redhat.com" , "oliver.upton@linux.dev" , "pbonzini@redhat.com" , "mst@redhat.com" , "will@kernel.org" , "gshan@redhat.com" , "rafael@kernel.org" , "alex.bennee@linaro.org" , "linux@armlinux.org.uk" , "darren@os.amperecomputing.com" , "ilkka@os.amperecomputing.com" , "vishnu@os.amperecomputing.com" , "karl.heubaum@oracle.com" , "miguel.luis@oracle.com" , "salil.mehta@opnsrc.net" , zhukeqian , "wangxiongfeng (C)" , "wangyanan (Y)" , "jiakernel2@gmail.com" , "maobibo@loongson.cn" , "lixianglai@loongson.cn" , "npiggin@gmail.com" , "harshpb@linux.ibm.com" , Linuxarm , Shaoqin Huang , Zhao Liu Subject: RE: [PATCH V15 3/7] hw/acpi: Update ACPI GED framework to support vCPU Hotplug Thread-Topic: [PATCH V15 3/7] hw/acpi: Update ACPI GED framework to support vCPU Hotplug Thread-Index: AQHa1VJAFAUX345Zckyl+RHip9u25rH3teGAgAAbbXA= Date: Mon, 15 Jul 2024 13:55:55 +0000 Message-ID: References: <20240713182516.1457-1-salil.mehta@huawei.com> <20240713182516.1457-4-salil.mehta@huawei.com> <20240715151229.7f934357@imammedo.users.ipa.redhat.com> In-Reply-To: <20240715151229.7f934357@imammedo.users.ipa.redhat.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.126.170.92] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-TUID: kt1borVlBJfS Hi Igor, Thanks for the feedback. > From: qemu-arm-bounces+salil.mehta=3Dhuawei.com@nongnu.org arm-bounces+salil.mehta=3Dhuawei.com@nongnu.org> On Behalf Of Igor > Mammedov > Sent: Monday, July 15, 2024 2:12 PM > To: Salil Mehta > =20 > On Sat, 13 Jul 2024 19:25:12 +0100 > Salil Mehta wrote: > =20 > > ACPI GED (as described in the ACPI 6.4 spec) uses an interrupt listed > > in the _CRS object of GED to intimate OSPM about an event. Later then > > demultiplexes the notified event by evaluating ACPI _EVT method to > > know the type of event. Use ACPI GED to also notify the guest kernel > about any CPU hot(un)plug events. > > > > Note, GED interface is used by many hotplug events like memory > > hotplug, NVDIMM hotplug and non-hotplug events like system power > down > > event. Each of these can be selected using a bit in the 32 bit GED IO > > interface. A bit has been reserved for the CPU hotplug event. > =20 > > ACPI CPU hotplug related initialization should only happen if > > ACPI_CPU_HOTPLUG support has been enabled for particular > architecture. > > Add cpu_hotplug_hw_init() stub to avoid compilation break. > =20 > so any target (and machines in it) that has ACPI_CPU_HOTPLUG enabled wil= l > use have all CPU hotplug machinery builtin which is fine. > =20 > However any machine that uses GED but do not opt-in into CPU hotplug, wi= ll > still have CPU hotplug registers/memory regions enabled/mapped. > =20 > It's not much concern for upstream as migration from new to older QEMU i= s > not supported, however it will break migration downstream (arm/virt) as > new QEMU will try to migrate memory regions/state that do not exists in > older QEMU. Se below for suggestion. Sorry. I missed this one. Yes. agreed. > > Co-developed-by: Keqian Zhu > > Signed-off-by: Keqian Zhu > > Signed-off-by: Salil Mehta > > Reviewed-by: Jonathan Cameron > > Reviewed-by: Gavin Shan > > Reviewed-by: David Hildenbrand > > Reviewed-by: Shaoqin Huang > > Tested-by: Vishnu Pajjuri > > Tested-by: Xianglai Li > > Tested-by: Miguel Luis > > Reviewed-by: Vishnu Pajjuri > > Tested-by: Zhao Liu > > Reviewed-by: Zhao Liu > > --- > > docs/specs/acpi_hw_reduced_hotplug.rst | 3 ++- > > hw/acpi/acpi-cpu-hotplug-stub.c | 6 ++++++ > > hw/acpi/generic_event_device.c | 24 ++++++++++++++++++++++++ > > include/hw/acpi/generic_event_device.h | 4 ++++ > > 4 files changed, 36 insertions(+), 1 deletion(-) > > > > diff --git a/docs/specs/acpi_hw_reduced_hotplug.rst > > b/docs/specs/acpi_hw_reduced_hotplug.rst > > index 0bd3f9399f..3acd6fcd8b 100644 > > --- a/docs/specs/acpi_hw_reduced_hotplug.rst > > +++ b/docs/specs/acpi_hw_reduced_hotplug.rst > > @@ -64,7 +64,8 @@ GED IO interface (4 byte access) > > 0: Memory hotplug event > > 1: System power down event > > 2: NVDIMM hotplug event > > - 3-31: Reserved > > + 3: CPU hotplug event > > + 4-31: Reserved > > > > **write_access:** > > > > diff --git a/hw/acpi/acpi-cpu-hotplug-stub.c > > b/hw/acpi/acpi-cpu-hotplug-stub.c index 3fc4b14c26..c6c61bb9cd 100644 > > --- a/hw/acpi/acpi-cpu-hotplug-stub.c > > +++ b/hw/acpi/acpi-cpu-hotplug-stub.c > > @@ -19,6 +19,12 @@ void legacy_acpi_cpu_hotplug_init(MemoryRegion > *parent, Object *owner, > > return; > > } > > > > +void cpu_hotplug_hw_init(MemoryRegion *as, Object *owner, > > + CPUHotplugState *state, hwaddr base_addr) { > > + return; > > +} > > + > > void acpi_cpu_ospm_status(CPUHotplugState *cpu_st, ACPIOSTInfoList > > ***list) { > > return; > > diff --git a/hw/acpi/generic_event_device.c > > b/hw/acpi/generic_event_device.c index 2d6e91b124..1b31d633ba > 100644 > > --- a/hw/acpi/generic_event_device.c > > +++ b/hw/acpi/generic_event_device.c > > @@ -25,6 +25,7 @@ static const uint32_t ged_supported_events[] =3D { > > ACPI_GED_MEM_HOTPLUG_EVT, > > ACPI_GED_PWR_DOWN_EVT, > > ACPI_GED_NVDIMM_HOTPLUG_EVT, > > + ACPI_GED_CPU_HOTPLUG_EVT, > > }; > > > > /* > > @@ -234,6 +235,8 @@ static void > acpi_ged_device_plug_cb(HotplugHandler *hotplug_dev, > > } else { > > acpi_memory_plug_cb(hotplug_dev, &s->memhp_state, dev, > errp); > > } > > + } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { > > + acpi_cpu_plug_cb(hotplug_dev, &s->cpuhp_state, dev, errp); > > } else { > > error_setg(errp, "virt: device plug request for unsupported d= evice" > > " type: %s", object_get_typename(OBJECT(dev))); > > @@ -248,6 +251,8 @@ static void > acpi_ged_unplug_request_cb(HotplugHandler *hotplug_dev, > > if ((object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM) && > > !(object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM= )))) { > > acpi_memory_unplug_request_cb(hotplug_dev, &s->memhp_state, > > dev, errp); > > + } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { > > + acpi_cpu_unplug_request_cb(hotplug_dev, &s->cpuhp_state, dev, > > + errp); > > } else { > > error_setg(errp, "acpi: device unplug request for unsupported > device" > > " type: %s", object_get_typename(OBJECT(dev))); > > @@ -261,6 +266,8 @@ static void acpi_ged_unplug_cb(HotplugHandler > > *hotplug_dev, > > > > if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { > > acpi_memory_unplug_cb(&s->memhp_state, dev, errp); > > + } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { > > + acpi_cpu_unplug_cb(&s->cpuhp_state, dev, errp); > > } else { > > error_setg(errp, "acpi: device unplug for unsupported device" > > " type: %s", object_get_typename(OBJECT(dev))); > > @@ -272,6 +279,7 @@ static void acpi_ged_ospm_status(AcpiDeviceIf > *adev, ACPIOSTInfoList ***list) > > AcpiGedState *s =3D ACPI_GED(adev); > > > > acpi_memory_ospm_status(&s->memhp_state, list); > > + acpi_cpu_ospm_status(&s->cpuhp_state, list); > > } > > > > static void acpi_ged_send_event(AcpiDeviceIf *adev, > > AcpiEventStatusBits ev) @@ -286,6 +294,8 @@ static void > acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev) > > sel =3D ACPI_GED_PWR_DOWN_EVT; > > } else if (ev & ACPI_NVDIMM_HOTPLUG_STATUS) { > > sel =3D ACPI_GED_NVDIMM_HOTPLUG_EVT; > > + } else if (ev & ACPI_CPU_HOTPLUG_STATUS) { > > + sel =3D ACPI_GED_CPU_HOTPLUG_EVT; > > } else { > > /* Unknown event. Return without generating interrupt. */ > > warn_report("GED: Unsupported event %d. No irq injected", > > ev); @@ -371,6 +381,19 @@ static const VMStateDescription > vmstate_acpi_ged =3D { > > } > > }; > > > > +static void acpi_ged_realize(DeviceState *dev, Error **errp) { > > + AcpiGedState *s =3D ACPI_GED(dev); > > + SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); > > + > =20 > > + /* initialize CPU Hotplug related regions */ > > + memory_region_init(&s->container_cpuhp, OBJECT(dev), "cpuhp > container", > > + ACPI_CPU_HOTPLUG_REG_LEN); > > + sysbus_init_mmio(sbd, &s->container_cpuhp); > > + cpu_hotplug_hw_init(&s->container_cpuhp, OBJECT(dev), > > + &s->cpuhp_state, 0); > =20 > how about making it conditional on supported events see hw/arm/virt.c: > create_acpi_ged() > if (ms->ram_slots) { > event |=3D ACPI_GED_MEM_HOTPLUG_EVT; > } > =20 > if (ms->nvdimms_state->is_enabled) { > event |=3D ACPI_GED_NVDIMM_HOTPLUG_EVT; > } > =20 > so cpu hotplug would have similar section and ged realize could use ged- > event to enable/disable cpuhp feature registers and hwinit. Got it, thanks for pointing out. I will fix this and share V16 by COB today= itself. Best regards Salil. > =20 > > +} > > + > > static void acpi_ged_initfn(Object *obj) { > > DeviceState *dev =3D DEVICE(obj); > > @@ -411,6 +434,7 @@ static void acpi_ged_class_init(ObjectClass *class= , > void *data) > > dc->desc =3D "ACPI Generic Event Device"; > > device_class_set_props(dc, acpi_ged_properties); > > dc->vmsd =3D &vmstate_acpi_ged; > > + dc->realize =3D acpi_ged_realize; > > > > hc->plug =3D acpi_ged_device_plug_cb; > > hc->unplug_request =3D acpi_ged_unplug_request_cb; diff --git > > a/include/hw/acpi/generic_event_device.h > > b/include/hw/acpi/generic_event_device.h > > index ba84ce0214..e091ac2108 100644 > > --- a/include/hw/acpi/generic_event_device.h > > +++ b/include/hw/acpi/generic_event_device.h > > @@ -62,6 +62,7 @@ > > #include "hw/sysbus.h" > > #include "hw/acpi/memory_hotplug.h" > > #include "hw/acpi/ghes.h" > > +#include "hw/acpi/cpu.h" > > #include "qom/object.h" > > > > #define ACPI_POWER_BUTTON_DEVICE "PWRB" > > @@ -95,6 +96,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(AcpiGedState, > ACPI_GED) > > #define ACPI_GED_MEM_HOTPLUG_EVT 0x1 > > #define ACPI_GED_PWR_DOWN_EVT 0x2 > > #define ACPI_GED_NVDIMM_HOTPLUG_EVT 0x4 > > +#define ACPI_GED_CPU_HOTPLUG_EVT 0x8 > > > > typedef struct GEDState { > > MemoryRegion evt; > > @@ -106,6 +108,8 @@ struct AcpiGedState { > > SysBusDevice parent_obj; > > MemHotplugState memhp_state; > > MemoryRegion container_memhp; > > + CPUHotplugState cpuhp_state; > > + MemoryRegion container_cpuhp; > > GEDState ged_state; > > uint32_t ged_event_bitmap; > > qemu_irq irq; > =20 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AE831C3DA4B for ; Mon, 15 Jul 2024 13:56:36 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sTMBT-0000jX-5U; Mon, 15 Jul 2024 09:56:07 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sTMBQ-0000Ow-GF; Mon, 15 Jul 2024 09:56:04 -0400 Received: from frasgout.his.huawei.com ([185.176.79.56]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1sTMBN-0003jj-4R; Mon, 15 Jul 2024 09:56:04 -0400 Received: from mail.maildlp.com (unknown [172.18.186.231]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4WN3bB2vJCz6K6Dx; Mon, 15 Jul 2024 21:54:14 +0800 (CST) Received: from lhrpeml100001.china.huawei.com (unknown [7.191.160.183]) by mail.maildlp.com (Postfix) with ESMTPS id E092B140CB1; Mon, 15 Jul 2024 21:55:55 +0800 (CST) Received: from lhrpeml500001.china.huawei.com (7.191.163.213) by lhrpeml100001.china.huawei.com (7.191.160.183) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Mon, 15 Jul 2024 14:55:55 +0100 Received: from lhrpeml500001.china.huawei.com ([7.191.163.213]) by lhrpeml500001.china.huawei.com ([7.191.163.213]) with mapi id 15.01.2507.039; Mon, 15 Jul 2024 14:55:55 +0100 To: Igor Mammedov CC: "qemu-devel@nongnu.org" , "qemu-arm@nongnu.org" , "maz@kernel.org" , "jean-philippe@linaro.org" , Jonathan Cameron , "lpieralisi@kernel.org" , "peter.maydell@linaro.org" , "richard.henderson@linaro.org" , "andrew.jones@linux.dev" , "david@redhat.com" , "philmd@linaro.org" , "eric.auger@redhat.com" , "oliver.upton@linux.dev" , "pbonzini@redhat.com" , "mst@redhat.com" , "will@kernel.org" , "gshan@redhat.com" , "rafael@kernel.org" , "alex.bennee@linaro.org" , "linux@armlinux.org.uk" , "darren@os.amperecomputing.com" , "ilkka@os.amperecomputing.com" , "vishnu@os.amperecomputing.com" , "karl.heubaum@oracle.com" , "miguel.luis@oracle.com" , "salil.mehta@opnsrc.net" , zhukeqian , "wangxiongfeng (C)" , "wangyanan (Y)" , "jiakernel2@gmail.com" , "maobibo@loongson.cn" , "lixianglai@loongson.cn" , "npiggin@gmail.com" , "harshpb@linux.ibm.com" , Linuxarm , Shaoqin Huang , Zhao Liu Subject: RE: [PATCH V15 3/7] hw/acpi: Update ACPI GED framework to support vCPU Hotplug Thread-Topic: [PATCH V15 3/7] hw/acpi: Update ACPI GED framework to support vCPU Hotplug Thread-Index: AQHa1VJAFAUX345Zckyl+RHip9u25rH3teGAgAAbbXA= Date: Mon, 15 Jul 2024 13:55:55 +0000 Message-ID: References: <20240713182516.1457-1-salil.mehta@huawei.com> <20240713182516.1457-4-salil.mehta@huawei.com> <20240715151229.7f934357@imammedo.users.ipa.redhat.com> In-Reply-To: <20240715151229.7f934357@imammedo.users.ipa.redhat.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [10.126.170.92] Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Received-SPF: pass client-ip=185.176.79.56; envelope-from=salil.mehta@huawei.com; helo=frasgout.his.huawei.com X-Spam_score_int: -41 X-Spam_score: -4.2 X-Spam_bar: ---- X-Spam_report: (-4.2 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_MED=-2.3, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-to: Salil Mehta From: Salil Mehta via Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Hi Igor, Thanks for the feedback. > From: qemu-arm-bounces+salil.mehta=3Dhuawei.com@nongnu.org arm-bounces+salil.mehta=3Dhuawei.com@nongnu.org> On Behalf Of Igor > Mammedov > Sent: Monday, July 15, 2024 2:12 PM > To: Salil Mehta > =20 > On Sat, 13 Jul 2024 19:25:12 +0100 > Salil Mehta wrote: > =20 > > ACPI GED (as described in the ACPI 6.4 spec) uses an interrupt listed > > in the _CRS object of GED to intimate OSPM about an event. Later then > > demultiplexes the notified event by evaluating ACPI _EVT method to > > know the type of event. Use ACPI GED to also notify the guest kernel > about any CPU hot(un)plug events. > > > > Note, GED interface is used by many hotplug events like memory > > hotplug, NVDIMM hotplug and non-hotplug events like system power > down > > event. Each of these can be selected using a bit in the 32 bit GED IO > > interface. A bit has been reserved for the CPU hotplug event. > =20 > > ACPI CPU hotplug related initialization should only happen if > > ACPI_CPU_HOTPLUG support has been enabled for particular > architecture. > > Add cpu_hotplug_hw_init() stub to avoid compilation break. > =20 > so any target (and machines in it) that has ACPI_CPU_HOTPLUG enabled wil= l > use have all CPU hotplug machinery builtin which is fine. > =20 > However any machine that uses GED but do not opt-in into CPU hotplug, wi= ll > still have CPU hotplug registers/memory regions enabled/mapped. > =20 > It's not much concern for upstream as migration from new to older QEMU i= s > not supported, however it will break migration downstream (arm/virt) as > new QEMU will try to migrate memory regions/state that do not exists in > older QEMU. Se below for suggestion. Sorry. I missed this one. Yes. agreed. > > Co-developed-by: Keqian Zhu > > Signed-off-by: Keqian Zhu > > Signed-off-by: Salil Mehta > > Reviewed-by: Jonathan Cameron > > Reviewed-by: Gavin Shan > > Reviewed-by: David Hildenbrand > > Reviewed-by: Shaoqin Huang > > Tested-by: Vishnu Pajjuri > > Tested-by: Xianglai Li > > Tested-by: Miguel Luis > > Reviewed-by: Vishnu Pajjuri > > Tested-by: Zhao Liu > > Reviewed-by: Zhao Liu > > --- > > docs/specs/acpi_hw_reduced_hotplug.rst | 3 ++- > > hw/acpi/acpi-cpu-hotplug-stub.c | 6 ++++++ > > hw/acpi/generic_event_device.c | 24 ++++++++++++++++++++++++ > > include/hw/acpi/generic_event_device.h | 4 ++++ > > 4 files changed, 36 insertions(+), 1 deletion(-) > > > > diff --git a/docs/specs/acpi_hw_reduced_hotplug.rst > > b/docs/specs/acpi_hw_reduced_hotplug.rst > > index 0bd3f9399f..3acd6fcd8b 100644 > > --- a/docs/specs/acpi_hw_reduced_hotplug.rst > > +++ b/docs/specs/acpi_hw_reduced_hotplug.rst > > @@ -64,7 +64,8 @@ GED IO interface (4 byte access) > > 0: Memory hotplug event > > 1: System power down event > > 2: NVDIMM hotplug event > > - 3-31: Reserved > > + 3: CPU hotplug event > > + 4-31: Reserved > > > > **write_access:** > > > > diff --git a/hw/acpi/acpi-cpu-hotplug-stub.c > > b/hw/acpi/acpi-cpu-hotplug-stub.c index 3fc4b14c26..c6c61bb9cd 100644 > > --- a/hw/acpi/acpi-cpu-hotplug-stub.c > > +++ b/hw/acpi/acpi-cpu-hotplug-stub.c > > @@ -19,6 +19,12 @@ void legacy_acpi_cpu_hotplug_init(MemoryRegion > *parent, Object *owner, > > return; > > } > > > > +void cpu_hotplug_hw_init(MemoryRegion *as, Object *owner, > > + CPUHotplugState *state, hwaddr base_addr) { > > + return; > > +} > > + > > void acpi_cpu_ospm_status(CPUHotplugState *cpu_st, ACPIOSTInfoList > > ***list) { > > return; > > diff --git a/hw/acpi/generic_event_device.c > > b/hw/acpi/generic_event_device.c index 2d6e91b124..1b31d633ba > 100644 > > --- a/hw/acpi/generic_event_device.c > > +++ b/hw/acpi/generic_event_device.c > > @@ -25,6 +25,7 @@ static const uint32_t ged_supported_events[] =3D { > > ACPI_GED_MEM_HOTPLUG_EVT, > > ACPI_GED_PWR_DOWN_EVT, > > ACPI_GED_NVDIMM_HOTPLUG_EVT, > > + ACPI_GED_CPU_HOTPLUG_EVT, > > }; > > > > /* > > @@ -234,6 +235,8 @@ static void > acpi_ged_device_plug_cb(HotplugHandler *hotplug_dev, > > } else { > > acpi_memory_plug_cb(hotplug_dev, &s->memhp_state, dev, > errp); > > } > > + } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { > > + acpi_cpu_plug_cb(hotplug_dev, &s->cpuhp_state, dev, errp); > > } else { > > error_setg(errp, "virt: device plug request for unsupported d= evice" > > " type: %s", object_get_typename(OBJECT(dev))); > > @@ -248,6 +251,8 @@ static void > acpi_ged_unplug_request_cb(HotplugHandler *hotplug_dev, > > if ((object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM) && > > !(object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM= )))) { > > acpi_memory_unplug_request_cb(hotplug_dev, &s->memhp_state, > > dev, errp); > > + } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { > > + acpi_cpu_unplug_request_cb(hotplug_dev, &s->cpuhp_state, dev, > > + errp); > > } else { > > error_setg(errp, "acpi: device unplug request for unsupported > device" > > " type: %s", object_get_typename(OBJECT(dev))); > > @@ -261,6 +266,8 @@ static void acpi_ged_unplug_cb(HotplugHandler > > *hotplug_dev, > > > > if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { > > acpi_memory_unplug_cb(&s->memhp_state, dev, errp); > > + } else if (object_dynamic_cast(OBJECT(dev), TYPE_CPU)) { > > + acpi_cpu_unplug_cb(&s->cpuhp_state, dev, errp); > > } else { > > error_setg(errp, "acpi: device unplug for unsupported device" > > " type: %s", object_get_typename(OBJECT(dev))); > > @@ -272,6 +279,7 @@ static void acpi_ged_ospm_status(AcpiDeviceIf > *adev, ACPIOSTInfoList ***list) > > AcpiGedState *s =3D ACPI_GED(adev); > > > > acpi_memory_ospm_status(&s->memhp_state, list); > > + acpi_cpu_ospm_status(&s->cpuhp_state, list); > > } > > > > static void acpi_ged_send_event(AcpiDeviceIf *adev, > > AcpiEventStatusBits ev) @@ -286,6 +294,8 @@ static void > acpi_ged_send_event(AcpiDeviceIf *adev, AcpiEventStatusBits ev) > > sel =3D ACPI_GED_PWR_DOWN_EVT; > > } else if (ev & ACPI_NVDIMM_HOTPLUG_STATUS) { > > sel =3D ACPI_GED_NVDIMM_HOTPLUG_EVT; > > + } else if (ev & ACPI_CPU_HOTPLUG_STATUS) { > > + sel =3D ACPI_GED_CPU_HOTPLUG_EVT; > > } else { > > /* Unknown event. Return without generating interrupt. */ > > warn_report("GED: Unsupported event %d. No irq injected", > > ev); @@ -371,6 +381,19 @@ static const VMStateDescription > vmstate_acpi_ged =3D { > > } > > }; > > > > +static void acpi_ged_realize(DeviceState *dev, Error **errp) { > > + AcpiGedState *s =3D ACPI_GED(dev); > > + SysBusDevice *sbd =3D SYS_BUS_DEVICE(dev); > > + > =20 > > + /* initialize CPU Hotplug related regions */ > > + memory_region_init(&s->container_cpuhp, OBJECT(dev), "cpuhp > container", > > + ACPI_CPU_HOTPLUG_REG_LEN); > > + sysbus_init_mmio(sbd, &s->container_cpuhp); > > + cpu_hotplug_hw_init(&s->container_cpuhp, OBJECT(dev), > > + &s->cpuhp_state, 0); > =20 > how about making it conditional on supported events see hw/arm/virt.c: > create_acpi_ged() > if (ms->ram_slots) { > event |=3D ACPI_GED_MEM_HOTPLUG_EVT; > } > =20 > if (ms->nvdimms_state->is_enabled) { > event |=3D ACPI_GED_NVDIMM_HOTPLUG_EVT; > } > =20 > so cpu hotplug would have similar section and ged realize could use ged- > event to enable/disable cpuhp feature registers and hwinit. Got it, thanks for pointing out. I will fix this and share V16 by COB today= itself. Best regards Salil. > =20 > > +} > > + > > static void acpi_ged_initfn(Object *obj) { > > DeviceState *dev =3D DEVICE(obj); > > @@ -411,6 +434,7 @@ static void acpi_ged_class_init(ObjectClass *class= , > void *data) > > dc->desc =3D "ACPI Generic Event Device"; > > device_class_set_props(dc, acpi_ged_properties); > > dc->vmsd =3D &vmstate_acpi_ged; > > + dc->realize =3D acpi_ged_realize; > > > > hc->plug =3D acpi_ged_device_plug_cb; > > hc->unplug_request =3D acpi_ged_unplug_request_cb; diff --git > > a/include/hw/acpi/generic_event_device.h > > b/include/hw/acpi/generic_event_device.h > > index ba84ce0214..e091ac2108 100644 > > --- a/include/hw/acpi/generic_event_device.h > > +++ b/include/hw/acpi/generic_event_device.h > > @@ -62,6 +62,7 @@ > > #include "hw/sysbus.h" > > #include "hw/acpi/memory_hotplug.h" > > #include "hw/acpi/ghes.h" > > +#include "hw/acpi/cpu.h" > > #include "qom/object.h" > > > > #define ACPI_POWER_BUTTON_DEVICE "PWRB" > > @@ -95,6 +96,7 @@ OBJECT_DECLARE_SIMPLE_TYPE(AcpiGedState, > ACPI_GED) > > #define ACPI_GED_MEM_HOTPLUG_EVT 0x1 > > #define ACPI_GED_PWR_DOWN_EVT 0x2 > > #define ACPI_GED_NVDIMM_HOTPLUG_EVT 0x4 > > +#define ACPI_GED_CPU_HOTPLUG_EVT 0x8 > > > > typedef struct GEDState { > > MemoryRegion evt; > > @@ -106,6 +108,8 @@ struct AcpiGedState { > > SysBusDevice parent_obj; > > MemHotplugState memhp_state; > > MemoryRegion container_memhp; > > + CPUHotplugState cpuhp_state; > > + MemoryRegion container_cpuhp; > > GEDState ged_state; > > uint32_t ged_event_bitmap; > > qemu_irq irq; > =20