From mboxrd@z Thu Jan 1 00:00:00 1970 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 5FF9A339381; Mon, 10 Aug 2026 15:54:30 +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=1786377272; cv=none; b=BgJf478S3HLSFUdVOgTVwZY51bmwFOy0D5pU25bKcYD4aLHVZx931iOfxywL2g3LLJ+croGr37HGqE0VOM3RXbMDiuG55R7Qep8sfjUgnVFH46nayNNkX8LSfmr1l1BxyhoX4tmP+KpsjGIR/LDydKakCN3/OekACOQm/Eja5pw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786377272; c=relaxed/simple; bh=rHq4hIql5bA8YYphZ+pIk4CQ+oS2Wj/dysUmPk733lU=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=VzhNEE6TGYDUGr2lOdufCCEachcbR4hHazrplrms3WPcIin1b+t25Ka5fdy754YgZbmrc0BuPuOrYuXmTDQ8r2mIjCf1cHq8oJJGNmUh2jcP199qMVsKNA9Vd2YcoGpK3E00iHvdy+ulL69dNzWhJEcX8hz98h+XbtvWq9+UlbI= 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=icCLgFe4; 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="icCLgFe4" 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 67AFWSgq930699; Mon, 10 Aug 2026 15:54:26 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:content-type:date:from:in-reply-to :message-id:mime-version:references:subject:to; s=pp1; bh=dKzCHo tXb58+XDpkdGGamzIxBTQlKQT/p2AGTtu12sA=; b=icCLgFe4CQX4c7kYCSLEI7 codVEYOM7oW7G6TiImt52qgqV08qV4icSU+S7xDC1wEimlXtuBngecccEjt+ywtY OrDhqLs+/nDXolXTjVRSDEKRbC42pRI1vrlzapEwTGgLO1/C6NUgsTRspx7rPJjU nQ321NgaSd21LpszsNel5/w/Q1tFxFWQi8yZ4yvtZ/jNlIuFRprGua7Qz3+GOucQ 6u8MWgbD3yOD0QfpToItLAYD9hirKAWgrBc3bem7Tbrlnq25oE14uBJ44H98EEIu ex1SZ/z0fwv5Jvd2T1s1xr0Pst+cCRU7lkPfEKTjhrRY/Ojp6D1WpU+KbcatCRtw == 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 4fyb23hs2q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 10 Aug 2026 15:54:25 +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 67AFggWa015393; Mon, 10 Aug 2026 15:54:25 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fxf5vwh4r-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 10 Aug 2026 15:54:25 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67AFsLGJ39911886 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 10 Aug 2026 15:54:21 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 44FAA20040; Mon, 10 Aug 2026 15:54:21 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A90052004B; Mon, 10 Aug 2026 15:54:20 +0000 (GMT) Received: from [192.168.88.52] (unknown [9.111.41.151]) by smtpav06.fra02v.mail.ibm.com (Postfix) with ESMTP; Mon, 10 Aug 2026 15:54:20 +0000 (GMT) From: Christoph Schlameuss Date: Mon, 10 Aug 2026 17:54:01 +0200 Subject: [PATCH v2 13/20] KVM: s390: vsie: Add struct vsie_sca with pin and unpin methods Precedence: bulk X-Mailing-List: linux-s390@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 7bit Message-Id: <20260810-vsie-sigpi-v2-13-e8d59a2f2f70@linux.ibm.com> References: <20260810-vsie-sigpi-v2-0-e8d59a2f2f70@linux.ibm.com> In-Reply-To: <20260810-vsie-sigpi-v2-0-e8d59a2f2f70@linux.ibm.com> To: kvm@vger.kernel.org, linux-s390@vger.kernel.org Cc: Alexander Gordeev , Christian Borntraeger , Claudio Imbrenda , David Hildenbrand , Eric Farman , Heiko Carstens , Janosch Frank , Nico Boehr , Paolo Bonzini , Shuah Khan , Sven Schnelle , Vasily Gorbik , Christoph Schlameuss X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=4379; i=schlameuss@linux.ibm.com; h=from:subject:message-id; bh=rHq4hIql5bA8YYphZ+pIk4CQ+oS2Wj/dysUmPk733lU=; b=owGbwMvMwCUmoqVx+bqN+mXG02pJDFmVX5Q0N2hEfb/66nGw8ll26ZaPO4Kev6ouj9mh87B5s 8Ktn2ItHaUsDGJcDLJiiizV4tZ5VX2tS+cctLwGM4eVCWQIAxenAEzk3jxGhsdmc6fHqHc6x13b ozDnqWhMQIfGQatPzBLaXQJuIea/NzEyHAh5zlHUO3Oq+BrHyG2Lf295ebFyzar313kuRu7ebiG 5nBUA X-Developer-Key: i=schlameuss@linux.ibm.com; a=openpgp; fpr=0E34A68642574B2253AF4D31EEED6AB388551EC3 X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=XqfK/1F9 c=1 sm=1 tr=0 ts=6a79f431 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VnNF1IyMAAAA:8 a=F8FVqei25e47uhyEDlAA:9 a=QEXdDO2ut3YA:10 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEwMDEzNCBTYWx0ZWRfX4/9/LbEvyHxH 1GESWlIkRiBZ4OKgsssW46v5BjzmCfHZKDYgLGWlk1CAnAlKyIBWE0eqt6Ku+yjy4qLiJHXOgkL 1DMCvDpP3OMvZUBon1kAW7SzsicvEuLXYapxT0gygB/VdVCyP7qChza8eRdBgeWLU6Q2LJ/l7RA jxTXij/FaLWZ3/lWvj5ASpDYs8a6OSHU/jlTB1LduwtMgIfLWxDrt/LGzeQaOAY5I8OytyXBfda R59U81h46baV3ld9lqvQgUkyIIKoqwp7+DJ1zokJk7v9j5FyBWAt3SDtInC4CnnZHx4Ov0jYmES xIIxCDNyVNQKP0nZAPzCYRLUUKsLGOgKrHoXgfkLHNqesgGsPnZwDsRMeGQ3THVNMUzasxylzul o/DBgzkpVgVQebrAB0H/sd/GU46XV4sx5mGqDEJtQmz9XWVaUE2d6oXDA9ZVYwZbpvaMQzJ6S/Z FSVhrOH6vGevd/dssfA== X-Proofpoint-ORIG-GUID: wSLArrn_Ll-Ai-PhNCOTeSyx5qIt8nUK X-Proofpoint-GUID: wSLArrn_Ll-Ai-PhNCOTeSyx5qIt8nUK X-Proofpoint-Spam-Info: AW1haW4tMjYwODEwMDEzNCBTYWx0ZWRfX1aVeg1QUiwTK Fy0vXLTUcZFyAlwW9XfAJsm/1B1Lf8QKNHooeQ4CAW1TaYkM7dpQLQnnW74x/8o0WYNYyOzoEsD jttor8SoCF7QN0npsCmedFFypkBX3+8= X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1176,Hydra:6.1.134,FMLib:17.12.100.49 definitions=2026-08-10_03,2026-08-10_02,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 lowpriorityscore=0 spamscore=0 adultscore=0 malwarescore=0 clxscore=1015 suspectscore=0 priorityscore=1501 impostorscore=0 phishscore=0 bulkscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608100134 Introduce the struct vsie_sca to hold the SSCA and required management data along with alloc and free methods to use with the struct. On this basis we can also add methods {,un}pin_sca() to simplify the pinning SCAs in g1. Signed-off-by: Christoph Schlameuss --- arch/s390/include/asm/kvm_host_types.h | 1 + arch/s390/kvm/vsie.c | 97 +++++++++++++++++++++++++++++++++- 2 files changed, 97 insertions(+), 1 deletion(-) diff --git a/arch/s390/include/asm/kvm_host_types.h b/arch/s390/include/asm/kvm_host_types.h index 8326ba1d2ead..b0421f0a0090 100644 --- a/arch/s390/include/asm/kvm_host_types.h +++ b/arch/s390/include/asm/kvm_host_types.h @@ -7,6 +7,7 @@ #include #define KVM_S390_MAX_VSIE_VCPUS 256 +#define KVM_S390_MAX_SCA_PAGES 5 #define KVM_S390_BSCA_CPU_SLOTS 64 #define KVM_S390_ESCA_CPU_SLOTS 248 diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index 0bbb65300a85..1970bfd8135d 100644 --- a/arch/s390/kvm/vsie.c +++ b/arch/s390/kvm/vsie.c @@ -62,7 +62,8 @@ struct vsie_page { gpa_t scb_gpa; /* 0x0258 */ /* the shadow gmap in use by the vsie_page */ struct gmap_cache gmap_cache; /* 0x0260 */ - __u8 reserved[0x06f8 - 0x0278]; /* 0x0278 */ + struct vsie_sca *vsie_sca; /* 0x0278 */ + __u8 reserved[0x06f8 - 0x0280]; /* 0x0280 */ struct kvm_s390_crypto_cb crycb; /* 0x06f8 */ __u8 fac[8 + S390_ARCH_FAC_LIST_SIZE_BYTE];/* 0x07f8 */ }; @@ -76,6 +77,32 @@ struct kvm_address_pair { hpa_t hpa; }; +enum vsie_sca_flags { + VSIE_SCA_ESCA = 0, + VSIE_SCA_SCA_PINNED = 1, +}; + +struct vsie_sca { + struct ssca_block ssca; + struct {} start_no_clear_fields; + struct vsie_page *pages[KVM_S390_MAX_VSIE_VCPUS]; + /* The mutex is used to synchronize access to the pages[] */ + struct mutex mutex; + atomic_t ref_count; + struct {} end_no_clear_fields; + gpa_t sca_gpa; + unsigned long flags; + u64 mcn[4]; + unsigned int sca_o_nr_pages; + struct kvm_address_pair sca_o_pages[KVM_S390_MAX_SCA_PAGES]; +}; + +/* + * SSCA needs to be 32-byte aligned and members before the cpu field need to be on the same page. + * Forcing it to offset 0 will always fulfill the requirements. + */ +static_assert(!(offsetof(struct vsie_sca, ssca))); + static inline bool sie_uses_esca(struct kvm_s390_sie_block *scb) { return (scb->ecb2 & ECB2_ESCA); @@ -844,6 +871,74 @@ static int pin_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) return 0; } +/* + * Unpin g2 original sca in g1 memory. + * + * Called with vsie_sca_lock held. + */ +static void unpin_sca(struct kvm *kvm, struct vsie_sca *vsie_sca) +{ + if (!test_bit(VSIE_SCA_SCA_PINNED, &vsie_sca->flags)) + return; + + unpin_guest_pages(kvm, vsie_sca->sca_o_pages, vsie_sca->sca_o_nr_pages); + vsie_sca->sca_o_nr_pages = 0; + + __clear_bit(VSIE_SCA_SCA_PINNED, &vsie_sca->flags); +} + +/* + * Pin g2 original sca in g1 memory. + * + * Called with vsie_sca_lock held. + */ +static int pin_sca(struct kvm *kvm, struct vsie_sca *vsie_sca) +{ + bool is_esca = test_bit(VSIE_SCA_ESCA, &vsie_sca->flags); + gpa_t offset = vsie_sca->sca_gpa & ~PAGE_MASK; + int nr_pages; + + if (test_bit(VSIE_SCA_SCA_PINNED, &vsie_sca->flags)) + return 0; + + if (is_esca) { + nr_pages = 4; + if (offset + sizeof(struct esca_block) > 4 * PAGE_SIZE) + nr_pages = 5; + } else { + nr_pages = 1; + if (offset + sizeof(struct bsca_block) > PAGE_SIZE) + nr_pages = 2; + } + + vsie_sca->sca_o_nr_pages = pin_guest_pages(kvm, vsie_sca->sca_gpa, nr_pages, + vsie_sca->sca_o_pages); + if (WARN_ON_ONCE(vsie_sca->sca_o_nr_pages != nr_pages)) + return -EIO; + __set_bit(VSIE_SCA_SCA_PINNED, &vsie_sca->flags); + + return 0; +} + +static void free_vsie_sca(struct kvm *kvm, struct vsie_sca *vsie_sca) +{ + free_pages_exact(vsie_sca, sizeof(*vsie_sca)); +} + +static struct vsie_sca *alloc_vsie_sca(void) +{ + struct vsie_sca *vsie_sca; + + vsie_sca = alloc_pages_exact(sizeof(*vsie_sca), GFP_KERNEL_ACCOUNT | __GFP_ZERO); + if (!vsie_sca) + return NULL; + + mutex_init(&vsie_sca->mutex); + atomic_set(&vsie_sca->ref_count, 0); + + return vsie_sca; +} + void kvm_s390_vsie_gmap_notifier(struct gmap *gmap, gpa_t start, gpa_t end) { struct vsie_page *cur, *next; -- 2.55.0