From nobody Sat Jun 13 20:04:00 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 F208E4A33E1; Tue, 5 May 2026 17:37:36 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778002659; cv=none; b=d7nUo4xuD8KH3mQXv+tJwLigcYqCtcIJkxaFLhggMOi9fCUOhNdFw/L9CoP8ve3YFnBLyqq4yDsN8M/8qvq0+IpkBh13jDjmr+eRNwx8RnA6CfOB2fIDYzJNhcOiy29QKysjd84ar4dYlVC/IEw5UggIoli7Kz8MO90Wxv3YQyA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778002659; c=relaxed/simple; bh=LfDq5pOaWKZp0c5r3by60B7k7RVyx0QYNcQGbtq1s1U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Iyde9duQzL73i+jw8ln4W5l/oTUWUjJtVPh9Jn0XXn7tL6bOmElqu2apuI9qcpQAgqocbR75OGmfyWjMi5RU7QRNWZppjcuxSZqXzfpPm3jzp+u5G2RpTutpTM7TLSjYylaLO5PKBckzzxaM7TPc9cecPtO01VWgqWUoTnznBX0= 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=g1ucuLX5; arc=none smtp.client-ip=148.163.158.5 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="g1ucuLX5" Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6456LqwF3352054; Tue, 5 May 2026 17:37:33 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=P9NPMCdFWyrAY6a9+ JQSftcCBZxMSKS2Z0uJpe57MwM=; b=g1ucuLX5edTTJlCIws1aeXtM0Ku5dFAtx byDe6eq0tUglcabGK6CNEZouD/xpmP0SSV7MKlIviDrFJzcqJAnj0x2DJiJU69eM De/Whlpr9OpZTKMOCrsmGADtaqYs9rDqi0Ey7EfhcWqa34+3p9ejrb57Xtlpaotq sGkWs3O5iuS82jZttDRoygkhU+eIjdQNHzL8/dncx5CRLbR1HydnkZbiiwCiW+4M 0/qyoZxe0lEHzGGou9I4gQte1MVQvvuTgzWfuGAx/06vSodtrQwkRjLl5CvPSHJS FLQlkvFLo8S+wJeIqUqn7vmmFoAHudxZVcIO3KUlvXHFVg/Euh2fg== Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4dw9xxmjd4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 05 May 2026 17:37:33 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 645HOdFD020518; Tue, 5 May 2026 17:37:32 GMT Received: from smtprelay04.wdc07v.mail.ibm.com ([172.16.1.71]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4dwvkjtqfw-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 05 May 2026 17:37:32 +0000 (GMT) Received: from smtpav01.wdc07v.mail.ibm.com (smtpav01.wdc07v.mail.ibm.com [10.39.53.228]) by smtprelay04.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 645HbVAc40698374 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 5 May 2026 17:37:31 GMT Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 6E5915804B; Tue, 5 May 2026 17:37:31 +0000 (GMT) Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 589EC58063; Tue, 5 May 2026 17:37:30 +0000 (GMT) Received: from 9.60.13.83 (unknown [9.60.13.83]) by smtpav01.wdc07v.mail.ibm.com (Postfix) with ESMTP; Tue, 5 May 2026 17:37:30 +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 v5 1/4] KVM: s390: Add map/unmap ioctl and clean mappings post-guest Date: Tue, 5 May 2026 19:37:25 +0200 Message-ID: <20260505173728.160562-2-freimuth@linux.ibm.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260505173728.160562-1-freimuth@linux.ibm.com> References: <20260505173728.160562-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: AW1haW4tMjYwNTA1MDE3MSBTYWx0ZWRfX8nLjASfq4cgn 7ZnV+tjVmprJMPGIm3AQhvo3hYijpqt0M2ugxlRuLyDJ/fSBJDWgsBTuNUd0K/0lC/8sb2zALkX oG78cwPjx6oPKud1dPbYWyJ8W9RJmZu/2bptKzqjRjYv0BcGw564NCpz18CWz0CrYh3qDc/mTF+ mBqqCIVL+xW/VIzoPRRkKjiUvL7OZ1TgJ8Kv5FC60txSS4Kd3aTPXswK8sgm4KdqfkfHSGaYvTe wTR7KfwGlJasGJEDDl9SlZwoao22/2Sn99vGx+XXdp0dGrKbl5Jr5Wt5P05rFGjfqWNY9RuT2Lu DUTxBzKkZG/Ka21dP7Z7kQ8uyJtQXcaBC+QnPXUKkeQ09UymEWp06a+TaX39GUrfTUbPya1u30K d6toWGbp8HC+H5DgRMmI5vlAKvNQzpx8bea0hDcKnZ35YO8eIao7yv2nbSEgetYwgXv/uwRSFCC I1ve47MAh2t3Sb9MwXA== X-Proofpoint-ORIG-GUID: pUpiFsPosS4wyeuw7LkHVv7-0Yqu1rxn X-Proofpoint-GUID: pUpiFsPosS4wyeuw7LkHVv7-0Yqu1rxn X-Authority-Analysis: v=2.4 cv=ctWrVV4i c=1 sm=1 tr=0 ts=69fa2add cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=8ZgC-7A039QE7m0hxJcA:9 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-05_02,2026-04-30_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 lowpriorityscore=0 adultscore=0 clxscore=1015 suspectscore=0 impostorscore=0 spamscore=0 malwarescore=0 phishscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605050171 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 | 190 ++++++++++++++++++++++++++----- arch/s390/kvm/kvm-s390.c | 8 ++ arch/s390/kvm/kvm-s390.h | 2 + 4 files changed, 176 insertions(+), 29 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..a9b418996225 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,10 +2892,10 @@ 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); return -1; @@ -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 20:04:00 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 AA9B54A33F7; Tue, 5 May 2026 17:37:37 +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=1778002661; cv=none; b=jgl8ksep62nM8/nvOoGqE90Whx6T5B2bYE6t6LviDMiYE1VCCZM9MRsScPnh6dM8gdYI+wwKd5hmRIj36OZq9qvdvTYZIJd+V+5JNSZrGAf+MirAbGnkEmVIxOBQMYF8b2D55oBzwhYaH4/47L34tstMP21D70XXzTQNUfDXPDA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778002661; c=relaxed/simple; bh=pFQW+Aavm9YwOjW7scdgeK52dCxNCwJJ498izyw2pvw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rDnHc/Of9k+eopvN6hQ2LOIwtygnAxqD2RZmmowSW0sg9zwgem2dWhbRy+FB7ImTEVJstQohdespdw8MOdfiYcKc1XpI/JJjAouFg2pkaHQABNbXm9iV+iiaVtqzuWV4xiFoRf2I+WKACHxAzOY7ocdZfpStO0/aWni/ewseqPM= 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=qGU3Fvhm; 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="qGU3Fvhm" 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 645FEkd31306776; Tue, 5 May 2026 17:37:35 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=qSlwilqYkCJkECVs3 s9xr4M0aR96tgG9xeCVSQ+Y/RA=; b=qGU3FvhmGNfyDd2i9dsmLdGaFpp9nQGAr b25LSv89s1R2I3BdSp9QO1rXOJDziTn1Lv+79/TX/ZFxlOxs8rGfZ/RDjNbq67SC /ja93I50Q0GqfelxK9zFrGqsdSnFSjnOxqTBI9qJ8OsRIavmD3JeHkYx7+Ahgk/U ZrCJtaTJP8Tjj5MtOmB1DdM/t/MejrZ7HgQJjMwn0KfyzLAYWyK647SjFV1wY1Mj w5tzdardQL7sCQ1lg32lunkkHkszDTNcKnTvY9EShNLunhfP19p7Gan8IBGvXAkN jPpCIP0okwDrn19r/8mgJrI5CXbqLnYbc4gCdxsHpqZUhqMeL4usg== Received: from ppma11.dal12v.mail.ibm.com (db.9e.1632.ip4.static.sl-reverse.com [50.22.158.219]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4dw9x4my6v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 05 May 2026 17:37:35 +0000 (GMT) Received: from pps.filterd (ppma11.dal12v.mail.ibm.com [127.0.0.1]) by ppma11.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 645HOddr000838; Tue, 5 May 2026 17:37:34 GMT Received: from smtprelay05.wdc07v.mail.ibm.com ([172.16.1.72]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4dwx9yafnr-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 05 May 2026 17:37:34 +0000 (GMT) Received: from smtpav01.wdc07v.mail.ibm.com (smtpav01.wdc07v.mail.ibm.com [10.39.53.228]) by smtprelay05.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 645HbWAc33161812 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 5 May 2026 17:37:32 GMT Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A30535804B; Tue, 5 May 2026 17:37:32 +0000 (GMT) Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 90E7E58059; Tue, 5 May 2026 17:37:31 +0000 (GMT) Received: from 9.60.13.83 (unknown [9.60.13.83]) by smtpav01.wdc07v.mail.ibm.com (Postfix) with ESMTP; Tue, 5 May 2026 17:37:31 +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 v5 2/4] KVM: s390: Enable adapter_indicators_set to use mapped pages Date: Tue, 5 May 2026 19:37:26 +0200 Message-ID: <20260505173728.160562-3-freimuth@linux.ibm.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260505173728.160562-1-freimuth@linux.ibm.com> References: <20260505173728.160562-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: AW1haW4tMjYwNTA1MDE3MSBTYWx0ZWRfX1xamYbhc9nD8 ApiA3ApKTNK+BQldzcZDt7I3s2RQZSjZp8i3vJ2NfYxMmRg9jkZNSuZ/Uh9451hvKKECHjxIYHE 7yGRZHvAj5Ik/xWRR8RFdD9YsoHl2iQDP0B/HC4G1CAPiUyXoIvISndSyxrTrzFfJm+sx4XB4SW 0za1JFPFiZhTUs2wXQrsu/tx6pg4o+ZGP2puex3tQ0KQYcxczDtiCDycY+9QTz2vr+TNfhbsNkf YvIy4PCvBk8UDOFF/kagPbh4sJK5xGGFQBRXi7zuw2b3h62Z2p/Trg5M5U59gAF2UqTbjbuqBzK 0O/q0fxuz1EFQxndnEsDHMfSa45gakP47F/zvTa5VDFMa/xDY8xhiTdNG4wid4xhI5cTYqzB2w2 EB76GWb8+rJrj6DM/zvRNfXpV854TB8JUV00iP4ekY2ZAIz38ZUQz3FLFfrXZ6XUEaLBVeoujPY NYle/Ng2Lr4JU5mh+sg== X-Proofpoint-ORIG-GUID: L5KMwgyEnMOOFzexlVCL2lr_XqsyALPY X-Proofpoint-GUID: L5KMwgyEnMOOFzexlVCL2lr_XqsyALPY X-Authority-Analysis: v=2.4 cv=W7UIkxWk c=1 sm=1 tr=0 ts=69fa2adf cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=uAbxVGIbfxUO_5tXvNgY:22 a=VnNF1IyMAAAA:8 a=HREIBFoc_rC1q7OR-gsA:9 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-05_02,2026-04-30_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 adultscore=0 lowpriorityscore=0 malwarescore=0 suspectscore=0 spamscore=0 clxscore=1015 phishscore=0 bulkscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605050171 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 a9b418996225..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) { - put_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 20:04:00 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 1055D4A2E2D; Tue, 5 May 2026 17:37:38 +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=1778002661; cv=none; b=CU+9Qz/SPIMB+73A+tEMKGyT0+EHKTYi2CPBAYJ6gEKQE5tv+qmQinNrMt9BkmklO951gJMpTfEc9XSfxNTfsSkjS4E8fU/Z1I6AeZVbW+wdVA8R5C6GuzbvLIBeKr2G4s4Zn2Yx58RhSIN58jqUihzIYzWDKfL1qa68USk6sgg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778002661; c=relaxed/simple; bh=bbvBbQLxwvTrULGGkPxnAgfA6qo2puCwqDbEU5CYOtU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=sghYv/Rl9/3aqdQ6+4/7YDG3YrA9vbJ4HF9pevjuMQr5rlyqMSuKAqgYe+hDU7Zs33SNLLAKeBrYfwLGx00hOlxmdflyT4RUl2mQ3KnBzQB9B5oY0YvxwTJJOvKOk2muQpDb5N66uZWhkxJFkVvbGq5bbMY1JjIJc4Ebd0GV6MQ= 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=UeprHP7i; 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="UeprHP7i" 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 645892Y7068020; Tue, 5 May 2026 17:37:36 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=lZQC62wmVNQuDsipZ ryUy4QJPHrqMN70Q3EiEDETvUM=; b=UeprHP7iLT5SSP8Bvb04WCyJPSuwoJS1C 9H+l+EnFaMGTWitb/Veb41BeukjqbKruIyD+1uLfyay9EkgDRMADWA6xo2EwZIxx aWCYHbxmKt3pWNZsumLgCCAi+qGX0DSi1MICfY8myQHUJEIDUBMuhqs4erZUKUCg 7PHDbg/DLm3FubEU+ugYNBOcpfSw2lyY2BthNXsafdK7xTl1uoIlKjyxQsAVxNnh gPq2lEppeAUVsbU/i6JvLlaYCZcK7aMUTza6xCDuh8c41LPkGZO1oWar0owBTxKm g6yvdiy/GV133R03rkC6YTikKoZOzhkTW6kNalEzWF8nJV8OtBuSw== 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 4dw9y1d0jg-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 05 May 2026 17:37:36 +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 645H9Y3O027513; Tue, 5 May 2026 17:37:35 GMT Received: from smtprelay07.wdc07v.mail.ibm.com ([172.16.1.74]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4dww3h2ny4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 05 May 2026 17:37:35 +0000 (GMT) Received: from smtpav01.wdc07v.mail.ibm.com (smtpav01.wdc07v.mail.ibm.com [10.39.53.228]) by smtprelay07.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 645HbYIJ20316838 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 5 May 2026 17:37:34 GMT Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id F21AE5804B; Tue, 5 May 2026 17:37:33 +0000 (GMT) Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C54C158055; Tue, 5 May 2026 17:37:32 +0000 (GMT) Received: from 9.60.13.83 (unknown [9.60.13.83]) by smtpav01.wdc07v.mail.ibm.com (Postfix) with ESMTP; Tue, 5 May 2026 17:37:32 +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 v5 3/4] KVM: s390: Change the fi->lock to a raw_spinlock for RT case Date: Tue, 5 May 2026 19:37:27 +0200 Message-ID: <20260505173728.160562-4-freimuth@linux.ibm.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260505173728.160562-1-freimuth@linux.ibm.com> References: <20260505173728.160562-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-ORIG-GUID: d81vL-uXm6FIFtWrxc8VGdZ7ytEnBb3y X-Proofpoint-GUID: d81vL-uXm6FIFtWrxc8VGdZ7ytEnBb3y X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTA1MDE3MSBTYWx0ZWRfX9XpZRezaOFLu cSf8A7ZzdVnr8VIpKIKZQzurp1eeszEQzINKKqH9A8neLx6z3ZaW5RjZ4AcmJ6PlK7+tIfo6VNn RTqdeSxyteCWD9TeW1R4pIsJddOy/etQQTd8oFNaEkuDse+0P/Dm5GNe1VH/owqU+Qhq2YTElL0 6vpUS+urlJq26ogg/I7LEc+qbZuVlc0Dc6TMEa/F9RpiOoaszF1+B8gOT/qPvugXyWvrdjWWv4p JPwDut17qwc2xMZ+widQzsb3QIthAFIKSJRC12oPin/fOoQmgykwfjljpSPtD064Ppb3pnBU8n7 7c7In777ftozoxpMUBuiyM4y578HdwC+cObhI6Ga2kwNqzMdT6E1mPMac127IjuGPAsgEu8i1Fy ZqL0RETxe0ygQjtbfHln5uxUr4jNQnSq71MAqcBbXzXwbby5uscnTomq2eecXKA9eKWjOW8fOEb NhOiRVEx3+erEjCzH4w== X-Authority-Analysis: v=2.4 cv=UbFhjqSN c=1 sm=1 tr=0 ts=69fa2ae0 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=EHZai7OVpKDGiIimAuEA:9 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-05_02,2026-04-30_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 clxscore=1015 spamscore=0 lowpriorityscore=0 malwarescore=0 suspectscore=0 adultscore=0 priorityscore=1501 bulkscore=0 phishscore=0 impostorscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605050171 Content-Type: text/plain; charset="utf-8" s390 needs to maintain support for an RT kernel. This requires the floating interrupt lock, fi->lock to be changed to a raw spin lock=20 since the fi->lock maybe called with interrupts disabled in __inject_io. Signed-off-by: Douglas Freimuth --- arch/s390/include/asm/kvm_host.h | 2 +- arch/s390/kvm/intercept.c | 4 +- arch/s390/kvm/interrupt.c | 68 ++++++++++++++++---------------- arch/s390/kvm/kvm-s390.c | 2 +- 4 files changed, 38 insertions(+), 38 deletions(-) diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_h= ost.h index fbb2406b31d2..9dd8a4986592 100644 --- a/arch/s390/include/asm/kvm_host.h +++ b/arch/s390/include/asm/kvm_host.h @@ -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..6e9ad58c0e90 100644 --- a/arch/s390/kvm/intercept.c +++ b/arch/s390/kvm/intercept.c @@ -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..49ccdeccc70c 100644 --- a/arch/s390/kvm/interrupt.c +++ b/arch/s390/kvm/interrupt.c @@ -625,7 +625,7 @@ static int __must_check __deliver_machine_check(struct = kvm_vcpu *vcpu) int deliver =3D 0; int rc =3D 0; =20 - spin_lock(&fi->lock); + raw_spin_lock(&fi->lock); spin_lock(&li->lock); if (test_bit(IRQ_PEND_MCHK_EX, &li->pending_irqs) || test_bit(IRQ_PEND_MCHK_REP, &li->pending_irqs)) { @@ -654,7 +654,7 @@ static int __must_check __deliver_machine_check(struct = kvm_vcpu *vcpu) deliver =3D 1; } spin_unlock(&li->lock); - spin_unlock(&fi->lock); + raw_spin_unlock(&fi->lock); =20 if (deliver) { VCPU_EVENT(vcpu, 3, "deliver: machine check mcic 0x%llx", @@ -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)); @@ -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 @@ -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)) diff --git a/arch/s390/kvm/kvm-s390.c b/arch/s390/kvm/kvm-s390.c index 74f453f039a3..d8011b6d6801 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); --=20 2.52.0 From nobody Sat Jun 13 20:04:00 2026 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) (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 2A4054A33F9; Tue, 5 May 2026 17:37:40 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=148.163.158.5 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778002663; cv=none; b=G6RN+JVWNy/yPTNJckIOPB05fNKVwvptMzDzPQjSddGRoz1sFoiGPmSW4i4awLd3EeaqVHJUx2uVfgQKfzah8QvorrxJeJPYKvAogHC6DS35C1Pl3VVJok37lsU1MaoHl89kHsFL8jVXGs3L+lr3caKYaxolJyHPlu8yhlHXRNA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778002663; c=relaxed/simple; bh=ucjhoXX5UUMmVXoYsHw0MDDjsLH4EPU8Qlt+nnbdWB8=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=AXk2H9Km6J4NxBh1A9GOC/BmG1PC/aeTFlXReqdRTiGHFBEmemKGR7AEWUIxVzDMAUZQTp4s1qGYniFPI3k+HBOnNeneudgRLEDVhFnQQGJA2kox3Kh/bVOr2gjh8FFl3s9cNb7YEmW5YY0uU0k+fWbVebc9Kbzk31JUASwSkso= 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=RzkiqbfD; arc=none smtp.client-ip=148.163.158.5 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="RzkiqbfD" Received: from pps.filterd (m0356516.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6459G8Um3634645; Tue, 5 May 2026 17:37:37 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=3rsF/ltGqEV0kYZ3U egGJxpsbju7zr1blMuDq4QE0aY=; b=RzkiqbfD3ei0bFRGQOSq8gMBKcnZvf5Ko 6CLTetQE01zYxhum11JcmIwhh66eMWiXP91TGG6IEYYNC0/lZ5g7Aztxccd/jBjW kEGa7nFfQHjYIS0TD5Gn/KdTVymNHGYeUEWxGrejW3whcvK+BGOIOAW/WMonFSlh +wULhQrFwo04/nT1x+XSe1zOUprnz+c/Ql6giZUf6yVOs9bbOpQFzAJ7wMeZNECw cXHuSi/sgRsHLmNoRDLh9dUMxPjIvsJFu56WFm2o53P9AGboGQsgDI7OW9hlwPLF ynljbJqnHmRPzfw1HEPipXZByJMYbAcdWldHp3MKxaXN2rgkJlHXw== Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4dw9w6cky1-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 05 May 2026 17:37:37 +0000 (GMT) Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 645HOdUN020515; Tue, 5 May 2026 17:37:36 GMT Received: from smtprelay02.dal12v.mail.ibm.com ([172.16.1.4]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4dwvkjtqg0-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 05 May 2026 17:37:36 +0000 (GMT) Received: from smtpav01.wdc07v.mail.ibm.com (smtpav01.wdc07v.mail.ibm.com [10.39.53.228]) by smtprelay02.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 645HbZuD27919012 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Tue, 5 May 2026 17:37:35 GMT Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 506045804B; Tue, 5 May 2026 17:37:35 +0000 (GMT) Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 22DED58055; Tue, 5 May 2026 17:37:34 +0000 (GMT) Received: from 9.60.13.83 (unknown [9.60.13.83]) by smtpav01.wdc07v.mail.ibm.com (Postfix) with ESMTP; Tue, 5 May 2026 17:37:34 +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 v5 4/4] KVM: s390: Introducing kvm_arch_set_irq_inatomic fast inject Date: Tue, 5 May 2026 19:37:28 +0200 Message-ID: <20260505173728.160562-5-freimuth@linux.ibm.com> X-Mailer: git-send-email 2.52.0 In-Reply-To: <20260505173728.160562-1-freimuth@linux.ibm.com> References: <20260505173728.160562-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=XPQAjwhE c=1 sm=1 tr=0 ts=69fa2ae1 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=IXbFIl4MR9N5CccVwUwA:9 X-Proofpoint-ORIG-GUID: eP4AChF05GGAftCJvXYKo6SRv9YncPSE X-Proofpoint-GUID: eP4AChF05GGAftCJvXYKo6SRv9YncPSE X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTA1MDE3MSBTYWx0ZWRfX7fWxV1GAMW73 B/4FF4WVBi/TJ7ep90ZxNnHkEfOnUoKKpEJjOgTAUk0GTyJHotQMXyypW17NcQA2mWitRWGOcjo daciR6ZEnluk32RaJpKEUOVdfGCXI5BnilSlMULrFRFFzDOORygBSB2GrYqAt9raFEDQulfQDkt 0DO4ub9DNXUHIoP388z+slRid16i2rTIj7qBG0uUESboCXguBQoX6XD8CYONdG/RPDQltHNhWj3 ta1lDQclSWSXq1HvxYtJ9w8xqEg/rKJosKq4a078u0ItLsoVCdlBja0ruM64K6vC4nugiK+n/rT ll0s1t8h1+bzg+ow+wgYGsvvworXIMtkuVsD0RpxiE+Qc4gm0a0y5aeFNh/mpqiAFEf8YTNfPcm mXOHesvWeh5Cnc2n2qeTWLdzX1IjKgobESEy7LXF46og/PVdytD6WGv/0lTK9OKrRIZ3sIFxiK8 GLmGXmg0S03tIJbaM1w== 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-05_02,2026-04-30_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 adultscore=0 spamscore=0 priorityscore=1501 impostorscore=0 phishscore=0 malwarescore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605050171 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 raw_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 | 163 +++++++++++++++++++++++++++---- arch/s390/kvm/kvm-s390.c | 21 +++- arch/s390/kvm/kvm-s390.h | 3 +- 4 files changed, 170 insertions(+), 23 deletions(-) diff --git a/arch/s390/include/asm/kvm_host.h b/arch/s390/include/asm/kvm_h= ost.h index 9dd8a4986592..b485dee4c766 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 49ccdeccc70c..1c79ad072fce 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,33 @@ 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); + kfree(inti); goto out; } =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 +2750,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 +2762,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 +2770,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 +2939,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 +2975,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 +3025,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 +3095,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 +3685,83 @@ 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); + kfree(inti); + goto out; + } + + 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 d8011b6d6801..11b62fa8634f 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