From nobody Sat Feb 7 04:47:10 2026 Received: from sender4-of-o52.zoho.com (sender4-of-o52.zoho.com [136.143.188.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 43A482E22AA; Mon, 2 Feb 2026 18:27:46 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.52 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770056867; cv=pass; b=S+ZmGPxbiWcpdFDkh7Fp7goRVsfav8R0bOo2ygZSFaPwfkvfIYDw6SsfncGfbh6M7KghTNRWwUxilsurS63QAgrl07YA2rKl6sOxat50Nwa8SuD7wtXmpadsVmnLf2JuJxQlsbDRHpB5qfI/MQ7VRY6Q3AINxuQCC8OVRzUis2g= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770056867; c=relaxed/simple; bh=AS94jxWg+n7oi3FuRHrztCo5IcdmOqszFNt2+LVXIYQ=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=qme5nSpzp4Smr2riSEHUvNYJbsNeMGAITVvttMCxZJe3lgAcXFdsJQtRMN7qVVFBHt1H7HWGhxZXrhl59z1a98FaAlHKEA/3qBTa6ogqjGsedUDDjMxnoixcCNCNLP6L8SoNmEj3r4Bd+nmZiog8g7TjQbcj7uMRBQgxDOU5d7A= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=anirudhrb.com; spf=pass smtp.mailfrom=anirudhrb.com; dkim=pass (1024-bit key) header.d=anirudhrb.com header.i=anirudh@anirudhrb.com header.b=lLG4Be9K; arc=pass smtp.client-ip=136.143.188.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=anirudhrb.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=anirudhrb.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=anirudhrb.com header.i=anirudh@anirudhrb.com header.b="lLG4Be9K" ARC-Seal: i=1; a=rsa-sha256; t=1770056859; cv=none; d=zohomail.com; s=zohoarc; b=QQfzS+eBl9tQ56n7+L80oSSBE5c7KNwQlS/sW08dwPrNARfsbzUbBq/59eZEQz21bCffrbB0Rf5BU49D1Q+CEtq38Vl2HUCqEekbZG1wfwtNnV2hD3j0Ijd/fdpLM15RkQTYJeZGMfJaycDyXIwh9pQqWa6Ke5Z9/WmqVypqk4s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770056859; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=bHwhlFdaF2jgP8JuXKthGOfk7MUmJ2z3OVWcSC96Vt4=; b=OwAxgJDaDBw88rsKoj+/Yayv3MNMlaCdSt01pp36WdgOfoN6ugwPndDcTzcdKtIzSLEsWkOvnuhONFdxhFHbBLD1DrKsKN6kh1/ZvwfM2mRPNExeDJjyqkdQ8odLPp1xiH2EYmWao5tGl8OQ9AgZFZOh+JRTIkmTlcIzvb1wuEQ= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=anirudhrb.com; spf=pass smtp.mailfrom=anirudh@anirudhrb.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1770056859; s=zoho; d=anirudhrb.com; i=anirudh@anirudhrb.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Reply-To; bh=bHwhlFdaF2jgP8JuXKthGOfk7MUmJ2z3OVWcSC96Vt4=; b=lLG4Be9KNsg2hF+3pOzp6WbfgsgJQglSuTk7X99mte1TcYSeKdBqsuxXj0v7FFht Ik1m2nxUDJKzWlff0KMs5a52VCQ4+5UnpJAj0G8IRhp2wQoyXCwGs9JyjESjpMo/kw1 pTL3nyjo47+OehYTS23ZdxotrBkfZ1/YHuTJaxyo= Received: by mx.zohomail.com with SMTPS id 177005685649179.93280722935799; Mon, 2 Feb 2026 10:27:36 -0800 (PST) From: Anirudh Rayabharam To: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, longli@microsoft.com, linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org Cc: anirudh@anirudhrb.com Subject: [PATCH v2 1/2] mshv: refactor synic init and cleanup Date: Mon, 2 Feb 2026 18:27:05 +0000 Message-Id: <20260202182706.648192-2-anirudh@anirudhrb.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260202182706.648192-1-anirudh@anirudhrb.com> References: <20260202182706.648192-1-anirudh@anirudhrb.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Content-Type: text/plain; charset="utf-8" From: Anirudh Rayabharam (Microsoft) Rename mshv_synic_init() to mshv_synic_cpu_init() and mshv_synic_cleanup() to mshv_synic_cpu_exit() to better reflect that these functions handle per-cpu synic setup and teardown. Use mshv_synic_init/cleanup() to perform init/cleanup that is not per-cpu. Move all the synic related setup from mshv_parent_partition_init. Move the reboot notifier to mshv_synic.c because it currently only operates on the synic cpuhp state. Move out synic_pages from the global mshv_root since it's use is now completely local to mshv_synic.c. This is in preparation for the next patch which will add more stuff to mshv_synic_init(). No functional change. Signed-off-by: Anirudh Rayabharam (Microsoft) --- drivers/hv/mshv_root.h | 5 ++- drivers/hv/mshv_root_main.c | 59 +++++------------------------- drivers/hv/mshv_synic.c | 71 +++++++++++++++++++++++++++++++++---- 3 files changed, 75 insertions(+), 60 deletions(-) diff --git a/drivers/hv/mshv_root.h b/drivers/hv/mshv_root.h index 3c1d88b36741..26e0320c8097 100644 --- a/drivers/hv/mshv_root.h +++ b/drivers/hv/mshv_root.h @@ -183,7 +183,6 @@ struct hv_synic_pages { }; =20 struct mshv_root { - struct hv_synic_pages __percpu *synic_pages; spinlock_t pt_ht_lock; DECLARE_HASHTABLE(pt_htable, MSHV_PARTITIONS_HASH_BITS); struct hv_partition_property_vmm_capabilities vmm_caps; @@ -242,8 +241,8 @@ int mshv_register_doorbell(u64 partition_id, doorbell_c= b_t doorbell_cb, void mshv_unregister_doorbell(u64 partition_id, int doorbell_portid); =20 void mshv_isr(void); -int mshv_synic_init(unsigned int cpu); -int mshv_synic_cleanup(unsigned int cpu); +int mshv_synic_init(struct device *dev); +void mshv_synic_cleanup(void); =20 static inline bool mshv_partition_encrypted(struct mshv_partition *partiti= on) { diff --git a/drivers/hv/mshv_root_main.c b/drivers/hv/mshv_root_main.c index 681b58154d5e..7c1666456e78 100644 --- a/drivers/hv/mshv_root_main.c +++ b/drivers/hv/mshv_root_main.c @@ -2035,7 +2035,6 @@ mshv_dev_release(struct inode *inode, struct file *fi= lp) return 0; } =20 -static int mshv_cpuhp_online; static int mshv_root_sched_online; =20 static const char *scheduler_type_to_string(enum hv_scheduler_type type) @@ -2198,40 +2197,14 @@ root_scheduler_deinit(void) free_percpu(root_scheduler_output); } =20 -static int mshv_reboot_notify(struct notifier_block *nb, - unsigned long code, void *unused) -{ - cpuhp_remove_state(mshv_cpuhp_online); - return 0; -} - -struct notifier_block mshv_reboot_nb =3D { - .notifier_call =3D mshv_reboot_notify, -}; - static void mshv_root_partition_exit(void) { - unregister_reboot_notifier(&mshv_reboot_nb); root_scheduler_deinit(); } =20 static int __init mshv_root_partition_init(struct device *dev) { - int err; - - err =3D root_scheduler_init(dev); - if (err) - return err; - - err =3D register_reboot_notifier(&mshv_reboot_nb); - if (err) - goto root_sched_deinit; - - return 0; - -root_sched_deinit: - root_scheduler_deinit(); - return err; + return root_scheduler_init(dev); } =20 static void mshv_init_vmm_caps(struct device *dev) @@ -2276,31 +2249,18 @@ static int __init mshv_parent_partition_init(void) MSHV_HV_MAX_VERSION); } =20 - mshv_root.synic_pages =3D alloc_percpu(struct hv_synic_pages); - if (!mshv_root.synic_pages) { - dev_err(dev, "Failed to allocate percpu synic page\n"); - ret =3D -ENOMEM; + ret =3D mshv_synic_init(dev); + if (ret) goto device_deregister; - } - - ret =3D cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "mshv_synic", - mshv_synic_init, - mshv_synic_cleanup); - if (ret < 0) { - dev_err(dev, "Failed to setup cpu hotplug state: %i\n", ret); - goto free_synic_pages; - } - - mshv_cpuhp_online =3D ret; =20 ret =3D mshv_retrieve_scheduler_type(dev); if (ret) - goto remove_cpu_state; + goto synic_cleanup; =20 if (hv_root_partition()) ret =3D mshv_root_partition_init(dev); if (ret) - goto remove_cpu_state; + goto synic_cleanup; =20 mshv_init_vmm_caps(dev); =20 @@ -2318,10 +2278,8 @@ static int __init mshv_parent_partition_init(void) exit_partition: if (hv_root_partition()) mshv_root_partition_exit(); -remove_cpu_state: - cpuhp_remove_state(mshv_cpuhp_online); -free_synic_pages: - free_percpu(mshv_root.synic_pages); +synic_cleanup: + mshv_synic_cleanup(); device_deregister: misc_deregister(&mshv_dev); return ret; @@ -2335,8 +2293,7 @@ static void __exit mshv_parent_partition_exit(void) mshv_irqfd_wq_cleanup(); if (hv_root_partition()) mshv_root_partition_exit(); - cpuhp_remove_state(mshv_cpuhp_online); - free_percpu(mshv_root.synic_pages); + mshv_synic_cleanup(); } =20 module_init(mshv_parent_partition_init); diff --git a/drivers/hv/mshv_synic.c b/drivers/hv/mshv_synic.c index f8b0337cdc82..98c58755846d 100644 --- a/drivers/hv/mshv_synic.c +++ b/drivers/hv/mshv_synic.c @@ -12,11 +12,16 @@ #include #include #include +#include +#include #include =20 #include "mshv_eventfd.h" #include "mshv.h" =20 +static int synic_cpuhp_online; +static struct hv_synic_pages __percpu *synic_pages; + static u32 synic_event_ring_get_queued_port(u32 sint_index) { struct hv_synic_event_ring_page **event_ring_page; @@ -26,7 +31,7 @@ static u32 synic_event_ring_get_queued_port(u32 sint_inde= x) u32 message; u8 tail; =20 - spages =3D this_cpu_ptr(mshv_root.synic_pages); + spages =3D this_cpu_ptr(synic_pages); event_ring_page =3D &spages->synic_event_ring_page; synic_eventring_tail =3D (u8 **)this_cpu_ptr(hv_synic_eventring_tail); =20 @@ -393,7 +398,7 @@ mshv_intercept_isr(struct hv_message *msg) =20 void mshv_isr(void) { - struct hv_synic_pages *spages =3D this_cpu_ptr(mshv_root.synic_pages); + struct hv_synic_pages *spages =3D this_cpu_ptr(synic_pages); struct hv_message_page **msg_page =3D &spages->hyp_synic_message_page; struct hv_message *msg; bool handled; @@ -446,7 +451,7 @@ void mshv_isr(void) } } =20 -int mshv_synic_init(unsigned int cpu) +static int mshv_synic_cpu_init(unsigned int cpu) { union hv_synic_simp simp; union hv_synic_siefp siefp; @@ -455,7 +460,7 @@ int mshv_synic_init(unsigned int cpu) union hv_synic_sint sint; #endif union hv_synic_scontrol sctrl; - struct hv_synic_pages *spages =3D this_cpu_ptr(mshv_root.synic_pages); + struct hv_synic_pages *spages =3D this_cpu_ptr(synic_pages); struct hv_message_page **msg_page =3D &spages->hyp_synic_message_page; struct hv_synic_event_flags_page **event_flags_page =3D &spages->synic_event_flags_page; @@ -542,14 +547,14 @@ int mshv_synic_init(unsigned int cpu) return -EFAULT; } =20 -int mshv_synic_cleanup(unsigned int cpu) +static int mshv_synic_cpu_exit(unsigned int cpu) { union hv_synic_sint sint; union hv_synic_simp simp; union hv_synic_siefp siefp; union hv_synic_sirbp sirbp; union hv_synic_scontrol sctrl; - struct hv_synic_pages *spages =3D this_cpu_ptr(mshv_root.synic_pages); + struct hv_synic_pages *spages =3D this_cpu_ptr(synic_pages); struct hv_message_page **msg_page =3D &spages->hyp_synic_message_page; struct hv_synic_event_flags_page **event_flags_page =3D &spages->synic_event_flags_page; @@ -663,3 +668,57 @@ mshv_unregister_doorbell(u64 partition_id, int doorbel= l_portid) =20 mshv_portid_free(doorbell_portid); } + +static int mshv_synic_reboot_notify(struct notifier_block *nb, + unsigned long code, void *unused) +{ + cpuhp_remove_state(synic_cpuhp_online); + return 0; +} + +static struct notifier_block mshv_synic_reboot_nb =3D { + .notifier_call =3D mshv_synic_reboot_notify, +}; + +int __init mshv_synic_init(struct device *dev) +{ + int ret =3D 0; + + synic_pages =3D alloc_percpu(struct hv_synic_pages); + if (!synic_pages) { + dev_err(dev, "Failed to allocate percpu synic page\n"); + return -ENOMEM; + } + + ret =3D cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "mshv_synic", + mshv_synic_cpu_init, + mshv_synic_cpu_exit); + if (ret < 0) { + dev_err(dev, "Failed to setup cpu hotplug state: %i\n", ret); + goto free_synic_pages; + } + + synic_cpuhp_online =3D ret; + + if (hv_root_partition()) { + ret =3D register_reboot_notifier(&mshv_synic_reboot_nb); + if (ret) + goto remove_cpuhp_state; + } + + return 0; + +remove_cpuhp_state: + cpuhp_remove_state(synic_cpuhp_online); +free_synic_pages: + free_percpu(synic_pages); + return ret; +} + +void mshv_synic_cleanup(void) +{ + if (hv_root_partition()) + unregister_reboot_notifier(&mshv_synic_reboot_nb); + cpuhp_remove_state(synic_cpuhp_online); + free_percpu(synic_pages); +} --=20 2.34.1 From nobody Sat Feb 7 04:47:10 2026 Received: from sender4-of-o52.zoho.com (sender4-of-o52.zoho.com [136.143.188.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 33E852DF12A; Mon, 2 Feb 2026 18:27:53 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=pass smtp.client-ip=136.143.188.52 ARC-Seal: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770056874; cv=pass; b=NQ5zwIcBiELdnGnnyrFWbV6ki8zcK/geUyXTbIkmQ+g6RNmrF1a2yNga5KhYfAhVhlYpQxoT8GTPe+z36FV+sLAP2gR0xDjQGv5vHZJShBzduExmVhw+Jgln7gNCiH6zFlTjYF3nvKog9qmHbwYaMRmRD2msjvuG2UwcZtnVF2o= ARC-Message-Signature: i=2; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1770056874; c=relaxed/simple; bh=i6E2BG3fmZ61cCvSFGo8qDQnTVECh1fOzUHZfpOVjBM=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=oYaSy/hsx1xb/t+IYNs8D7Ijas2zDSHJLEhuu+yXllvcD62U+ZfVbdmRQQzDthoYjI+xhTl12Cez6y6Mqg5OcVaAMX54KIxdhqOKzIMJpXj+GBl4TzVun5VHKZWXn9otBjiZMQbOM2nWTaHJ/eBRtXtoIR/A7+6dNqo9br71C94= ARC-Authentication-Results: i=2; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=anirudhrb.com; spf=pass smtp.mailfrom=anirudhrb.com; dkim=pass (1024-bit key) header.d=anirudhrb.com header.i=anirudh@anirudhrb.com header.b=tOSGmKlO; arc=pass smtp.client-ip=136.143.188.52 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=anirudhrb.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=anirudhrb.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=anirudhrb.com header.i=anirudh@anirudhrb.com header.b="tOSGmKlO" ARC-Seal: i=1; a=rsa-sha256; t=1770056867; cv=none; d=zohomail.com; s=zohoarc; b=A52MIABv/xTCqGWCd/J3tZJojfXvy84fYZdifgBOBTGE9mX7bzmGmvmGwHKaI0Sf7RgZP/uqVq0T0rLVNa3qTosfXNIMIObAKRaIbY1EwlpGix22+tORaw3Rzcn7Mt01GFX8xlPy2tQDP5iVv0NJguG5d0PaHoGr8oBTY/NyYFg= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1770056867; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:MIME-Version:Message-ID:References:Subject:Subject:To:To:Message-Id:Reply-To; bh=mx7O/zXOAbdiaNWi2kWP4kiU1sNJSFWVveu6dLILbOI=; b=IkEYdN1CKY5X3hDWqRjvDgaZZE8igsuQOx7QzwFClE7AOMccSi5pxX4jz+REWqP7KMv4gJ/y2ELhzz+OZtvWEJ+BYiRtX5VtLOAwCkUO6ahgYb2iVobYo8g5Ipxvj4jhU2IMv8cZKH/kNHT7KAbTrHxZ1rXcJONUrCcJ2gIr9eY= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=anirudhrb.com; spf=pass smtp.mailfrom=anirudh@anirudhrb.com; dmarc=pass header.from= DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; t=1770056867; s=zoho; d=anirudhrb.com; i=anirudh@anirudhrb.com; h=From:From:To:To:Cc:Cc:Subject:Subject:Date:Date:Message-Id:Message-Id:In-Reply-To:References:MIME-Version:Content-Transfer-Encoding:Reply-To; bh=mx7O/zXOAbdiaNWi2kWP4kiU1sNJSFWVveu6dLILbOI=; b=tOSGmKlORdVeEr2d5rKRsVoOg7TMPfvDiI14t2f7CjtAe+kbNc0GU38sen5hfMPt 9v7cCI7u53JEj79ayceWYXlRHe81PGhE8mzWYfnO418zZSFGDRzfzvRrWJWqB6wjIA1 ecn3mscXIoksrEBHinKrSgcbDUCuCRBEaOrczOoI= Received: by mx.zohomail.com with SMTPS id 1770056864902880.0118829679859; Mon, 2 Feb 2026 10:27:44 -0800 (PST) From: Anirudh Rayabharam To: kys@microsoft.com, haiyangz@microsoft.com, wei.liu@kernel.org, decui@microsoft.com, longli@microsoft.com, linux-hyperv@vger.kernel.org, linux-kernel@vger.kernel.org Cc: anirudh@anirudhrb.com Subject: [PATCH v2 2/2] mshv: add arm64 support for doorbell & intercept SINTs Date: Mon, 2 Feb 2026 18:27:06 +0000 Message-Id: <20260202182706.648192-3-anirudh@anirudhrb.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20260202182706.648192-1-anirudh@anirudhrb.com> References: <20260202182706.648192-1-anirudh@anirudhrb.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMailClient: External Content-Type: text/plain; charset="utf-8" From: Anirudh Rayabharam (Microsoft) On x86, the HYPERVISOR_CALLBACK_VECTOR is used to receive synthetic interrupts (SINTs) from the hypervisor for doorbells and intercepts. There is no such vector reserved for arm64. On arm64, the INTID for SINTs should be in the SGI or PPI range. The hypervisor exposes a virtual device in the ACPI that reserves a PPI for this use. Introduce a platform_driver that binds to this ACPI device and obtains the interrupt vector that can be used for SINTs. To better unify x86 and arm64 paths, introduce mshv_sint_vector_init() that either registers the platform_driver and obtains the INTID (arm64) or just uses HYPERVISOR_CALLBACK_VECTOR as the interrupt vector (x86). Signed-off-by: Anirudh Rayabharam (Microsoft) --- drivers/hv/mshv_synic.c | 163 ++++++++++++++++++++++++++++++++++++++-- 1 file changed, 156 insertions(+), 7 deletions(-) diff --git a/drivers/hv/mshv_synic.c b/drivers/hv/mshv_synic.c index 98c58755846d..de5fee6e9f29 100644 --- a/drivers/hv/mshv_synic.c +++ b/drivers/hv/mshv_synic.c @@ -10,17 +10,24 @@ #include #include #include +#include #include #include #include #include #include +#include +#include =20 #include "mshv_eventfd.h" #include "mshv.h" =20 static int synic_cpuhp_online; static struct hv_synic_pages __percpu *synic_pages; +static int mshv_sint_vector =3D -1; /* hwirq for the SynIC SINTs */ +#ifndef HYPERVISOR_CALLBACK_VECTOR +static int mshv_sint_irq =3D -1; /* Linux IRQ for mshv_sint_vector */ +#endif =20 static u32 synic_event_ring_get_queued_port(u32 sint_index) { @@ -456,9 +463,7 @@ static int mshv_synic_cpu_init(unsigned int cpu) union hv_synic_simp simp; union hv_synic_siefp siefp; union hv_synic_sirbp sirbp; -#ifdef HYPERVISOR_CALLBACK_VECTOR union hv_synic_sint sint; -#endif union hv_synic_scontrol sctrl; struct hv_synic_pages *spages =3D this_cpu_ptr(synic_pages); struct hv_message_page **msg_page =3D &spages->hyp_synic_message_page; @@ -501,10 +506,13 @@ static int mshv_synic_cpu_init(unsigned int cpu) =20 hv_set_non_nested_msr(HV_MSR_SIRBP, sirbp.as_uint64); =20 -#ifdef HYPERVISOR_CALLBACK_VECTOR +#ifndef HYPERVISOR_CALLBACK_VECTOR + enable_percpu_irq(mshv_sint_irq, 0); +#endif + /* Enable intercepts */ sint.as_uint64 =3D 0; - sint.vector =3D HYPERVISOR_CALLBACK_VECTOR; + sint.vector =3D mshv_sint_vector; sint.masked =3D false; sint.auto_eoi =3D hv_recommend_using_aeoi(); hv_set_non_nested_msr(HV_MSR_SINT0 + HV_SYNIC_INTERCEPTION_SINT_INDEX, @@ -512,13 +520,12 @@ static int mshv_synic_cpu_init(unsigned int cpu) =20 /* Doorbell SINT */ sint.as_uint64 =3D 0; - sint.vector =3D HYPERVISOR_CALLBACK_VECTOR; + sint.vector =3D mshv_sint_vector; sint.masked =3D false; sint.as_intercept =3D 1; sint.auto_eoi =3D hv_recommend_using_aeoi(); hv_set_non_nested_msr(HV_MSR_SINT0 + HV_SYNIC_DOORBELL_SINT_INDEX, sint.as_uint64); -#endif =20 /* Enable global synic bit */ sctrl.as_uint64 =3D hv_get_non_nested_msr(HV_MSR_SCONTROL); @@ -573,6 +580,10 @@ static int mshv_synic_cpu_exit(unsigned int cpu) hv_set_non_nested_msr(HV_MSR_SINT0 + HV_SYNIC_DOORBELL_SINT_INDEX, sint.as_uint64); =20 +#ifndef HYPERVISOR_CALLBACK_VECTOR + disable_percpu_irq(mshv_sint_irq); +#endif + /* Disable Synic's event ring page */ sirbp.as_uint64 =3D hv_get_non_nested_msr(HV_MSR_SIRBP); sirbp.sirbp_enabled =3D false; @@ -680,14 +691,149 @@ static struct notifier_block mshv_synic_reboot_nb = =3D { .notifier_call =3D mshv_synic_reboot_notify, }; =20 +#ifndef HYPERVISOR_CALLBACK_VECTOR +#ifdef CONFIG_ACPI +static long __percpu *mshv_evt; + +static acpi_status mshv_walk_resources(struct acpi_resource *res, void *ct= x) +{ + struct resource r; + + if (res->type =3D=3D ACPI_RESOURCE_TYPE_EXTENDED_IRQ) { + if (!acpi_dev_resource_interrupt(res, 0, &r)) { + pr_err("Unable to parse MSHV ACPI interrupt\n"); + return AE_ERROR; + } + /* ARM64 INTID */ + mshv_sint_vector =3D res->data.extended_irq.interrupts[0]; + /* Linux IRQ number */ + mshv_sint_irq =3D r.start; + } + + return AE_OK; +} + +static irqreturn_t mshv_percpu_isr(int irq, void *dev_id) +{ + mshv_isr(); + return IRQ_HANDLED; +} + +static int mshv_sint_probe(struct platform_device *pdev) +{ + acpi_status result; + int ret; + struct acpi_device *device =3D ACPI_COMPANION(&pdev->dev); + + result =3D acpi_walk_resources(device->handle, METHOD_NAME__CRS, + mshv_walk_resources, NULL); + if (ACPI_FAILURE(result)) { + ret =3D -ENODEV; + goto out_fail; + } + + mshv_evt =3D alloc_percpu(long); + if (!mshv_evt) { + ret =3D -ENOMEM; + goto out_fail; + } + + ret =3D request_percpu_irq(mshv_sint_irq, mshv_percpu_isr, "MSHV", + mshv_evt); + if (ret) + goto free_evt; + + return 0; + +free_evt: + free_percpu(mshv_evt); +out_fail: + mshv_sint_vector =3D -1; + mshv_sint_irq =3D -1; + return ret; +} + +static void mshv_sint_remove(struct platform_device *pdev) +{ + free_percpu_irq(mshv_sint_irq, mshv_evt); + free_percpu(mshv_evt); +} +#else +static int mshv_sint_probe(struct platform_device *pdev) +{ + return -ENODEV; +} + +static void mshv_sint_remove(struct platform_device *pdev) +{ +} +#endif + +static const __maybe_unused struct acpi_device_id mshv_sint_device_ids[] = =3D { + {"MSFT1003", 0}, + {"", 0}, +}; + +static struct platform_driver mshv_sint_drv =3D { + .probe =3D mshv_sint_probe, + .remove =3D mshv_sint_remove, + .driver =3D { + .name =3D "mshv_sint", + .acpi_match_table =3D ACPI_PTR(mshv_sint_device_ids), + .probe_type =3D PROBE_FORCE_SYNCHRONOUS, + }, +}; + +static int __init mshv_sint_vector_init(void) +{ + int ret; + + if (acpi_disabled) + return -ENODEV; + + ret =3D platform_driver_register(&mshv_sint_drv); + if (ret) + return ret; + + if (mshv_sint_vector =3D=3D -1 || mshv_sint_irq =3D=3D -1) { + platform_driver_unregister(&mshv_sint_drv); + return -ENODEV; + } + + return 0; +} + +static void mshv_sint_vector_cleanup(void) +{ + platform_driver_unregister(&mshv_sint_drv); +} +#else /* HYPERVISOR_CALLBACK_VECTOR */ +static int __init mshv_sint_vector_init(void) +{ + mshv_sint_vector =3D HYPERVISOR_CALLBACK_VECTOR; + return 0; +} + +static void mshv_sint_vector_cleanup(void) +{ +} +#endif /* HYPERVISOR_CALLBACK_VECTOR */ + int __init mshv_synic_init(struct device *dev) { int ret =3D 0; =20 + ret =3D mshv_sint_vector_init(); + if (ret) { + dev_err(dev, "Failed to get MSHV SINT vector: %i\n", ret); + return ret; + } + synic_pages =3D alloc_percpu(struct hv_synic_pages); if (!synic_pages) { dev_err(dev, "Failed to allocate percpu synic page\n"); - return -ENOMEM; + ret =3D -ENOMEM; + goto sint_vector_cleanup; } =20 ret =3D cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "mshv_synic", @@ -712,6 +858,8 @@ int __init mshv_synic_init(struct device *dev) cpuhp_remove_state(synic_cpuhp_online); free_synic_pages: free_percpu(synic_pages); +sint_vector_cleanup: + mshv_sint_vector_cleanup(); return ret; } =20 @@ -721,4 +869,5 @@ void mshv_synic_cleanup(void) unregister_reboot_notifier(&mshv_synic_reboot_nb); cpuhp_remove_state(synic_cpuhp_online); free_percpu(synic_pages); + mshv_sint_vector_cleanup(); } --=20 2.34.1