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 5BAAF32ED39; Mon, 10 Aug 2026 15:54:26 +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=1786377267; cv=none; b=DebtAOESx2xe8FrVl1QXZThaDkS1LX+Wzz8PXx1Ps3WyaNzfac7Rf0axz/OUSKKqhJtxxiyAhHEgbEr+Ul1AVeqtQxQCfBEealKAftkYIv1VAlsWVEODhtm4gfCHFqMlfyA0O8JHBcPRDWlkpJCH1MKiDAyeuTY1pVvo1oN2hKs= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786377267; c=relaxed/simple; bh=++qcauf+pBgLcHuU+vB4q+rnvb9ryqOaO6SVS0lUnhI=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=naOoc7q0ItLQLLZdtR9tajMtgv8mh++uvhGaI6jccr3kk3mVySCUDOJ1Yh1C9Ea2w78cbgRGp1n81PjIztD+TSS/vXjlYKGRvqvAz+ckU/KT55sNHLXyKWKwYwD2WWIwoOyal1HPeZ23hy1ZBlwfWzC0Yx2N6F+ACez5o5WRwuI= 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=f8uOqDLx; 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="f8uOqDLx" 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 67AFWedl1941882; Mon, 10 Aug 2026 15:54:22 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=IhZaII cnvScMWelgXKut2aIcQfrShx1uIK0CLcpVoIU=; b=f8uOqDLxWY3WfXTuHp5RUh DZO1LSBwehaOqw/LYvVtNzsYxXdb9aszBqOmHQcjqPXhtcA6W1XcaM5uSst2vtHp o9wOfuYMigmQVJqNNzOdPN8L3hOvj+Xfb5zytrMfHIcu0T0HH9OdX1baBUlz6iH3 LdGy8v1Chiby/zQCAM0WIOf7bjf1zLyGGbnsbmBcdiOGEDn4HEAXpuQv4tj17IXn xiIgRTyiY4OYWIHuitaF6InHigTKR53QiIHJ7A503IIisyzRgT8VZX4u/jw4qx1n qDc1KLnRQ8bZwp0GtQEyudBZeU+6FJvNHarqxbsngOWZ9nXvjo09YZP0kWE+JGAg == 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 4fwvp2rdu3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 10 Aug 2026 15:54:22 +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 67AFgW29003777; Mon, 10 Aug 2026 15:54:22 GMT Received: from smtprelay05.fra02v.mail.ibm.com ([9.218.2.225]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fxfsjne39-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 10 Aug 2026 15:54:21 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (smtpav06.fra02v.mail.ibm.com [10.20.54.105]) by smtprelay05.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67AFsH5326673496 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 10 Aug 2026 15:54:18 GMT Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id DE8B720040; Mon, 10 Aug 2026 15:54:17 +0000 (GMT) Received: from smtpav06.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4D9CB2004B; Mon, 10 Aug 2026 15:54:17 +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:17 +0000 (GMT) From: Christoph Schlameuss Date: Mon, 10 Aug 2026 17:53:56 +0200 Subject: [PATCH v2 08/20] KVM: s390: vsie: Create helpers to alloc and free vsie_pages 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-8-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=2486; i=schlameuss@linux.ibm.com; h=from:subject:message-id; bh=++qcauf+pBgLcHuU+vB4q+rnvb9ryqOaO6SVS0lUnhI=; b=owGbwMvMwCUmoqVx+bqN+mXG02pJDFmVXxQnTJTI3V17e/7d1c8TPBtsW0tXrZaval1WMHEL2 5ak+UdXdZSyMIhxMciKKbJUi1vnVfW1Lp1z0PIazBxWJpAhDFycAnCTjRkZHpbzXbEwunL8gdrC jcm+RnEynA0v2HRTPOqOlyvsvVV0lZHhvur9vhk5P1plF6x7ziYT/pz7ShJ3row275XvQc8P7fX hBQA= X-Developer-Key: i=schlameuss@linux.ibm.com; a=openpgp; fpr=0E34A68642574B2253AF4D31EEED6AB388551EC3 X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=AMtp2X5w c=1 sm=1 tr=0 ts=6a79f42e cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=IkcTkHD0fZMA:10 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=-UiXzxHpo5ppJV-mmbwA:9 a=QEXdDO2ut3YA:10 X-Proofpoint-GUID: 2R0iqfKeYM9tvrCviVWV7syOGpWgsT7X X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEwMDEzNCBTYWx0ZWRfXye2bj/H/zjcF 06NEm0Yw3scGbadGDudS6eGRu2KbHROUNm102Ri9EwrgAA4ZuUb3IVDieqf+5COBsSSr56ZlVID 5dzavE671LmNTGvdu8CTiocT8/vXCbndivsd2j+ajDMCA1vF+rXQtGbnLvVmQ9M7JG+R3NDPw4n tFFmitKSDuIuhQvupKEzv6fKKI/zt9B513OVCmRGrYf+JCZd3Xj+A+NFLaT0zG5u3Me35/lRdiU Oy1S/itlVulqi/EPbLFTHDPyX65a23yQRMsI/SeV5UKpfy4xRC07J8KLRzC0NftMWxeCHjez5bc oqyp0M2YKmBqURTTexmE0nKizE0UmzZTWN4T8tR8giH+MJEUmwat1ezz6GUaD//QBaRt4cH20Bu YPca2+8dY22RaV9SKAB8p//Tj8qeUyVQa1d7Un+r2cpuE6zrQykGYNEwaQvjAL1I7hiYUlpwYVP I+iwsSheNgR9msjvsIw== X-Proofpoint-ORIG-GUID: 2R0iqfKeYM9tvrCviVWV7syOGpWgsT7X X-Proofpoint-Spam-Info: AW1haW4tMjYwODEwMDEzNCBTYWx0ZWRfX3iLptxfBG5rS gBT3MogntuRLSI9wfEqNUNCe6+aERuFr7TKGJUDcJYj8fmWNAIOJ3EbimCWkwLd1Qd5hzFrBSsS WRC+yjvFYYtvWGd0SNeWgIaftIOkX6o= 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 suspectscore=0 adultscore=0 lowpriorityscore=0 clxscore=1015 priorityscore=1501 impostorscore=0 phishscore=0 spamscore=0 bulkscore=0 malwarescore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608100134 Encapsulate allocation of struct vsie_page and free into its own methods to allow this from multiple code paths. Signed-off-by: Christoph Schlameuss --- arch/s390/kvm/vsie.c | 26 ++++++++++++++++++++++---- 1 file changed, 22 insertions(+), 4 deletions(-) diff --git a/arch/s390/kvm/vsie.c b/arch/s390/kvm/vsie.c index 86e1c605f4ce..20e5fcbe382c 100644 --- a/arch/s390/kvm/vsie.c +++ b/arch/s390/kvm/vsie.c @@ -1502,6 +1502,24 @@ static void put_vsie_page(struct vsie_page *vsie_page) clear_bit(VSIE_PAGE_IN_USE, &vsie_page->flags); } +static void free_vsie_page(struct vsie_page *vsie_page) +{ + free_page((unsigned long)vsie_page); +} + +static struct vsie_page *alloc_vsie_page(struct kvm *kvm) +{ + struct vsie_page *vsie_page; + + vsie_page = (struct vsie_page *)__get_free_page(GFP_KERNEL_ACCOUNT | __GFP_ZERO | GFP_DMA); + if (!vsie_page) + return vsie_page; + + /* Mark it as invalid until it resides in the tree. */ + vsie_page->scb_gpa = ULONG_MAX; + return vsie_page; +} + /* * Get or create a vsie page for a scb address. * @@ -1537,7 +1555,7 @@ static struct vsie_page *get_vsie_page(struct kvm *kvm, unsigned long addr) mutex_lock(&kvm->arch.vsie.mutex); if (kvm->arch.vsie.page_count < nr_vcpus) { - vsie_page = (void *)__get_free_page(GFP_KERNEL_ACCOUNT | __GFP_ZERO | GFP_DMA); + vsie_page = alloc_vsie_page(kvm); if (!vsie_page) { mutex_unlock(&kvm->arch.vsie.mutex); return ERR_PTR(-ENOMEM); @@ -1557,9 +1575,9 @@ static struct vsie_page *get_vsie_page(struct kvm *kvm, unsigned long addr) if (vsie_page->scb_gpa != ULONG_MAX) radix_tree_delete(&kvm->arch.vsie.addr_to_page, vsie_page->scb_gpa >> SCB_ALIGNMENT_SHIFT); + /* Mark it as invalid until it resides in the tree. */ + vsie_page->scb_gpa = ULONG_MAX; } - /* Mark it as invalid until it resides in the tree. */ - vsie_page->scb_gpa = ULONG_MAX; /* Double use of the same address or allocation failure. */ if (radix_tree_insert(&kvm->arch.vsie.addr_to_page, addr >> SCB_ALIGNMENT_SHIFT, @@ -1662,7 +1680,7 @@ void kvm_s390_vsie_destroy(struct kvm *kvm) if (vsie_page->scb_gpa != ULONG_MAX) radix_tree_delete(&kvm->arch.vsie.addr_to_page, vsie_page->scb_gpa >> SCB_ALIGNMENT_SHIFT); - free_page((unsigned long)vsie_page); + free_vsie_page(vsie_page); } kvm->arch.vsie.page_count = 0; mutex_unlock(&kvm->arch.vsie.mutex); -- 2.55.0