From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-17.3 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5075BC4361B for ; Fri, 18 Dec 2020 18:57:29 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id A6A4623B83 for ; Fri, 18 Dec 2020 18:57:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org A6A4623B83 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:56418 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kqKwR-0002xp-Bw for qemu-devel@archiver.kernel.org; Fri, 18 Dec 2020 13:57:27 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58302) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kqKuY-00025C-69 for qemu-devel@nongnu.org; Fri, 18 Dec 2020 13:55:30 -0500 Received: from us-smtp-delivery-124.mimecast.com ([63.128.21.124]:26153) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1kqKuH-0003ds-K4 for qemu-devel@nongnu.org; Fri, 18 Dec 2020 13:55:29 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1608317710; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=4GGgACEM7uTboIAVlYw1/hBpEx4EtmCc57M6ok4vvVA=; b=Lr92UTBCM61QAbvlXWPKUukETX822MYiFjx4dkxo7YT1s8eC7sPhLp6R8LwCdLj42fu84Y EaWjU5ii1V9RpcALwp2DKPG5UdF7lQXLlvhgVyaTOyjfkMbcpFAWGNpg92SwpIG2lslnUj zK1BPwPHsYHJY6voOqwh+kEuCQ/Fud8= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-406-l6J1ubI4O2SfTAS_dPe_bw-1; Fri, 18 Dec 2020 13:55:08 -0500 X-MC-Unique: l6J1ubI4O2SfTAS_dPe_bw-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 85A47804006 for ; Fri, 18 Dec 2020 18:55:07 +0000 (UTC) Received: from work-vm (ovpn-114-200.ams2.redhat.com [10.36.114.200]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 0B72B5C1C5; Fri, 18 Dec 2020 18:54:59 +0000 (UTC) Date: Fri, 18 Dec 2020 18:54:57 +0000 From: "Dr. David Alan Gilbert" To: Paolo Bonzini Subject: Re: [PATCH] pci: add romsize property Message-ID: <20201218185457.GH2956@work-vm> References: <20201218182736.1634344-1-pbonzini@redhat.com> MIME-Version: 1.0 In-Reply-To: <20201218182736.1634344-1-pbonzini@redhat.com> User-Agent: Mutt/1.14.6 (2020-07-11) X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=dgilbert@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Received-SPF: pass client-ip=63.128.21.124; envelope-from=dgilbert@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -16 X-Spam_score: -1.7 X-Spam_bar: - X-Spam_report: (-1.7 / 5.0 requ) BAYES_00=-1.9, DKIM_INVALID=0.1, DKIM_SIGNED=0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: qemu-devel@nongnu.org, mst@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" * Paolo Bonzini (pbonzini@redhat.com) wrote: > This property can be useful for distros to set up known-good ROM sizes for > migration purposes. The VM will fail to start if the ROM is too large, > and migration compatibility will not be broken if the ROM is too small. > > Signed-off-by: Paolo Bonzini I suspect something breaks horribly if you set this to the 4GB that the UINT32 would allow. Reviewed-by: Dr. David Alan Gilbert > --- > hw/pci/pci.c | 19 +++++++++++++++++-- > hw/xen/xen_pt_load_rom.c | 14 ++++++++++++-- > include/hw/pci/pci.h | 1 + > 3 files changed, 30 insertions(+), 4 deletions(-) > > diff --git a/hw/pci/pci.c b/hw/pci/pci.c > index d4349ea577..fd25253c2a 100644 > --- a/hw/pci/pci.c > +++ b/hw/pci/pci.c > @@ -67,6 +67,7 @@ static void pcibus_reset(BusState *qbus); > static Property pci_props[] = { > DEFINE_PROP_PCI_DEVFN("addr", PCIDevice, devfn, -1), > DEFINE_PROP_STRING("romfile", PCIDevice, romfile), > + DEFINE_PROP_UINT32("romsize", PCIDevice, romsize, -1), > DEFINE_PROP_UINT32("rombar", PCIDevice, rom_bar, 1), > DEFINE_PROP_BIT("multifunction", PCIDevice, cap_present, > QEMU_PCI_CAP_MULTIFUNCTION_BITNR, false), > @@ -2106,6 +2107,11 @@ static void pci_qdev_realize(DeviceState *qdev, Error **errp) > bool is_default_rom; > uint16_t class_id; > > + if (pci_dev->romsize != -1 && !is_power_of_2(pci_dev->romsize)) { > + error_setg(errp, "ROM size %d is not a power of two", pci_dev->romsize); > + return; > + } > + > /* initialize cap_present for pci_is_express() and pci_config_size(), > * Note that hybrid PCIs are not set automatically and need to manage > * QEMU_PCI_CAP_EXPRESS manually */ > @@ -2366,7 +2372,16 @@ static void pci_add_option_rom(PCIDevice *pdev, bool is_default_rom, > g_free(path); > return; > } > - size = pow2ceil(size); > + if (pdev->romsize != -1) { > + if (size > pdev->romsize) { > + error_setg(errp, "romfile \"%s\" (%d bytes) is too large for ROM size %d", > + pdev->romfile, size, pdev->romsize); > + g_free(path); > + return; > + } > + } else { > + pdev->romsize = pow2ceil(size); > + } > > vmsd = qdev_get_vmsd(DEVICE(pdev)); > > @@ -2376,7 +2391,7 @@ static void pci_add_option_rom(PCIDevice *pdev, bool is_default_rom, > snprintf(name, sizeof(name), "%s.rom", object_get_typename(OBJECT(pdev))); > } > pdev->has_rom = true; > - memory_region_init_rom(&pdev->rom, OBJECT(pdev), name, size, &error_fatal); > + memory_region_init_rom(&pdev->rom, OBJECT(pdev), name, pdev->romsize, &error_fatal); > ptr = memory_region_get_ram_ptr(&pdev->rom); > if (load_image_size(path, ptr, size) < 0) { > error_setg(errp, "failed to load romfile \"%s\"", pdev->romfile); > diff --git a/hw/xen/xen_pt_load_rom.c b/hw/xen/xen_pt_load_rom.c > index a50a80837e..153812f8cd 100644 > --- a/hw/xen/xen_pt_load_rom.c > +++ b/hw/xen/xen_pt_load_rom.c > @@ -53,10 +53,20 @@ void *pci_assign_dev_load_option_rom(PCIDevice *dev, > } > fseek(fp, 0, SEEK_SET); > > + if (dev->romsize != -1) { > + if (st.st_size > dev->romsize) { > + error_report("ROM BAR \"%s\" (%ld bytes) is too large for ROM size %d", > + rom_file, (long) st.st_size, dev->romsize); > + goto close_rom; > + } > + } else { > + dev->romsize = st.st_size; > + } > + > snprintf(name, sizeof(name), "%s.rom", object_get_typename(owner)); > - memory_region_init_ram(&dev->rom, owner, name, st.st_size, &error_abort); > + memory_region_init_ram(&dev->rom, owner, name, dev->romsize, &error_abort); > ptr = memory_region_get_ram_ptr(&dev->rom); > - memset(ptr, 0xff, st.st_size); > + memset(ptr, 0xff, dev->romsize); > > if (!fread(ptr, 1, st.st_size, fp)) { > error_report("pci-assign: Cannot read from host %s", rom_file); > diff --git a/include/hw/pci/pci.h b/include/hw/pci/pci.h > index 259f9c992d..b028245b62 100644 > --- a/include/hw/pci/pci.h > +++ b/include/hw/pci/pci.h > @@ -343,6 +343,7 @@ struct PCIDevice { > > /* Location of option rom */ > char *romfile; > + uint32_t romsize; > bool has_rom; > MemoryRegion rom; > uint32_t rom_bar; > -- > 2.26.2 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK