Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1839907/?format=api
{ "id": 1839907, "url": "http://patchwork.ozlabs.org/api/patches/1839907/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20230926185738.277351-9-david@redhat.com/", "project": { "id": 14, "url": "http://patchwork.ozlabs.org/api/projects/14/?format=api", "name": "QEMU Development", "link_name": "qemu-devel", "list_id": "qemu-devel.nongnu.org", "list_email": "qemu-devel@nongnu.org", "web_url": "", "scm_url": "", "webscm_url": "", "list_archive_url": "", "list_archive_url_format": "", "commit_url_format": "" }, "msgid": "<20230926185738.277351-9-david@redhat.com>", "list_archive_url": null, "date": "2023-09-26T18:57:28", "name": "[v4,08/18] memory-device: Track required and actually used memslots in DeviceMemoryState", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "1ae04e5f0bce93cebb9fed4bccd366a15bd91fa0", "submitter": { "id": 70402, "url": "http://patchwork.ozlabs.org/api/people/70402/?format=api", "name": "David Hildenbrand", "email": "david@redhat.com" }, "delegate": null, "mbox": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20230926185738.277351-9-david@redhat.com/mbox/", "series": [ { "id": 374991, "url": "http://patchwork.ozlabs.org/api/series/374991/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/list/?series=374991", "date": "2023-09-26T18:57:23", "name": "virtio-mem: Expose device memory through multiple memslots", "version": 4, "mbox": "http://patchwork.ozlabs.org/series/374991/mbox/" } ], "comments": "http://patchwork.ozlabs.org/api/patches/1839907/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1839907/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org>", "X-Original-To": "incoming@patchwork.ozlabs.org", "Delivered-To": "patchwork-incoming@legolas.ozlabs.org", "Authentication-Results": [ "legolas.ozlabs.org;\n\tdkim=pass (1024-bit key;\n unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256\n header.s=mimecast20190719 header.b=JVgwhgvB;\n\tdkim-atps=neutral", "legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)" ], "Received": [ "from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4Rw8Dg56Kzz1ypD\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 27 Sep 2023 04:59:31 +1000 (AEST)", "from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from <qemu-devel-bounces@nongnu.org>)\n\tid 1qlDHC-0008EN-Tk; Tue, 26 Sep 2023 14:59:18 -0400", "from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <david@redhat.com>) id 1qlDHA-000847-Es\n for qemu-devel@nongnu.org; Tue, 26 Sep 2023 14:59:16 -0400", "from us-smtp-delivery-124.mimecast.com ([170.10.129.124])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from <david@redhat.com>) id 1qlDH8-00037a-Gm\n for qemu-devel@nongnu.org; Tue, 26 Sep 2023 14:59:16 -0400", "from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com\n [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS\n (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id\n us-mta-179-feTK4n4PNCexBE0aSqjznw-1; Tue, 26 Sep 2023 14:59:10 -0400", "from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com\n [10.11.54.4])\n (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))\n (No client certificate requested)\n by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 828FA8039C1;\n Tue, 26 Sep 2023 18:59:09 +0000 (UTC)", "from t14s.fritz.box (unknown [10.39.192.33])\n by smtp.corp.redhat.com (Postfix) with ESMTP id 1F2D42026D4B;\n Tue, 26 Sep 2023 18:59:02 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1695754753;\n h=from:from:reply-to:subject:subject:date:date:message-id:message-id:\n to:to:cc:cc:mime-version:mime-version:\n content-transfer-encoding:content-transfer-encoding:\n in-reply-to:in-reply-to:references:references;\n bh=5slP1Mq6ReelzapelY7FkkpRO49e4JIwaD4dFcmfqHc=;\n b=JVgwhgvB4CHKFbrMKsapCop2+K7q1Ybqjw9Hske76XYe3QJpOixAnzgJMhDUVoRz5fIuQO\n HUhuTaWXPJZZvWEQP3HELuD6iOgRtya4MdS1fsWWa8Is43RHmLFGqjh/NkqyTE0DKyxl5N\n YJgSDhxoEtR8tHpg4MJjadoF79eU4ag=", "X-MC-Unique": "feTK4n4PNCexBE0aSqjznw-1", "From": "David Hildenbrand <david@redhat.com>", "To": "qemu-devel@nongnu.org", "Cc": "David Hildenbrand <david@redhat.com>, Paolo Bonzini <pbonzini@redhat.com>,\n Igor Mammedov <imammedo@redhat.com>,\n Xiao Guangrong <xiaoguangrong.eric@gmail.com>,\n \"Michael S. Tsirkin\" <mst@redhat.com>, Peter Xu <peterx@redhat.com>,\n\t=?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= <philmd@linaro.org>,\n Eduardo Habkost <eduardo@habkost.net>,\n Marcel Apfelbaum <marcel.apfelbaum@gmail.com>,\n Yanan Wang <wangyanan55@huawei.com>, Michal Privoznik <mprivozn@redhat.com>,\n\t=?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= <berrange@redhat.com>,\n Gavin Shan <gshan@redhat.com>, Alex Williamson <alex.williamson@redhat.com>,\n Stefan Hajnoczi <stefanha@redhat.com>,\n \"Maciej S . Szmigiero\" <mail@maciej.szmigiero.name>, kvm@vger.kernel.org,\n \"Maciej S . Szmigiero\" <maciej.szmigiero@oracle.com>", "Subject": "[PATCH v4 08/18] memory-device: Track required and actually used\n memslots in DeviceMemoryState", "Date": "Tue, 26 Sep 2023 20:57:28 +0200", "Message-ID": "<20230926185738.277351-9-david@redhat.com>", "In-Reply-To": "<20230926185738.277351-1-david@redhat.com>", "References": "<20230926185738.277351-1-david@redhat.com>", "MIME-Version": "1.0", "Content-Transfer-Encoding": "8bit", "X-Scanned-By": "MIMEDefang 3.1 on 10.11.54.4", "Received-SPF": "pass client-ip=170.10.129.124; envelope-from=david@redhat.com;\n helo=us-smtp-delivery-124.mimecast.com", "X-Spam_score_int": "-20", "X-Spam_score": "-2.1", "X-Spam_bar": "--", "X-Spam_report": "(-2.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.001,\n DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H4=0.001, RCVD_IN_MSPIKE_WL=0.001,\n 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": "<qemu-devel.nongnu.org>", "List-Unsubscribe": "<https://lists.nongnu.org/mailman/options/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>", "List-Archive": "<https://lists.nongnu.org/archive/html/qemu-devel>", "List-Post": "<mailto:qemu-devel@nongnu.org>", "List-Help": "<mailto:qemu-devel-request@nongnu.org?subject=help>", "List-Subscribe": "<https://lists.nongnu.org/mailman/listinfo/qemu-devel>,\n <mailto:qemu-devel-request@nongnu.org?subject=subscribe>", "Errors-To": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org", "Sender": "qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org" }, "content": "Let's track how many memslots are required by plugged memory devices and\nhow many are currently actually getting used by plugged memory\ndevices.\n\n\"required - used\" is the number of reserved memslots. For now, the number\nof used and required memslots is always equal, and there are no\nreservations. This is a preparation for memory devices that want to\ndynamically consume memslots after initially specifying how many they\nrequire -- where we'll end up with reserved memslots.\n\nTo track the number of used memslots, create a new address space for\nour device memory and register a memory listener (add/remove) for that\naddress space.\n\nReviewed-by: Maciej S. Szmigiero <maciej.szmigiero@oracle.com>\nSigned-off-by: David Hildenbrand <david@redhat.com>\n---\n hw/mem/memory-device.c | 54 ++++++++++++++++++++++++++++++++++++++++++\n include/hw/boards.h | 10 +++++++-\n 2 files changed, 63 insertions(+), 1 deletion(-)", "diff": "diff --git a/hw/mem/memory-device.c b/hw/mem/memory-device.c\nindex 0eec0872a9..d37cfbd65d 100644\n--- a/hw/mem/memory-device.c\n+++ b/hw/mem/memory-device.c\n@@ -286,6 +286,7 @@ void memory_device_plug(MemoryDeviceState *md, MachineState *ms)\n g_assert(ms->device_memory);\n \n ms->device_memory->used_region_size += memory_region_size(mr);\n+ ms->device_memory->required_memslots += memory_device_get_memslots(md);\n memory_region_add_subregion(&ms->device_memory->mr,\n addr - ms->device_memory->base, mr);\n trace_memory_device_plug(DEVICE(md)->id ? DEVICE(md)->id : \"\", addr);\n@@ -305,6 +306,7 @@ void memory_device_unplug(MemoryDeviceState *md, MachineState *ms)\n \n memory_region_del_subregion(&ms->device_memory->mr, mr);\n ms->device_memory->used_region_size -= memory_region_size(mr);\n+ ms->device_memory->required_memslots -= memory_device_get_memslots(md);\n trace_memory_device_unplug(DEVICE(md)->id ? DEVICE(md)->id : \"\",\n mdc->get_addr(md));\n }\n@@ -324,6 +326,50 @@ uint64_t memory_device_get_region_size(const MemoryDeviceState *md,\n return memory_region_size(mr);\n }\n \n+static void memory_devices_region_mod(MemoryListener *listener,\n+ MemoryRegionSection *mrs, bool add)\n+{\n+ DeviceMemoryState *dms = container_of(listener, DeviceMemoryState,\n+ listener);\n+\n+ if (!memory_region_is_ram(mrs->mr)) {\n+ warn_report(\"Unexpected memory region mapped into device memory region.\");\n+ return;\n+ }\n+\n+ /*\n+ * The expectation is that each distinct RAM memory region section in\n+ * our region for memory devices consumes exactly one memslot in KVM\n+ * and in vhost. For vhost, this is true, except:\n+ * * ROM memory regions don't consume a memslot. These get used very\n+ * rarely for memory devices (R/O NVDIMMs).\n+ * * Memslots without a fd (memory-backend-ram) don't necessarily\n+ * consume a memslot. Such setups are quite rare and possibly bogus:\n+ * the memory would be inaccessible by such vhost devices.\n+ *\n+ * So for vhost, in corner cases we might over-estimate the number of\n+ * memslots that are currently used or that might still be reserved\n+ * (required - used).\n+ */\n+ dms->used_memslots += add ? 1 : -1;\n+\n+ if (dms->used_memslots > dms->required_memslots) {\n+ warn_report(\"Memory devices use more memory slots than indicated as required.\");\n+ }\n+}\n+\n+static void memory_devices_region_add(MemoryListener *listener,\n+ MemoryRegionSection *mrs)\n+{\n+ return memory_devices_region_mod(listener, mrs, true);\n+}\n+\n+static void memory_devices_region_del(MemoryListener *listener,\n+ MemoryRegionSection *mrs)\n+{\n+ return memory_devices_region_mod(listener, mrs, false);\n+}\n+\n void machine_memory_devices_init(MachineState *ms, hwaddr base, uint64_t size)\n {\n g_assert(size);\n@@ -333,8 +379,16 @@ void machine_memory_devices_init(MachineState *ms, hwaddr base, uint64_t size)\n \n memory_region_init(&ms->device_memory->mr, OBJECT(ms), \"device-memory\",\n size);\n+ address_space_init(&ms->device_memory->as, &ms->device_memory->mr,\n+ \"device-memory\");\n memory_region_add_subregion(get_system_memory(), ms->device_memory->base,\n &ms->device_memory->mr);\n+\n+ /* Track the number of memslots used by memory devices. */\n+ ms->device_memory->listener.region_add = memory_devices_region_add;\n+ ms->device_memory->listener.region_del = memory_devices_region_del;\n+ memory_listener_register(&ms->device_memory->listener,\n+ &ms->device_memory->as);\n }\n \n static const TypeInfo memory_device_info = {\ndiff --git a/include/hw/boards.h b/include/hw/boards.h\nindex 6c67af196a..5a9d72289c 100644\n--- a/include/hw/boards.h\n+++ b/include/hw/boards.h\n@@ -296,15 +296,23 @@ struct MachineClass {\n * DeviceMemoryState:\n * @base: address in guest physical address space where the memory\n * address space for memory devices starts\n- * @mr: address space container for memory devices\n+ * @mr: memory region container for memory devices\n+ * @as: address space for memory devices\n+ * @listener: memory listener used to track used memslots in the address space\n * @dimm_size: the sum of plugged DIMMs' sizes\n * @used_region_size: the part of @mr already used by memory devices\n+ * @required_memslots: the number of memslots required by memory devices\n+ * @used_memslots: the number of memslots currently used by memory devices\n */\n typedef struct DeviceMemoryState {\n hwaddr base;\n MemoryRegion mr;\n+ AddressSpace as;\n+ MemoryListener listener;\n uint64_t dimm_size;\n uint64_t used_region_size;\n+ unsigned int required_memslots;\n+ unsigned int used_memslots;\n } DeviceMemoryState;\n \n /**\n", "prefixes": [ "v4", "08/18" ] }