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 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 smtp.lore.kernel.org (Postfix) with ESMTPS id 87516C433F5 for ; Tue, 30 Nov 2021 09:38:39 +0000 (UTC) Received: from localhost ([::1]:42248 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mrzaw-00076G-Im for qemu-devel@archiver.kernel.org; Tue, 30 Nov 2021 04:38:38 -0500 Received: from eggs.gnu.org ([209.51.188.92]:59748) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrzZk-0006Oy-M0 for qemu-devel@nongnu.org; Tue, 30 Nov 2021 04:37:24 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:55073) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mrzZi-0001ZV-J9 for qemu-devel@nongnu.org; Tue, 30 Nov 2021 04:37:24 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1638265041; 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: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=8DvuRQsMUbAN6psyKk2WEoF9wulJvxjK7U+AbJWxVNc=; b=AGlzWTYLM6kvj0DVWfQviSVUe/UrRq985TPsAlHLydZIZ8gAAOknbmLZWRcvDiyvi9KdKu kf0W6WW+pKBYGBm+HgF2TZn1qIpS9GYMDuMQ9yGr+KLtc6TvKl/CvxoQM9ZVV20y701B5x ov+TpGmXlhceId/NKrVc9RWRC82zAMs= Received: from mail-wm1-f70.google.com (mail-wm1-f70.google.com [209.85.128.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-480-zeeaWKjSN4eILsZESG4BLA-1; Tue, 30 Nov 2021 04:37:20 -0500 X-MC-Unique: zeeaWKjSN4eILsZESG4BLA-1 Received: by mail-wm1-f70.google.com with SMTP id y141-20020a1c7d93000000b0033c2ae3583fso10141618wmc.5 for ; Tue, 30 Nov 2021 01:37:19 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:cc:references:from:organization:in-reply-to :content-transfer-encoding; bh=8DvuRQsMUbAN6psyKk2WEoF9wulJvxjK7U+AbJWxVNc=; b=fhMTOSbcqjgzVwesU0EP+IVSKJggxHo9Uw9qNrN+FhS21IJL8Ks38trOv3F7JhD5QS C/MYmfdJYLo+HGODwBc05yPJqWpX0uV3xxdN6OCjDCeaFV3YhAaWFzKB8qw3koE9fPoE 698Mb7ehm2XmNKPGWQ3DcFZPnoPrD87BmZe0Tv0WW5Ng7If22nZyMPW2NI0dB4WZcyYB 0WS0dex0I8vLFpil3hmVoK01p39cFliLBsyl3rnIXh7cmgOlCf9wpKy/Vasxgxln4hiU wvtxPtikQmJdh9B8WUQNPRq1hKvIU3JbUNGhCnvV0JVbfOMiDxa4hCjZJIo9lfpvAHtw apig== X-Gm-Message-State: AOAM532H2oeJlNgo+zYuQGwZ1faNtqQdpDiQh1Kfy+u/+uM9iMJPfJFK HiQUcfnK6SZ5BqapxG3wyXgXhCjvcZIIvOAmBFQP/Nz/QX0Rwsi4CVyy2eAXRIG1KIuV7RdS5Cr Wc7u/oFz7NaFKs+Y= X-Received: by 2002:a5d:6ac2:: with SMTP id u2mr38112817wrw.486.1638265038823; Tue, 30 Nov 2021 01:37:18 -0800 (PST) X-Google-Smtp-Source: ABdhPJxoMAX06q4VfhIc1grEpaNYTlT+d/zNojqIe1cstBN/f60vW2aBNRl9rlBv7Nx1WfXRckU7ww== X-Received: by 2002:a5d:6ac2:: with SMTP id u2mr38112769wrw.486.1638265038365; Tue, 30 Nov 2021 01:37:18 -0800 (PST) Received: from [192.168.3.132] (p5b0c68ec.dip0.t-ipconnect.de. [91.12.104.236]) by smtp.gmail.com with ESMTPSA id p14sm1746459wms.29.2021.11.30.01.37.17 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 30 Nov 2021 01:37:17 -0800 (PST) Message-ID: Date: Tue, 30 Nov 2021 10:37:17 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:91.0) Gecko/20100101 Thunderbird/91.2.0 Subject: Re: [PATCH 1/1] hw/arm/virt: Support for virtio-mem-pci To: Gavin Shan , qemu-arm@nongnu.org References: <20211130003328.201270-1-gshan@redhat.com> <20211130003328.201270-2-gshan@redhat.com> From: David Hildenbrand Organization: Red Hat In-Reply-To: <20211130003328.201270-2-gshan@redhat.com> Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=david@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Received-SPF: pass client-ip=170.10.133.124; envelope-from=david@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -56 X-Spam_score: -5.7 X-Spam_bar: ----- X-Spam_report: (-5.7 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.716, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, NICE_REPLY_A=-2.211, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H2=-0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org, drjones@redhat.com, richard.henderson@linaro.org, qemu-devel@nongnu.org, eric.auger@redhat.com, shan.gavin@gmail.com, Jonathan.Cameron@huawei.com, imammedo@redhat.com Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On 30.11.21 01:33, Gavin Shan wrote: > This supports virtio-mem-pci device on "virt" platform, by simply > following the implementation on x86. Thanks for picking this up! > > * The patch was written by David Hildenbrand > modified by Jonathan Cameron Maybe replace this section by Co-developed-by: David Hildenbrand Co-developed-by: Jonathan Cameron > > * This implements the hotplug handlers to support virtio-mem-pci > device hot-add, while the hot-remove isn't supported as we have > on x86. > > * The block size is 1GB on ARM64 instead of 128MB on x86. See below, isn't it actually 512 MiB nowadays? > > * It has been passing the tests with various combinations like 64KB > and 4KB page sizes on host and guest, different memory device > backends like normal, transparent huge page and HugeTLB, plus > migration. Perfect. A note that hugetlbfs isn't fully supported/safe to use until we have preallocation support in QEMU (WIP). > > Signed-off-by: Gavin Shan > --- > hw/arm/Kconfig | 1 + > hw/arm/virt.c | 68 +++++++++++++++++++++++++++++++++++++++++- > hw/virtio/virtio-mem.c | 2 ++ > 3 files changed, 70 insertions(+), 1 deletion(-) > > diff --git a/hw/arm/Kconfig b/hw/arm/Kconfig > index 2d37d29f02..15aff8efb8 100644 > --- a/hw/arm/Kconfig > +++ b/hw/arm/Kconfig > @@ -27,6 +27,7 @@ config ARM_VIRT > select DIMM > select ACPI_HW_REDUCED > select ACPI_APEI > + select VIRTIO_MEM_SUPPORTED > > config CHEETAH > bool > diff --git a/hw/arm/virt.c b/hw/arm/virt.c > index 369552ad45..f4599a5ef0 100644 > --- a/hw/arm/virt.c > +++ b/hw/arm/virt.c > @@ -71,9 +71,11 @@ > #include "hw/arm/smmuv3.h" > #include "hw/acpi/acpi.h" > #include "target/arm/internals.h" > +#include "hw/mem/memory-device.h" > #include "hw/mem/pc-dimm.h" > #include "hw/mem/nvdimm.h" > #include "hw/acpi/generic_event_device.h" > +#include "hw/virtio/virtio-mem-pci.h" > #include "hw/virtio/virtio-iommu.h" > #include "hw/char/pl011.h" > #include "qemu/guest-random.h" > @@ -2480,6 +2482,63 @@ static void virt_memory_plug(HotplugHandler *hotplug_dev, > dev, &error_abort); > } > > +static void virt_virtio_md_pci_pre_plug(HotplugHandler *hotplug_dev, > + DeviceState *dev, Error **errp) > +{ > + HotplugHandler *hotplug_dev2 = qdev_get_bus_hotplug_handler(dev); > + Error *local_err = NULL; > + > + if (!hotplug_dev2 && dev->hotplugged) { > + /* > + * Without a bus hotplug handler, we cannot control the plug/unplug > + * order. We should never reach this point when hotplugging on x86, > + * however, better add a safety net. > + */ > + error_setg(errp, "hotplug of virtio based memory devices not supported" > + " on this bus."); > + return; > + } > + /* > + * First, see if we can plug this memory device at all. If that > + * succeeds, branch of to the actual hotplug handler. > + */ > + memory_device_pre_plug(MEMORY_DEVICE(dev), MACHINE(hotplug_dev), NULL, > + &local_err); > + if (!local_err && hotplug_dev2) { > + hotplug_handler_pre_plug(hotplug_dev2, dev, &local_err); > + } > + error_propagate(errp, local_err); > +} > + > +static void virt_virtio_md_pci_plug(HotplugHandler *hotplug_dev, > + DeviceState *dev, Error **errp) > +{ > + HotplugHandler *hotplug_dev2 = qdev_get_bus_hotplug_handler(dev); > + Error *local_err = NULL; > + > + /* > + * Plug the memory device first and then branch off to the actual > + * hotplug handler. If that one fails, we can easily undo the memory > + * device bits. > + */ > + memory_device_plug(MEMORY_DEVICE(dev), MACHINE(hotplug_dev)); > + if (hotplug_dev2) { > + hotplug_handler_plug(hotplug_dev2, dev, &local_err); > + if (local_err) { > + memory_device_unplug(MEMORY_DEVICE(dev), MACHINE(hotplug_dev)); > + } > + } > + error_propagate(errp, local_err); > +} > + > +static void virt_virtio_md_pci_unplug_request(HotplugHandler *hotplug_dev, > + DeviceState *dev, Error **errp) > +{ > + /* We don't support hot unplug of virtio based memory devices */ > + error_setg(errp, "virtio based memory devices cannot be unplugged."); > +} > + > + > static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev, > DeviceState *dev, Error **errp) > { > @@ -2513,6 +2572,8 @@ static void virt_machine_device_pre_plug_cb(HotplugHandler *hotplug_dev, > qdev_prop_set_uint32(dev, "len-reserved-regions", 1); > qdev_prop_set_string(dev, "reserved-regions[0]", resv_prop_str); > g_free(resv_prop_str); > + } else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MEM_PCI)) { > + virt_virtio_md_pci_pre_plug(hotplug_dev, dev, errp); > } > } > > @@ -2538,6 +2599,8 @@ static void virt_machine_device_plug_cb(HotplugHandler *hotplug_dev, > vms->iommu = VIRT_IOMMU_VIRTIO; > vms->virtio_iommu_bdf = pci_get_bdf(pdev); > create_virtio_iommu_dt_bindings(vms); > + } else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MEM_PCI)) { > + virt_virtio_md_pci_plug(hotplug_dev, dev, errp); > } > } > > @@ -2588,6 +2651,8 @@ static void virt_machine_device_unplug_request_cb(HotplugHandler *hotplug_dev, > { > if (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM)) { > virt_dimm_unplug_request(hotplug_dev, dev, errp); > + } else if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MEM_PCI)) { > + virt_virtio_md_pci_unplug_request(hotplug_dev, dev, errp); > } else { > error_setg(errp, "device unplug request for unsupported device" > " type: %s", object_get_typename(OBJECT(dev))); > @@ -2611,7 +2676,8 @@ static HotplugHandler *virt_machine_get_hotplug_handler(MachineState *machine, > MachineClass *mc = MACHINE_GET_CLASS(machine); > > if (device_is_dynamic_sysbus(mc, dev) || > - (object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM))) { > + object_dynamic_cast(OBJECT(dev), TYPE_PC_DIMM) || > + object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_MEM_PCI)) { > return HOTPLUG_HANDLER(machine); > } > if (object_dynamic_cast(OBJECT(dev), TYPE_VIRTIO_IOMMU_PCI)) { > diff --git a/hw/virtio/virtio-mem.c b/hw/virtio/virtio-mem.c > index d5a578142b..3033692a83 100644 > --- a/hw/virtio/virtio-mem.c > +++ b/hw/virtio/virtio-mem.c > @@ -126,6 +126,8 @@ static uint64_t virtio_mem_default_block_size(RAMBlock *rb) > */ > #if defined(TARGET_X86_64) || defined(TARGET_I386) > #define VIRTIO_MEM_USABLE_EXTENT (2 * (128 * MiB)) > +#elif defined(TARGET_ARM) > +#define VIRTIO_MEM_USABLE_EXTENT (2 * (1024 * MiB)) Can we make this 512 MiB ? arch/arm64/include/asm/sparsemem.h /* * Section size must be at least 512MB for 64K base * page size config. Otherwise it will be less than * (MAX_ORDER - 1) and the build process will fail. */ #ifdef CONFIG_ARM64_64K_PAGES #define SECTION_SIZE_BITS 29 #else /* * Section size must be at least 128MB for 4K base * page size config. Otherwise PMD based huge page * entries could not be created for vmemmap mappings. * 16K follows 4K for simplicity. */ #define SECTION_SIZE_BITS 27 #endif /* CONFIG_ARM64_64K_PAGES */ Apart from that, LGTM -- thanks! -- Thanks, David / dhildenb