From nobody Wed Nov 5 14:28:09 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; dkim=fail; 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 1534872600543514.1839030830398; Tue, 21 Aug 2018 10:30:00 -0700 (PDT) Received: from localhost ([::1]:55078 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsATb-0002l6-1I for importer@patchew.org; Tue, 21 Aug 2018 13:29:55 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33955) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fsA4v-0002Pl-PX for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:26 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fsA4o-0007Bs-4P for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:23 -0400 Received: from mail-wm0-x22e.google.com ([2a00:1450:400c:c09::22e]:53041) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1fsA4j-00070n-IN for qemu-devel@nongnu.org; Tue, 21 Aug 2018 13:04:17 -0400 Received: by mail-wm0-x22e.google.com with SMTP id y139-v6so855125wmc.2 for ; Tue, 21 Aug 2018 10:04:09 -0700 (PDT) Received: from 640k.lan (dynamic-adsl-78-12-184-244.clienti.tiscali.it. [78.12.184.244]) by smtp.gmail.com with ESMTPSA id v6-v6sm2608955wmc.43.2018.08.21.10.04.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 21 Aug 2018 10:04:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=Mk2XD0BBAHMOhrHGadnYVtpP85Ft74x4Vi5v62K6L1s=; b=aYUePBJhFajCVFNycTDrGjkELnNcZij8kY+l+Oa6DL991jC3ExjsoowP4ajson+huw U2Hk0FpLDDlBbSJbRnJ/NBrpwEwlzGzT9HRFREktriEDY/qNR+GEoz71tExqalj9ZYi2 QWLMmYZA1MtaiCyIYTkSvSQkAfaCE7QfyME+qvXio1F4fIkJAimE7yJsaSFWYGBXlsNm +IUYK37w9ERVwW4KDCnFg8pNsdWODE5EhnqAR/4UnhthNgeH46HbGoQn7ZA3RvXeH4ek NK5ZNHgAvA/0TuaMF4ap4/ouikqTkif1NS5Xy+OFafU2XO900ktII4rsIFBN04vU+CnC ejHA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :in-reply-to:references; bh=Mk2XD0BBAHMOhrHGadnYVtpP85Ft74x4Vi5v62K6L1s=; b=Vgvr1zYWXFWbHCyZOsD7keq/e8u7U5EB3cuFU1Y80v021sZhzPEPgyiwiGRbl1RqlX pg/xQa4fF/VLobDvIa9Calb9Fi36zocqVtLnCGG1JZpmg+hVUrg5t3w6vZvPjH+jkvAp 4xpvFOSB9PUXmhI21Sq2aNyCuSiXW8gNSLPXbmDG3QC97oqSk3Ma98pURqAEW/KdWY+y rKk1Gvs9y62sYDuhD18Wq/MdF17YLecmLOTh8k72vQRZMIrNBIFelFpTTHCXnDcLOmK0 ykwXOYcIwYe/t3blH06piOGu1qMlwllf3sboyq+WOkRb4n2u5DrC/oe+1t9v1AEfJax7 cuFg== X-Gm-Message-State: APzg51CSqW8XWFA2WDdBcOuNWcPJkitrYw1Hjh/c5dd+/ejNhOJkfPSW Gm7BKntsFp7lq7zbu9WMQbkhXvcS X-Google-Smtp-Source: ANB0VdZGF0b4IO1FWV6jiN8HAdCx11AUBBS2gq+cADY7e/sThWfmUsC/GD7JbHCoq5p9qipWuh+7xQ== X-Received: by 2002:a1c:c289:: with SMTP id s131-v6mr145576wmf.65.1534871048128; Tue, 21 Aug 2018 10:04:08 -0700 (PDT) From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Tue, 21 Aug 2018 19:02:33 +0200 Message-Id: <1534870966-9287-62-git-send-email-pbonzini@redhat.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> References: <1534870966-9287-1-git-send-email-pbonzini@redhat.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2a00:1450:400c:c09::22e Subject: [Qemu-devel] [PULL 61/74] pc-dimm: assign and verify the "addr" property during pre_plug 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: David Hildenbrand Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail-DKIM: fail (Header signature does not verify) X-ZohoMail: RDMRC_1 RDKM_2 RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" From: David Hildenbrand We can assign and verify the address before realizing and trying to plug. reading/writing the address property should never fail for DIMMs, so let's reduce error handling a bit by using &error_abort. Getting access to the memory region now might however fail. So forward errors from get_memory_region() properly. As all memory devices should use the alignment of the underlying memory region for guest physical address asignment, do detection of the alignment in pc_dimm_pre_plug(), but allow pc.c to overwrite the alignment for compatibility handling. Reviewed-by: Eric Auger Reviewed-by: Igor Mammedov Acked-by: David Gibson Signed-off-by: David Hildenbrand Message-Id: <20180801133444.11269-5-david@redhat.com> Signed-off-by: Paolo Bonzini --- hw/i386/pc.c | 16 +++++----------- hw/mem/pc-dimm.c | 50 +++++++++++++++++++++++++-------------------= ---- hw/ppc/spapr.c | 7 +++---- include/hw/mem/pc-dimm.h | 6 +++--- 4 files changed, 37 insertions(+), 42 deletions(-) diff --git a/hw/i386/pc.c b/hw/i386/pc.c index b31610c..0314845 100644 --- a/hw/i386/pc.c +++ b/hw/i386/pc.c @@ -1679,7 +1679,9 @@ static void pc_memory_pre_plug(HotplugHandler *hotplu= g_dev, DeviceState *dev, Error **errp) { const PCMachineState *pcms =3D PC_MACHINE(hotplug_dev); + const PCMachineClass *pcmc =3D PC_MACHINE_GET_CLASS(pcms); const bool is_nvdimm =3D object_dynamic_cast(OBJECT(dev), TYPE_NVDIMM); + const uint64_t legacy_align =3D TARGET_PAGE_SIZE; =20 /* * When -no-acpi is used with Q35 machine type, no ACPI is built, @@ -1697,7 +1699,8 @@ static void pc_memory_pre_plug(HotplugHandler *hotplu= g_dev, DeviceState *dev, return; } =20 - pc_dimm_pre_plug(dev, MACHINE(hotplug_dev), errp); + pc_dimm_pre_plug(dev, MACHINE(hotplug_dev), + pcmc->enforce_aligned_dimm ? NULL : &legacy_align, er= rp); } =20 static void pc_memory_plug(HotplugHandler *hotplug_dev, @@ -1706,18 +1709,9 @@ static void pc_memory_plug(HotplugHandler *hotplug_d= ev, HotplugHandlerClass *hhc; Error *local_err =3D NULL; PCMachineState *pcms =3D PC_MACHINE(hotplug_dev); - PCMachineClass *pcmc =3D PC_MACHINE_GET_CLASS(pcms); - 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 (pcmc->enforce_aligned_dimm) { - 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/pc-dimm.c b/hw/mem/pc-dimm.c index e56c4da..fb6bcae 100644 --- a/hw/mem/pc-dimm.c +++ b/hw/mem/pc-dimm.c @@ -29,9 +29,14 @@ =20 static int pc_dimm_get_free_slot(const int *hint, int max_slots, Error **e= rrp); =20 -void pc_dimm_pre_plug(DeviceState *dev, MachineState *machine, Error **err= p) +void pc_dimm_pre_plug(DeviceState *dev, MachineState *machine, + const uint64_t *legacy_align, Error **errp) { + PCDIMMDevice *dimm =3D PC_DIMM(dev); + PCDIMMDeviceClass *ddc =3D PC_DIMM_GET_CLASS(dimm); Error *local_err =3D NULL; + MemoryRegion *mr; + uint64_t addr, align; int slot; =20 slot =3D object_property_get_int(OBJECT(dev), PC_DIMM_SLOT_PROP, @@ -43,44 +48,41 @@ void pc_dimm_pre_plug(DeviceState *dev, MachineState *m= achine, Error **errp) } object_property_set_int(OBJECT(dev), slot, PC_DIMM_SLOT_PROP, &error_a= bort); trace_mhp_pc_dimm_assigned_slot(slot); + + mr =3D ddc->get_memory_region(dimm, &local_err); + if (local_err) { + goto out; + } + + align =3D legacy_align ? *legacy_align : memory_region_get_alignment(m= r); + addr =3D object_property_get_uint(OBJECT(dev), PC_DIMM_ADDR_PROP, + &error_abort); + addr =3D memory_device_get_free_addr(machine, !addr ? NULL : &addr, al= ign, + memory_region_size(mr), &local_err); + if (local_err) { + goto out; + } + trace_mhp_pc_dimm_assigned_address(addr); + object_property_set_uint(OBJECT(dev), addr, PC_DIMM_ADDR_PROP, + &error_abort); 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); - Error *local_err =3D NULL; uint64_t addr; =20 - addr =3D object_property_get_uint(OBJECT(dimm), - PC_DIMM_ADDR_PROP, &local_err); - if (local_err) { - goto out; - } - - addr =3D memory_device_get_free_addr(machine, !addr ? NULL : &addr, al= ign, - memory_region_size(mr), &local_err); - if (local_err) { - goto out; - } - - object_property_set_uint(OBJECT(dev), addr, PC_DIMM_ADDR_PROP, &local_= err); - if (local_err) { - goto out; - } - trace_mhp_pc_dimm_assigned_address(addr); + addr =3D object_property_get_uint(OBJECT(dev), PC_DIMM_ADDR_PROP, + &error_abort); =20 memory_device_plug_region(machine, mr, addr); vmstate_register_ram(vmstate_mr, dev); - -out: - error_propagate(errp, local_err); } =20 void pc_dimm_unplug(DeviceState *dev, MachineState *machine) diff --git a/hw/ppc/spapr.c b/hw/ppc/spapr.c index 96468dc..a70704a 100644 --- a/hw/ppc/spapr.c +++ b/hw/ppc/spapr.c @@ -3164,13 +3164,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; } @@ -3237,7 +3236,7 @@ static void spapr_memory_pre_plug(HotplugHandler *hot= plug_dev, DeviceState *dev, return; } =20 - pc_dimm_pre_plug(dev, MACHINE(hotplug_dev), errp); + pc_dimm_pre_plug(dev, MACHINE(hotplug_dev), NULL, errp); } =20 struct sPAPRDIMMState { diff --git a/include/hw/mem/pc-dimm.h b/include/hw/mem/pc-dimm.h index 7b12041..b382eb4 100644 --- a/include/hw/mem/pc-dimm.h +++ b/include/hw/mem/pc-dimm.h @@ -79,8 +79,8 @@ typedef struct PCDIMMDeviceClass { Error **errp); } 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_pre_plug(DeviceState *dev, MachineState *machine, + const uint64_t *legacy_align, Error **errp); +void pc_dimm_plug(DeviceState *dev, MachineState *machine, Error **errp); void pc_dimm_unplug(DeviceState *dev, MachineState *machine); #endif --=20 1.8.3.1