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 8C6DD488213; Thu, 27 Aug 2026 15:53:09 +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=1787845991; cv=none; b=mI6rcETy953WtSpteWtT894+GVF+70CENycF5HF96gqX37IAexuGJAuY0kNnLqrBG8PMwTv0vGdCaJyayAkaCerB5pAcKHBU3Kz5RvgyFm8pMxmJS/qcYVZtbZ/xbLX2I3aoSktDMSlyJuppHgWMjk2eLVNxub17m+hwBUbG+qk= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1787845991; c=relaxed/simple; bh=DKQxICjKjZGpSAZdFvMqRVzAZOQV7Gw1zlGcnwWUS+Q=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=pTMHDKxKTDxkiDGHtk862wfT03hBYKhZQPTxhTRB9b4Zhot9DyZikcztMQglVeFRchNok1Wp79hh8aZicU9bwlJuVbJxcif21Suc3leTirjts2lk5almS8ETcShPGMrDHgUeYg0OurmJ0Cz/7n3T+aEi6LEocUjDNEbC4RHIW3M= 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=X+g3Qc7u; 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="X+g3Qc7u" 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 67RF5Zo93246181; Thu, 27 Aug 2026 15:53:06 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=UyXygP P7R+K49NyxC4nSzyOBjFGa4yvWe3KLGvqr6x8=; b=X+g3Qc7uLW3AgOplbe6cdc Jgt6KNaaLPM21/cguVjgFRyzrkSZErtskNM7zl7SFvEh+7ufR4sPAjbve/6Q3qQg k6CCnUAF5M2CW4Y0XRGCnIaXe3H4MJb5mDMlGFzLm28VLYo8Q4QPMVhrJ4QzBZEK 5qopOmQbq/uHbJR69hMN529PxHzzJYjoJSRctIpSFMSqATtzfx5yPtN1gP6qU1+I 9bGpUx0aqPisgpXZ03MUN1WRt/hfesqAYv/ctz5WaB6OBXeo2SmxJG1GUSCPYrnI kZtpW+ZITAW6TYrZPtp5jdqCluUBcLWXLrB8EyfU2SWMZnz5+ocmupVa8NmK7FLw == 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 4g716j6e1h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 27 Aug 2026 15:53:05 +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 67RFffNB008844; Thu, 27 Aug 2026 15:53:04 GMT Received: from smtprelay06.fra02v.mail.ibm.com ([9.218.2.230]) by ppma11.dal12v.mail.ibm.com (PPS) with ESMTPS id 4g7rsygm9h-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 27 Aug 2026 15:53:04 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (smtpav02.fra02v.mail.ibm.com [10.20.54.101]) by smtprelay06.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67RFqwMB36635072 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 27 Aug 2026 15:52:58 GMT Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AEF862004F; Thu, 27 Aug 2026 15:52:58 +0000 (GMT) Received: from smtpav02.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 02C292004B; Thu, 27 Aug 2026 15:52:58 +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:52:57 +0000 (GMT) From: Christoph Schlameuss Date: Thu, 27 Aug 2026 17:52:46 +0200 Subject: [PATCH v6 06/21] KVM: s390: vsie: Move pin/unpin_scb 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: <20260827-vsie-sigpi-v6-6-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=2527; i=schlameuss@linux.ibm.com; h=from:subject:message-id; bh=DKQxICjKjZGpSAZdFvMqRVzAZOQV7Gw1zlGcnwWUS+Q=; b=owGbwMvMwCUmoqVx+bqN+mXG02pJDFkTYoMOf0grmml7vOBlvvF1q6vblc5ZLW5r0BT9L97Hu 8iubF17RykLgxgXg6yYIku1uHVeVV/r0jkHLa/BzGFlAhnCwMUpABPZF8/w3/2pKus5zdcBQtPr b3JlLF+T83pa04d6iYfKPBttEm5x1jP8UxSY0RxgcvvJqhubMhew3JmwcOHzNU2Pd+Qd9HHzXLV pFTcA 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-Spam-Info: AW1haW4tMjYwODI3MDEzMSBTYWx0ZWRfXy78xyNQAwhBk U1PkFassGPEjNqV/BM6qdPD8mkEixF8bB38EKtYkc9C8LOFKLlIGPjJcXBdYpzceEYg2V0cmFsp 2BFIN5Ss28UO+XhvwC/cBWFw1OZqEcw= X-Proofpoint-GUID: F0mhOEurrMwskEHHs6mNxvuEXqIUd1Da X-Proofpoint-ORIG-GUID: ySEbER1CXXJNnRGV-Ikjoa_eMhIpMJL0 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODI3MDEzMSBTYWx0ZWRfX33t5k6YQ4QJa fDjp7sZ8MVCpzTu5Iawfl5Z3kO254VVeQV1J+z6p+uIz/VlGMEIlZQkkK6sS26HD5+pXtdix8K3 fQztxcSzSmf83+RboXhSGb9MwIxgYWmBG6SVJmoExXKEw2HDdyb6A0Hjdpyj5iItfT6wrvVDbUR 2dQFzBaTE6HIogGNXhQRfGi+soxtAHN1JyKi5e86cg1DVLqApM3RTCdLMHOjBaq85R91lF1zRk7 uvEH42adICV2IwowS+bm8uk0WOknwwzRuY+g2mCn6JoWLFsqlhIOgSZP7Ef65T700aLyqvjctGx gHhupUMBsoir2kTCAe6vsRBHWxXMUB6xmXhzFoHSEVxnLjRFlSNWvE3CtOkp5XoHAUUA1eooTfo xMQhPxzOCa7+6Ypry9R27BUvAj6zZ4jBFMUYPeqCp7+/h0U3vIYCfseqWb+1e7Hd77gQ+lO0GG8 Aq6DbkduxsnzbNd/PBQ== X-Authority-Analysis: v=2.4 cv=H7brBeYi c=1 sm=1 tr=0 ts=6a905d62 cx=c_pps a=aDMHemPKRhS1OARIsFnwRA==:117 a=aDMHemPKRhS1OARIsFnwRA==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=7EIyOw4XjRUV76RzNM0A:9 a=QEXdDO2ut3YA:10 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 suspectscore=0 malwarescore=0 lowpriorityscore=0 impostorscore=0 spamscore=0 bulkscore=0 adultscore=0 priorityscore=1501 clxscore=1015 phishscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608270131 Move {,un}pin_scb() up in preparation for the next patches. No change intended. Signed-off-by: Christoph Schlameuss --- arch/s390/kvm/s390/vsie.c | 66 +++++++++++++++++++++++------------------------ 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/arch/s390/kvm/s390/vsie.c b/arch/s390/kvm/s390/vsie.c index e867d96917dd..55e9399b9b30 100644 --- a/arch/s390/kvm/s390/vsie.c +++ b/arch/s390/kvm/s390/vsie.c @@ -686,6 +686,39 @@ static int shadow_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) return rc; } +/* unpin the scb provided by guest 2, marking it as dirty */ +static void unpin_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page, + gpa_t gpa) +{ + hpa_t hpa = virt_to_phys(vsie_page->scb_o); + + if (hpa) + unpin_guest_page(vcpu->kvm, gpa, hpa); + vsie_page->scb_o = NULL; +} + +/* + * Pin the scb at gpa provided by guest 2 at vsie_page->scb_o. + * + * Returns: - 0 if the scb was pinned. + * - > 0 if control has to be given to guest 2 + */ +static int pin_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page, + gpa_t gpa) +{ + hpa_t hpa; + int rc; + + rc = pin_guest_page(vcpu->kvm, gpa, &hpa); + if (rc) { + rc = kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); + WARN_ON_ONCE(rc); + return 1; + } + vsie_page->scb_o = phys_to_virt(hpa); + return 0; +} + void kvm_s390_vsie_gmap_notifier(struct gmap *gmap, gpa_t start, gpa_t end) { struct vsie_page *cur, *next; @@ -910,39 +943,6 @@ static int pin_blocks(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page) return rc; } -/* unpin the scb provided by guest 2, marking it as dirty */ -static void unpin_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page, - gpa_t gpa) -{ - hpa_t hpa = virt_to_phys(vsie_page->scb_o); - - if (hpa) - unpin_guest_page(vcpu->kvm, gpa, hpa); - vsie_page->scb_o = NULL; -} - -/* - * Pin the scb at gpa provided by guest 2 at vsie_page->scb_o. - * - * Returns: - 0 if the scb was pinned. - * - > 0 if control has to be given to guest 2 - */ -static int pin_scb(struct kvm_vcpu *vcpu, struct vsie_page *vsie_page, - gpa_t gpa) -{ - hpa_t hpa; - int rc; - - rc = pin_guest_page(vcpu->kvm, gpa, &hpa); - if (rc) { - rc = kvm_s390_inject_program_int(vcpu, PGM_ADDRESSING); - WARN_ON_ONCE(rc); - return 1; - } - vsie_page->scb_o = phys_to_virt(hpa); - return 0; -} - /* * Inject a fault into guest 2. * -- 2.55.0