{"id":2224397,"url":"http://patchwork.ozlabs.org/api/patches/2224397/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20260417105618.3621-10-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-10-magnuskulke@linux.microsoft.com>","list_archive_url":null,"date":"2026-04-17T10:55:53","name":"[09/34] accel/mshv: update s->irq_routes in update_msi_route","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"fe68e049de9aa82672108a91bc79df6e2ef27d7b","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-10-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/2224397/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/2224397/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=gCBXmQvV;\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 4fxsLy0hrQz1yJ8\n\tfor ; Fri, 17 Apr 2026 20:58:50 +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 1wDgsg-0000Qs-As; Fri, 17 Apr 2026 06:57:02 -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 1wDgse-0000Om-Pi\n for qemu-devel@nongnu.org; Fri, 17 Apr 2026 06:57:00 -0400","from linux.microsoft.com ([13.77.154.182])\n by eggs.gnu.org with esmtp (Exim 4.90_1)\n (envelope-from ) id 1wDgsc-0001YG-Np\n for qemu-devel@nongnu.org; Fri, 17 Apr 2026 06:56:59 -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 156D420B7129;\n Fri, 17 Apr 2026 03:56:54 -0700 (PDT)"],"DKIM-Filter":"OpenDKIM Filter v2.11.0 linux.microsoft.com 156D420B7129","DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;\n s=default; t=1776423418;\n bh=DLb4Xz56FicxDJh1EcJd2k8Rmdkqnc0+6TN1HYuGNCw=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=gCBXmQvVr3L4PFi/hA7EDj5O5SVDdAG6iO8x2ch2HwvQenlAEbQGpydTAeypfFRLV\n ydjK97GH0PCrWzeo7ws8b7c7I18URh7R4C2cAyOjUdqZSfNo83Zn/iw0Z24QLi61Ip\n ZetVWgkXVnjQM2wI3uxxFjDUvQjJpQDvor9Fbs3s=","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 09/34] accel/mshv: update s->irq_routes in update_msi_route","Date":"Fri, 17 Apr 2026 12:55:53 +0200","Message-Id":"<20260417105618.3621-10-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 updated with a new dest/vector.\n\nThe old set_msi_routing() fn is redundant and can be removed.\n\nSigned-off-by: Magnus Kulke \n---\n accel/mshv/irq.c | 87 +++++++++++++++++++++---------------------------\n 1 file changed, 38 insertions(+), 49 deletions(-)","diff":"diff --git a/accel/mshv/irq.c b/accel/mshv/irq.c\nindex 9d6bdde27a..b5a047b367 100644\n--- a/accel/mshv/irq.c\n+++ b/accel/mshv/irq.c\n@@ -36,52 +36,6 @@ void mshv_init_msicontrol(void)\n msi_control->updated = false;\n }\n \n-static int set_msi_routing(uint32_t gsi, uint64_t addr, uint32_t data)\n-{\n- struct mshv_user_irq_entry *entry;\n- uint32_t high_addr = addr >> 32;\n- uint32_t low_addr = addr & 0xFFFFFFFF;\n- GHashTable *gsi_routes;\n-\n- trace_mshv_set_msi_routing(gsi, addr, data);\n-\n- if (gsi >= MSHV_MAX_MSI_ROUTES) {\n- error_report(\"gsi >= MSHV_MAX_MSI_ROUTES\");\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- entry = g_hash_table_lookup(gsi_routes, GINT_TO_POINTER(gsi));\n-\n- if (entry\n- && entry->address_hi == high_addr\n- && entry->address_lo == low_addr\n- && entry->data == data)\n- {\n- /* nothing to update */\n- return 0;\n- }\n-\n- /* free old entry */\n- g_free(entry);\n-\n- /* create new entry */\n- entry = g_new0(struct mshv_user_irq_entry, 1);\n- entry->gsi = gsi;\n- entry->address_hi = high_addr;\n- entry->address_lo = low_addr;\n- entry->data = data;\n-\n- g_hash_table_insert(gsi_routes, GINT_TO_POINTER(gsi), entry);\n- msi_control->updated = true;\n- }\n-\n- return 0;\n-}\n-\n static int add_msi_routing(uint64_t addr, uint32_t data)\n {\n struct mshv_user_irq_entry *route_entry;\n@@ -370,16 +324,51 @@ void mshv_irqchip_release_virq(int virq)\n remove_msi_routing(virq);\n }\n \n+static int update_routing_entry(MshvState *s,\n+ struct mshv_user_irq_entry *new_entry)\n+{\n+ struct mshv_user_irq_entry *entry;\n+ int n;\n+\n+ for (n = 0; n < s->irq_routes->nr; n++) {\n+ entry = &s->irq_routes->entries[n];\n+ if (entry->gsi != new_entry->gsi) {\n+ continue;\n+ }\n+\n+ if (!memcmp(entry, new_entry, sizeof *entry)) {\n+ return 0;\n+ }\n+\n+ *entry = *new_entry;\n+\n+ return 0;\n+ }\n+\n+ return -ESRCH;\n+}\n+\n int mshv_irqchip_update_msi_route(int virq, MSIMessage msg, PCIDevice *dev)\n {\n+ uint32_t addr_hi = msg.address >> 32;\n+ uint32_t addr_lo = msg.address & 0xFFFFFFFF;\n+ uint32_t data = le32_to_cpu(msg.data);\n+ struct mshv_user_irq_entry entry = {\n+ .gsi = virq,\n+ .address_hi = addr_hi,\n+ .address_lo = addr_lo,\n+ .data = data,\n+ };\n int ret;\n \n- ret = set_msi_routing(virq, msg.address, le32_to_cpu(msg.data));\n+ ret = update_routing_entry(mshv_state, &entry);\n if (ret < 0) {\n- error_report(\"Failed to set msi routing\");\n- return -1;\n+ error_report(\"Failed to set msi routing for gsi %d\", virq);\n+ abort();\n }\n \n+ trace_mshv_set_msi_routing(virq, msg.address, data);\n+\n return 0;\n }\n \n","prefixes":["09/34"]}