From nobody Sun Nov 24 13:33:53 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=none dis=none) header.from=gmail.com ARC-Seal: i=1; a=rsa-sha256; t=1723468012; cv=none; d=zohomail.com; s=zohoarc; b=j9HnyEIJqH1r0gNlUc2NW/eMD+7oLaT8djoIZD7Q3exc0xT8/Ge+esvRtb+zx9o8fQgD1C25beVhmag/gzub3ASh3W5nrlN6IxFtwERXcHJc8RdUYLCZ9KxEawtoGcJ8rtnyPqDIgzavobMLUynQST36nhFFBi/Y4j8vjZ2GkOU= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1723468012; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:To:To:Message-Id:Reply-To; bh=zpYqNKXAVuA0a+6/wfjyGjtY9ZeW5tCWM6T6raDN/Y4=; b=OI0tDjBfByGmimfH7zLcK6kOqNyy2E9KjcpJ1Z6sAazVSs98LvyzQfq9CXV4O6yPjN16+xv1eB1UnVl/OAciI9954i4qmbB9uSUbEl6iOjJ05x+7yoTLjwFhdt1QSY1z1xJHgkqqDlP6sar6P2oKaA7ZS0hTHKKTLGDUKvtClIc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1723468012619357.19437808154976; Mon, 12 Aug 2024 06:06:52 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.775499.1185779 (Exim 4.92) (envelope-from ) id 1sdUks-0001Gn-4b; Mon, 12 Aug 2024 13:06:34 +0000 Received: by outflank-mailman (output) from mailman id 775499.1185779; Mon, 12 Aug 2024 13:06:34 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdUkr-0001FU-QX; Mon, 12 Aug 2024 13:06:33 +0000 Received: by outflank-mailman (input) for mailman id 775499; Mon, 12 Aug 2024 13:06:32 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sdUkq-00074b-8p for xen-devel@lists.xenproject.org; Mon, 12 Aug 2024 13:06:32 +0000 Received: from mail-lj1-x22b.google.com (mail-lj1-x22b.google.com [2a00:1450:4864:20::22b]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b19c9544-58ab-11ef-bc05-fd08da9f4363; Mon, 12 Aug 2024 15:06:31 +0200 (CEST) Received: by mail-lj1-x22b.google.com with SMTP id 38308e7fff4ca-2f149845fbaso45483501fa.3 for ; Mon, 12 Aug 2024 06:06:31 -0700 (PDT) Received: from gmail.com (213-67-3-247-no600.tbcn.telia.com. [213.67.3.247]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-2f291df3c4esm8503311fa.40.2024.08.12.06.06.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 12 Aug 2024 06:06:29 -0700 (PDT) X-Outflank-Mailman: Message body and most headers restored to incoming version X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: b19c9544-58ab-11ef-bc05-fd08da9f4363 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1723467991; x=1724072791; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zpYqNKXAVuA0a+6/wfjyGjtY9ZeW5tCWM6T6raDN/Y4=; b=QgtnSVwvc56thpNKoLxfoUNC63Fjzv+hEvod3nd6UDvPR2s3IUGi6j4YUV2BpclwMj BjlEsJzQGwLC8NZQXg5i8Mfidi05RWTd3CErmFhpyv5nOrFa7hD3j1YItkMjfh+S85af +DFERiStt4Tc8Qgb2/DiH4FQFy8pD41uaBRT76Rf9bGucoReXgZ6UfbnFmPnHBGcK73f SHwF3Wlp8PIaINzUIL+DbpcC8nlSWf/fzhlCA2FIu5mJz4xj/2yxLhNkAUY7E+Pe7vbw mSAZrWwIvHf9ejvtUCrHFUxnW+wwTqZzhkrCYtWfbzUD24M+53KWpOmHeEw/Nq4O++PQ odkQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1723467991; x=1724072791; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zpYqNKXAVuA0a+6/wfjyGjtY9ZeW5tCWM6T6raDN/Y4=; b=iisgonhi8F+AiaTVJt/i++d9IhHL9UGi/9O6XFH76/7hy4+aRfCoct5BUquQyzT533 ElZGfsNE8ThATyyY2adxpfnpXhfz2iP3Q2i4W4WyAGMDD1n+z0fD6CAuc7eQsa5oGmVm ZB1hQmIFZjL7wXbDPFvQb/Xij70UTeBH+yxmcAtzNJbUZ7BI3IooQH2++nYociaeWGGj VDs7Lhcdzpf/39qFCXaoL2m7Gv8BOR6Hn0TeQPziNo/LUzmVUj0BanAz40VF7bojwY2W 1/Z1iT+Wq6j8SQ/zmJtAKzn8WLKi97gMsyCjDzLlRIUPd1ruhNJoVKSTe8a3++a9fbPR AaNw== X-Forwarded-Encrypted: i=1; AJvYcCWPbfU8bBwWKDJzAH0XSWGwS4OxTstfwKlVYECoyaMVf6xMzhZsJdF5qdLTSLnagMYx+o3fk/XcFWG/C78RT7de8cGebOo16j/dou7Miw0= X-Gm-Message-State: AOJu0YwFS4RRpunwJmAIjLPeT9jlombF23gc82tM5KYMoCNaMEhJ9JMP Tv0cTHnGbTjAZQ9Z3mpehiv880foqE2gd40D/AgcdqymNMxFRkT3 X-Google-Smtp-Source: AGHT+IFbDkFVn4nHNTgp2rSK1ep8EB3W/CnGnNoziWsVxIa3hCXemD+rWCA6eJi3qacG+boCLJdOoQ== X-Received: by 2002:a2e:2414:0:b0:2ef:1808:7523 with SMTP id 38308e7fff4ca-2f2b714d294mr1493031fa.18.1723467990279; Mon, 12 Aug 2024 06:06:30 -0700 (PDT) From: "Edgar E. Iglesias" To: qemu-devel@nongnu.org Cc: sstabellini@kernel.org, anthony@xenproject.org, paul@xen.org, peter.maydell@linaro.org, alex.bennee@linaro.org, xenia.ragiadakou@amd.com, jason.andryuk@amd.com, edgar.iglesias@amd.com, xen-devel@lists.xenproject.org, "Edgar E. Iglesias" , "Michael S. Tsirkin" , Marcel Apfelbaum , Paolo Bonzini , Richard Henderson , Eduardo Habkost Subject: [PATCH v1 09/10] hw/i386/xen: Add a Xen PVH x86 machine Date: Mon, 12 Aug 2024 15:06:04 +0200 Message-ID: <20240812130606.90410-10-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240812130606.90410-1-edgar.iglesias@gmail.com> References: <20240812130606.90410-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1723468014074116600 Content-Type: text/plain; charset="utf-8" From: "Edgar E. Iglesias" This adds a Xen PVH x86 machine based on the PVH Common module used by the ARM PVH machine. Signed-off-by: Edgar E. Iglesias --- hw/i386/xen/meson.build | 1 + hw/i386/xen/xen-pvh.c | 196 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 197 insertions(+) create mode 100644 hw/i386/xen/xen-pvh.c diff --git a/hw/i386/xen/meson.build b/hw/i386/xen/meson.build index 3f0df8bc07..c73c62b8e3 100644 --- a/hw/i386/xen/meson.build +++ b/hw/i386/xen/meson.build @@ -4,6 +4,7 @@ i386_ss.add(when: 'CONFIG_XEN', if_true: files( )) i386_ss.add(when: ['CONFIG_XEN', xen], if_true: files( 'xen-hvm.c', + 'xen-pvh.c', )) =20 i386_ss.add(when: 'CONFIG_XEN_BUS', if_true: files( diff --git a/hw/i386/xen/xen-pvh.c b/hw/i386/xen/xen-pvh.c new file mode 100644 index 0000000000..9c3d3fc58d --- /dev/null +++ b/hw/i386/xen/xen-pvh.c @@ -0,0 +1,196 @@ +/* + * QEMU Xen PVH x86 Machine + * + * Copyright (c) 2024 Advanced Micro Devices, Inc. + * Written by Edgar E. Iglesias + * + * SPDX-License-Identifier: GPL-2.0-or-later + */ + +#include "qemu/osdep.h" +#include "qapi/error.h" +#include "qapi/visitor.h" +#include "qemu/error-report.h" +#include "hw/boards.h" +#include "sysemu/sysemu.h" +#include "hw/xen/arch_hvm.h" +#include "hw/xen/xen.h" +#include "hw/xen/xen-pvh-common.h" + +#define TYPE_XEN_PVH_X86 MACHINE_TYPE_NAME("xenpvh") +OBJECT_DECLARE_SIMPLE_TYPE(XenPVHx86State, XEN_PVH_X86) + +#define PVH_MAX_CPUS 128 + +struct XenPVHx86State { + /*< private >*/ + MachineState parent; + + DeviceState *cpu[PVH_MAX_CPUS]; + XenPVHCommonState pvh; + + /* + * We provide these properties to allow Xen to move things to other + * addresses for example when users need to accomodate the memory-map + * for 1:1 mapped devices/memory. + */ + struct { + MemMapEntry ram_low, ram_high; + MemMapEntry pci_ecam, pci_mmio, pci_mmio_high; + } cfg; +}; + +static void xenpvh_cpu_new(MachineState *ms, + XenPVHx86State *xp, + int cpu_idx, + int64_t apic_id) +{ + Object *cpu =3D object_new(ms->cpu_type); + + object_property_add_child(OBJECT(ms), "cpu[*]", cpu); + object_property_set_uint(cpu, "apic-id", apic_id, &error_fatal); + qdev_realize(DEVICE(cpu), NULL, &error_fatal); + object_unref(cpu); + + xp->cpu[cpu_idx] =3D DEVICE(cpu); +} + +static void xenpvh_init(MachineState *ms) +{ + XenPVHx86State *xp =3D XEN_PVH_X86(ms); + const struct { + const char *name; + MemMapEntry *map; + } map[] =3D { + { "ram-low", &xp->cfg.ram_low }, + { "ram-high", &xp->cfg.ram_high }, + { "pci-ecam", &xp->cfg.pci_ecam }, + { "pci-mmio", &xp->cfg.pci_mmio }, + { "pci-mmio-high", &xp->cfg.pci_mmio_high }, + }; + int i; + + object_initialize_child(OBJECT(ms), "pvh", &xp->pvh, TYPE_XEN_PVH_COMM= ON); + object_property_set_int(OBJECT(&xp->pvh), "max-cpus", ms->smp.max_cpus, + &error_abort); + object_property_set_int(OBJECT(&xp->pvh), "ram-size", ms->ram_size, + &error_abort); + + for (i =3D 0; i < ARRAY_SIZE(map); i++) { + g_autofree char *base_name =3D g_strdup_printf("%s-base", map[i].n= ame); + g_autofree char *size_name =3D g_strdup_printf("%s-size", map[i].n= ame); + + object_property_set_int(OBJECT(&xp->pvh), base_name, map[i].map->b= ase, + &error_abort); + object_property_set_int(OBJECT(&xp->pvh), size_name, map[i].map->s= ize, + &error_abort); + } + + /* GSI's 16 - 20 are used for legacy PCIe INTX IRQs. */ + object_property_set_int(OBJECT(&xp->pvh), "pci-intx-irq-base", 16, + &error_abort); + + sysbus_realize(SYS_BUS_DEVICE(&xp->pvh), &error_abort); + + /* Create dummy cores. This will indirectly create the APIC MSI window= . */ + for (i =3D 0; i < ms->smp.cpus; i++) { + xenpvh_cpu_new(ms, xp, i, i); + } +} + +#define XENPVH_PROP_MEMMAP_SETTER(n, f) = \ +static void xenpvh_set_ ## n ## _ ## f(Object *obj, Visitor *v, = \ + const char *name, void *opaque, = \ + Error **errp) = \ +{ = \ + XenPVHx86State *xp =3D XEN_PVH_X86(obj); = \ + uint64_t value; = \ + = \ + if (!visit_type_size(v, name, &value, errp)) { = \ + return; = \ + } = \ + xp->cfg.n.f =3D value; = \ +} + +#define XENPVH_PROP_MEMMAP_GETTER(n, f) = \ +static void xenpvh_get_ ## n ## _ ## f(Object *obj, Visitor *v, = \ + const char *name, void *opaque, = \ + Error **errp) = \ +{ = \ + XenPVHx86State *xp =3D XEN_PVH_X86(obj); = \ + uint64_t value =3D xp->cfg.n.f; = \ + = \ + visit_type_uint64(v, name, &value, errp); = \ +} + +#define XENPVH_PROP_MEMMAP(n) \ + XENPVH_PROP_MEMMAP_SETTER(n, base) \ + XENPVH_PROP_MEMMAP_SETTER(n, size) \ + XENPVH_PROP_MEMMAP_GETTER(n, base) \ + XENPVH_PROP_MEMMAP_GETTER(n, size) + + +XENPVH_PROP_MEMMAP(ram_low) +XENPVH_PROP_MEMMAP(ram_high) +XENPVH_PROP_MEMMAP(pci_ecam) +XENPVH_PROP_MEMMAP(pci_mmio) +XENPVH_PROP_MEMMAP(pci_mmio_high) + +static void xenpvh_instance_init(Object *obj) +{ + XenPVHx86State *xp =3D XEN_PVH_X86(obj); + + /* Default memmap. */ + xp->cfg.ram_low.base =3D 0x0; + xp->cfg.ram_low.size =3D 0x80000000U; + xp->cfg.ram_high.base =3D 0xC000000000ULL; + xp->cfg.ram_high.size =3D 0x4000000000ULL; +} + +static void xenpvh_machine_class_init(ObjectClass *oc, void *data) +{ + MachineClass *mc =3D MACHINE_CLASS(oc); + + mc->desc =3D "Xen PVH x86 machine"; + mc->init =3D xenpvh_init; + mc->max_cpus =3D PVH_MAX_CPUS; + mc->default_cpu_type =3D TARGET_DEFAULT_CPU_TYPE; + mc->default_machine_opts =3D "accel=3Dxen"; + /* Set explicitly here to make sure that real ram_size is passed */ + mc->default_ram_size =3D 0; + +#define OC_MEMMAP_PROP(c, prop_name, name) \ +do { \ + object_class_property_add(c, prop_name "-base", "uint64_t", \ + xenpvh_get_ ## name ## _base, \ + xenpvh_set_ ## name ## _base, NULL, NULL); \ + object_class_property_set_description(oc, prop_name "-base", \ + prop_name " base address"); \ + object_class_property_add(c, prop_name "-size", "uint64_t", \ + xenpvh_get_ ## name ## _size, \ + xenpvh_set_ ## name ## _size, NULL, NULL); \ + object_class_property_set_description(oc, prop_name "-size", \ + prop_name " size of memory region"); \ +} while (0) + + OC_MEMMAP_PROP(oc, "ram-low", ram_low); + OC_MEMMAP_PROP(oc, "ram-high", ram_high); + OC_MEMMAP_PROP(oc, "pci-ecam", pci_ecam); + OC_MEMMAP_PROP(oc, "pci-mmio", pci_mmio); + OC_MEMMAP_PROP(oc, "pci-mmio-high", pci_mmio_high); +} + +static const TypeInfo xenpvh_machine_type =3D { + .name =3D TYPE_XEN_PVH_X86, + .parent =3D TYPE_MACHINE, + .class_init =3D xenpvh_machine_class_init, + .instance_init =3D xenpvh_instance_init, + .instance_size =3D sizeof(XenPVHx86State), +}; + +static void xenpvh_machine_register_types(void) +{ + type_register_static(&xenpvh_machine_type); +} + +type_init(xenpvh_machine_register_types) --=20 2.43.0