From mboxrd@z Thu Jan 1 00:00:00 1970 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 248F648988A; Thu, 27 Aug 2026 15:53:19 +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=1787846002; cv=none; b=phJ4ofN23t9TnvzLGB2T05V0NGooyLaFpCzvltJgN/gjpFH2MrzuSBqyz6UlCSxHTwJ2mTAKp0cqCBrlxp5/T5aYMY2ICYH5YtJa44/BY65gLczjQOfQ6AREoz8Mg0wHTXuBMstYcedlhbAqaI0DlGJX7pA/w6W/wyl88HV8/hw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787846002; c=relaxed/simple; bh=ClPoGxSRLoXGZjDBaTNvCEepdd2WvAlGbccdDMYnz5E=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=hLEf/u0Z9IDILHDfkf/F68bJ/yj/8kboUqkx0+8eFoA+oJ+V93hiKnQDPCDc8dvjGSc9c27TmQkM02M1I9aoD16GYCxN51+ZyKX4cyEjPZ6qhrzDbB8pYH1gIATQWzURU5eRUNEUo385ZxlMyzyiTAoHZghjg7RK4+O+XnAjDOo= 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=bEWfHttp; 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="bEWfHttp" 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 67RF53ME3355214; Thu, 27 Aug 2026 15:53:16 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=7uwgqN o/tWUlSA+XRLBZVmRg5N9pehfqKvxsHirpsUw=; b=bEWfHttpf7aCrMTEQViRBp AZz+7s2NsK75VoOzh52sfRuSPwZqKd4i6F9a+KDE6Ks8HJtVyzdT5Fv4OvNzZnOt Dudgpk1Z73Y4gkD4+kwUuPkeopkmIyR1/0WS1hJtdNFI3b+KJoIdPSyo8E8/2SEy bu3kQV7/9hIRREuZCnL4t6RBrstur1ROju7CrapOjLUgk0wFh2Dl88kZTCPoZ31w uwi9gD4tr8hTcSnV8bjw5AZE3o1sb9VFWrO/ug9zIcDFTUSkXxePmSLMeHWeSZG4 lGxa/PcAPAlGI6a+BGy7448vqp/d6KBNutEE8D7E3XOXEnlS5mdmMfofHAKyPhbw == 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 4g73g56f4b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 27 Aug 2026 15:53:15 +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 67RFfhG9015127; Thu, 27 Aug 2026 15:53:14 GMT Received: from smtprelay04.fra02v.mail.ibm.com ([9.218.2.228]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4g7pfwh00k-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 27 Aug 2026 15:53:14 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay04.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67RFrAvp31785688 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Aug 2026 15:53:10 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 0A5B02004E; Thu, 27 Aug 2026 15:53:10 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4527B2004B; Thu, 27 Aug 2026 15:53:09 +0000 (GMT) Received: from [192.168.88.251] (unknown [9.111.61.153]) by smtpav02.fra02v.mail.ibm.com (Postfix) with ESMTP; Thu, 27 Aug 2026 15:53:09 +0000 (GMT) From: Christoph Schlameuss Date: Thu, 27 Aug 2026 17:53:00 +0200 Subject: [PATCH v6 20/21] KVM: s390: vsie: Create minimal scb shadows for not running g3 blocks 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: <20260827-vsie-sigpi-v6-20-8020bb53be52@linux.ibm.com> References: <20260827-vsie-sigpi-v6-0-8020bb53be52@linux.ibm.com> In-Reply-To: <20260827-vsie-sigpi-v6-0-8020bb53be52@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 , Sven Schnelle , Vasily Gorbik , Paolo Bonzini , Shuah Khan , Sean Christopherson , Christoph Schlameuss X-Mailer: b4 0.16.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=4201; i=schlameuss@linux.ibm.com; h=from:subject:message-id; bh=ClPoGxSRLoXGZjDBaTNvCEepdd2WvAlGbccdDMYnz5E=; b=owGbwMvMwCUmoqVx+bqN+mXG02pJDFkTYkPSHA44HOw+e803kctsyuJH7buiucoOb3yqE2BjO iMhh7O/o5SFQYyLQVZMkaVa3Dqvqq916ZyDltdg5rAygQxh4OIUgIm8iGdkeBcZ7athtywpZ37O gWOf8rbdfRP1516DWEPNDYbGqRXLRRn+Cm+wk6krCbDdEDln82V+laOfct4vMTq7cat0+9zztkp reAA= X-Developer-Key: i=schlameuss@linux.ibm.com; a=openpgp; fpr=0E34A68642574B2253AF4D31EEED6AB388551EC3 X-TM-AS-GCONF: 00 X-Proofpoint-Reinject: loops=2 maxloops=12 X-Proofpoint-ORIG-GUID: G4xudTr54gJzkoYkJm0Xj2Ol0QRQpkv8 X-Proofpoint-Spam-Info: AW1haW4tMjYwODI3MDEzMSBTYWx0ZWRfX4YLBIDK/F2pA aDXbyedGdNfCYJQ4x7mr5N71YMLNfr82VTMhbAn1cjg+JWAUhk9XKUUcdF5gjWof1FnqR9w/Il5 Z0aRQ8vj9agVJLhJxsrQO3sfYoJqihU= X-Proofpoint-GUID: Skxo_x3iaoLhaF7n9SNCagQuymzr0s6K X-Authority-Analysis: v=2.4 cv=JZyMa0KV c=1 sm=1 tr=0 ts=6a905d6b cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=o-mTpO_FGGOuZA_1EAsA:9 a=QEXdDO2ut3YA:10 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI3MDEzMSBTYWx0ZWRfXzgeWI//GMqQb fC80kTGMcrPHdCNBGHgTTui9rcNEnSibCPu/a1K/Bu+sLH2eHMoBuA5s++IbFbCqY3VvoUy0KZv lepB22z310X5/W1ZJbaT3Nn6B6DJdDAWGcE40ROBBk76HF71krEoyia5FmB0D49pxOduaa6nE4O I+HItOnNFrJnpcYXzq/dCKrMr8WIjhweEwgemBfnOzn2sBYkeBmuzCJn2PM++LiEwQ8F1Kz8/TZ l3ImtS/hJ5P5bT2q+783o7lwr1coCD7IHjA5Dki3p4fBTRxSUAamZmWwt33hek64Icu2KJn8hFD VtZa7zHe8rVlmvATlPdxu4fffjkMmlwXvg/XEthWMpg4yksduSW2jyXA7L04Dmh9VBr/2P8FjYx NbHQ7qnPCZrio9kzp3jLqXOJqPyettOc4YcKTX/C647KFTaOACH34/F6ss1ZTsjcrQidOHgMSCc BV1JADrLMcUtcKsRtrQ== 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-27_06,2026-08-27_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 clxscore=1015 adultscore=0 priorityscore=1501 impostorscore=0 malwarescore=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608270131 Instead of creating a full shadow for vSIE control blocks only create a minimal shadow for SIGP purposes for currently not running guest-3 control blocks. This reduces the overhead to shadow the whole guest-3 configuration. The minimal shadow only contains the information needed for SIGPI and SRSI. The shadow will still be recreated fully when a vSIE is entered with that SCB later. Signed-off-by: Christoph Schlameuss --- arch/s390/kvm/s390/vsie.c | 54 ++++++++++++++++++++++++++++++++--------------- 1 file changed, 37 insertions(+), 17 deletions(-) diff --git a/arch/s390/kvm/s390/vsie.c b/arch/s390/kvm/s390/vsie.c index f8dff6846fb3..67b68f4302b7 100644 --- a/arch/s390/kvm/s390/vsie.c +++ b/arch/s390/kvm/s390/vsie.c @@ -368,8 +368,7 @@ static void update_intervention_requests(struct vsie_page *vsie_page) static int prepare_cpuflags(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) { struct kvm_s390_sie_block *scb_s = &vsie_page->scb_s; - struct kvm_s390_sie_block *scb_o = vsie_page->scb_o; - int newflags, cpuflags = atomic_read(&scb_o->cpuflags); + int newflags, cpuflags = atomic_read(&vsie_page->scb_o->cpuflags); /* we don't allow ESA/390 guests unless explicitly enabled */ if (!(cpuflags & CPUSTAT_ZARCH) && !vcpu->kvm->arch.allow_vsie_esamode) @@ -722,6 +721,39 @@ static void unshadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) scb_o->ihcpu = scb_s->ihcpu; } +static int shadow_scb_minimal(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) +{ + struct kvm_s390_sie_block *scb_s = &vsie_page->scb_s; + struct kvm_s390_sie_block *scb_o = vsie_page->scb_o; + int rc; + + /* make sure we don't have any leftovers when reusing the scb */ + scb_s->icptcode = 0; + scb_s->eca = 0; + scb_s->ecb = 0; + scb_s->ecb2 = 0; + scb_s->ecb3 = 0; + scb_s->ecd = 0; + scb_s->fac = 0; + scb_s->fpf = 0; + + rc = prepare_cpuflags(vcpu, vsie_page); + if (rc) + return rc; + + scb_s->icpua = scb_o->icpua; + scb_s->ecb2 |= scb_o->ecb2 & ECB2_ESCA; + + if (vsie_page->vsie_sca) { + scb_s->eca |= scb_o->eca & ECA_SIGPI; + scb_s->ecb |= scb_o->ecb & ECB_SRSI; + write_scao(scb_s, virt_to_phys(&vsie_page->vsie_sca->ssca)); + scb_s->osda = virt_to_phys(scb_o); + } + + return 0; +} + /* * Setup the shadow scb by copying and checking the relevant parts of the g2 * provided scb. @@ -741,17 +773,7 @@ static int shadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) unsigned long new_mso = 0; int rc; - /* make sure we don't have any leftovers when reusing the scb */ - scb_s->icptcode = 0; - scb_s->eca = 0; - scb_s->ecb = 0; - scb_s->ecb2 = 0; - scb_s->ecb3 = 0; - scb_s->ecd = 0; - scb_s->fac = 0; - scb_s->fpf = 0; - - rc = prepare_cpuflags(vcpu, vsie_page); + rc = shadow_scb_minimal(vcpu, vsie_page); if (rc) goto out_validity; @@ -781,8 +803,6 @@ static int shadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) if (!(atomic_read(&scb_s->cpuflags) & CPUSTAT_KSS)) scb_s->ictl |= ICTL_ISKE | ICTL_SSKE | ICTL_RRBE; - scb_s->icpua = scb_o->icpua; - if (!(atomic_read(&scb_s->cpuflags) & CPUSTAT_ZARCH)) new_prefix &= GUEST_PREFIX_MASK_ESA; else @@ -2182,7 +2202,7 @@ static int _shadow_sca_cpu(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page, if (rc) return rc; - rc = shadow_scb(vcpu, vsie_page_n); + rc = shadow_scb_minimal(vcpu, vsie_page_n); update_vsie_sca(vsie_sca, cpu_nr, vsie_page_n, sca_o_entry_hpa); if (rc) { /* copy intercept to primary scb_o, no unshadow_scb() on exit */ @@ -2209,7 +2229,7 @@ static int _shadow_sca(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page, clear_bit(VSIE_SCA_ESCA, &vsie_sca->flags); sca_mcn_copy(vsie_sca, phys_to_virt(sca_o_hpa(vsie_sca))); - /* pin and make shadow for ALL scb in the sca */ + /* pin and make minimal shadow for ALL scb in the sca */ cpu_slots = is_esca ? KVM_S390_MAX_VSIE_VCPUS : KVM_S390_BSCA_CPU_SLOTS; for_each_set_bit_inv(cpu_nr, (unsigned long *)&vsie_sca->mcn, cpu_slots) { rc = get_sca_entry_addr(vcpu->kvm, vsie_sca, cpu_nr, NULL, &sca_o_entry_hpa); -- 2.55.0