From nobody Sat Jun 13 01:19:59 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 DDE704219E8; Mon, 11 May 2026 16:15:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778516103; cv=none; b=GpVYYokD29IcAuGfmw4dua+8efUdhD7tTjKwrbytpsYC2ROQ/E95Z1Eruslq9InSFZZgvNijcVr8sF532PbsHh6Rpug8rsixdOuYrB3rA2u9pKjy19Rf0SRufHZVanXdJS3YP5NfXA2gYINsQVJenFYr93Ho7XNo8Sg0nnCl2V0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778516103; c=relaxed/simple; bh=HMwAiZtYipVdQYLlWBs2AS8R6QzJJVI7kY9oJr2SxYk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=B8QwTacsgIfnwyBbqdUYlB8ydRObFJl9E7xWcHYoQjsgMJIP92mZhqGp5CmPmJSdCHv/Sj+Wx+SuhWTwuhGQmH3Dyi08YGP3L1hienATyntCnUV70dGt68hwkKSpcw64J3vAIh+mgMCGptLDu52779IigM+hYKOPcIyFwmwTojM= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=LOs3v66m; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="LOs3v66m" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64BEMMxA3808092; Mon, 11 May 2026 16:14:57 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=Pv3maWecD9u3COqH+ 6A89VgVxDBuoqFZT4+3PsNTADI=; b=LOs3v66mxV0gr8jniAnOdLMGopNt1wZV/ 5iJZjcpHzfmYquSH1egNHD0dzuXPdkl1KTWbppv14n82wHVW7QHmJknt0y1MakYg jX39sjFRcje+IAGPrfd4EacnC08yicr5Tj8w/a3Op0EsZMDrsK+tP1xBEEdOZHZ9 7HlX+pqcEdyMNAa4gPUeDDjOau/wftVwDXTOmZhhQrLh+dOfVZg5DlJFyIx96w4a HShIH0yqeiJ/NvVH+58caGbQUhQAs1k7cBrlefcWho2WDnyE4RWI8oPiuXUUVX+v HhQRMhtf083Xtu23P+g3vmqMiD5/k7mhDStyKYu0yfm+DGarWO09w== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4e1vn4s56n-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 May 2026 16:14:57 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 64BFsXOH002457; Mon, 11 May 2026 16:14:56 GMT Received: from smtprelay06.dal12v.mail.ibm.com ([172.16.1.8]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4e2fmvx4bx-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 May 2026 16:14:56 +0000 (GMT) Received: from smtpav03.wdc07v.mail.ibm.com (smtpav03.wdc07v.mail.ibm.com [10.39.53.230]) by smtprelay06.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 64BGEsA623134842 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 11 May 2026 16:14:55 GMT Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B11635805C; Mon, 11 May 2026 16:14:54 +0000 (GMT) Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 8C28A58054; Mon, 11 May 2026 16:14:53 +0000 (GMT) Received: from 9.60.13.83 (unknown [9.60.13.83]) by smtpav03.wdc07v.mail.ibm.com (Postfix) with ESMTP; Mon, 11 May 2026 16:14:53 +0000 (GMT) From: Douglas Freimuth To: borntraeger@linux.ibm.com, imbrenda@linux.ibm.com, frankja@linux.ibm.com, david@kernel.org, hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, svens@linux.ibm.com, kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Cc: mjrosato@linux.ibm.com, freimuth@linux.ibm.com Subject: [PATCH v6 1/4] KVM: s390: Add map/unmap ioctl and clean mappings post-guest Date: Mon, 11 May 2026 18:14:48 +0200 Message-ID: <20260511161451.209464-2-freimuth@linux.ibm.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260511161451.209464-1-freimuth@linux.ibm.com> References: <20260511161451.209464-1-freimuth@linux.ibm.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-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=BM+DalQG c=1 sm=1 tr=0 ts=6a020081 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=8ZgC-7A039QE7m0hxJcA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTExMDE3NCBTYWx0ZWRfXx2l/2rfRmhhZ 4a/Tn+qVK8GOYcPqgkLtxmA0nDcVySvySPhhvnVT0rSc+2G67rVWCN+bdOfGW7ZVNf4Gr97+S1A rDw1Ab7lyK4Ik6d7isupb0JhU3szoXcCF0ozXlEK4wz0YdJxSC9R82HBR9jiziZkRMRcgLzw5E/ g5Rmv30Jot+Ej8QXci0MjpUt3Lbz+zEo3xBn700tuOe01WlPzu2zx1gm3lEfQmxqRsGACJk167y DYoeurl8BO4ipJATmXZN4NrcwEAz9sGgwui63gzJNs7GrDP/EqJaa0/D9Pa2LIzyrgxJiAnPePp O5qC/ZkggEIlV5yNDuV5L8kO9Hf8gnz9UcsnHJoCthiOBbrmy6nrAqwlh10lpj17pSLTXcUAHsE 9vwIRMVTcVRoF8XAhoZpIuBchd0PfFDrZ7KCmA6S4bBMMMymiWI7Lk2IWwP5ZUOW2I4rUZvEP67 uexGa83uZ09AdOCza8A== X-Proofpoint-GUID: zFRY8zgJxQ7LlpUrK7U_Q4cUFfajKca0 X-Proofpoint-ORIG-GUID: zFRY8zgJxQ7LlpUrK7U_Q4cUFfajKca0 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-11_04,2026-05-08_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 suspectscore=0 bulkscore=0 spamscore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 malwarescore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605110174 Content-Type: text/plain; charset="utf-8" S390 needs map/unmap ioctls, which map the adapter set indicator pages, so the pages can be accessed when interrupts are disabled. The mappings are cleaned up when the guest is removed. Map/Unmap ioctls are fenced in order to avoid the longterm pinning in Secure Execution environments. In Secure Execution environments the path of execution available before this patch is followed. Statistical counters to count map/unmap functions for adapter indicator pages are added. The counters can be used to analyze map/unmap functions in non-Secure Execution environments and similarly can be used to analyze Secure Execution environments where the counters will not be incremented as the adapter indicator pages are not mapped. Signed-off-by: Douglas Freimuth --- arch/s390/include/asm/kvm_host.h | 5 + arch/s390/kvm/interrupt.c | 192 ++++++++++++++++++++++++++----- arch/s390/kvm/kvm-s390.c | 8 ++ arch/s390/kvm/kvm-s390.h | 2 + 4 files changed, 177 insertions(+), 30 deletions(-) diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_h= ost.h index 8a4f4a39f7a2..fbb2406b31d2 100644 --- a/arch/s390/include/asm/kvm_host.h +++ b/arch/s390/include/asm/kvm_host.h @@ -448,6 +448,8 @@ struct kvm_vcpu_arch { struct kvm_vm_stat { struct kvm_vm_stat_generic generic; u64 inject_io; + u64 io_390_adapter_map; + u64 io_390_adapter_unmap; u64 inject_float_mchk; u64 inject_pfault_done; u64 inject_service_signal; @@ -479,6 +481,9 @@ struct s390_io_adapter { bool masked; bool swap; bool suppressible; + raw_spinlock_t maps_lock; + struct list_head maps; + unsigned int nr_maps; }; =20 #define MAX_S390_IO_ADAPTERS ((MAX_ISC + 1) * 8) diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index 07f59c3b9a7b..96ead830c35f 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c @@ -2429,6 +2429,9 @@ static int register_io_adapter(struct kvm_device *dev, if (!adapter) return -ENOMEM; =20 + INIT_LIST_HEAD(&adapter->maps); + raw_spin_lock_init(&adapter->maps_lock); + adapter->nr_maps =3D 0; adapter->id =3D adapter_info.id; adapter->isc =3D adapter_info.isc; adapter->maskable =3D adapter_info.maskable; @@ -2453,12 +2456,151 @@ int kvm_s390_mask_adapter(struct kvm *kvm, unsigne= d int id, bool masked) return ret; } =20 +static struct page *pin_map_page(struct kvm *kvm, u64 uaddr, + unsigned int gup_flags) +{ + struct mm_struct *mm =3D kvm->mm; + struct page *page =3D NULL; + int locked =3D 1; + + if (mmget_not_zero(mm)) { + mmap_read_lock(mm); + pin_user_pages_remote(mm, uaddr, 1, FOLL_WRITE | gup_flags, + &page, &locked); + if (locked) + mmap_read_unlock(mm); + mmput(mm); + } + + return page; +} + +static int kvm_s390_adapter_map(struct kvm *kvm, unsigned int id, __u64 ad= dr) +{ + struct s390_io_adapter *adapter =3D get_io_adapter(kvm, id); + struct s390_map_info *map; + unsigned long flags; + __u64 host_addr; + int ret, idx; + + if (!adapter || !addr) + return -EINVAL; + + map =3D kzalloc_obj(*map, GFP_KERNEL_ACCOUNT); + if (!map) + return -ENOMEM; + + INIT_LIST_HEAD(&map->list); + idx =3D srcu_read_lock(&kvm->srcu); + host_addr =3D gpa_to_hva(kvm, addr); + if (kvm_is_error_hva(host_addr)) { + srcu_read_unlock(&kvm->srcu, idx); + ret =3D -EFAULT; + goto out; + } + srcu_read_unlock(&kvm->srcu, idx); + map->guest_addr =3D addr; + map->addr =3D host_addr; + map->page =3D pin_map_page(kvm, host_addr, FOLL_LONGTERM); + if (!map->page) { + ret =3D -EINVAL; + goto out; + } + raw_spin_lock_irqsave(&adapter->maps_lock, flags); + if (adapter->nr_maps < MAX_S390_ADAPTER_MAPS) { + list_add_tail(&map->list, &adapter->maps); + adapter->nr_maps++; + ret =3D 0; + } else { + ret =3D -EINVAL; + } + raw_spin_unlock_irqrestore(&adapter->maps_lock, flags); + if (ret) + unpin_user_page(map->page); +out: + if (ret) + kfree(map); + return ret; +} + +static int kvm_s390_adapter_unmap(struct kvm *kvm, unsigned int id, __u64 = addr) +{ + struct s390_io_adapter *adapter =3D get_io_adapter(kvm, id); + struct s390_map_info *map, *tmp, *map_to_free; + struct page *map_page_to_put =3D NULL; + u64 map_addr_to_mark =3D 0; + unsigned long flags; + int found =3D 0, idx; + + if (!adapter || !addr) + return -EINVAL; + + raw_spin_lock_irqsave(&adapter->maps_lock, flags); + list_for_each_entry_safe(map, tmp, &adapter->maps, list) { + if (map->guest_addr =3D=3D addr) { + found =3D 1; + adapter->nr_maps--; + list_del(&map->list); + map_page_to_put =3D map->page; + map_addr_to_mark =3D map->guest_addr; + map_to_free =3D map; + break; + } + } + raw_spin_unlock_irqrestore(&adapter->maps_lock, flags); + + if (found) { + kfree(map_to_free); + idx =3D srcu_read_lock(&kvm->srcu); + mark_page_dirty(kvm, map_addr_to_mark >> PAGE_SHIFT); + set_page_dirty_lock(map_page_to_put); + srcu_read_unlock(&kvm->srcu, idx); + unpin_user_page(map_page_to_put); + } + + return found ? 0 : -ENOENT; +} + +void kvm_s390_unmap_all_adapters(struct kvm *kvm) +{ + struct s390_map_info *map, *tmp; + unsigned long flags; + int i, idx; + + for (i =3D 0; i < MAX_S390_IO_ADAPTERS; i++) { + struct s390_io_adapter *adapter =3D kvm->arch.adapters[i]; + LIST_HEAD(local_list); + + if (!adapter) + continue; + + raw_spin_lock_irqsave(&adapter->maps_lock, flags); + list_splice_init(&adapter->maps, &local_list); + adapter->nr_maps =3D 0; + raw_spin_unlock_irqrestore(&adapter->maps_lock, flags); + + list_for_each_entry_safe(map, tmp, &local_list, list) { + list_del(&map->list); + idx =3D srcu_read_lock(&kvm->srcu); + mark_page_dirty(kvm, map->guest_addr >> PAGE_SHIFT); + set_page_dirty_lock(map->page); + srcu_read_unlock(&kvm->srcu, idx); + unpin_user_page(map->page); + kfree(map); + } + } +} + void kvm_s390_destroy_adapters(struct kvm *kvm) { int i; =20 - for (i =3D 0; i < MAX_S390_IO_ADAPTERS; i++) + kvm_s390_unmap_all_adapters(kvm); + + for (i =3D 0; i < MAX_S390_IO_ADAPTERS; i++) { kfree(kvm->arch.adapters[i]); + kvm->arch.adapters[i] =3D NULL; + } } =20 static int modify_io_adapter(struct kvm_device *dev, @@ -2480,14 +2622,22 @@ static int modify_io_adapter(struct kvm_device *dev, if (ret > 0) ret =3D 0; break; - /* - * The following operations are no longer needed and therefore no-ops. - * The gpa to hva translation is done when an IRQ route is set up. The - * set_irq code uses get_user_pages_remote() to do the actual write. - */ case KVM_S390_IO_ADAPTER_MAP: case KVM_S390_IO_ADAPTER_UNMAP: - ret =3D 0; + /* If in Secure Execution mode do not long term pin. */ + mutex_lock(&dev->kvm->lock); + if (kvm_s390_pv_is_protected(dev->kvm)) { + mutex_unlock(&dev->kvm->lock); + return 0; + } + if (req.type =3D=3D KVM_S390_IO_ADAPTER_MAP) { + dev->kvm->stat.io_390_adapter_map++; + ret =3D kvm_s390_adapter_map(dev->kvm, req.id, req.addr); + } else { + dev->kvm->stat.io_390_adapter_unmap++; + ret =3D kvm_s390_adapter_unmap(dev->kvm, req.id, req.addr); + } + mutex_unlock(&dev->kvm->lock); break; default: ret =3D -EINVAL; @@ -2733,24 +2883,6 @@ static unsigned long get_ind_bit(__u64 addr, unsigne= d long bit_nr, bool swap) return swap ? (bit ^ (BITS_PER_LONG - 1)) : bit; } =20 -static struct page *get_map_page(struct kvm *kvm, u64 uaddr) -{ - struct mm_struct *mm =3D kvm->mm; - struct page *page =3D NULL; - int locked =3D 1; - - if (mmget_not_zero(mm)) { - mmap_read_lock(mm); - get_user_pages_remote(mm, uaddr, 1, FOLL_WRITE, - &page, &locked); - if (locked) - mmap_read_unlock(mm); - mmput(mm); - } - - return page; -} - static int adapter_indicators_set(struct kvm *kvm, struct s390_io_adapter *adapter, struct kvm_s390_adapter_int *adapter_int) @@ -2760,12 +2892,12 @@ static int adapter_indicators_set(struct kvm *kvm, struct page *ind_page, *summary_page; void *map; =20 - ind_page =3D get_map_page(kvm, adapter_int->ind_addr); + ind_page =3D pin_map_page(kvm, adapter_int->ind_addr, 0); if (!ind_page) return -1; - summary_page =3D get_map_page(kvm, adapter_int->summary_addr); + summary_page =3D pin_map_page(kvm, adapter_int->summary_addr, 0); if (!summary_page) { - put_page(ind_page); + unpin_user_page(ind_page); return -1; } =20 @@ -2784,8 +2916,8 @@ static int adapter_indicators_set(struct kvm *kvm, set_page_dirty_lock(summary_page); srcu_read_unlock(&kvm->srcu, idx); =20 - put_page(ind_page); - put_page(summary_page); + unpin_user_page(ind_page); + unpin_user_page(summary_page); return summary_set ? 0 : 1; } =20 diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index e09960c2e6ed..74f453f039a3 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -68,6 +68,8 @@ const struct kvm_stats_desc kvm_vm_stats_desc[] =3D { KVM_GENERIC_VM_STATS(), STATS_DESC_COUNTER(VM, inject_io), + STATS_DESC_COUNTER(VM, io_390_adapter_map), + STATS_DESC_COUNTER(VM, io_390_adapter_unmap), STATS_DESC_COUNTER(VM, inject_float_mchk), STATS_DESC_COUNTER(VM, inject_pfault_done), STATS_DESC_COUNTER(VM, inject_service_signal), @@ -2497,6 +2499,11 @@ static int kvm_s390_pv_dmp(struct kvm *kvm, struct k= vm_pv_cmd *cmd, return r; } =20 +static void kvm_s390_unmap_all_adapters_pv(struct kvm *kvm) +{ + kvm_s390_unmap_all_adapters(kvm); +} + static int kvm_s390_handle_pv(struct kvm *kvm, struct kvm_pv_cmd *cmd) { const bool need_lock =3D (cmd->cmd !=3D KVM_PV_ASYNC_CLEANUP_PERFORM); @@ -2513,6 +2520,7 @@ static int kvm_s390_handle_pv(struct kvm *kvm, struct= kvm_pv_cmd *cmd) if (kvm_s390_pv_is_protected(kvm)) break; =20 + kvm_s390_unmap_all_adapters_pv(kvm); mmap_write_lock(kvm->mm); /* * Disable creation of new THPs. Existing THPs can stay, they diff --git a/arch/s390/kvm/kvm-s390.h b/arch/s390/kvm/kvm-s390.h index dc0573b7aa4b..7ba885cb6bd1 100644 --- a/arch/s390/kvm/kvm-s390.h +++ b/arch/s390/kvm/kvm-s390.h @@ -560,6 +560,8 @@ void kvm_s390_gisa_disable(struct kvm *kvm); void kvm_s390_gisa_enable(struct kvm *kvm); int __init kvm_s390_gib_init(u8 nisc); void kvm_s390_gib_destroy(void); +void kvm_s390_unmap_all_adapters(struct kvm *kvm); + =20 /* implemented in guestdbg.c */ void kvm_s390_backup_guest_per_regs(struct kvm_vcpu *vcpu); --=20 2.52.0 From nobody Sat Jun 13 01:19:59 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 836644218A9; Mon, 11 May 2026 16:15:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778516102; cv=none; b=BsTNElgh5It66O0KbiS9KbXcjKbDY+TtkvNPNsKZsqWFAk3kPKJJpNRad2GCu3heUicEI10j3G1PC3q+RO8lx1rB21rzufnjJi3OQmv9lDOjXfWJo8VOXA+8fEk8qkbdHA8IywzMYHfvmFLyT1P5uEN/ACv7setiiKca+3bwqJI= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778516102; c=relaxed/simple; bh=Lq0oCWRnsWcXhfl4sgdO5+TuetVomFBLpGJnPCAsF08=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=jAz525EitmHazZHYefoYGxXTQuSvvJJq9i1g03KJtzSNoGyi6WBeJPayyzi0iTgYraxoLkHzMBzCxyVxvzqSgPnSFlEmVM58TCPsPNR7WLT5o8QJffsXJyi31noU6Dudh1X2B+iyf+kvnJGTD7e2lS4FrpJt2L5loFOAaoYMau8= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=IfKc8mT9; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="IfKc8mT9" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64BEDgIL3821662; Mon, 11 May 2026 16:14:58 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=NT8fMxeg0CVzpQoiA 59cN0oUJZR7LRWnKX76mMi4qQM=; b=IfKc8mT9sPsuKmr1xxZZYF25Hy/R6DHZp JDUwEfyF5R+i8ftNoiEFh2AiFEhr4uQlq++YXJYqxVjftoMZ3J9mUoosYGq7PObJ Naf8kvhYmbcxogQPNaUFD8yP+oF07Ei9KUv8M518JxGwaje9qsM1NBqRpZyOX7XC 14byOIeTrrRvjVOz8C+cGQpK9cHY+9n0cpW5y4ExXdZ1AE/v+UenkxUmssGUcUF9 NpS+MVGG2uAFXjb88Psq1zvIZl7EsaazsEdEzGR946Wi3dFnVJwFdT8kOfpUIbUx kXua5QRspW7WyfGELIcNVCtCUUZKmNOo/CjKNcqN/kmY9tLbE4DUw== Received: from ppma12.dal12v.mail.ibm.com (dc.9e.1632.ip4.static.sl-reverse.com [50.22.158.220]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4e1vn4s56v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 May 2026 16:14:58 +0000 (GMT) Received: from pps.filterd (ppma12.dal12v.mail.ibm.com [127.0.0.1]) by ppma12.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 64BG9ZNH023420; Mon, 11 May 2026 16:14:57 GMT Received: from smtprelay01.wdc07v.mail.ibm.com ([172.16.1.68]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4e2f8q659e-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 May 2026 16:14:57 +0000 (GMT) Received: from smtpav03.wdc07v.mail.ibm.com (smtpav03.wdc07v.mail.ibm.com [10.39.53.230]) by smtprelay01.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 64BGEu9f63308138 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 11 May 2026 16:14:56 GMT Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 078795805A; Mon, 11 May 2026 16:14:56 +0000 (GMT) Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D5D5C58054; Mon, 11 May 2026 16:14:54 +0000 (GMT) Received: from 9.60.13.83 (unknown [9.60.13.83]) by smtpav03.wdc07v.mail.ibm.com (Postfix) with ESMTP; Mon, 11 May 2026 16:14:54 +0000 (GMT) From: Douglas Freimuth To: borntraeger@linux.ibm.com, imbrenda@linux.ibm.com, frankja@linux.ibm.com, david@kernel.org, hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, svens@linux.ibm.com, kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Cc: mjrosato@linux.ibm.com, freimuth@linux.ibm.com Subject: [PATCH v6 2/4] KVM: s390: Enable adapter_indicators_set to use mapped pages Date: Mon, 11 May 2026 18:14:49 +0200 Message-ID: <20260511161451.209464-3-freimuth@linux.ibm.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260511161451.209464-1-freimuth@linux.ibm.com> References: <20260511161451.209464-1-freimuth@linux.ibm.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-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=BM+DalQG c=1 sm=1 tr=0 ts=6a020082 cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=HREIBFoc_rC1q7OR-gsA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTExMDE3NCBTYWx0ZWRfXwIroPKq4fL7P krth66daoj9M5liQIrzZLhEFPGpaa25JP7vaE8N0R/7sQ5xAZr9F3OZePj67lGhcHMMO8c+66cG w1lAVFa+QWwGUsjgziifIKtU7XEkgiDloAAKa0Y3KYJT/7HWFX/97uIHpsYODSuqwKX5d/6d6nu TckFVi+R0DL0La2VivbSd02vyyvp4HYMxSKbqZK6UaEFMeix6DahnifF3e6xkXYtaHegmZvJO3P bUsZUbvTdRuWFCX8+gOeoqUqGcKwXqV4DLf5t70hvcCTSnJj9FNtNar5oOd4xGohTawVTVxvH0g Z5zf0KI7bZBhp6CnP3ZZE1JzadKirujnEa17oBwnqMlgbdaNckf0Ym6Y0Z3pZQMfe2RUv25SPuO Gjn8OJtmVLHZ1UyBiEGL+q1w094aV1fss/3g8VAlRBKc5SgPXziJhVKTVcANT1wPeCtS21Lm9e7 45bozkhudx3lx+UFsVw== X-Proofpoint-GUID: NCnlAhjrmmPHOfJtvsrev24bWPINt__J X-Proofpoint-ORIG-GUID: NCnlAhjrmmPHOfJtvsrev24bWPINt__J X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-11_04,2026-05-08_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 suspectscore=0 bulkscore=0 spamscore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 malwarescore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605110174 Content-Type: text/plain; charset="utf-8" The S390 adapter_indicators_set function needs to be able to use mapped pages so that worked can be processed,on a fast path when interrupts are disabled. If adapter indicator pages are not mapped then local mapping is done on a slow path as it is prior to this patch. For example, Secure Execution environments will take the local mapping path as it does prior to this patch. Signed-off-by: Douglas Freimuth --- arch/s390/kvm/interrupt.c | 94 ++++++++++++++++++++++++++++----------- 1 file changed, 69 insertions(+), 25 deletions(-) diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index 96ead830c35f..12d8d38c260d 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c @@ -2883,41 +2883,85 @@ static unsigned long get_ind_bit(__u64 addr, unsign= ed long bit_nr, bool swap) return swap ? (bit ^ (BITS_PER_LONG - 1)) : bit; } =20 +static struct s390_map_info *get_map_info(struct s390_io_adapter *adapter, + u64 addr) +{ + struct s390_map_info *map; + + if (!adapter) + return NULL; + + list_for_each_entry(map, &adapter->maps, list) { + if (map->addr =3D=3D addr) + return map; + } + return NULL; +} + static int adapter_indicators_set(struct kvm *kvm, struct s390_io_adapter *adapter, struct kvm_s390_adapter_int *adapter_int) { unsigned long bit; int summary_set, idx; - struct page *ind_page, *summary_page; + struct s390_map_info *ind_info, *summary_info; void *map; + struct page *ind_page, *summary_page; + unsigned long flags; =20 - ind_page =3D pin_map_page(kvm, adapter_int->ind_addr, 0); - if (!ind_page) - return -1; - summary_page =3D pin_map_page(kvm, adapter_int->summary_addr, 0); - if (!summary_page) { - unpin_user_page(ind_page); - return -1; + raw_spin_lock_irqsave(&adapter->maps_lock, flags); + ind_info =3D get_map_info(adapter, adapter_int->ind_addr); + if (!ind_info) { + raw_spin_unlock_irqrestore(&adapter->maps_lock, flags); + ind_page =3D pin_map_page(kvm, adapter_int->ind_addr, 0); + if (!ind_page) + return -1; + idx =3D srcu_read_lock(&kvm->srcu); + map =3D page_address(ind_page); + bit =3D get_ind_bit(adapter_int->ind_addr, + adapter_int->ind_offset, adapter->swap); + set_bit(bit, map); + mark_page_dirty(kvm, adapter_int->ind_gaddr >> PAGE_SHIFT); + set_page_dirty_lock(ind_page); + srcu_read_unlock(&kvm->srcu, idx); + } else { + map =3D page_address(ind_info->page); + bit =3D get_ind_bit(ind_info->addr, adapter_int->ind_offset, adapter->sw= ap); + set_bit(bit, map); + raw_spin_unlock_irqrestore(&adapter->maps_lock, flags); + } + raw_spin_lock_irqsave(&adapter->maps_lock, flags); + summary_info =3D get_map_info(adapter, adapter_int->summary_addr); + if (!summary_info) { + raw_spin_unlock_irqrestore(&adapter->maps_lock, flags); + summary_page =3D pin_map_page(kvm, adapter_int->summary_addr, 0); + if (!summary_page) { + if (!ind_info) { + WARN_ON_ONCE(!ind_page); + unpin_user_page(ind_page); + } + return -1; + } + idx =3D srcu_read_lock(&kvm->srcu); + map =3D page_address(summary_page); + bit =3D get_ind_bit(adapter_int->summary_addr, + adapter_int->summary_offset, adapter->swap); + summary_set =3D test_and_set_bit(bit, map); + mark_page_dirty(kvm, adapter_int->summary_gaddr >> PAGE_SHIFT); + set_page_dirty_lock(summary_page); + srcu_read_unlock(&kvm->srcu, idx); + } else { + map =3D page_address(summary_info->page); + bit =3D get_ind_bit(summary_info->addr, adapter_int->summary_offset, + adapter->swap); + summary_set =3D test_and_set_bit(bit, map); + raw_spin_unlock_irqrestore(&adapter->maps_lock, flags); } =20 - idx =3D srcu_read_lock(&kvm->srcu); - map =3D page_address(ind_page); - bit =3D get_ind_bit(adapter_int->ind_addr, - adapter_int->ind_offset, adapter->swap); - set_bit(bit, map); - mark_page_dirty(kvm, adapter_int->ind_gaddr >> PAGE_SHIFT); - set_page_dirty_lock(ind_page); - map =3D page_address(summary_page); - bit =3D get_ind_bit(adapter_int->summary_addr, - adapter_int->summary_offset, adapter->swap); - summary_set =3D test_and_set_bit(bit, map); - mark_page_dirty(kvm, adapter_int->summary_gaddr >> PAGE_SHIFT); - set_page_dirty_lock(summary_page); - srcu_read_unlock(&kvm->srcu, idx); - - unpin_user_page(ind_page); - unpin_user_page(summary_page); + if (!ind_info) + unpin_user_page(ind_page); + if (!summary_info) + unpin_user_page(summary_page); return summary_set ? 0 : 1; } =20 --=20 2.52.0 From nobody Sat Jun 13 01:19:59 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 374A742668F; Mon, 11 May 2026 16:15:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778516105; cv=none; b=Bshy5rPTrT+BeJcmb1igKV2Cf+Og26NTvj1YsKg1YfrzUFSJijpCa8nStNy2sJbv2ZvZUvTBw3Z3eqWQ3OPGnyZadjS/Lzavm6kTc/8XF5Q4/qTXXM783C2pohZXxngdwKFcYKUXLEoObrIn4Dn9mGQ0PSYSD1qazwBy8EPSWmA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778516105; c=relaxed/simple; bh=9zYRNSVh4OLDnkMa/saIohSRT//DcjtoCkk9MuI6myw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=aJvIfrbZgPxDCRRkICpQ8ubPzg0gWNLZkCToBPyVghEcvic+oGN8qyj6AFJdebYqcizyIl1cE/ZUk1E1hAM0NpW1KE617H4Pb10RbIGGVHUHtW0KD/ZsowziQA2AlKLPvu5R0AthQMZXGeyl6gvAr7xBIObu+OckhYiKvo+Eb0E= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=N7LzNaPk; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="N7LzNaPk" Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64BCW4UQ3249645; Mon, 11 May 2026 16:15:00 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=6/ynIiSkQj1012AdA FcFxPJ4QYfi9z6UeZRKQ4JwgEE=; b=N7LzNaPkrAuDEAp8bwSFDTVG9Ufb5qccV h7+2cIG5qI0E0KRqMxlFpGhiJD3mEq/goe1u3CUknflaDokHwfAW+uM8ZrlR1Nxs WyzVpfFaw2lFhWxIVThnARS8W+mL6a60jiC0r9/0C0xjhbZrJ8qeZjFYZIZyPobF i3eEK1XTRzsaERsZ/KcYpvMFeP61/r8RIECUXOw6PnCl9tJgZLZs6biaBT6sRy3X J0BHj9qo9pzrtbgu/7rsj/WmTmcwuW4uHUsaWZW6LAmj456m98y8Wl/vRzU5zEJA TWpV5YiAiFPKI2pjCHgL8m5KpG8c85h8EdyoaUHPC3H/oeiQwJyRQ== Received: from ppma22.wdc07v.mail.ibm.com (5c.69.3da9.ip4.static.sl-reverse.com [169.61.105.92]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4e1vkqs4wn-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 May 2026 16:14:59 +0000 (GMT) Received: from pps.filterd (ppma22.wdc07v.mail.ibm.com [127.0.0.1]) by ppma22.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 64BFsaaM002471; Mon, 11 May 2026 16:14:58 GMT Received: from smtprelay02.wdc07v.mail.ibm.com ([172.16.1.69]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4e2fmvx4c4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 May 2026 16:14:58 +0000 (GMT) Received: from smtpav03.wdc07v.mail.ibm.com (smtpav03.wdc07v.mail.ibm.com [10.39.53.230]) by smtprelay02.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 64BGEv4R22610548 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 11 May 2026 16:14:57 GMT Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 5A3535805A; Mon, 11 May 2026 16:14:57 +0000 (GMT) Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 2E88758054; Mon, 11 May 2026 16:14:56 +0000 (GMT) Received: from 9.60.13.83 (unknown [9.60.13.83]) by smtpav03.wdc07v.mail.ibm.com (Postfix) with ESMTP; Mon, 11 May 2026 16:14:56 +0000 (GMT) From: Douglas Freimuth To: borntraeger@linux.ibm.com, imbrenda@linux.ibm.com, frankja@linux.ibm.com, david@kernel.org, hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, svens@linux.ibm.com, kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Cc: mjrosato@linux.ibm.com, freimuth@linux.ibm.com Subject: [PATCH v6 3/4] KVM: S390: Change fi->lock, li->lock to raw Date: Mon, 11 May 2026 18:14:50 +0200 Message-ID: <20260511161451.209464-4-freimuth@linux.ibm.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260511161451.209464-1-freimuth@linux.ibm.com> References: <20260511161451.209464-1-freimuth@linux.ibm.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-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTExMDE3NCBTYWx0ZWRfXxPEK7iKD1tpu 3z0Dra7WVb7EgIbx8s0Lkph1lKsTSVNHM3voeiPYGfw11eyEzywW/pDu0p+aJvq0DaZCJZckV/S 0GgwAEkMlD78D9fqdkTpg8WvTKj2sF4/fsw1xodIwK5cR+kkP32ZIgIg+0lId4/qn1CHaJe4epc DsGv//RrqIjVAjQ+VPqjYd5O1lG/AkQpz2r6nh4sfOem9QJah59iRYpekTbOkFdIU14opEsElQb vmSvAx1/oM9KsvBSGZtrrVZK1NvtAOvdM1rRxo/+wJWzY4MoJc+S5T2aNYPBOJ51KWKjG7l0ahZ DrMWJtnEBIoleAXyyWi6EMTNbshEIFpSp0DTkrbMOrM3I8102CdxjlR0RUauisPDp/MogYRdMVT KNXAmZPMYtUtxzpH+/4WcVFg6GKtMuBuCY1S4LiMECy8f3p9gdDlTQmhZmIKpP7Kb/KM0/a17Y4 mxWrfnmHH1IDQXslBkw== X-Authority-Analysis: v=2.4 cv=OaWoyBTY c=1 sm=1 tr=0 ts=6a020083 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=vmYEZ7anJvjYlnvue9IA:9 X-Proofpoint-ORIG-GUID: MdICb98ap9-lyYuT_bHLk6F-LFWLkrq9 X-Proofpoint-GUID: MdICb98ap9-lyYuT_bHLk6F-LFWLkrq9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-11_04,2026-05-08_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 suspectscore=0 spamscore=0 clxscore=1015 bulkscore=0 phishscore=0 lowpriorityscore=0 priorityscore=1501 impostorscore=0 adultscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605110174 Content-Type: text/plain; charset="utf-8" s390 needs to maintain support for common code. This requires the floating interrupt lock and local interrupt lock to be changed to raw_spinlocks. Most or all other platforms use raw_spinlocks in their inatomic implementations since they will be called with=20 interrupts disabled and the locks in that context cannot sleep. Signed-off-by: Douglas Freimuth --- arch/s390/include/asm/kvm_host.h | 4 +- arch/s390/kvm/intercept.c | 8 +-- arch/s390/kvm/interrupt.c | 112 +++++++++++++++---------------- arch/s390/kvm/kvm-s390.c | 4 +- arch/s390/kvm/sigp.c | 4 +- 5 files changed, 66 insertions(+), 66 deletions(-) diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_h= ost.h index fbb2406b31d2..295f0770bcb1 100644 --- a/arch/s390/include/asm/kvm_host.h +++ b/arch/s390/include/asm/kvm_host.h @@ -321,7 +321,7 @@ struct kvm_s390_irq_payload { }; =20 struct kvm_s390_local_interrupt { - spinlock_t lock; + raw_spinlock_t lock; DECLARE_BITMAP(sigp_emerg_pending, KVM_MAX_VCPUS); struct kvm_s390_irq_payload irq; unsigned long pending_irqs; @@ -353,7 +353,7 @@ struct kvm_s390_local_interrupt { struct kvm_s390_float_interrupt { unsigned long pending_irqs; unsigned long masked_irqs; - spinlock_t lock; + raw_spinlock_t lock; struct list_head lists[FIRQ_LIST_COUNT]; int counters[FIRQ_MAX_COUNT]; struct kvm_s390_mchk_info mchk; diff --git a/arch/s390/kvm/intercept.c b/arch/s390/kvm/intercept.c index 39aff324203e..fff2baa31651 100644 --- a/arch/s390/kvm/intercept.c +++ b/arch/s390/kvm/intercept.c @@ -64,10 +64,10 @@ static int handle_stop(struct kvm_vcpu *vcpu) return 0; =20 /* avoid races with the injection/SIGP STOP code */ - spin_lock(&li->lock); + raw_spin_lock(&li->lock); flags =3D li->irq.stop.flags; stop_pending =3D kvm_s390_is_stop_irq_pending(vcpu); - spin_unlock(&li->lock); + raw_spin_unlock(&li->lock); =20 trace_kvm_s390_stop_request(stop_pending, flags); if (!stop_pending) @@ -518,7 +518,7 @@ static int handle_pv_sclp(struct kvm_vcpu *vcpu) { struct kvm_s390_float_interrupt *fi =3D &vcpu->kvm->arch.float_int; =20 - spin_lock(&fi->lock); + raw_spin_lock(&fi->lock); /* * 2 cases: * a: an sccb answering interrupt was already pending or in flight. @@ -534,7 +534,7 @@ static int handle_pv_sclp(struct kvm_vcpu *vcpu) fi->srv_signal.ext_params |=3D 0x43000; set_bit(IRQ_PEND_EXT_SERVICE, &fi->pending_irqs); clear_bit(IRQ_PEND_EXT_SERVICE, &fi->masked_irqs); - spin_unlock(&fi->lock); + raw_spin_unlock(&fi->lock); return 0; } =20 diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index 12d8d38c260d..4b700813692b 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c @@ -483,11 +483,11 @@ static int __must_check __deliver_pfault_init(struct = kvm_vcpu *vcpu) struct kvm_s390_ext_info ext; int rc; =20 - spin_lock(&li->lock); + raw_spin_lock(&li->lock); ext =3D li->irq.ext; clear_bit(IRQ_PEND_PFAULT_INIT, &li->pending_irqs); li->irq.ext.ext_params2 =3D 0; - spin_unlock(&li->lock); + raw_spin_unlock(&li->lock); =20 VCPU_EVENT(vcpu, 4, "deliver: pfault init token 0x%llx", ext.ext_params2); @@ -625,8 +625,8 @@ static int __must_check __deliver_machine_check(struct = kvm_vcpu *vcpu) int deliver =3D 0; int rc =3D 0; =20 - spin_lock(&fi->lock); - spin_lock(&li->lock); + raw_spin_lock(&fi->lock); + raw_spin_lock(&li->lock); if (test_bit(IRQ_PEND_MCHK_EX, &li->pending_irqs) || test_bit(IRQ_PEND_MCHK_REP, &li->pending_irqs)) { /* @@ -653,8 +653,8 @@ static int __must_check __deliver_machine_check(struct = kvm_vcpu *vcpu) memset(&fi->mchk, 0, sizeof(mchk)); deliver =3D 1; } - spin_unlock(&li->lock); - spin_unlock(&fi->lock); + raw_spin_unlock(&li->lock); + raw_spin_unlock(&fi->lock); =20 if (deliver) { VCPU_EVENT(vcpu, 3, "deliver: machine check mcic 0x%llx", @@ -695,11 +695,11 @@ static int __must_check __deliver_set_prefix(struct k= vm_vcpu *vcpu) struct kvm_s390_local_interrupt *li =3D &vcpu->arch.local_int; struct kvm_s390_prefix_info prefix; =20 - spin_lock(&li->lock); + raw_spin_lock(&li->lock); prefix =3D li->irq.prefix; li->irq.prefix.address =3D 0; clear_bit(IRQ_PEND_SET_PREFIX, &li->pending_irqs); - spin_unlock(&li->lock); + raw_spin_unlock(&li->lock); =20 vcpu->stat.deliver_prefix_signal++; trace_kvm_s390_deliver_interrupt(vcpu->vcpu_id, @@ -716,12 +716,12 @@ static int __must_check __deliver_emergency_signal(st= ruct kvm_vcpu *vcpu) int rc; int cpu_addr; =20 - spin_lock(&li->lock); + raw_spin_lock(&li->lock); cpu_addr =3D find_first_bit(li->sigp_emerg_pending, KVM_MAX_VCPUS); clear_bit(cpu_addr, li->sigp_emerg_pending); if (bitmap_empty(li->sigp_emerg_pending, KVM_MAX_VCPUS)) clear_bit(IRQ_PEND_EXT_EMERGENCY, &li->pending_irqs); - spin_unlock(&li->lock); + raw_spin_unlock(&li->lock); =20 VCPU_EVENT(vcpu, 4, "%s", "deliver: sigp emerg"); vcpu->stat.deliver_emergency_signal++; @@ -750,11 +750,11 @@ static int __must_check __deliver_external_call(struc= t kvm_vcpu *vcpu) struct kvm_s390_extcall_info extcall; int rc; =20 - spin_lock(&li->lock); + raw_spin_lock(&li->lock); extcall =3D li->irq.extcall; li->irq.extcall.code =3D 0; clear_bit(IRQ_PEND_EXT_EXTERNAL, &li->pending_irqs); - spin_unlock(&li->lock); + raw_spin_unlock(&li->lock); =20 VCPU_EVENT(vcpu, 4, "%s", "deliver: sigp ext call"); vcpu->stat.deliver_external_call++; @@ -800,11 +800,11 @@ static int __must_check __deliver_prog(struct kvm_vcp= u *vcpu) int rc =3D 0, nullifying =3D false; u16 ilen; =20 - spin_lock(&li->lock); + raw_spin_lock(&li->lock); pgm_info =3D li->irq.pgm; clear_bit(IRQ_PEND_PROG, &li->pending_irqs); memset(&li->irq.pgm, 0, sizeof(pgm_info)); - spin_unlock(&li->lock); + raw_spin_unlock(&li->lock); =20 ilen =3D pgm_info.flags & KVM_S390_PGM_FLAGS_ILC_MASK; VCPU_EVENT(vcpu, 3, "deliver: program irq code 0x%x, ilen:%d", @@ -942,10 +942,10 @@ static int __must_check __deliver_service(struct kvm_= vcpu *vcpu) struct kvm_s390_float_interrupt *fi =3D &vcpu->kvm->arch.float_int; struct kvm_s390_ext_info ext; =20 - spin_lock(&fi->lock); + raw_spin_lock(&fi->lock); if (test_bit(IRQ_PEND_EXT_SERVICE, &fi->masked_irqs) || !(test_bit(IRQ_PEND_EXT_SERVICE, &fi->pending_irqs))) { - spin_unlock(&fi->lock); + raw_spin_unlock(&fi->lock); return 0; } ext =3D fi->srv_signal; @@ -954,7 +954,7 @@ static int __must_check __deliver_service(struct kvm_vc= pu *vcpu) clear_bit(IRQ_PEND_EXT_SERVICE_EV, &fi->pending_irqs); if (kvm_s390_pv_cpu_is_protected(vcpu)) set_bit(IRQ_PEND_EXT_SERVICE, &fi->masked_irqs); - spin_unlock(&fi->lock); + raw_spin_unlock(&fi->lock); =20 if (!ext.ext_params) return 0; @@ -973,16 +973,16 @@ static int __must_check __deliver_service_ev(struct k= vm_vcpu *vcpu) struct kvm_s390_float_interrupt *fi =3D &vcpu->kvm->arch.float_int; struct kvm_s390_ext_info ext; =20 - spin_lock(&fi->lock); + raw_spin_lock(&fi->lock); if (!(test_bit(IRQ_PEND_EXT_SERVICE_EV, &fi->pending_irqs))) { - spin_unlock(&fi->lock); + raw_spin_unlock(&fi->lock); return 0; } ext =3D fi->srv_signal; /* only clear the event bits */ fi->srv_signal.ext_params &=3D ~SCCB_EVENT_PENDING; clear_bit(IRQ_PEND_EXT_SERVICE_EV, &fi->pending_irqs); - spin_unlock(&fi->lock); + raw_spin_unlock(&fi->lock); =20 VCPU_EVENT(vcpu, 4, "%s", "deliver: sclp parameter event"); vcpu->stat.deliver_service_signal++; @@ -998,7 +998,7 @@ static int __must_check __deliver_pfault_done(struct kv= m_vcpu *vcpu) struct kvm_s390_interrupt_info *inti; int rc =3D 0; =20 - spin_lock(&fi->lock); + raw_spin_lock(&fi->lock); inti =3D list_first_entry_or_null(&fi->lists[FIRQ_LIST_PFAULT], struct kvm_s390_interrupt_info, list); @@ -1008,7 +1008,7 @@ static int __must_check __deliver_pfault_done(struct = kvm_vcpu *vcpu) } if (list_empty(&fi->lists[FIRQ_LIST_PFAULT])) clear_bit(IRQ_PEND_PFAULT_DONE, &fi->pending_irqs); - spin_unlock(&fi->lock); + raw_spin_unlock(&fi->lock); =20 if (inti) { trace_kvm_s390_deliver_interrupt(vcpu->vcpu_id, @@ -1040,7 +1040,7 @@ static int __must_check __deliver_virtio(struct kvm_v= cpu *vcpu) struct kvm_s390_interrupt_info *inti; int rc =3D 0; =20 - spin_lock(&fi->lock); + raw_spin_lock(&fi->lock); inti =3D list_first_entry_or_null(&fi->lists[FIRQ_LIST_VIRTIO], struct kvm_s390_interrupt_info, list); @@ -1058,7 +1058,7 @@ static int __must_check __deliver_virtio(struct kvm_v= cpu *vcpu) } if (list_empty(&fi->lists[FIRQ_LIST_VIRTIO])) clear_bit(IRQ_PEND_VIRTIO, &fi->pending_irqs); - spin_unlock(&fi->lock); + raw_spin_unlock(&fi->lock); =20 if (inti) { rc =3D put_guest_lc(vcpu, EXT_IRQ_CP_SERVICE, @@ -1119,7 +1119,7 @@ static int __must_check __deliver_io(struct kvm_vcpu = *vcpu, =20 fi =3D &vcpu->kvm->arch.float_int; =20 - spin_lock(&fi->lock); + raw_spin_lock(&fi->lock); isc =3D irq_type_to_isc(irq_type); isc_list =3D &fi->lists[isc]; inti =3D list_first_entry_or_null(isc_list, @@ -1146,7 +1146,7 @@ static int __must_check __deliver_io(struct kvm_vcpu = *vcpu, } if (list_empty(isc_list)) clear_bit(irq_type, &fi->pending_irqs); - spin_unlock(&fi->lock); + raw_spin_unlock(&fi->lock); =20 if (inti) { rc =3D __do_deliver_io(vcpu, &(inti->io)); @@ -1323,11 +1323,11 @@ void kvm_s390_clear_local_irqs(struct kvm_vcpu *vcp= u) { struct kvm_s390_local_interrupt *li =3D &vcpu->arch.local_int; =20 - spin_lock(&li->lock); + raw_spin_lock(&li->lock); li->pending_irqs =3D 0; bitmap_zero(li->sigp_emerg_pending, KVM_MAX_VCPUS); memset(&li->irq, 0, sizeof(li->irq)); - spin_unlock(&li->lock); + raw_spin_unlock(&li->lock); =20 sca_clear_ext_call(vcpu); } @@ -1663,7 +1663,7 @@ static struct kvm_s390_interrupt_info *get_io_int(str= uct kvm *kvm, u16 id =3D (schid & 0xffff0000U) >> 16; u16 nr =3D schid & 0x0000ffffU; =20 - spin_lock(&fi->lock); + raw_spin_lock(&fi->lock); list_for_each_entry(iter, isc_list, list) { if (schid && (id !=3D iter->io.subchannel_id || nr !=3D iter->io.subchannel_nr)) @@ -1673,10 +1673,10 @@ static struct kvm_s390_interrupt_info *get_io_int(s= truct kvm *kvm, fi->counters[FIRQ_CNTR_IO] -=3D 1; if (list_empty(isc_list)) clear_bit(isc_to_irq_type(isc), &fi->pending_irqs); - spin_unlock(&fi->lock); + raw_spin_unlock(&fi->lock); return iter; } - spin_unlock(&fi->lock); + raw_spin_unlock(&fi->lock); return NULL; } =20 @@ -1771,7 +1771,7 @@ static int __inject_service(struct kvm *kvm, struct kvm_s390_float_interrupt *fi =3D &kvm->arch.float_int; =20 kvm->stat.inject_service_signal++; - spin_lock(&fi->lock); + raw_spin_lock(&fi->lock); fi->srv_signal.ext_params |=3D inti->ext.ext_params & SCCB_EVENT_PENDING; =20 /* We always allow events, track them separately from the sccb ints */ @@ -1791,7 +1791,7 @@ static int __inject_service(struct kvm *kvm, fi->srv_signal.ext_params |=3D inti->ext.ext_params & SCCB_MASK; set_bit(IRQ_PEND_EXT_SERVICE, &fi->pending_irqs); out: - spin_unlock(&fi->lock); + raw_spin_unlock(&fi->lock); kfree(inti); return 0; } @@ -1802,15 +1802,15 @@ static int __inject_virtio(struct kvm *kvm, struct kvm_s390_float_interrupt *fi =3D &kvm->arch.float_int; =20 kvm->stat.inject_virtio++; - spin_lock(&fi->lock); + raw_spin_lock(&fi->lock); if (fi->counters[FIRQ_CNTR_VIRTIO] >=3D KVM_S390_MAX_VIRTIO_IRQS) { - spin_unlock(&fi->lock); + raw_spin_unlock(&fi->lock); return -EBUSY; } fi->counters[FIRQ_CNTR_VIRTIO] +=3D 1; list_add_tail(&inti->list, &fi->lists[FIRQ_LIST_VIRTIO]); set_bit(IRQ_PEND_VIRTIO, &fi->pending_irqs); - spin_unlock(&fi->lock); + raw_spin_unlock(&fi->lock); return 0; } =20 @@ -1820,16 +1820,16 @@ static int __inject_pfault_done(struct kvm *kvm, struct kvm_s390_float_interrupt *fi =3D &kvm->arch.float_int; =20 kvm->stat.inject_pfault_done++; - spin_lock(&fi->lock); + raw_spin_lock(&fi->lock); if (fi->counters[FIRQ_CNTR_PFAULT] >=3D (ASYNC_PF_PER_VCPU * KVM_MAX_VCPUS)) { - spin_unlock(&fi->lock); + raw_spin_unlock(&fi->lock); return -EBUSY; } fi->counters[FIRQ_CNTR_PFAULT] +=3D 1; list_add_tail(&inti->list, &fi->lists[FIRQ_LIST_PFAULT]); set_bit(IRQ_PEND_PFAULT_DONE, &fi->pending_irqs); - spin_unlock(&fi->lock); + raw_spin_unlock(&fi->lock); return 0; } =20 @@ -1840,11 +1840,11 @@ static int __inject_float_mchk(struct kvm *kvm, struct kvm_s390_float_interrupt *fi =3D &kvm->arch.float_int; =20 kvm->stat.inject_float_mchk++; - spin_lock(&fi->lock); + raw_spin_lock(&fi->lock); fi->mchk.cr14 |=3D inti->mchk.cr14 & (1UL << CR_PENDING_SUBCLASS); fi->mchk.mcic |=3D inti->mchk.mcic; set_bit(IRQ_PEND_MCHK_REP, &fi->pending_irqs); - spin_unlock(&fi->lock); + raw_spin_unlock(&fi->lock); kfree(inti); return 0; } @@ -1873,9 +1873,9 @@ static int __inject_io(struct kvm *kvm, struct kvm_s3= 90_interrupt_info *inti) } =20 fi =3D &kvm->arch.float_int; - spin_lock(&fi->lock); + raw_spin_lock(&fi->lock); if (fi->counters[FIRQ_CNTR_IO] >=3D KVM_S390_MAX_FLOAT_IRQS) { - spin_unlock(&fi->lock); + raw_spin_unlock(&fi->lock); return -EBUSY; } fi->counters[FIRQ_CNTR_IO] +=3D 1; @@ -1890,7 +1890,7 @@ static int __inject_io(struct kvm *kvm, struct kvm_s3= 90_interrupt_info *inti) list =3D &fi->lists[FIRQ_LIST_IO_ISC_0 + isc]; list_add_tail(&inti->list, list); set_bit(isc_to_irq_type(isc), &fi->pending_irqs); - spin_unlock(&fi->lock); + raw_spin_unlock(&fi->lock); return 0; } =20 @@ -2082,10 +2082,10 @@ void kvm_s390_clear_stop_irq(struct kvm_vcpu *vcpu) { struct kvm_s390_local_interrupt *li =3D &vcpu->arch.local_int; =20 - spin_lock(&li->lock); + raw_spin_lock(&li->lock); li->irq.stop.flags =3D 0; clear_bit(IRQ_PEND_SIGP_STOP, &li->pending_irqs); - spin_unlock(&li->lock); + raw_spin_unlock(&li->lock); } =20 static int do_inject_vcpu(struct kvm_vcpu *vcpu, struct kvm_s390_irq *irq) @@ -2138,9 +2138,9 @@ int kvm_s390_inject_vcpu(struct kvm_vcpu *vcpu, struc= t kvm_s390_irq *irq) struct kvm_s390_local_interrupt *li =3D &vcpu->arch.local_int; int rc; =20 - spin_lock(&li->lock); + raw_spin_lock(&li->lock); rc =3D do_inject_vcpu(vcpu, irq); - spin_unlock(&li->lock); + raw_spin_unlock(&li->lock); if (!rc) kvm_s390_vcpu_wakeup(vcpu); return rc; @@ -2181,7 +2181,7 @@ void kvm_s390_clear_float_irqs(struct kvm *kvm) if (!kvm_s390_pv_is_protected(kvm)) fi->masked_irqs =3D 0; mutex_unlock(&kvm->lock); - spin_lock(&fi->lock); + raw_spin_lock(&fi->lock); fi->pending_irqs =3D 0; memset(&fi->srv_signal, 0, sizeof(fi->srv_signal)); memset(&fi->mchk, 0, sizeof(fi->mchk)); @@ -2189,7 +2189,7 @@ void kvm_s390_clear_float_irqs(struct kvm *kvm) clear_irq_list(&fi->lists[i]); for (i =3D 0; i < FIRQ_MAX_COUNT; i++) fi->counters[i] =3D 0; - spin_unlock(&fi->lock); + raw_spin_unlock(&fi->lock); kvm_s390_gisa_clear(kvm); }; =20 @@ -2235,7 +2235,7 @@ static int get_all_floating_irqs(struct kvm *kvm, u8 = __user *usrbuf, u64 len) } } fi =3D &kvm->arch.float_int; - spin_lock(&fi->lock); + raw_spin_lock(&fi->lock); for (i =3D 0; i < FIRQ_LIST_COUNT; i++) { list_for_each_entry(inti, &fi->lists[i], list) { if (n =3D=3D max_irqs) { @@ -2272,7 +2272,7 @@ static int get_all_floating_irqs(struct kvm *kvm, u8 = __user *usrbuf, u64 len) } =20 out: - spin_unlock(&fi->lock); + raw_spin_unlock(&fi->lock); out_nolock: if (!ret && n > 0) { if (copy_to_user(usrbuf, buf, sizeof(struct kvm_s390_irq) * n)) @@ -3105,7 +3105,7 @@ int kvm_s390_set_irq_state(struct kvm_vcpu *vcpu, voi= d __user *irqstate, int len * Don't allow setting the interrupt state * when there are already interrupts pending */ - spin_lock(&li->lock); + raw_spin_lock(&li->lock); if (li->pending_irqs) { r =3D -EBUSY; goto out_unlock; @@ -3118,7 +3118,7 @@ int kvm_s390_set_irq_state(struct kvm_vcpu *vcpu, voi= d __user *irqstate, int len } =20 out_unlock: - spin_unlock(&li->lock); + raw_spin_unlock(&li->lock); out_free: vfree(buf); =20 @@ -3178,11 +3178,11 @@ int kvm_s390_get_irq_state(struct kvm_vcpu *vcpu, _= _u8 __user *buf, int len) int cpuaddr; int n =3D 0; =20 - spin_lock(&li->lock); + raw_spin_lock(&li->lock); pending_irqs =3D li->pending_irqs; memcpy(&sigp_emerg_pending, &li->sigp_emerg_pending, sizeof(sigp_emerg_pending)); - spin_unlock(&li->lock); + raw_spin_unlock(&li->lock); =20 for_each_set_bit(irq_type, &pending_irqs, IRQ_PEND_COUNT) { memset(&irq, 0, sizeof(irq)); diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 74f453f039a3..5695038119c8 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -3263,7 +3263,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long t= ype) } =20 mutex_init(&kvm->arch.float_int.ais_lock); - spin_lock_init(&kvm->arch.float_int.lock); + raw_spin_lock_init(&kvm->arch.float_int.lock); for (i =3D 0; i < FIRQ_LIST_COUNT; i++) INIT_LIST_HEAD(&kvm->arch.float_int.lists[i]); init_waitqueue_head(&kvm->arch.ipte_wq); @@ -3734,7 +3734,7 @@ int kvm_arch_vcpu_create(struct kvm_vcpu *vcpu) vcpu->arch.sie_block->msl =3D sclp.hamax; =20 vcpu->arch.sie_block->icpua =3D vcpu->vcpu_id; - spin_lock_init(&vcpu->arch.local_int.lock); + raw_spin_lock_init(&vcpu->arch.local_int.lock); vcpu->arch.sie_block->gd =3D kvm_s390_get_gisa_desc(vcpu->kvm); seqcount_init(&vcpu->arch.cputm_seqcount); =20 diff --git a/arch/s390/kvm/sigp.c b/arch/s390/kvm/sigp.c index 55c34cb35428..911bb8e6ed69 100644 --- a/arch/s390/kvm/sigp.c +++ b/arch/s390/kvm/sigp.c @@ -245,10 +245,10 @@ static int __prepare_sigp_re_start(struct kvm_vcpu *v= cpu, int rc =3D -EOPNOTSUPP; =20 /* make sure we don't race with STOP irq injection */ - spin_lock(&li->lock); + raw_spin_lock(&li->lock); if (kvm_s390_is_stop_irq_pending(dst_vcpu)) rc =3D SIGP_CC_BUSY; - spin_unlock(&li->lock); + raw_spin_unlock(&li->lock); =20 return rc; } --=20 2.52.0 From nobody Sat Jun 13 01:19:59 2026 Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) (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 DA188426D14; Mon, 11 May 2026 16:15:03 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.156.1 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778516105; cv=none; b=i2yHG30a09wWcqyhLXONrJSHsEdog6MbABuc7q7cK3XPmzqmCHfXucMAVXuMvTedvsRRKeOUZCkzexrJA5uhgP3n8vUQ0TeKfmGmJtFCM3B/3i465gz5eLZoQX1cq5qVNvCW1G1nex9XnedGxxtrfGZufqqpmTLSi/uK2bkLgPA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778516105; c=relaxed/simple; bh=kjkE7RJ4BkhgRyOjr+dQBFkQ3TbLNACrHVoh3kWvQLU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ADc6SXiIOPRYK8WKLTA1mF2xGF4I0mONXVyjX1jsoOgVUIpFHX5x+8Nc1+s8YFnI0/7zt51D7Fz6ZJ6vnox3NGg5gbMPQ4sM8WdCAoaJVc7Q+UDu+UcJ7XjiAmyHq3wvAtCN0XgawOCq8NDvipM65bdZAvGPbN61GOSir+7nGHs= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com; spf=pass smtp.mailfrom=linux.ibm.com; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b=GhAXphh4; arc=none smtp.client-ip=148.163.156.1 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linux.ibm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=ibm.com header.i=@ibm.com header.b="GhAXphh4" Received: from pps.filterd (m0356517.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 64BFJ15A017896; Mon, 11 May 2026 16:15:01 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=oMG5eAPkwT5Z339Fj zBauSiXXyp3uYw7vUPEvW0IFmc=; b=GhAXphh4gP845JRG3o52IG3Tqlps1myIw nXQbKlFb64EZGT3p3eRw9xv3/0Em+kSg2XEXmPscbEIFTvJEDm5DyIXZFSyEm0x3 REsUBFBkLa2xDBSZ3D7JLSvmjJzWIvunUIoLa1+Vpxbk2BfiF3us9P18AOLXe+Yd 5hXZGR0ebmXlB89MF9/cs+hziHB44h1ZMIecKl1v6zuTcoLHmQz9K120kakKw4t/ Awwg2EY9/Jbe4hwwsZNy9Xqif4pE3rKI25M04VLP3DCo6DE3DoKxol+1n7lEZqGr wWCUbGdFAGIsqaMa03r5LVteOV3+i2fdQR5YDfmAjtt+dwY21EeCQ== Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4e1vn4s572-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 May 2026 16:15:01 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 64BG9XoE017130; Mon, 11 May 2026 16:15:00 GMT Received: from smtprelay03.wdc07v.mail.ibm.com ([172.16.1.70]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4e2grh5xuu-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 11 May 2026 16:15:00 +0000 (GMT) Received: from smtpav03.wdc07v.mail.ibm.com (smtpav03.wdc07v.mail.ibm.com [10.39.53.230]) by smtprelay03.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 64BGEUMu23200398 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 11 May 2026 16:14:30 GMT Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AEE395805A; Mon, 11 May 2026 16:14:58 +0000 (GMT) Received: from smtpav03.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 80B7058054; Mon, 11 May 2026 16:14:57 +0000 (GMT) Received: from 9.60.13.83 (unknown [9.60.13.83]) by smtpav03.wdc07v.mail.ibm.com (Postfix) with ESMTP; Mon, 11 May 2026 16:14:57 +0000 (GMT) From: Douglas Freimuth To: borntraeger@linux.ibm.com, imbrenda@linux.ibm.com, frankja@linux.ibm.com, david@kernel.org, hca@linux.ibm.com, gor@linux.ibm.com, agordeev@linux.ibm.com, svens@linux.ibm.com, kvm@vger.kernel.org, linux-s390@vger.kernel.org, linux-kernel@vger.kernel.org Cc: mjrosato@linux.ibm.com, freimuth@linux.ibm.com Subject: [PATCH v6 4/4] KVM: s390: Introducing kvm_arch_set_irq_inatomic fast inject Date: Mon, 11 May 2026 18:14:51 +0200 Message-ID: <20260511161451.209464-5-freimuth@linux.ibm.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260511161451.209464-1-freimuth@linux.ibm.com> References: <20260511161451.209464-1-freimuth@linux.ibm.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-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=BM+DalQG c=1 sm=1 tr=0 ts=6a020085 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=IXbFIl4MR9N5CccVwUwA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTExMDE3NCBTYWx0ZWRfX29Jm/02aBt0d hjai6Bmj7gk2mzuv5OxdHCO6lWuQJhJ7Dd3Xe/RLaldnr21Vd2HhehDCpbd9pC/eUN6asvHDJEb nuwLqAr41T9ScgZHlQWJVBY7xApEo53ifU0JXVax1hDBNUl46gEjUXYQ+o8t5ZeTcaSQqttD2BM sRfSilrmKmauhbJf9yF4Y79LrOudsY38Hr5JHOWv7Fk/3kNmqH7sPqSwvVvO99OhfWes/tReRCQ Q8K+10l7Fqt0l7vOy9AHh12RuRFt0HlWcCK7fYe2qo3SjgCVC+HS4KKaF1U94CupQSqyUJu8k7g DQM3CBDx954kxKZaTJtGtYhHAvY1T+Yxhm1URQqEypOhSbd8TgNQO7T7M4EUOoTcwemq7UmOBhh xR4/8WWSWReGzbYAZXgwqfsZFbld6dhrAgEO0trAigWdIlLzkECztqKCqCfjikFVnRz2PsKKcEK ZfIw/TVtLnjAVmjyvyQ== X-Proofpoint-GUID: qTnrQ7eJJAxiEsFJ8hnFVKhbBHyuZt20 X-Proofpoint-ORIG-GUID: qTnrQ7eJJAxiEsFJ8hnFVKhbBHyuZt20 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-11_04,2026-05-08_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 impostorscore=0 suspectscore=0 bulkscore=0 spamscore=0 lowpriorityscore=0 priorityscore=1501 adultscore=0 malwarescore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605110174 Content-Type: text/plain; charset="utf-8" S390 needs a fast path for irq injection, and along those lines we introduce kvm_arch_set_irq_inatomic. Instead of placing all interrupts on the global work queue as it does today, this patch provides a fast path for irq injection. The inatomic fast path cannot lose control since it is running with interrupts disabled. This meant making the following changes that exist on the slow path today. First, the adapter_indicators page needs to be mapped since it is accessed with interrupts disabled, so we added map/unmap functions. Second, access to shared resources between the fast and slow paths needed to be changed from mutex and semaphores to spin_lock's. Finally, the memory allocation on the slow path utilizes GFP_KERNEL_ACCOUNT but we had to implement the fast path with GFP_ATOMIC allocation. Each of these enhancements were required to prevent blocking on the fast inject path. Fencing of Fast Inject in Secure Execution environments is enabled in the patch series by not mapping adapter indicator pages. In Secure Execution environments the path of execution available before this patch is followed. Statistical counters have been added to enable analysis of irq injection on the fast path and slow path including io_390_inatomic, io_flic_inject_airq, io_set_adapter_int and io_390_inatomic_adapter_masked. Signed-off-by: Douglas Freimuth --- arch/s390/include/asm/kvm_host.h | 6 +- arch/s390/kvm/interrupt.c | 167 +++++++++++++++++++++++++++---- arch/s390/kvm/kvm-s390.c | 21 +++- arch/s390/kvm/kvm-s390.h | 3 +- 4 files changed, 173 insertions(+), 24 deletions(-) diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_h= ost.h index 295f0770bcb1..221d41f3902e 100644 --- a/arch/s390/include/asm/kvm_host.h +++ b/arch/s390/include/asm/kvm_host.h @@ -359,7 +359,7 @@ struct kvm_s390_float_interrupt { struct kvm_s390_mchk_info mchk; struct kvm_s390_ext_info srv_signal; int last_sleep_cpu; - struct mutex ais_lock; + raw_spinlock_t ais_lock; u8 simm; u8 nimm; }; @@ -450,6 +450,10 @@ struct kvm_vm_stat { u64 inject_io; u64 io_390_adapter_map; u64 io_390_adapter_unmap; + u64 io_390_inatomic; + u64 io_flic_inject_airq; + u64 io_set_adapter_int; + u64 io_390_inatomic_adapter_masked; u64 inject_float_mchk; u64 inject_pfault_done; u64 inject_service_signal; diff --git a/arch/s390/kvm/interrupt.c b/arch/s390/kvm/interrupt.c index 4b700813692b..0592ad18cb56 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c @@ -1966,15 +1966,10 @@ static int __inject_vm(struct kvm *kvm, struct kvm_= s390_interrupt_info *inti) } =20 int kvm_s390_inject_vm(struct kvm *kvm, - struct kvm_s390_interrupt *s390int) + struct kvm_s390_interrupt *s390int, struct kvm_s390_interrupt_inf= o *inti) { - struct kvm_s390_interrupt_info *inti; int rc; =20 - inti =3D kzalloc_obj(*inti, GFP_KERNEL_ACCOUNT); - if (!inti) - return -ENOMEM; - inti->type =3D s390int->type; switch (inti->type) { case KVM_S390_INT_VIRTIO: @@ -2010,6 +2005,7 @@ int kvm_s390_inject_vm(struct kvm *kvm, 2); =20 rc =3D __inject_vm(kvm, inti); + /* memory allocation is done by the caller and inti is passed in, we free= it here */ if (rc) kfree(inti); return rc; @@ -2287,6 +2283,7 @@ static int flic_ais_mode_get_all(struct kvm *kvm, str= uct kvm_device_attr *attr) { struct kvm_s390_float_interrupt *fi =3D &kvm->arch.float_int; struct kvm_s390_ais_all ais; + unsigned long flags; =20 if (attr->attr < sizeof(ais)) return -EINVAL; @@ -2294,10 +2291,10 @@ static int flic_ais_mode_get_all(struct kvm *kvm, s= truct kvm_device_attr *attr) if (!test_kvm_facility(kvm, 72)) return -EOPNOTSUPP; =20 - mutex_lock(&fi->ais_lock); + raw_spin_lock_irqsave(&fi->ais_lock, flags); ais.simm =3D fi->simm; ais.nimm =3D fi->nimm; - mutex_unlock(&fi->ais_lock); + raw_spin_unlock_irqrestore(&fi->ais_lock, flags); =20 if (copy_to_user((void __user *)attr->addr, &ais, sizeof(ais))) return -EFAULT; @@ -2674,6 +2671,7 @@ static int modify_ais_mode(struct kvm *kvm, struct kv= m_device_attr *attr) struct kvm_s390_float_interrupt *fi =3D &kvm->arch.float_int; struct kvm_s390_ais_req req; int ret =3D 0; + unsigned long flags; =20 if (!test_kvm_facility(kvm, 72)) return -EOPNOTSUPP; @@ -2690,7 +2688,7 @@ static int modify_ais_mode(struct kvm *kvm, struct kv= m_device_attr *attr) 2 : KVM_S390_AIS_MODE_SINGLE : KVM_S390_AIS_MODE_ALL, req.mode); =20 - mutex_lock(&fi->ais_lock); + raw_spin_lock_irqsave(&fi->ais_lock, flags); switch (req.mode) { case KVM_S390_AIS_MODE_ALL: fi->simm &=3D ~AIS_MODE_MASK(req.isc); @@ -2703,7 +2701,7 @@ static int modify_ais_mode(struct kvm *kvm, struct kv= m_device_attr *attr) default: ret =3D -EINVAL; } - mutex_unlock(&fi->ais_lock); + raw_spin_unlock_irqrestore(&fi->ais_lock, flags); =20 return ret; } @@ -2717,25 +2715,34 @@ static int kvm_s390_inject_airq(struct kvm *kvm, .parm =3D 0, .parm64 =3D isc_to_int_word(adapter->isc), }; + struct kvm_s390_interrupt_info *inti; + unsigned long flags; + int ret =3D 0; =20 + inti =3D kzalloc_obj(*inti, GFP_KERNEL_ACCOUNT); + if (!inti) + return -ENOMEM; + if (!test_kvm_facility(kvm, 72) || !adapter->suppressible) - return kvm_s390_inject_vm(kvm, &s390int); + return kvm_s390_inject_vm(kvm, &s390int, inti); =20 - mutex_lock(&fi->ais_lock); + raw_spin_lock_irqsave(&fi->ais_lock, flags); if (fi->nimm & AIS_MODE_MASK(adapter->isc)) { trace_kvm_s390_airq_suppressed(adapter->id, adapter->isc); - goto out; + raw_spin_unlock_irqrestore(&fi->ais_lock, flags); + kfree(inti); + return ret; } =20 - ret =3D kvm_s390_inject_vm(kvm, &s390int); + ret =3D kvm_s390_inject_vm(kvm, &s390int, inti); if (!ret && (fi->simm & AIS_MODE_MASK(adapter->isc))) { fi->nimm |=3D AIS_MODE_MASK(adapter->isc); trace_kvm_s390_modify_ais_mode(adapter->isc, KVM_S390_AIS_MODE_SINGLE, 2); } out: - mutex_unlock(&fi->ais_lock); + raw_spin_unlock_irqrestore(&fi->ais_lock, flags); return ret; } =20 @@ -2744,6 +2751,8 @@ static int flic_inject_airq(struct kvm *kvm, struct k= vm_device_attr *attr) unsigned int id =3D attr->attr; struct s390_io_adapter *adapter =3D get_io_adapter(kvm, id); =20 + kvm->stat.io_flic_inject_airq++; + if (!adapter) return -EINVAL; =20 @@ -2754,6 +2763,7 @@ static int flic_ais_mode_set_all(struct kvm *kvm, str= uct kvm_device_attr *attr) { struct kvm_s390_float_interrupt *fi =3D &kvm->arch.float_int; struct kvm_s390_ais_all ais; + unsigned long flags; =20 if (!test_kvm_facility(kvm, 72)) return -EOPNOTSUPP; @@ -2761,10 +2771,10 @@ static int flic_ais_mode_set_all(struct kvm *kvm, s= truct kvm_device_attr *attr) if (copy_from_user(&ais, (void __user *)attr->addr, sizeof(ais))) return -EFAULT; =20 - mutex_lock(&fi->ais_lock); + raw_spin_lock_irqsave(&fi->ais_lock, flags); fi->simm =3D ais.simm; fi->nimm =3D ais.nimm; - mutex_unlock(&fi->ais_lock); + raw_spin_unlock_irqrestore(&fi->ais_lock, flags); =20 return 0; } @@ -2930,6 +2940,7 @@ static int adapter_indicators_set(struct kvm *kvm, set_bit(bit, map); raw_spin_unlock_irqrestore(&adapter->maps_lock, flags); } + raw_spin_lock_irqsave(&adapter->maps_lock, flags); summary_info =3D get_map_info(adapter, adapter_int->summary_addr); if (!summary_info) { @@ -2965,6 +2976,44 @@ static int adapter_indicators_set(struct kvm *kvm, return summary_set ? 0 : 1; } =20 +static int adapter_indicators_set_fast(struct kvm *kvm, + struct s390_io_adapter *adapter, + struct kvm_s390_adapter_int *adapter_int, + int setbit) +{ + unsigned long bit; + int summary_set; + struct s390_map_info *ind_info, *summary_info; + void *map; + + raw_spin_lock(&adapter->maps_lock); + ind_info =3D get_map_info(adapter, adapter_int->ind_addr); + if (!ind_info) { + raw_spin_unlock(&adapter->maps_lock); + return -EWOULDBLOCK; + } + map =3D page_address(ind_info->page); + bit =3D get_ind_bit(ind_info->addr, adapter_int->ind_offset, adapter->swa= p); + if (setbit) + set_bit(bit, map); + summary_info =3D get_map_info(adapter, adapter_int->summary_addr); + if (!summary_info) { + raw_spin_unlock(&adapter->maps_lock); + return -EWOULDBLOCK; + } + map =3D page_address(summary_info->page); + bit =3D get_ind_bit(summary_info->addr, adapter_int->summary_offset, + adapter->swap); + /* If setbit then set summary bit. Else if falling back to the slow path = */ + /* with setbit=3D=3D0 then clear the summary bit so the slow path re-inje= cts */ + if (setbit) + summary_set =3D test_and_set_bit(bit, map); + else + summary_set =3D test_and_clear_bit(bit, map); + raw_spin_unlock(&adapter->maps_lock); + return summary_set ? 0 : 1; +} + /* * < 0 - not injected due to error * =3D 0 - coalesced, summary indicator already active @@ -2977,6 +3026,8 @@ static int set_adapter_int(struct kvm_kernel_irq_rout= ing_entry *e, int ret; struct s390_io_adapter *adapter; =20 + kvm->stat.io_set_adapter_int++; + /* We're only interested in the 0->1 transition. */ if (!level) return 0; @@ -3045,7 +3096,6 @@ int kvm_set_routing_entry(struct kvm *kvm, int idx; =20 switch (ue->type) { - /* we store the userspace addresses instead of the guest addresses */ case KVM_IRQ_ROUTING_S390_ADAPTER: if (kvm_is_ucontrol(kvm)) return -EINVAL; @@ -3636,3 +3686,84 @@ int __init kvm_s390_gib_init(u8 nisc) out: return rc; } + +/* + * kvm_arch_set_irq_inatomic: fast-path for irqfd injection + */ +int kvm_arch_set_irq_inatomic(struct kvm_kernel_irq_routing_entry *e, + struct kvm *kvm, int irq_source_id, int level, + bool line_status) +{ + int ret, setbit; + struct s390_io_adapter *adapter; + struct kvm_s390_float_interrupt *fi =3D &kvm->arch.float_int; + struct kvm_s390_interrupt_info *inti; + struct kvm_s390_interrupt s390int =3D { + .type =3D KVM_S390_INT_IO(1, 0, 0, 0), + .parm =3D 0, + }; + + kvm->stat.io_390_inatomic++; + + /* We're only interested in the 0->1 transition. */ + if (!level) + return -EWOULDBLOCK; + if (e->type !=3D KVM_IRQ_ROUTING_S390_ADAPTER) + return -EWOULDBLOCK; + + adapter =3D get_io_adapter(kvm, e->adapter.adapter_id); + if (!adapter) + return -EWOULDBLOCK; + + s390int.parm64 =3D isc_to_int_word(adapter->isc); + setbit =3D 1; + ret =3D adapter_indicators_set_fast(kvm, adapter, &e->adapter, setbit); + if (ret < 0) + return -EWOULDBLOCK; + if (!ret || adapter->masked) { + kvm->stat.io_390_inatomic_adapter_masked++; + return 0; + } + + inti =3D kzalloc_obj(*inti, GFP_ATOMIC); + if (!inti) { + setbit =3D 0; + adapter_indicators_set_fast(kvm, adapter, &e->adapter, setbit); + return -EWOULDBLOCK; + } + + if (!test_kvm_facility(kvm, 72) || !adapter->suppressible) { + ret =3D kvm_s390_inject_vm(kvm, &s390int, inti); + if (ret =3D=3D 0) { + return ret; + } else { + setbit =3D 0; + adapter_indicators_set_fast(kvm, adapter, &e->adapter, setbit); + return -EWOULDBLOCK; + } + } + + raw_spin_lock(&fi->ais_lock); + if (fi->nimm & AIS_MODE_MASK(adapter->isc)) { + trace_kvm_s390_airq_suppressed(adapter->id, adapter->isc); + raw_spin_unlock(&fi->ais_lock); + kfree(inti); + return 0; + } + + ret =3D kvm_s390_inject_vm(kvm, &s390int, inti); + if (!ret && (fi->simm & AIS_MODE_MASK(adapter->isc))) { + fi->nimm |=3D AIS_MODE_MASK(adapter->isc); + trace_kvm_s390_modify_ais_mode(adapter->isc, + KVM_S390_AIS_MODE_SINGLE, 2); + } else if (ret) { + raw_spin_unlock(&fi->ais_lock); + setbit =3D 0; + adapter_indicators_set_fast(kvm, adapter, &e->adapter, setbit); + return -EWOULDBLOCK; + } + +out: + raw_spin_unlock(&fi->ais_lock); + return 0; +} diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 5695038119c8..6a4ecd3f3539 100644 --- a/arch/s390/kvm/kvm-s390.c +++ b/arch/s390/kvm/kvm-s390.c @@ -70,6 +70,10 @@ const struct kvm_stats_desc kvm_vm_stats_desc[] =3D { STATS_DESC_COUNTER(VM, inject_io), STATS_DESC_COUNTER(VM, io_390_adapter_map), STATS_DESC_COUNTER(VM, io_390_adapter_unmap), + STATS_DESC_COUNTER(VM, io_390_inatomic), + STATS_DESC_COUNTER(VM, io_flic_inject_airq), + STATS_DESC_COUNTER(VM, io_set_adapter_int), + STATS_DESC_COUNTER(VM, io_390_inatomic_adapter_masked), STATS_DESC_COUNTER(VM, inject_float_mchk), STATS_DESC_COUNTER(VM, inject_pfault_done), STATS_DESC_COUNTER(VM, inject_service_signal), @@ -2856,6 +2860,7 @@ int kvm_arch_vm_ioctl(struct file *filp, unsigned int= ioctl, unsigned long arg) void __user *argp =3D (void __user *)arg; struct kvm_device_attr attr; int r; + struct kvm_s390_interrupt_info *inti; =20 switch (ioctl) { case KVM_S390_INTERRUPT: { @@ -2864,7 +2869,10 @@ int kvm_arch_vm_ioctl(struct file *filp, unsigned in= t ioctl, unsigned long arg) r =3D -EFAULT; if (copy_from_user(&s390int, argp, sizeof(s390int))) break; - r =3D kvm_s390_inject_vm(kvm, &s390int); + inti =3D kzalloc_obj(*inti, GFP_KERNEL_ACCOUNT); + if (!inti) + return -ENOMEM; + r =3D kvm_s390_inject_vm(kvm, &s390int, inti); break; } case KVM_CREATE_IRQCHIP: { @@ -3262,7 +3270,7 @@ int kvm_arch_init_vm(struct kvm *kvm, unsigned long t= ype) mutex_unlock(&kvm->lock); } =20 - mutex_init(&kvm->arch.float_int.ais_lock); + raw_spin_lock_init(&kvm->arch.float_int.ais_lock); raw_spin_lock_init(&kvm->arch.float_int.lock); for (i =3D 0; i < FIRQ_LIST_COUNT; i++) INIT_LIST_HEAD(&kvm->arch.float_int.lists[i]); @@ -4384,19 +4392,24 @@ int kvm_s390_try_set_tod_clock(struct kvm *kvm, con= st struct kvm_s390_vm_tod_clo } =20 static void __kvm_inject_pfault_token(struct kvm_vcpu *vcpu, bool start_to= ken, - unsigned long token) + unsigned long token) { struct kvm_s390_interrupt inti; struct kvm_s390_irq irq; + struct kvm_s390_interrupt_info *inti_mem =3D NULL; =20 if (start_token) { irq.u.ext.ext_params2 =3D token; irq.type =3D KVM_S390_INT_PFAULT_INIT; WARN_ON_ONCE(kvm_s390_inject_vcpu(vcpu, &irq)); } else { + inti_mem =3D kzalloc_obj(*inti_mem, GFP_KERNEL_ACCOUNT); + if (WARN_ON_ONCE(!inti_mem)) + return; + inti.type =3D KVM_S390_INT_PFAULT_DONE; inti.parm64 =3D token; - WARN_ON_ONCE(kvm_s390_inject_vm(vcpu->kvm, &inti)); + WARN_ON_ONCE(kvm_s390_inject_vm(vcpu->kvm, &inti, inti_mem)); } } =20 diff --git a/arch/s390/kvm/kvm-s390.h b/arch/s390/kvm/kvm-s390.h index 7ba885cb6bd1..6d2842fb71a3 100644 --- a/arch/s390/kvm/kvm-s390.h +++ b/arch/s390/kvm/kvm-s390.h @@ -376,7 +376,8 @@ int __must_check kvm_s390_deliver_pending_interrupts(st= ruct kvm_vcpu *vcpu); void kvm_s390_clear_local_irqs(struct kvm_vcpu *vcpu); void kvm_s390_clear_float_irqs(struct kvm *kvm); int __must_check kvm_s390_inject_vm(struct kvm *kvm, - struct kvm_s390_interrupt *s390int); + struct kvm_s390_interrupt *s390int, + struct kvm_s390_interrupt_info *inti); int __must_check kvm_s390_inject_vcpu(struct kvm_vcpu *vcpu, struct kvm_s390_irq *irq); static inline int kvm_s390_inject_prog_irq(struct kvm_vcpu *vcpu, --=20 2.52.0