From nobody Fri Nov 22 01:26:03 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=1724164239; cv=none; d=zohomail.com; s=zohoarc; b=XtesOwLEsqV7m8Gl+aw0Ezawh5UzV6trc0suqQ4VoQrmrScumMpjSKwaGEeEmQr5GDTPAw7EdkKJBof1TiWATjtHum7TWnsJso/KDns9VGPzVP74/dxpdsriUYgs4AgqHNi/gbTuVgwFpvMX9udrabjfQ5661x7hgtAyZAU9TS4= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1724164239; 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=qb70tZhf6O0rqG3q2lg1Kgw4jrd26x22YIO9764ldGo=; b=a2RizgmmUBPWVSzcQ/SNkxuSpyzByyWyIayB4XBKNVL2l1jQeTowt3dy6WgiyaQv6yGYrAIOvFPtQfDsVCTyGD4jXP9PjjooJtnOMpEs6tEO+Y5NgdN/JaFEbWxXxZmZ4wG/n4EyYKw54ascZKeQCKgRVIozTw0JRP9IR34oSJM= 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 1724164239456728.5933176226282; Tue, 20 Aug 2024 07:30:39 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.780542.1190256 (Exim 4.92) (envelope-from ) id 1sgPsG-0004fD-NS; Tue, 20 Aug 2024 14:30:16 +0000 Received: by outflank-mailman (output) from mailman id 780542.1190256; Tue, 20 Aug 2024 14:30:16 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1sgPsG-0004cx-EG; Tue, 20 Aug 2024 14:30:16 +0000 Received: by outflank-mailman (input) for mailman id 780542; Tue, 20 Aug 2024 14:30:14 +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 1sgPsE-0000m9-NM for xen-devel@lists.xenproject.org; Tue, 20 Aug 2024 14:30:14 +0000 Received: from mail-lf1-x129.google.com (mail-lf1-x129.google.com [2a00:1450:4864:20::129]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id b6a0bd42-5f00-11ef-a507-bb4a2ccca743; Tue, 20 Aug 2024 16:30:14 +0200 (CEST) Received: by mail-lf1-x129.google.com with SMTP id 2adb3069b0e04-52efc60a6e6so8080533e87.1 for ; Tue, 20 Aug 2024 07:30:14 -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 2adb3069b0e04-533449f5fdasm118978e87.284.2024.08.20.07.30.12 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 20 Aug 2024 07:30:12 -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: b6a0bd42-5f00-11ef-a507-bb4a2ccca743 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1724164213; x=1724769013; 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=qb70tZhf6O0rqG3q2lg1Kgw4jrd26x22YIO9764ldGo=; b=jc/8/A4rHGCO692fgEx6TruDitoNfXvLzCOzpfNVA/iJQA1p0vUhINfBmBo7JMORMz S1Ydq53Q72Bvp3Vr1nqltZGZ3uPCy2DO2GwzJJII1KSpySA/yWf9AmwR1KMuuKet0UeQ 6qhzCtovZH/mrPv2WnqmUhBuXOGAJShy0p8+0bmkvnob1T5mWtYiLSdN/j8ag62dwWHx 0kOIMs46O/QHGwG0Dyd4ZJNTKIduXV8S4xq/otTpN+lZ0xXZJcGuPMPuo5aZl1/MFUkt c96ciIowyZLy+VSzROVbTYeoCUSI/4qCPdEq3XOOYq3m2Q9QwkWq4W689rkCw9mdH9Q8 SZow== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1724164213; x=1724769013; 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=qb70tZhf6O0rqG3q2lg1Kgw4jrd26x22YIO9764ldGo=; b=o4p3dbZMC1lPbcw1ugVbkhjGLRT67ZqEwSK9HrxeHHAwuqjsvOOI6LwCQzwC93A5vz u0XQclXZ0iqUT4P9u078FrUknExRYnngFw0sTOVdKuEnHXimzNKvb/jhRXGpMlxZWvvu ol4fDQiLX2VJYPI1t5+DWcIlkPEedIgfI7RBsVwUQXPMR6TUiAXsLETE0mHoQj6V0msX jgomG5mCQ0Kg2+1C9N8hLorlwMVNNL1RHQxRec1qHTvI0xUiNzux5FRAv0J59XmTdt2Q ET8Rgjv/lSb+pqfL/ifiE0jrVLnaE+K0iuYCk11W/khvOxBEVA1IUGcu4durDRK+NBJV PVtw== X-Forwarded-Encrypted: i=1; AJvYcCXHR52t0wziCvrjNvMi+hQBWLWaQiRJe+PEPiKde8rcf7xVV9mtdcZBNvI6SUBNFlo4J3qruysD3snczemp9aEaFHOeAkeEB9Yjzjiaff8= X-Gm-Message-State: AOJu0YyF6cBw5Ijx4NgCIB6dQvzsklPFS7JlmIP8aoxFAKII+0R+orG6 RVsOkx8a9gl7Hh1VOOmeYtS92/72gVNUjbZILFI9dEoPMott/jgy X-Google-Smtp-Source: AGHT+IFoXhrlxg3cNGb0+DSA5Qu76KzL7+3HHVZt7gmKWNEWr1BFmaIm+WYR3dUl/tDDDSx61bB+zA== X-Received: by 2002:a05:6512:641a:b0:533:4477:28a2 with SMTP id 2adb3069b0e04-53344772a8emr1193165e87.16.1724164212866; Tue, 20 Aug 2024 07:30:12 -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 v2 11/12] hw/i386/xen: Add a Xen PVH x86 machine Date: Tue, 20 Aug 2024 16:29:48 +0200 Message-ID: <20240820142949.533381-12-edgar.iglesias@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240820142949.533381-1-edgar.iglesias@gmail.com> References: <20240820142949.533381-1-edgar.iglesias@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @gmail.com) X-ZM-MESSAGEID: 1724164240691116600 Content-Type: text/plain; charset="utf-8" From: "Edgar E. Iglesias" Add a Xen PVH x86 machine based on the abstract PVH Machine. Signed-off-by: Edgar E. Iglesias Reviewed-by: Stefano Stabellini --- hw/i386/xen/meson.build | 1 + hw/i386/xen/xen-pvh.c | 121 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 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..45645667e9 --- /dev/null +++ b/hw/i386/xen/xen-pvh.c @@ -0,0 +1,121 @@ +/* + * 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 "qemu/error-report.h" +#include "hw/boards.h" +#include "sysemu/sysemu.h" +#include "hw/xen/arch_hvm.h" +#include +#include "hw/xen/xen-pvh-common.h" + +#define TYPE_XEN_PVH_X86 MACHINE_TYPE_NAME("xenpvh") +OBJECT_DECLARE_SIMPLE_TYPE(XenPVHx86State, XEN_PVH_X86) + +struct XenPVHx86State { + /*< private >*/ + XenPVHMachineState parent; + + DeviceState **cpu; +}; + +static DeviceState *xen_pvh_cpu_new(MachineState *ms, + 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); + + return DEVICE(cpu); +} + +static void xen_pvh_init(MachineState *ms) +{ + XenPVHx86State *xp =3D XEN_PVH_X86(ms); + int i; + + /* Create dummy cores. This will indirectly create the APIC MSI window= . */ + xp->cpu =3D g_malloc(sizeof xp->cpu[0] * ms->smp.max_cpus); + for (i =3D 0; i < ms->smp.max_cpus; i++) { + xp->cpu[i] =3D xen_pvh_cpu_new(ms, i); + } +} + +static void xen_pvh_instance_init(Object *obj) +{ + XenPVHMachineState *s =3D XEN_PVH_MACHINE(obj); + + /* Default values. */ + s->cfg.ram_low =3D (MemMapEntry) { 0x0, 0x80000000U }; + s->cfg.ram_high =3D (MemMapEntry) { 0xC000000000ULL, 0x4000000000ULL }; + s->cfg.pci_intx_irq_base =3D 16; +} + +/* + * Deliver INTX interrupts to Xen guest. + */ +static void xen_pvh_set_pci_intx_irq(void *opaque, int irq, int level) +{ + /* + * Since QEMU emulates all of the swizziling + * We don't want Xen to do any additional swizzling in + * xen_set_pci_intx_level() so we always set device to 0. + */ + if (xen_set_pci_intx_level(xen_domid, 0, 0, 0, irq, level)) { + error_report("xendevicemodel_set_pci_intx_level failed"); + } +} + +static void xen_pvh_machine_class_init(ObjectClass *oc, void *data) +{ + XenPVHMachineClass *xpc =3D XEN_PVH_MACHINE_CLASS(oc); + MachineClass *mc =3D MACHINE_CLASS(oc); + + mc->desc =3D "Xen PVH x86 machine"; + mc->default_cpu_type =3D TARGET_DEFAULT_CPU_TYPE; + + /* mc->max_cpus holds the MAX value allowed in the -smp cmd-line opts.= */ + mc->max_cpus =3D HVM_MAX_VCPUS; + + /* We have an implementation specific init to create CPU objects. */ + xpc->init =3D xen_pvh_init; + + /* + * PCI INTX routing. + * + * We describe the mapping between the 4 INTX interrupt and GSIs + * using xen_set_pci_link_route(). xen_pvh_set_pci_intx_irq is + * used to deliver the interrupt. + */ + xpc->set_pci_intx_irq =3D xen_pvh_set_pci_intx_irq; + xpc->set_pci_link_route =3D xen_set_pci_link_route; + + /* List of supported features known to work on PVH x86. */ + xpc->has_pci =3D true; + + xen_pvh_class_setup_common_props(xpc); +} + +static const TypeInfo xen_pvh_x86_machine_type =3D { + .name =3D TYPE_XEN_PVH_X86, + .parent =3D TYPE_XEN_PVH_MACHINE, + .class_init =3D xen_pvh_machine_class_init, + .instance_init =3D xen_pvh_instance_init, + .instance_size =3D sizeof(XenPVHx86State), +}; + +static void xen_pvh_machine_register_types(void) +{ + type_register_static(&xen_pvh_x86_machine_type); +} + +type_init(xen_pvh_machine_register_types) --=20 2.43.0