{"id":2224407,"url":"http://patchwork.ozlabs.org/api/1.2/patches/2224407/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260417105618.3621-13-magnuskulke@linux.microsoft.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/1.2/projects/14/?format=json","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":"<20260417105618.3621-13-magnuskulke@linux.microsoft.com>","list_archive_url":null,"date":"2026-04-17T10:55:56","name":"[12/34] accel/mshv: reserve ioapic routes on s->irq_routes","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"0d4427552f01aa9a25279234410525c8e9913404","submitter":{"id":90753,"url":"http://patchwork.ozlabs.org/api/1.2/people/90753/?format=json","name":"Magnus Kulke","email":"magnuskulke@linux.microsoft.com"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260417105618.3621-13-magnuskulke@linux.microsoft.com/mbox/","series":[{"id":500310,"url":"http://patchwork.ozlabs.org/api/1.2/series/500310/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=500310","date":"2026-04-17T10:55:44","name":"Add migration support to the MSHV accelerator","version":1,"mbox":"http://patchwork.ozlabs.org/series/500310/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/2224407/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2224407/checks/","tags":{},"related":[],"headers":{"Return-Path":"","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=linux.microsoft.com header.i=@linux.microsoft.com\n header.a=rsa-sha256 header.s=default header.b=BGZOPnJc;\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=lists1p.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists1p.gnu.org (lists1p.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 4fxsMm1J94z1yD3\n\tfor ; Fri, 17 Apr 2026 20:59:32 +1000 (AEST)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists1p.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1wDgsr-00011A-6Q; Fri, 17 Apr 2026 06:57:13 -0400","from eggs.gnu.org ([2001:470:142:3::10])\n by lists1p.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1wDgsp-0000r0-6g\n for qemu-devel@nongnu.org; Fri, 17 Apr 2026 06:57:11 -0400","from linux.microsoft.com ([13.77.154.182])\n by eggs.gnu.org with esmtp (Exim 4.90_1)\n (envelope-from ) id 1wDgsn-0001Zi-Cs\n for qemu-devel@nongnu.org; Fri, 17 Apr 2026 06:57:10 -0400","from DESKTOP-TUU1E5L.fritz.box (p5086d620.dip0.t-ipconnect.de\n [80.134.214.32])\n by linux.microsoft.com (Postfix) with ESMTPSA id D7EB120B712B;\n Fri, 17 Apr 2026 03:57:05 -0700 (PDT)"],"DKIM-Filter":"OpenDKIM Filter v2.11.0 linux.microsoft.com D7EB120B712B","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;\n s=default; t=1776423428;\n bh=apZ0c23LEobuYLV/xQNkaE00YRO3wUE05eRvWn9R9qc=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=BGZOPnJcx1ZsrIs+bn+McAgX7yPIVHiapkungveFKCxa1fnFH+Nv5QJq1/M9DU1bi\n 4Grg03FgRxLh6QiRG2/Qt4ePVTpbkikVGtGGMJtb2j2VMscAcsU4faVfHkx4cudK5+\n 5g6Ulwi3K+t0Dg0+rGlBMjhy9HferEYqOpO/IJsw=","From":"Magnus Kulke ","To":"qemu-devel@nongnu.org","Cc":"kvm@vger.kernel.org, Magnus Kulke ,\n Wei Liu , \"Michael S. Tsirkin\" ,\n\t=?utf-8?q?C=C3=A9dric_Le_Goater?= ,\n Zhao Liu ,\n Richard Henderson ,\n Paolo Bonzini , Wei Liu ,\n Magnus Kulke ,\n Alex Williamson ,\n Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?=\n\t=?utf-8?q?aud=C3=A9?= ,\n Marcelo Tosatti ","Subject":"[PATCH 12/34] accel/mshv: reserve ioapic routes on s->irq_routes","Date":"Fri, 17 Apr 2026 12:55:56 +0200","Message-Id":"<20260417105618.3621-13-magnuskulke@linux.microsoft.com>","X-Mailer":"git-send-email 2.34.1","In-Reply-To":"<20260417105618.3621-1-magnuskulke@linux.microsoft.com>","References":"<20260417105618.3621-1-magnuskulke@linux.microsoft.com>","MIME-Version":"1.0","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=13.77.154.182;\n envelope-from=magnuskulke@linux.microsoft.com; helo=linux.microsoft.com","X-Spam_score_int":"-42","X-Spam_score":"-4.3","X-Spam_bar":"----","X-Spam_report":"(-4.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, RCVD_IN_DNSWL_MED=-2.3,\n RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, RCVD_IN_VALIDITY_SAFE_BLOCKED=0.001,\n SPF_HELO_PASS=-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 development ","List-Unsubscribe":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"We reserve 24 ioapic routes using the new functions that operate on the\nmshv apic state.\n\ncommit/add_msi_routing() fn's can be removed now.\n\nSigned-off-by: Magnus Kulke \n---\n accel/mshv/irq.c | 115 ++++++--------------------------------\n accel/mshv/mshv-all.c | 5 --\n include/system/mshv_int.h | 1 -\n 3 files changed, 18 insertions(+), 103 deletions(-)","diff":"diff --git a/accel/mshv/irq.c b/accel/mshv/irq.c\nindex 9ba837f0e2..52b8ac9479 100644\n--- a/accel/mshv/irq.c\n+++ b/accel/mshv/irq.c\n@@ -36,93 +36,6 @@ void mshv_init_msicontrol(void)\n msi_control->updated = false;\n }\n \n-static int add_msi_routing(uint64_t addr, uint32_t data)\n-{\n- struct mshv_user_irq_entry *route_entry;\n- uint32_t high_addr = addr >> 32;\n- uint32_t low_addr = addr & 0xFFFFFFFF;\n- int gsi;\n- GHashTable *gsi_routes;\n-\n- trace_mshv_add_msi_routing(addr, data);\n-\n- assert(msi_control);\n-\n- WITH_QEMU_LOCK_GUARD(&msi_control_mutex) {\n- /* find an empty slot */\n- gsi = 0;\n- gsi_routes = msi_control->gsi_routes;\n- while (gsi < MSHV_MAX_MSI_ROUTES) {\n- route_entry = g_hash_table_lookup(gsi_routes, GINT_TO_POINTER(gsi));\n- if (!route_entry) {\n- break;\n- }\n- gsi++;\n- }\n- if (gsi >= MSHV_MAX_MSI_ROUTES) {\n- error_report(\"No empty gsi slot available\");\n- return -1;\n- }\n-\n- /* create new entry */\n- route_entry = g_new0(struct mshv_user_irq_entry, 1);\n- route_entry->gsi = gsi;\n- route_entry->address_hi = high_addr;\n- route_entry->address_lo = low_addr;\n- route_entry->data = data;\n-\n- g_hash_table_insert(gsi_routes, GINT_TO_POINTER(gsi), route_entry);\n- msi_control->updated = true;\n- }\n-\n- return gsi;\n-}\n-\n-static int commit_msi_routing_table(int vm_fd)\n-{\n- guint len;\n- int i, ret;\n- size_t table_size;\n- struct mshv_user_irq_table *table;\n- GHashTableIter iter;\n- gpointer key, value;\n-\n- assert(msi_control);\n-\n- WITH_QEMU_LOCK_GUARD(&msi_control_mutex) {\n- if (!msi_control->updated) {\n- /* nothing to update */\n- return 0;\n- }\n-\n- /* Calculate the size of the table */\n- len = g_hash_table_size(msi_control->gsi_routes);\n- table_size = sizeof(struct mshv_user_irq_table)\n- + len * sizeof(struct mshv_user_irq_entry);\n- table = g_malloc0(table_size);\n-\n- g_hash_table_iter_init(&iter, msi_control->gsi_routes);\n- i = 0;\n- while (g_hash_table_iter_next(&iter, &key, &value)) {\n- struct mshv_user_irq_entry *entry = value;\n- table->entries[i] = *entry;\n- i++;\n- }\n- table->nr = i;\n-\n- trace_mshv_commit_msi_routing_table(vm_fd, len);\n-\n- ret = ioctl(vm_fd, MSHV_SET_MSI_ROUTING, table);\n- g_free(table);\n- if (ret < 0) {\n- error_report(\"Failed to commit msi routing table\");\n- return -1;\n- }\n- msi_control->updated = false;\n- }\n- return 0;\n-}\n-\n /* Pass an eventfd which is to be used for injecting interrupts from userland */\n static int irqfd(int vm_fd, int fd, int resample_fd, uint32_t gsi,\n uint32_t flags)\n@@ -420,37 +333,45 @@ int mshv_irqchip_remove_irqfd_notifier_gsi(const EventNotifier *event,\n return irqchip_update_irqfd_notifier_gsi(event, NULL, virq, false);\n }\n \n-int mshv_reserve_ioapic_msi_routes(int vm_fd)\n+static int mshv_reserve_ioapic_msi_routes(MshvState *s)\n {\n- int ret, gsi;\n+ int ret, i;\n+ int gsi = 0;\n+ struct mshv_user_irq_entry blank_entry = { 0 };\n \n /*\n * Reserve GSI 0-23 for IOAPIC pins, to avoid conflicts of legacy\n * peripherals with MSI-X devices\n */\n- for (gsi = 0; gsi < IOAPIC_NUM_PINS; gsi++) {\n- ret = add_msi_routing(0, 0);\n+ for (i = 0; i < IOAPIC_NUM_PINS; i++) {\n+ /* ret = add_msi_routing(0, 0); */\n+ ret = irqchip_allocate_gsi(s, &gsi);\n if (ret < 0) {\n- error_report(\"Failed to reserve GSI %d\", gsi);\n+ error_report(\"Failed to reserve GSI %d: %s\", gsi, strerror(-ret));\n return -1;\n }\n+ blank_entry.gsi = gsi;\n+ add_routing_entry(s, &blank_entry);\n }\n \n- ret = commit_msi_routing_table(vm_fd);\n- if (ret < 0) {\n- error_report(\"Failed to commit reserved IOAPIC MSI routes\");\n- return -1;\n- }\n+ mshv_irqchip_commit_routes(s);\n \n return 0;\n }\n \n void mshv_init_irq_routing(MshvState *s)\n {\n+ int ret;\n int gsi_count = MSHV_MAX_MSI_ROUTES;\n \n s->irq_routes = g_malloc0(sizeof(*s->irq_routes));\n s->nr_allocated_irq_routes = 0;\n s->gsi_count = gsi_count;\n s->used_gsi_bitmap = bitmap_new(gsi_count);\n+\n+ ret = mshv_reserve_ioapic_msi_routes(s);\n+ if (ret < 0) {\n+ error_report(\"Failed to reserve IOAPIC MSI routes\");\n+ abort();\n+ }\n }\ndiff --git a/accel/mshv/mshv-all.c b/accel/mshv/mshv-all.c\nindex 8acb080db1..08bc26713f 100644\n--- a/accel/mshv/mshv-all.c\n+++ b/accel/mshv/mshv-all.c\n@@ -200,11 +200,6 @@ static int create_vm(int mshv_fd, int *vm_fd)\n return -1;\n }\n \n- ret = mshv_reserve_ioapic_msi_routes(*vm_fd);\n- if (ret < 0) {\n- return -1;\n- }\n-\n ret = mshv_arch_post_init_vm(*vm_fd);\n if (ret < 0) {\n return -1;\ndiff --git a/include/system/mshv_int.h b/include/system/mshv_int.h\nindex 56fda76a9c..9bc56e70cf 100644\n--- a/include/system/mshv_int.h\n+++ b/include/system/mshv_int.h\n@@ -120,6 +120,5 @@ int mshv_configure_msr(const CPUState *cpu, const MshvMsrEntry *msrs,\n \n /* interrupt */\n void mshv_init_msicontrol(void);\n-int mshv_reserve_ioapic_msi_routes(int vm_fd);\n \n #endif\n","prefixes":["12/34"]}