From nobody Wed Oct 29 22:56:11 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1526045586620190.3381349011379; Fri, 11 May 2018 06:33:06 -0700 (PDT) Received: from localhost ([::1]:44665 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fH8AR-0006Kx-6k for importer@patchew.org; Fri, 11 May 2018 09:33:03 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:36227) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fH7zS-0002OO-1V for qemu-devel@nongnu.org; Fri, 11 May 2018 09:21:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fH7zR-0005Pq-1k for qemu-devel@nongnu.org; Fri, 11 May 2018 09:21:42 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:37274 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fH7zQ-0005PL-Sw; Fri, 11 May 2018 09:21:40 -0400 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 7C761406F11D; Fri, 11 May 2018 13:21:40 +0000 (UTC) Received: from t460s.redhat.com (ovpn-117-7.ams2.redhat.com [10.36.117.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id F22951002979; Fri, 11 May 2018 13:21:37 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Fri, 11 May 2018 15:19:52 +0200 Message-Id: <20180511131953.12905-17-david@redhat.com> In-Reply-To: <20180511131953.12905-1-david@redhat.com> References: <20180511131953.12905-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.3 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Fri, 11 May 2018 13:21:40 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Fri, 11 May 2018 13:21:40 +0000 (UTC) for IP:'10.11.54.3' DOMAIN:'int-mx03.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'david@redhat.com' RCPT:'' X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v2 16/17] s390x: initialize memory region for memory devices X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Pankaj Gupta , Eduardo Habkost , "Michael S . Tsirkin" , Cornelia Huck , David Hildenbrand , Markus Armbruster , Alexander Graf , Christian Borntraeger , qemu-s390x@nongnu.org, qemu-ppc@nongnu.org, Paolo Bonzini , Marcel Apfelbaum , Igor Mammedov , Luiz Capitulino , David Gibson , Richard Henderson Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" While s390x has no real interface for communicating devices mapped into the physical address space of the guest, paravirtualized devices can easily expose the applicable address range themselves. So let's use the difference between maxram_size and ram_size as the size for our hotplug memory area (just as on other architectures). Signed-off-by: David Hildenbrand --- hw/s390x/s390-virtio-ccw.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/hw/s390x/s390-virtio-ccw.c b/hw/s390x/s390-virtio-ccw.c index ee0a2b124f..09b755282b 100644 --- a/hw/s390x/s390-virtio-ccw.c +++ b/hw/s390x/s390-virtio-ccw.c @@ -157,9 +157,11 @@ static void virtio_ccw_register_hcalls(void) #define KVM_MEM_MAX_NR_PAGES ((1ULL << 31) - 1) #define SEG_MSK (~0xfffffULL) #define KVM_SLOT_MAX_BYTES ((KVM_MEM_MAX_NR_PAGES * TARGET_PAGE_SIZE) & SE= G_MSK) -static void s390_memory_init(ram_addr_t mem_size) +static void s390_memory_init(MachineState *machine) { + S390CcwMachineState *ms =3D S390_CCW_MACHINE(machine); MemoryRegion *sysmem =3D get_system_memory(); + ram_addr_t mem_size =3D machine->ram_size; ram_addr_t chunk, offset =3D 0; unsigned int number =3D 0; gchar *name; @@ -181,6 +183,28 @@ static void s390_memory_init(ram_addr_t mem_size) } g_free(name); =20 + /* always allocate the device memory information */ + machine->device_memory =3D g_malloc0(sizeof(*machine->device_memory)); + + /* initialize device memory address space */ + if (machine->ram_size < machine->maxram_size) { + ram_addr_t device_mem_size =3D machine->maxram_size - machine->ram= _size; + + if (QEMU_ALIGN_UP(machine->maxram_size, TARGET_PAGE_SIZE) !=3D + machine->maxram_size) { + error_report("maximum memory size must be aligned to multiple = of " + "%d bytes", TARGET_PAGE_SIZE); + exit(EXIT_FAILURE); + } + + machine->device_memory->base =3D machine->ram_size; + memory_region_init(&machine->device_memory->mr, OBJECT(ms), + "device-memory", device_mem_size); + memory_region_add_subregion(sysmem, machine->device_memory->base, + &machine->device_memory->mr); + + } + /* Initialize storage key device */ s390_skeys_init(); /* Initialize storage attributes device */ @@ -304,7 +328,7 @@ static void ccw_init(MachineState *machine) DeviceState *dev; =20 s390_sclp_init(); - s390_memory_init(machine->ram_size); + s390_memory_init(machine); =20 /* init CPUs (incl. CPU model) early so s390_has_feature() works */ s390_init_cpus(machine); --=20 2.14.3