Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/1839905/?format=api
{ "id": 1839905, "url": "http://patchwork.ozlabs.org/api/patches/1839905/?format=api", "web_url": "http://patchwork.ozlabs.org/project/qemu-devel/patch/20230926185738.277351-3-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-3-david@redhat.com>", "list_archive_url": null, "date": "2023-09-26T18:57:22", "name": "[v4,02/18] vhost: Remove vhost_backend_can_merge() callback", "commit_ref": null, "pull_url": null, "state": "new", "archived": false, "hash": "1b9b00995d16754add988b6963d0858199b432a8", "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-3-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/1839905/comments/", "check": "pending", "checks": "http://patchwork.ozlabs.org/api/patches/1839905/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=RakYpAvu;\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 4Rw8DR2CCRz1ypD\n\tfor <incoming@patchwork.ozlabs.org>; Wed, 27 Sep 2023 04:59:19 +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 1qlDGM-0006p9-CB; Tue, 26 Sep 2023 14:58:26 -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 1qlDGJ-0006o0-Df\n for qemu-devel@nongnu.org; Tue, 26 Sep 2023 14:58:24 -0400", "from us-smtp-delivery-124.mimecast.com ([170.10.133.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 1qlDGH-0002vi-Qc\n for qemu-devel@nongnu.org; Tue, 26 Sep 2023 14:58:23 -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-140-btqKUQzdPK6FB-vU-IaNHw-1; Tue, 26 Sep 2023 14:58:19 -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 E5A90800B35;\n Tue, 26 Sep 2023 18:58:18 +0000 (UTC)", "from t14s.fritz.box (unknown [10.39.192.33])\n by smtp.corp.redhat.com (Postfix) with ESMTP id E9B1B2026D4B;\n Tue, 26 Sep 2023 18:58:06 +0000 (UTC)" ], "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com;\n s=mimecast20190719; t=1695754701;\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=5hGg5Jd2AwoQp/M7rl8YRge8IzBVWAeYBCSo0mtTyyc=;\n b=RakYpAvu/Dp3A/8dTwf9SVW+G/NgGktMeKtgVsLRSuFkH9puWG/Ib391HbodYt3gAUmsqL\n vpw9vkAO1pQpJkZ8hZl1Ulamv4uKYAEfs63q1u8tOzeKQCuf2/DOLDYGQJg+A5k4sa31YR\n vmuqpJgvhxGnJCTVQjfiP4QgxMVzEPg=", "X-MC-Unique": "btqKUQzdPK6FB-vU-IaNHw-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", "Subject": "[PATCH v4 02/18] vhost: Remove vhost_backend_can_merge() callback", "Date": "Tue, 26 Sep 2023 20:57:22 +0200", "Message-ID": "<20230926185738.277351-3-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.133.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_H3=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": "Checking whether the memory regions are equal is sufficient: if they are\nequal, then most certainly the contained fd is equal.\n\nThe whole vhost-user memslot handling is suboptimal and overly\ncomplicated. We shouldn't have to lookup a RAM memory regions we got\nnotified about in vhost_user_get_mr_data() using a host pointer. But that\nrequires a bigger rework -- especially an alternative vhost_set_mem_table()\nbackend call that simply consumes MemoryRegionSections.\n\nFor now, let's just drop vhost_backend_can_merge().\n\nAcked-by: Stefan Hajnoczi <stefanha@redhat.com>\nReviewed-by: Igor Mammedov <imammedo@redhat.com>\nAcked-by: Igor Mammedov <imammedo@redhat.com>\nReviewed-by: Peter Xu <peterx@redhat.com>\nSigned-off-by: David Hildenbrand <david@redhat.com>\n---\n hw/virtio/vhost-user.c | 14 --------------\n hw/virtio/vhost-vdpa.c | 1 -\n hw/virtio/vhost.c | 6 +-----\n include/hw/virtio/vhost-backend.h | 4 ----\n 4 files changed, 1 insertion(+), 24 deletions(-)", "diff": "diff --git a/hw/virtio/vhost-user.c b/hw/virtio/vhost-user.c\nindex 1e7553352a..e6de930872 100644\n--- a/hw/virtio/vhost-user.c\n+++ b/hw/virtio/vhost-user.c\n@@ -2205,19 +2205,6 @@ static int vhost_user_migration_done(struct vhost_dev *dev, char* mac_addr)\n return -ENOTSUP;\n }\n \n-static bool vhost_user_can_merge(struct vhost_dev *dev,\n- uint64_t start1, uint64_t size1,\n- uint64_t start2, uint64_t size2)\n-{\n- ram_addr_t offset;\n- int mfd, rfd;\n-\n- (void)vhost_user_get_mr_data(start1, &offset, &mfd);\n- (void)vhost_user_get_mr_data(start2, &offset, &rfd);\n-\n- return mfd == rfd;\n-}\n-\n static int vhost_user_net_set_mtu(struct vhost_dev *dev, uint16_t mtu)\n {\n VhostUserMsg msg;\n@@ -2764,7 +2751,6 @@ const VhostOps user_ops = {\n .vhost_set_vring_enable = vhost_user_set_vring_enable,\n .vhost_requires_shm_log = vhost_user_requires_shm_log,\n .vhost_migration_done = vhost_user_migration_done,\n- .vhost_backend_can_merge = vhost_user_can_merge,\n .vhost_net_set_mtu = vhost_user_net_set_mtu,\n .vhost_set_iotlb_callback = vhost_user_set_iotlb_callback,\n .vhost_send_device_iotlb_msg = vhost_user_send_device_iotlb_msg,\ndiff --git a/hw/virtio/vhost-vdpa.c b/hw/virtio/vhost-vdpa.c\nindex 42f2a4bae9..8f07bee041 100644\n--- a/hw/virtio/vhost-vdpa.c\n+++ b/hw/virtio/vhost-vdpa.c\n@@ -1508,7 +1508,6 @@ const VhostOps vdpa_ops = {\n .vhost_set_config = vhost_vdpa_set_config,\n .vhost_requires_shm_log = NULL,\n .vhost_migration_done = NULL,\n- .vhost_backend_can_merge = NULL,\n .vhost_net_set_mtu = NULL,\n .vhost_set_iotlb_callback = NULL,\n .vhost_send_device_iotlb_msg = NULL,\ndiff --git a/hw/virtio/vhost.c b/hw/virtio/vhost.c\nindex c1e6148833..c16ad14535 100644\n--- a/hw/virtio/vhost.c\n+++ b/hw/virtio/vhost.c\n@@ -728,11 +728,7 @@ static void vhost_region_add_section(struct vhost_dev *dev,\n size_t offset = mrs_gpa - prev_gpa_start;\n \n if (prev_host_start + offset == mrs_host &&\n- section->mr == prev_sec->mr &&\n- (!dev->vhost_ops->vhost_backend_can_merge ||\n- dev->vhost_ops->vhost_backend_can_merge(dev,\n- mrs_host, mrs_size,\n- prev_host_start, prev_size))) {\n+ section->mr == prev_sec->mr) {\n uint64_t max_end = MAX(prev_host_end, mrs_host + mrs_size);\n need_add = false;\n prev_sec->offset_within_address_space =\ndiff --git a/include/hw/virtio/vhost-backend.h b/include/hw/virtio/vhost-backend.h\nindex df2821ddae..12d578824b 100644\n--- a/include/hw/virtio/vhost-backend.h\n+++ b/include/hw/virtio/vhost-backend.h\n@@ -86,9 +86,6 @@ typedef int (*vhost_set_vring_enable_op)(struct vhost_dev *dev,\n typedef bool (*vhost_requires_shm_log_op)(struct vhost_dev *dev);\n typedef int (*vhost_migration_done_op)(struct vhost_dev *dev,\n char *mac_addr);\n-typedef bool (*vhost_backend_can_merge_op)(struct vhost_dev *dev,\n- uint64_t start1, uint64_t size1,\n- uint64_t start2, uint64_t size2);\n typedef int (*vhost_vsock_set_guest_cid_op)(struct vhost_dev *dev,\n uint64_t guest_cid);\n typedef int (*vhost_vsock_set_running_op)(struct vhost_dev *dev, int start);\n@@ -163,7 +160,6 @@ typedef struct VhostOps {\n vhost_set_vring_enable_op vhost_set_vring_enable;\n vhost_requires_shm_log_op vhost_requires_shm_log;\n vhost_migration_done_op vhost_migration_done;\n- vhost_backend_can_merge_op vhost_backend_can_merge;\n vhost_vsock_set_guest_cid_op vhost_vsock_set_guest_cid;\n vhost_vsock_set_running_op vhost_vsock_set_running;\n vhost_set_iotlb_callback_op vhost_set_iotlb_callback;\n", "prefixes": [ "v4", "02/18" ] }