From nobody Mon Nov 25 03:23:52 2024 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass(p=none dis=none) header.from=nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1718322402; cv=none; d=zohomail.com; s=zohoarc; b=U8CtkewnRJAT0qD9zWHJkzHRHAlM1a4ZxPyxVUGOd9kmc2QPWIZ0qVQ7evImQQU+uyZg+wDR3W6esZwGlHCqtGwKonxhkYvw8ynja519F7t5LEsTblZWQm+1xXkx/eKqY8AZP9u76s14ZMSCaATrTr9Rdwr3QzscEe1eCSgh0vc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1718322402; h=Content-Type:Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Reply-To:Reply-To:References:Sender:Subject:Subject:To:To:Message-Id; bh=UqjDGrMVpwBsxpYyT/rhxM4TQiMCLFl336upNWhqBCY=; b=iPcRt+QLt2j7gxjJRmk+lsx8N3fhJDtrbfT3QFv8ez6vlyZvdp7eEPC1mtIxywgWb3ZVCe34xeyFp2Ve4L6elCUAjdMbgoy+RREVzAzzkU794oQZefyXdKHXZRgS4mfl+5EiNxueB6VtJNWjN4ZuHb9GYyc61KZqKDTStECkdMg= ARC-Authentication-Results: i=1; mx.zohomail.com; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1718322402160598.4950450098581; Thu, 13 Jun 2024 16:46:42 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1sHu98-0004WL-6Y; Thu, 13 Jun 2024 19:46:22 -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 1sHu95-0004TR-4q; Thu, 13 Jun 2024 19:46:19 -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 1sHu91-0004aO-E9; Thu, 13 Jun 2024 19:46:18 -0400 Received: from mail.maildlp.com (unknown [172.18.186.31]) by frasgout.his.huawei.com (SkyGuard) with ESMTP id 4W0fCP3vpSz6H784; Fri, 14 Jun 2024 07:44:49 +0800 (CST) Received: from lhrpeml500001.china.huawei.com (unknown [7.191.163.213]) by mail.maildlp.com (Postfix) with ESMTPS id 046F5140594; Fri, 14 Jun 2024 07:46:13 +0800 (CST) Received: from 00293818-MRGF.china.huawei.com (10.195.245.24) by lhrpeml500001.china.huawei.com (7.191.163.213) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2507.39; Fri, 14 Jun 2024 00:45:50 +0100 To: , , CC: , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , , Subject: [PATCH RFC V3 22/29] arm/virt: Update the guest(via GED) about CPU hot-(un)plug events Date: Fri, 14 Jun 2024 00:36:32 +0100 Message-ID: <20240613233639.202896-23-salil.mehta@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240613233639.202896-1-salil.mehta@huawei.com> References: <20240613233639.202896-1-salil.mehta@huawei.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Originating-IP: [10.195.245.24] X-ClientProxiedBy: dggems703-chm.china.huawei.com (10.3.19.180) To lhrpeml500001.china.huawei.com (7.191.163.213) Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; 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, T_SCC_BODY_TEXT_LINE=-0.01 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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZM-MESSAGEID: 1718322402478100001 Content-Type: text/plain; charset="utf-8" During any vCPU hot-(un)plug, running guest VM needs to be intimated about = the new vCPU being added or request the deletion of the vCPU which is already p= art of the guest VM. This is done using the ACPI GED event which eventually gets demultiplexed to a CPU hotplug event and further to specific hot-(un)plug e= vent of a particular vCPU. This change adds the ACPI calls to the existing hot-(un)plug hooks to trigg= er ACPI GED events from QEMU to guest VM. Co-developed-by: Keqian Zhu Signed-off-by: Keqian Zhu Signed-off-by: Salil Mehta --- hw/arm/virt.c | 34 ++++++++++++++++++++++++++-------- 1 file changed, 26 insertions(+), 8 deletions(-) diff --git a/hw/arm/virt.c b/hw/arm/virt.c index 9f7e07bd8e..4fa2b7d9e7 100644 --- a/hw/arm/virt.c +++ b/hw/arm/virt.c @@ -3169,6 +3169,7 @@ static void virt_cpu_plug(HotplugHandler *hotplug_dev= , DeviceState *dev, VirtMachineState *vms =3D VIRT_MACHINE(hotplug_dev); MachineState *ms =3D MACHINE(hotplug_dev); CPUState *cs =3D CPU(dev); + Error *local_err =3D NULL; CPUArchId *cpu_slot; =20 /* insert the cold/hot-plugged vcpu in the slot */ @@ -3181,12 +3182,18 @@ static void virt_cpu_plug(HotplugHandler *hotplug_d= ev, DeviceState *dev, * plugged, guest is also notified. */ if (vms->acpi_dev) { - /* TODO: update acpi hotplug state. Send cpu hotplug event to gues= t */ + HotplugHandlerClass *hhc; + /* update acpi hotplug state and send cpu hotplug event to guest */ + hhc =3D HOTPLUG_HANDLER_GET_CLASS(vms->acpi_dev); + hhc->plug(HOTPLUG_HANDLER(vms->acpi_dev), dev, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } /* TODO: register cpu for reset & update F/W info for the next boo= t */ } =20 cs->disabled =3D false; - return; } =20 static void virt_cpu_unplug_request(HotplugHandler *hotplug_dev, @@ -3194,8 +3201,10 @@ static void virt_cpu_unplug_request(HotplugHandler *= hotplug_dev, { MachineClass *mc =3D MACHINE_GET_CLASS(qdev_get_machine()); VirtMachineState *vms =3D VIRT_MACHINE(hotplug_dev); + HotplugHandlerClass *hhc; ARMCPU *cpu =3D ARM_CPU(dev); CPUState *cs =3D CPU(dev); + Error *local_err =3D NULL; =20 if (!vms->acpi_dev || !dev->realized) { error_setg(errp, "GED does not exists or device is not realized!"); @@ -3214,9 +3223,12 @@ static void virt_cpu_unplug_request(HotplugHandler *= hotplug_dev, return; } =20 - /* TODO: request cpu hotplug from guest */ - - return; + /* request cpu hotplug from guest */ + hhc =3D HOTPLUG_HANDLER_GET_CLASS(vms->acpi_dev); + hhc->unplug_request(HOTPLUG_HANDLER(vms->acpi_dev), dev, &local_err); + if (local_err) { + error_propagate(errp, local_err); + } } =20 static void virt_cpu_unplug(HotplugHandler *hotplug_dev, DeviceState *dev, @@ -3224,7 +3236,9 @@ static void virt_cpu_unplug(HotplugHandler *hotplug_d= ev, DeviceState *dev, { VirtMachineState *vms =3D VIRT_MACHINE(hotplug_dev); MachineState *ms =3D MACHINE(hotplug_dev); + HotplugHandlerClass *hhc; CPUState *cs =3D CPU(dev); + Error *local_err =3D NULL; CPUArchId *cpu_slot; =20 if (!vms->acpi_dev || !dev->realized) { @@ -3234,7 +3248,13 @@ static void virt_cpu_unplug(HotplugHandler *hotplug_= dev, DeviceState *dev, =20 cpu_slot =3D virt_find_cpu_slot(ms, cs->cpu_index); =20 - /* TODO: update the acpi cpu hotplug state for cpu hot-unplug */ + /* update the acpi cpu hotplug state for cpu hot-unplug */ + hhc =3D HOTPLUG_HANDLER_GET_CLASS(vms->acpi_dev); + hhc->unplug(HOTPLUG_HANDLER(vms->acpi_dev), dev, &local_err); + if (local_err) { + error_propagate(errp, local_err); + return; + } =20 unwire_gic_cpu_irqs(vms, cs); virt_update_gic(vms, cs); @@ -3246,8 +3266,6 @@ static void virt_cpu_unplug(HotplugHandler *hotplug_d= ev, DeviceState *dev, =20 cpu_slot->cpu =3D NULL; cs->disabled =3D true; - - return; } =20 static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev, --=20 2.34.1