{"id":2224403,"url":"http://patchwork.ozlabs.org/api/patches/2224403/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260417105618.3621-11-magnuskulke@linux.microsoft.com/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/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-11-magnuskulke@linux.microsoft.com>","list_archive_url":null,"date":"2026-04-17T10:55:54","name":"[10/34] accel/mshv: update s->irq_routes in release_virq","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"cca2458fb3013cb6e12a2297ed74fc2eb22b8acf","submitter":{"id":90753,"url":"http://patchwork.ozlabs.org/api/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-11-magnuskulke@linux.microsoft.com/mbox/","series":[{"id":500310,"url":"http://patchwork.ozlabs.org/api/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/2224403/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2224403/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=UQgHl4f/;\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 4fxsML22yLz1yD3\n\tfor ; Fri, 17 Apr 2026 20:59:10 +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 1wDgsj-0000UI-Vx; Fri, 17 Apr 2026 06:57:06 -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 1wDgsi-0000Rz-2d\n for qemu-devel@nongnu.org; Fri, 17 Apr 2026 06:57:04 -0400","from linux.microsoft.com ([13.77.154.182])\n by eggs.gnu.org with esmtp (Exim 4.90_1)\n (envelope-from ) id 1wDgsg-0001Ym-FL\n for qemu-devel@nongnu.org; Fri, 17 Apr 2026 06:57:03 -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 B75E720B712D;\n Fri, 17 Apr 2026 03:56:58 -0700 (PDT)"],"DKIM-Filter":"OpenDKIM Filter v2.11.0 linux.microsoft.com B75E720B712D","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;\n s=default; t=1776423421;\n bh=4H6AOTHbSt4M6umhyzila9t2EZwbHKhGHm3APiPWRFc=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=UQgHl4f/Ib1eL/MQ79hlHeyrt7REOCCttAmgc+vSuwiDoM6R2v/Azs6mVaLEteccG\n hbQywJuG2a7C6I31vLHfeWnDi/SYIgdntbMS1G2HF12IsnVtxdKQYyY1JDAebuvfse\n bA9rRI7Tec/hY2n/ORB1PPwTz2S10S+FOjr0eE80=","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 10/34] accel/mshv: update s->irq_routes in release_virq","Date":"Fri, 17 Apr 2026 12:55:54 +0200","Message-Id":"<20260417105618.3621-11-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":"The state's irq_routes field will be updated when an irqchip's gsi\nis requested to be released.\n\nThe old remove_msi_routing() fn is redundant and can be removed.\n\nSigned-off-by: Magnus Kulke \n---\n accel/accel-irq.c | 2 +-\n accel/mshv/irq.c | 43 ++++++++++++++---------------------------\n accel/stubs/mshv-stub.c | 2 +-\n include/system/mshv.h | 2 +-\n 4 files changed, 17 insertions(+), 32 deletions(-)","diff":"diff --git a/accel/accel-irq.c b/accel/accel-irq.c\nindex 5a97a345b2..0cb3ef78d3 100644\n--- a/accel/accel-irq.c\n+++ b/accel/accel-irq.c\n@@ -67,7 +67,7 @@ void accel_irqchip_release_virq(int virq)\n {\n #ifdef CONFIG_MSHV_IS_POSSIBLE\n if (mshv_msi_via_irqfd_enabled()) {\n- mshv_irqchip_release_virq(virq);\n+ mshv_irqchip_release_virq(mshv_state, virq);\n }\n #endif\n if (kvm_enabled()) {\ndiff --git a/accel/mshv/irq.c b/accel/mshv/irq.c\nindex b5a047b367..990ce34620 100644\n--- a/accel/mshv/irq.c\n+++ b/accel/mshv/irq.c\n@@ -123,33 +123,6 @@ static int commit_msi_routing_table(int vm_fd)\n return 0;\n }\n \n-static int remove_msi_routing(uint32_t gsi)\n-{\n- struct mshv_user_irq_entry *route_entry;\n- GHashTable *gsi_routes;\n-\n- trace_mshv_remove_msi_routing(gsi);\n-\n- if (gsi >= MSHV_MAX_MSI_ROUTES) {\n- error_report(\"Invalid GSI: %u\", gsi);\n- return -1;\n- }\n-\n- assert(msi_control);\n-\n- WITH_QEMU_LOCK_GUARD(&msi_control_mutex) {\n- gsi_routes = msi_control->gsi_routes;\n- route_entry = g_hash_table_lookup(gsi_routes, GINT_TO_POINTER(gsi));\n- if (route_entry) {\n- g_hash_table_remove(gsi_routes, GINT_TO_POINTER(gsi));\n- g_free(route_entry);\n- msi_control->updated = true;\n- }\n- }\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@@ -319,9 +292,21 @@ int mshv_irqchip_add_msi_route(AccelRouteChange *c, int vector, PCIDevice *dev)\n return gsi;\n }\n \n-void mshv_irqchip_release_virq(int virq)\n+void mshv_irqchip_release_virq(MshvState *s, int virq)\n {\n- remove_msi_routing(virq);\n+ struct mshv_user_irq_entry *e;\n+ int i;\n+\n+ for (i = 0; i < s->irq_routes->nr; i++) {\n+ e = &s->irq_routes->entries[i];\n+ if (e->gsi == virq) {\n+ s->irq_routes->nr--;\n+ *e = s->irq_routes->entries[s->irq_routes->nr];\n+ }\n+ }\n+ irqchip_release_gsi(s, virq);\n+\n+ trace_mshv_remove_msi_routing(virq);\n }\n \n static int update_routing_entry(MshvState *s,\ndiff --git a/accel/stubs/mshv-stub.c b/accel/stubs/mshv-stub.c\nindex 998c9e2fc6..dadf05511a 100644\n--- a/accel/stubs/mshv-stub.c\n+++ b/accel/stubs/mshv-stub.c\n@@ -19,7 +19,7 @@ int mshv_irqchip_add_msi_route(AccelRouteChange *c, int vector, PCIDevice *dev)\n return -ENOSYS;\n }\n \n-void mshv_irqchip_release_virq(int virq)\n+void mshv_irqchip_release_virq(MshvState *s, int virq)\n {\n }\n \ndiff --git a/include/system/mshv.h b/include/system/mshv.h\nindex 7f60aba308..2033beed70 100644\n--- a/include/system/mshv.h\n+++ b/include/system/mshv.h\n@@ -63,7 +63,7 @@ int mshv_request_interrupt(MshvState *mshv_state, uint32_t interrupt_type, uint3\n int mshv_irqchip_add_msi_route(AccelRouteChange *c, int vector, PCIDevice *dev);\n int mshv_irqchip_update_msi_route(int virq, MSIMessage msg, PCIDevice *dev);\n void mshv_irqchip_commit_routes(void);\n-void mshv_irqchip_release_virq(int virq);\n+void mshv_irqchip_release_virq(MshvState *s, int virq);\n int mshv_irqchip_add_irqfd_notifier_gsi(const EventNotifier *n,\n const EventNotifier *rn, int virq);\n int mshv_irqchip_remove_irqfd_notifier_gsi(const EventNotifier *n, int virq);\n","prefixes":["10/34"]}