From nobody Tue Feb 10 10:04:22 2026 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 1529333509816294.3652551106236; Mon, 18 Jun 2018 07:51:49 -0700 (PDT) Received: from localhost ([::1]:35174 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUvVV-0000Zv-3p for importer@patchew.org; Mon, 18 Jun 2018 10:51:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46408) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fUvS2-0006pE-B9 for qemu-devel@nongnu.org; Mon, 18 Jun 2018 10:48:15 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fUvRy-0004lI-62 for qemu-devel@nongnu.org; Mon, 18 Jun 2018 10:48:14 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:37340 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 1fUvRx-0004lA-VK; Mon, 18 Jun 2018 10:48:10 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 79FCD818A6A9; Mon, 18 Jun 2018 14:48:09 +0000 (UTC) Received: from t460s.redhat.com (ovpn-117-240.ams2.redhat.com [10.36.117.240]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9E95D2156880; Mon, 18 Jun 2018 14:48:07 +0000 (UTC) From: David Hildenbrand To: qemu-devel@nongnu.org Date: Mon, 18 Jun 2018 16:47:59 +0200 Message-Id: <20180618144800.555-4-david@redhat.com> In-Reply-To: <20180618144800.555-1-david@redhat.com> References: <20180618144800.555-1-david@redhat.com> X-Scanned-By: MIMEDefang 2.78 on 10.11.54.6 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Mon, 18 Jun 2018 14:48:09 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.8]); Mon, 18 Jun 2018 14:48:09 +0000 (UTC) for IP:'10.11.54.6' DOMAIN:'int-mx06.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 v1 3/4] pc-dimm/memory-device: detect alignment internally 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: Eduardo Habkost , "Michael S . Tsirkin" , David Hildenbrand , Alexander Graf , qemu-ppc@nongnu.org, Paolo Bonzini , Igor Mammedov , 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" We can now avoid having to pass in the alignment explicitly but can instead make use of the new machine compat parameter "memory_device_align". As we are using TARGET_PAGE_SIZE in memory-device.c, we can now longer compile it as common object. Signed-off-by: David Hildenbrand --- hw/i386/pc.c | 13 +------------ hw/mem/Makefile.objs | 2 +- hw/mem/memory-device.c | 25 +++++++++++++++++++++++++ hw/mem/pc-dimm.c | 4 ++-- hw/ppc/spapr.c | 5 ++--- include/hw/mem/memory-device.h | 1 + include/hw/mem/pc-dimm.h | 3 +-- 7 files changed, 33 insertions(+), 20 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index 04a97e89e7..d5581ab0a1 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1704,20 +1704,9 @@ static void pc_memory_plug(HotplugHandler *hotplug_d= ev, HotplugHandlerClass *hhc; Error *local_err =3D NULL; PCMachineState *pcms =3D PC_MACHINE(hotplug_dev); - MachineClass *mc =3D MACHINE_GET_CLASS(hotplug_dev); - PCDIMMDevice *dimm =3D PC_DIMM(dev); - PCDIMMDeviceClass *ddc =3D PC_DIMM_GET_CLASS(dimm); - MemoryRegion *mr =3D ddc->get_memory_region(dimm, &error_abort); - uint64_t align =3D TARGET_PAGE_SIZE; bool is_nvdimm =3D object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); =20 - - if (memory_region_get_alignment(mr) && - mc->memory_device_align !=3D MEMORY_DEVICE_ALIGN_PAGE) { - align =3D memory_region_get_alignment(mr); - } - - pc_dimm_plug(dev, MACHINE(pcms), align, &local_err); + pc_dimm_plug(dev, MACHINE(pcms), &local_err); if (local_err) { goto out; } diff --git a/hw/mem/Makefile.objs b/hw/mem/Makefile.objs index 10be4df2a2..f519441091 100644 --- a/hw/mem/Makefile.objs +++ b/hw/mem/Makefile.objs @@ -1,3 +1,3 @@ common-obj-$(CONFIG_MEM_HOTPLUG) +=3D pc-dimm.o -common-obj-$(CONFIG_MEM_HOTPLUG) +=3D memory-device.o +obj-$(CONFIG_MEM_HOTPLUG) +=3D memory-device.o common-obj-$(CONFIG_NVDIMM) +=3D nvdimm.o diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c index 6de4f70bb4..968c64be97 100644 --- a/hw/mem/memory-device.c +++ b/hw/mem/memory-device.c @@ -249,6 +249,31 @@ uint64_t get_plugged_memory_size(void) return size; } =20 +uint64_t memory_device_get_align(MachineState *ms, MemoryRegion *mr) { + const MachineClass *mc =3D MACHINE_GET_CLASS(ms); + uint64_t align; + + /* use the configured memory device alignment (compat handling) */ + switch (mc->memory_device_align) { + case MEMORY_DEVICE_ALIGN_REGION: + align =3D memory_region_get_alignment(mr);; + break; + case MEMORY_DEVICE_ALIGN_PAGE: + align =3D TARGET_PAGE_SIZE; + break; + case MEMORY_DEVICE_ALIGN_REGION_OR_PAGE: + align =3D memory_region_get_alignment(mr); + if (!align) { + align =3D TARGET_PAGE_SIZE; + } + break; + default: + g_assert_not_reached(); + } + + return align; +} + void memory_device_plug_region(MachineState *ms, MemoryRegion *mr, uint64_t addr) { diff --git a/hw/mem/pc-dimm.c b/hw/mem/pc-dimm.c index e56c4daef2..9198104d34 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -47,14 +47,14 @@ out: error_propagate(errp, local_err); } =20 -void pc_dimm_plug(DeviceState *dev, MachineState *machine, uint64_t align, - Error **errp) +void pc_dimm_plug(DeviceState *dev, MachineState *machine, Error **errp) { PCDIMMDevice *dimm =3D PC_DIMM(dev); PCDIMMDeviceClass *ddc =3D PC_DIMM_GET_CLASS(dimm); MemoryRegion *vmstate_mr =3D ddc->get_vmstate_memory_region(dimm, &error_abort= ); MemoryRegion *mr =3D ddc->get_memory_region(dimm, &error_abort); + const uint64_t align =3D memory_device_get_align(machine, mr); Error *local_err =3D NULL; uint64_t addr; =20 diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 9da233588b..03752c6aaf 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3143,13 +3143,12 @@ static void spapr_memory_plug(HotplugHandler *hotpl= ug_dev, DeviceState *dev, PCDIMMDevice *dimm =3D PC_DIMM(dev); PCDIMMDeviceClass *ddc =3D PC_DIMM_GET_CLASS(dimm); MemoryRegion *mr =3D ddc->get_memory_region(dimm, &error_abort); - uint64_t align, size, addr; + uint64_t size, addr; uint32_t node; =20 - align =3D memory_region_get_alignment(mr); size =3D memory_region_size(mr); =20 - pc_dimm_plug(dev, MACHINE(ms), align, &local_err); + pc_dimm_plug(dev, MACHINE(ms), &local_err); if (local_err) { goto out; } diff --git a/include/hw/mem/memory-device.h b/include/hw/mem/memory-device.h index 2853b084b5..32cd15a0cb 100644 --- a/include/hw/mem/memory-device.h +++ b/include/hw/mem/memory-device.h @@ -44,6 +44,7 @@ uint64_t get_plugged_memory_size(void); uint64_t memory_device_get_free_addr(MachineState *ms, const uint64_t *hin= t, uint64_t align, uint64_t size, Error **errp); +uint64_t memory_device_get_align(MachineState *ms, MemoryRegion *mr); void memory_device_plug_region(MachineState *ms, MemoryRegion *mr, uint64_t addr); void memory_device_unplug_region(MachineState *ms, MemoryRegion *mr); diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h index 7b120416d1..ba9f7e7146 100644 --- a/include/hw/mem/pc-dimm.h +++ b/include/hw/mem/pc-dimm.h @@ -80,7 +80,6 @@ typedef struct PCDIMMDeviceClass { } PCDIMMDeviceClass; =20 void pc_dimm_pre_plug(DeviceState *dev, MachineState *machine, Error **err= p); -void pc_dimm_plug(DeviceState *dev, MachineState *machine, uint64_t align, - Error **errp); +void pc_dimm_plug(DeviceState *dev, MachineState *machine, Error **errp); void pc_dimm_unplug(DeviceState *dev, MachineState *machine); #endif --=20 2.17.1