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 86952329E7E; Mon, 10 Aug 2026 15:54:22 +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=1786377265; cv=none; b=grGc/yErD4FuF6vb1nWbmmryO6WtVRH2BEV8Q1mwZELMNQ0HEljz9NHUYBZrjKqBNIWKsn7taLP8KzwUHGY+97c+zl6aSWvQa6AVwBUl+7gMajBUWiJVZgLGQH+t7+dniZxhc/ELHIblFBeZFnDq19VEQwKdyeYXP3i3fwhWjs8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786377265; c=relaxed/simple; bh=O7SL02TT8NHppOgjP8Vqtbxt9/IOiKhI7TMJciscvls=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=PzZO1DMbXKuGwFh7oRl2PfTnaQGmKVB9xLEpZWhz9iiZY+vsOUpIWMTYR6WhED+fIg8XyQydNLwUBaXsIe2svMot4Dsp5ebEM9clqV6bKqwZvY2GCoZBucH3DlAW5DTvFOMAKn6EXcDX0TYlRpiXcVGAfqZQiUQLSLhNH2Tkx6w= 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=OYXvm6RV; 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="OYXvm6RV" 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 67AFWwaA2026347; Mon, 10 Aug 2026 15:54:19 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=XERgtJ aujzI76yTWAGyFdJElEeoffQDG8xdh8pspT7M=; b=OYXvm6RVFxfpcavjghWv3l VdCy7s2JT+3bbxB5A9eanpS+0J4eyPdhNQVoI70521OwwN2SjhkahkEDkZvlEUR2 mWxOPjE4/7y0TwutrpPlzBj7FORwkCE1cUtA7wB3azFcMj9OZNn7ZNyCF3uo4un+ NbQbUMoS+7gsQ4HACsDe+5R3uhOMoUbqEL0Bqp5Jf5n0l3epa/7Tx0R6Gw4hrgWy Et6JtabobsUKV5kRdVFfQcJ3qaA8AyzUdjuFRBEkQcMCT/mhG447Il3lHKPsINen cE8igcwkzRT9jNGD6hp1v7HxuuWPyRuUxX785bP8HbcUp3HozNtN1mybtFYBYyMA == 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 4fwvm9gu9s-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 10 Aug 2026 15:54:18 +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 67AFgXb7024476; Mon, 10 Aug 2026 15:54:17 GMT Received: from smtprelay02.fra02v.mail.ibm.com ([9.218.2.226]) by ppma12.dal12v.mail.ibm.com (PPS) with ESMTPS id 4fxespwjk3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 10 Aug 2026 15:54:17 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay02.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67AFsDV844171626 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 10 Aug 2026 15:54:13 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 84B3920049; Mon, 10 Aug 2026 15:54:13 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id CB9B320040; Mon, 10 Aug 2026 15:54:12 +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:12 +0000 (GMT) From: Christoph Schlameuss Date: Mon, 10 Aug 2026 17:53:50 +0200 Subject: [PATCH v2 02/20] KVM: s390: vsie: Move SCAO validation into a function Precedence: bulk X-Mailing-List: kvm@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-2-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=2730; i=schlameuss@linux.ibm.com; h=from:subject:message-id; bh=O7SL02TT8NHppOgjP8Vqtbxt9/IOiKhI7TMJciscvls=; b=owGbwMvMwCUmoqVx+bqN+mXG02pJDFmVXxSvPTp4r1OaY+a30L1neutNV9sXvOvPTV9xf3r9k wmsj2uOd5SyMIhxMciKKbJUi1vnVfW1Lp1z0PIazBxWJpAhDFycAjCR7SaMDMf3u7Z0zFsw+13r +yURkxc+PDo34Kffj9RCjQMNvqrKptGMDGdrv/0JyLxaHCBW8uppbd9qrtfGubOuHe6tZLDVcnr uzwoA X-Developer-Key: i=schlameuss@linux.ibm.com; a=openpgp; fpr=0E34A68642574B2253AF4D31EEED6AB388551EC3 X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEwMDEzNCBTYWx0ZWRfX4HJlL1PU3zby Q585ufsgZ74lDmvHWQGMZCWPCIRi2Qg0tTyzTnZrd90ifokVV14scnQjlA4y0mWnbiwAafSiLHy jXcWuAcv51mlUEkk+YPPySBdC0T4THSdpYwSxnP8u///dk3rwpiwL5ZvFJuFP10hByHUUnYFRB5 voEcKwxWE2xHj0m9hvcCltqb/4Q48cZAjcGhw79wZsOgValdie6lVvxGguR57UNyLTYU2X7sJDi zCQC/MiHNDWnTBYyTxOOLJEtIRckGXjO3m4XDFKCRmN/Nzb7jydKFaFaUocOCNqLrj+4jucUtUY rDYAHJoRaxwjDeZwqDs6yWOT+0JCoNUsmrLdy4Ty8+NKVFSfp0JsYXTGDJFaGBRH9RqB/euiPPx Y3SNxJLCAvvREi5MPluJuiEbKUZUTa2sMqwQW0mbRogrwJ2L6a8g6+5R6APGrfLcPFJulPrHvTt 3a6koBzRBD4UXx4S2GQ== X-Proofpoint-ORIG-GUID: 0c9Y4JN6h_oRdoOG1Ju_heYmu2k5TQQk X-Proofpoint-Spam-Info: AW1haW4tMjYwODEwMDEzNCBTYWx0ZWRfX5VgAZ119skig zgUgPusiOAmxqFdPeDZxFOa4osUqXf355bnHomSoTjtuIOwr2/FSS7zSZSO49DUvdH8gmxh+EMa KPJN+2WRP+PY81HzIctYePC8QNBAyM0= X-Authority-Analysis: v=2.4 cv=IfK3n2qa c=1 sm=1 tr=0 ts=6a79f42a cx=c_pps a=bLidbwmWQ0KltjZqbj+ezA==:117 a=bLidbwmWQ0KltjZqbj+ezA==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=U7nrCbtTmkRpXpFmAIza:22 a=VnNF1IyMAAAA:8 a=e9sD66FpFztUsjZjJoEA:9 a=QEXdDO2ut3YA:10 X-Proofpoint-GUID: 0c9Y4JN6h_oRdoOG1Ju_heYmu2k5TQQk 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 phishscore=0 priorityscore=1501 impostorscore=0 bulkscore=0 clxscore=1015 lowpriorityscore=0 adultscore=0 malwarescore=0 spamscore=0 suspectscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608100134 Improve readability as well as allow re-use in coming patches. In particular add the logic to be able to check the validity of BSCA and ESCA origin addresses. Signed-off-by: Christoph Schlameuss --- arch/s390/kvm/vsie.c | 42 ++++++++++++++++++++++++++++++------------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index 010327a6ebee..6aa44362033c 100644 --- a/arch/s390/kvm/vsie.c +++ b/arch/s390/kvm/vsie.c @@ -71,6 +71,11 @@ static_assert(sizeof(struct vsie_page) == PAGE_SIZE); static_assert(offsetof(struct vsie_page, mcck_info) == offsetof(struct sie_page, mcck_info)); static_assert(IS_ALIGNED(offsetof(struct vsie_page, crycb), 8)); +static inline bool sie_uses_esca(struct kvm_s390_sie_block *scb) +{ + return (scb->ecb2 & ECB2_ESCA); +} + static unsigned long read_scao(struct kvm *kvm, struct kvm_s390_sie_block *scb) { unsigned long vsie_sca = READ_ONCE(scb->scaol) & ~0xfUL; @@ -97,6 +102,25 @@ static int set_validity_icpt(struct kvm_s390_sie_block *scb, return 1; } +/* The sca header must not cross pages etc. */ +static int validate_scao(struct kvm_vcpu *vcpu, struct kvm_s390_sie_block *scb, gpa_t gpa) +{ + int offset; + + if (gpa < 2 * PAGE_SIZE) + return set_validity_icpt(scb, 0x0038U); + if ((gpa & ~0x1fffUL) == kvm_s390_get_prefix(vcpu)) + return set_validity_icpt(scb, 0x0011U); + + if (sie_uses_esca(scb)) + offset = offsetof(struct esca_block, cpu[0]) - 1; + else + offset = offsetof(struct bsca_block, cpu[0]) - 1; + if ((gpa & PAGE_MASK) != ((gpa + offset) & PAGE_MASK)) + return set_validity_icpt(scb, 0x003bU); + return 0; +} + /* mark the prefix as unmapped, this will block the VSIE */ static void prefix_unmapped(struct vsie_page *vsie_page) { @@ -787,20 +811,14 @@ static int pin_blocks(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) gpa = read_scao(vcpu->kvm, scb_o); if (gpa) { - if (gpa < 2 * PAGE_SIZE) - rc = set_validity_icpt(scb_s, 0x0038U); - else if ((gpa & ~0x1fffUL) == kvm_s390_get_prefix(vcpu)) - rc = set_validity_icpt(scb_s, 0x0011U); - else if ((gpa & PAGE_MASK) != - ((gpa + offsetof(struct bsca_block, cpu[0]) - 1) & PAGE_MASK)) - rc = set_validity_icpt(scb_s, 0x003bU); - if (!rc) { - rc = pin_guest_page(vcpu->kvm, gpa, &hpa); - if (rc) - rc = set_validity_icpt(scb_s, 0x0034U); - } + rc = validate_scao(vcpu, scb_s, gpa); if (rc) goto unpin; + rc = pin_guest_page(vcpu->kvm, gpa, &hpa); + if (rc) { + rc = set_validity_icpt(scb_s, 0x0034U); + goto unpin; + } vsie_page->sca_gpa = gpa; write_scao(scb_s, hpa); } -- 2.55.0