From nobody Sat Jun 13 16:18:26 2026 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 6D20A47ECE2; Wed, 6 May 2026 14:12:10 +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=1778076731; cv=none; b=uhqFrHuiuvybJAhaaDEQBo8RgF7I0Qh+Dxz+0pxL11MLufWFJPk/dKp1AVrjtOePWoysZz45Tkk+cBZATVL/ijf/KMkbaCu49l4svNZbECjMkOKcV4DGCcXWrfP8BqKD/1JP2iL3nsHup7lpi7aK3RKRKFJblEJHuP1Y/2qmhcQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778076731; c=relaxed/simple; bh=kQ61SAgcpNKVNqQyHejQt/G1nqRZgV8Fz2vwq2rwfAg=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=BHCz8zwuvDq1AieTzOyzcbznSFp2S/avaPla7OXzLiZ38RsM5QcfmmqT7C5HM8vB87FP1wMHyVvqVSY99+JTU3J4PMbmJOAWoczyA/jNwDAFV/JUfFF3umiGHMD/xIcha9oZ0NYwtkOAo7hnXjHuIDJI/bm2POAQjJhb40RWLIQ= 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=Ffn1GEyn; 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="Ffn1GEyn" Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 646703Ej1105811; Wed, 6 May 2026 14:12:06 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=DhfPWcO5EF3y/xxNO 7K0qO9cxW4EkyZsDNGaVY1+IN4=; b=Ffn1GEynO5JXplSVKLzAL/DdS5Y7vKP6u 5t8lsz6/Y+p1Zm3dBWVsDxTksCz8yXQmwH5t8ihyPRJBIHSb0QZjDxLDLpqnNUC/ 8R/bF67G2vSTOMyPMMNZEYMbCktFf1CCnMRyWSj6HlXcy7rYT0ejQ6APr2WuX4VG 6KeBjKnlj9I73bgaOQ/oJoLR0PqTvLXdDSvy9CjUdQWpqlY1HxXi7mdSPXikOcgf hPtwj60ddrZdyvZzqWmsePB2wkjx1z33jMXq5BYCqlV0TCM8xXy1DsRTfNeR9KNf YvqZzcMqIxxqFSXd24XzYh0Q69c369haoEe4VELWAtv8il0g/swyg== Received: from ppma13.dal12v.mail.ibm.com (dd.9e.1632.ip4.static.sl-reverse.com [50.22.158.221]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4dw9y4rdgk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 May 2026 14:12:06 +0000 (GMT) Received: from pps.filterd (ppma13.dal12v.mail.ibm.com [127.0.0.1]) by ppma13.dal12v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 646E9g4i007382; Wed, 6 May 2026 14:12:06 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma13.dal12v.mail.ibm.com (PPS) with ESMTPS id 4dwwtgec80-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 May 2026 14:12:05 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 646EC0NS60162496 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 6 May 2026 14:12:00 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 720B020065; Wed, 6 May 2026 14:12:00 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 457B620063; Wed, 6 May 2026 14:12:00 +0000 (GMT) Received: from p-imbrenda.aag-de.ibm.com (unknown [9.52.223.175]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 6 May 2026 14:12:00 +0000 (GMT) From: Claudio Imbrenda To: linux-kernel@vger.kernel.org Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org, borntraeger@de.ibm.com, frankja@linux.ibm.com, david@kernel.org, seiden@linux.ibm.com, nrb@linux.ibm.com, schlameuss@linux.ibm.com, gra@linux.ibm.com Subject: [PATCH v1 1/3] KVM: s390: vsie: Fix memory leak when unshadowing Date: Wed, 6 May 2026 16:11:57 +0200 Message-ID: <20260506141159.154240-2-imbrenda@linux.ibm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260506141159.154240-1-imbrenda@linux.ibm.com> References: <20260506141159.154240-1-imbrenda@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTA2MDEzOSBTYWx0ZWRfXzVe1Qp2mGNRd EP7GmOVNUkoN33P361bs4m1yKSG6n2WWhWD8B1oDSmnh5NSpkzw8SVdNoOgonnhE995vmu9EXgc A7wsQehoAPq4+N8/Fidcr2SMmgtI2KFDCDjizZcFkZKCIHwaoHcki2hZiBn/eel+GJH3uKE3vnp Dmptn9pZqC9wMnDSjuwApVp35+JJugbSNZn8yTx+Axz+7ZqOfWhpYj2ZRiNbo7Drs0Y5G8op+Vx O3O+7IaHRDTAIe+NwRe1eyPKpu4VRJOUIzgGt71m8fiy2e9JyA6xzKEMsblEjQtee8V0Or3/wUE EEnP1vI9DP/A2JiIS5OxwJazTtAxXhud7DFEdFB9UGqWyQNq347ucCOmmLAlks3QP4k5RkS+hFa w3OgNIcOcvIC7VFrJldbn5H+t9Cc+0Iky5C/9jkdu+8ekJ+NV+4LzD7PKDagLdsxy67sPFwpgev KArycMLzSra9p2V52Ig== X-Authority-Analysis: v=2.4 cv=J4GaKgnS c=1 sm=1 tr=0 ts=69fb4c36 cx=c_pps a=AfN7/Ok6k8XGzOShvHwTGQ==:117 a=AfN7/Ok6k8XGzOShvHwTGQ==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=RzCfie-kr_QcCd8fBx8p:22 a=VnNF1IyMAAAA:8 a=FIwfFwBzLqp-Dx9J93EA:9 X-Proofpoint-GUID: pg7UiIAw5nVFWB4yJmw3TbLFR8OC1mlJ X-Proofpoint-ORIG-GUID: pg7UiIAw5nVFWB4yJmw3TbLFR8OC1mlJ X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-05_03,2026-05-06_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 clxscore=1015 malwarescore=0 bulkscore=0 suspectscore=0 priorityscore=1501 spamscore=0 phishscore=0 adultscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605060139 Content-Type: text/plain; charset="utf-8" When performing a partial unshadowing, the rmap was being leaked. Add the missing kfree(). Fixes: a2c17f9270cc ("KVM: s390: New gmap code") Signed-off-by: Claudio Imbrenda Reviewed-by: Christoph Schlameuss --- arch/s390/kvm/gmap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/arch/s390/kvm/gmap.c b/arch/s390/kvm/gmap.c index 3c26e35af0ef..fd1927761980 100644 --- a/arch/s390/kvm/gmap.c +++ b/arch/s390/kvm/gmap.c @@ -1143,8 +1143,10 @@ void _gmap_handle_vsie_unshadow_event(struct gmap *p= arent, gfn_t gfn) } scoped_guard(spinlock, &sg->host_to_rmap_lock) head =3D radix_tree_delete(&sg->host_to_rmap, gfn); - gmap_for_each_rmap_safe(rmap, rnext, head) + gmap_for_each_rmap_safe(rmap, rnext, head) { gmap_unshadow_level(sg, rmap->r_gfn, rmap->level); + kfree(rmap); + } } } =20 --=20 2.54.0 From nobody Sat Jun 13 16:18:26 2026 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 07EF73EBF2F; Wed, 6 May 2026 14:12:10 +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=1778076732; cv=none; b=trBHp2BXrI2CG6LKWmH6MGle7b3d2xRWuX8QPgpYjYf967CtI9QfzZ61zfZf8Dcgu4gWLiCoL2pkIE/kaauOQB1X3P9hi2UakXpW/NXTsUw3z8Q5Wy0ql88QeHptnnmvoonY1c2cL9JxvYkFjs4ayljLz7NnNfVm8SRQliDDWLA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778076732; c=relaxed/simple; bh=uV7zSy0el/vGLgHsiSmPpflQKIpEHxU6qV9MJH93HW4=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=OY5H25flEsGs8bQC23EXP80ycQAiAsu/TOrGliHi0TnnbYxhvnKeLojy1Qs6APv+CoovC7H8U/1clFJjJHVBGKl+OuBUqlnXwcc+5SBBtyEpapg0Dt2PbVCxaN9zI0v/YS3XB0/FmsXxJzB5QwT3zLo011rE01us5xYehmYAO7c= 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=W84A6Fkd; 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="W84A6Fkd" Received: from pps.filterd (m0360083.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 6460tWa81383158; Wed, 6 May 2026 14:12:07 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=7Hi6x6owi33AHI8nF 8akzM8rEDf01kP9B4FFxVEBRJ0=; b=W84A6FkdTcoHjKdwq4CHZ5azQx/WcSEcG nmBVxzeZ8rDhup/0GOC9jM5O9A9jW5mgBcVcCTjB6rl9epcu4HHnLq2PrRcaRS66 f8FKoK03r3iVpppQdo3HGaihFY4BlW/XlnOZiV6PEO6YLaoeb41CBgzmMmQd4Y5T 0wCkaOC9BT63ULrOXo+sSuArWM2T0aNOQmEmFiOlKoWNsaPzeiNGcXFDt7vmG20T Bx+57nsGzkSmEoiZvwStcJZYEblvznMap6Df+4vPmyYWO44lPQy//9HP/6WzZBVO pFecfGmXnhm44l41B0OcMUF57I1WEy9sB+OqnL1kHaBmlduYZPFiQ== 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 4dw9v7h4w5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 May 2026 14:12:07 +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 646E9at6001518; Wed, 6 May 2026 14:12:06 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma22.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4dwuyw6mrs-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 May 2026 14:12:06 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 646EC0ee58327424 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 6 May 2026 14:12:00 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id A50EE2004B; Wed, 6 May 2026 14:12:00 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 771CE20067; Wed, 6 May 2026 14:12:00 +0000 (GMT) Received: from p-imbrenda.aag-de.ibm.com (unknown [9.52.223.175]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 6 May 2026 14:12:00 +0000 (GMT) From: Claudio Imbrenda To: linux-kernel@vger.kernel.org Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org, borntraeger@de.ibm.com, frankja@linux.ibm.com, david@kernel.org, seiden@linux.ibm.com, nrb@linux.ibm.com, schlameuss@linux.ibm.com, gra@linux.ibm.com Subject: [PATCH v1 2/3] KVM: s390: Fix memory leak in UCONTROL path Date: Wed, 6 May 2026 16:11:58 +0200 Message-ID: <20260506141159.154240-3-imbrenda@linux.ibm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260506141159.154240-1-imbrenda@linux.ibm.com> References: <20260506141159.154240-1-imbrenda@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTA2MDEzOSBTYWx0ZWRfXxUOgQz8RATAY 7uUrEERlaINJs2XhvrHn8lalo1Ti0UV/GSfmiRierqhAwGHl0TBvXhURHjKvmTcnjTpHUx1Ytp/ KLeBhiCwA2MZzN6KxOlKVvrxPJZcPQgmKymeukZ+A8FSNSLndCGclJl9XNWsdetbcxSwsGi1wt/ dBbr7cAXpBJrvQdOsznGSY/UFdJ9rdwweIBthSLKJZ1tz/yqG9I13jvAzT//801IVAFEK55WkFB baXZCOUXyM2iHfPj4Ave1ygvbgIljf8FGjfIZjQ0Q1OFLTVqs/ILBbnvagLbpVKaMeQd8cQtMis rhFdOj6oeLK/MDgNtQ93SN0+v/4sMAPSzGKVHT9qJ3a42Qv097i0noxveT6F8VGYzfSdMD24DYn T3kIDnnkTfZLgL9GM5Upjn5n9n18w+c5R1+RwXNZoFpYGEqpSjcDHflzYby4jqX/CInHukOx/mf yljdIq8CxBO596u9xOw== X-Proofpoint-GUID: lcAYYLc5YJRCL8xUqtFuiw8Nkmpk8NtJ X-Proofpoint-ORIG-GUID: lcAYYLc5YJRCL8xUqtFuiw8Nkmpk8NtJ X-Authority-Analysis: v=2.4 cv=eu/vCIpX c=1 sm=1 tr=0 ts=69fb4c37 cx=c_pps a=5BHTudwdYE3Te8bg5FgnPg==:117 a=5BHTudwdYE3Te8bg5FgnPg==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=VnNF1IyMAAAA:8 a=jYruZbZcGJNaxceoNIUA:9 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-05_03,2026-05-06_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 phishscore=0 lowpriorityscore=0 clxscore=1015 adultscore=0 suspectscore=0 malwarescore=0 bulkscore=0 impostorscore=0 spamscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605060139 Content-Type: text/plain; charset="utf-8" Fix a memory leak that can happen if gmap_ucas_map_one() or kvm_s390_mmu_cache_topup() return error values. Signed-off-by: Claudio Imbrenda Fixes: a2c17f9270cc ("KVM: s390: New gmap code") Reported-by: Jiaxin Fan --- arch/s390/kvm/gmap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/s390/kvm/gmap.c b/arch/s390/kvm/gmap.c index fd1927761980..c1140da0689d 100644 --- a/arch/s390/kvm/gmap.c +++ b/arch/s390/kvm/gmap.c @@ -822,8 +822,8 @@ int gmap_ucas_translate(struct kvm_s390_mmu_cache *mc, = struct gmap *gmap, gpa_t =20 int gmap_ucas_map(struct gmap *gmap, gfn_t p_gfn, gfn_t c_gfn, unsigned lo= ng count) { - struct kvm_s390_mmu_cache *mc; - int rc; + struct kvm_s390_mmu_cache *mc __free(kvm_s390_mmu_cache) =3D NULL; + int rc =3D 0; =20 mc =3D kvm_s390_new_mmu_cache(); if (!mc) --=20 2.54.0 From nobody Sat Jun 13 16:18:26 2026 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 84DAC3EFD1C; Wed, 6 May 2026 14:12:11 +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=1778076733; cv=none; b=bPptxi6pZOwwWylvAXG97ylaGSiRdJVKKHMYVz8w4rXC0JOJFsDBVkTQ33gzSE2uHezWdeiozuKNqlyi5NPJYTd8/D+vrjHiWLjDwga5RI7PnJbE6dY/T0R9jgWlTjmXn+CeNKh7VW2TZRy6PGVLDY3/He0oVRe1mzd4wSg6uLw= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778076733; c=relaxed/simple; bh=PQXL2q8lPz28tHv3UNIhhZHz7U9Srk3+0bqAXPx1isU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=ArG9ensP2hbDDMduyCkD/cxO/lU+RHujT9DrGxDg+2x99M+yC2I6E38ztYtGyqRePoseiadUy3pOoKHYNZZDdOQM8tVq8SDuebe5Rmmif7eCVfePXFIqr8AOd8a7dkcIUasELS1oUDu/6a+i8WFG1DjDiZmBXgVVvKFcfQX85+U= 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=noA8kfOb; 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="noA8kfOb" 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 645MtRoe989845; Wed, 6 May 2026 14:12:07 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=cc :content-transfer-encoding:date:from:in-reply-to:message-id :mime-version:references:subject:to; s=pp1; bh=HEftkmCaoDUHlx8a+ 3vIvDJinmnGodSU8A50Eix8Pz8=; b=noA8kfObQWZ52T524zqr251gJuprTbakm Z0IPTqcP+dPCkyKsWoemIAaHyoCKFtbkT9AuebFu8XwwQWNT6ndWxi93BX8pTYwa yhN5biyp4fkBlUqkKA91bnI8/Ac8V6nmfScrlr6ff8QiXpIiUWCMikIaEMJq5eeK C+NjfSSijZP2Z4oDuweYFLtDYu85eK+gyTd6JWwx2JVrwTjqDxkwoIlLnBh11XIn r2vlOw7bXVDbTUxr+l5wD56VxIYVZZihshjnrqdR9MV9M4WuVLcjV2zl+JGvXvWu pfbZHro67wRXq33o0QGfZ4v8EC5gLU/GPrjLFhd0UKdeQ8WsUsFkA== Received: from ppma23.wdc07v.mail.ibm.com (5d.69.3da9.ip4.static.sl-reverse.com [169.61.105.93]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 4dw9w6gcv8-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 May 2026 14:12:07 +0000 (GMT) Received: from pps.filterd (ppma23.wdc07v.mail.ibm.com [127.0.0.1]) by ppma23.wdc07v.mail.ibm.com (8.18.1.7/8.18.1.7) with ESMTP id 646E9bIR024653; Wed, 6 May 2026 14:12:06 GMT Received: from smtprelay01.fra02v.mail.ibm.com ([9.218.2.227]) by ppma23.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4dww3h6g2v-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 06 May 2026 14:12:06 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (smtpav01.fra02v.mail.ibm.com [10.20.54.100]) by smtprelay01.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 646EC0aw62914898 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 6 May 2026 14:12:01 GMT Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id C675A20043; Wed, 6 May 2026 14:12:00 +0000 (GMT) Received: from smtpav01.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id AA4282005A; Wed, 6 May 2026 14:12:00 +0000 (GMT) Received: from p-imbrenda.aag-de.ibm.com (unknown [9.52.223.175]) by smtpav01.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 6 May 2026 14:12:00 +0000 (GMT) From: Claudio Imbrenda To: linux-kernel@vger.kernel.org Cc: kvm@vger.kernel.org, linux-s390@vger.kernel.org, borntraeger@de.ibm.com, frankja@linux.ibm.com, david@kernel.org, seiden@linux.ibm.com, nrb@linux.ibm.com, schlameuss@linux.ibm.com, gra@linux.ibm.com Subject: [PATCH v1 3/3] KVM: s390: vsie: Fix unshadowing logic Date: Wed, 6 May 2026 16:11:59 +0200 Message-ID: <20260506141159.154240-4-imbrenda@linux.ibm.com> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260506141159.154240-1-imbrenda@linux.ibm.com> References: <20260506141159.154240-1-imbrenda@linux.ibm.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Authority-Analysis: v=2.4 cv=XPQAjwhE c=1 sm=1 tr=0 ts=69fb4c37 cx=c_pps a=3Bg1Hr4SwmMryq2xdFQyZA==:117 a=3Bg1Hr4SwmMryq2xdFQyZA==:17 a=NGcC8JguVDcA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=Y2IxJ9c9Rs8Kov3niI8_:22 a=VnNF1IyMAAAA:8 a=Ww7HMaUJomrHWgeF4nUA:9 X-Proofpoint-ORIG-GUID: k10qdcYFr75xG3EjYB18BhP2rQbZTOb4 X-Proofpoint-GUID: k10qdcYFr75xG3EjYB18BhP2rQbZTOb4 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwNTA2MDEzOSBTYWx0ZWRfXz1kztoRrKlBL DikW+M3vurUoZAfKIi+GPpjoPop9XaesyApvlaMzMDyCS09h2MhZqxur/xPIBwWMM3zP2dgt+fs Z7PRnTAmXGARQPjcXh8jf1ZRezY5Tjp3cU8kk/JzutHw5Je926DprQtVhu8ulRg8nDp1U7G9z6Y Ys2KOdysFEfMcXGufOdZzRFm2ZfNTLhJryHXGmCD/D0ggBVNq0eZlxk4+iQ9O/wwvL7RHh0NEV2 rIoP8wFgTstYN7QVRTHUftz9gY6+NcBbxCc4Tv74n9vFjkPdV9jQo7Ttm4/5AxBJ4ZRb/nAJAWq SoPwF1Y0aI2gpfcq+x168zGC4NQB6UjP0PwsryAqFjC/mlKPXHN9+toxECPtJxTQOmsIfuP51Y8 mtj+qtOfgGz917UGwBOObKyq8nJne4JlXO7CLCAfuI8FqS9COcdyReyPH+CPuhRaJ8r7d1ZpN2e VvRf3iChu9HyUYTFvYA== X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.293,Aquarius:18.0.1143,Hydra:6.1.51,FMLib:17.12.100.49 definitions=2026-05-05_03,2026-05-06_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 bulkscore=0 lowpriorityscore=0 suspectscore=0 adultscore=0 spamscore=0 priorityscore=1501 impostorscore=0 phishscore=0 malwarescore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2604200000 definitions=main-2605060139 Content-Type: text/plain; charset="utf-8" In some cases (i.e. under extreme memory pressure on the host), attempting to shadow memory will result in the same memory being unshadowed, causing a loop. Add a PGSTE bit to distinguish between shadowed memory and shadowed DAT tables, fix the unshadowing logic in _gmap_ptep_xchg() to prevent unnecessary unshadowing and perform better checks. Also fix the unshadowing logic in _gmap_crstep_xchg_atomic() which did not unshadow properly when the large page would become unprotected. Signed-off-by: Claudio Imbrenda Fixes: a2c17f9270cc ("KVM: s390: New gmap code") --- arch/s390/kvm/dat.h | 3 ++- arch/s390/kvm/gmap.c | 1 + arch/s390/kvm/gmap.h | 12 ++++++++++-- 3 files changed, 13 insertions(+), 3 deletions(-) diff --git a/arch/s390/kvm/dat.h b/arch/s390/kvm/dat.h index 8f8278c44879..873e13ac5a27 100644 --- a/arch/s390/kvm/dat.h +++ b/arch/s390/kvm/dat.h @@ -145,7 +145,8 @@ union pgste { unsigned long cmma_d : 1; /* Dirty flag for CMMA bits */ unsigned long prefix_notif : 1; /* Guest prefix invalidation notificatio= n */ unsigned long vsie_notif : 1; /* Referenced in a shadow table */ - unsigned long : 5; + unsigned long vsie_gmem : 1; /* Contains nested guest memory */ + unsigned long : 4; unsigned long : 8; }; struct { diff --git a/arch/s390/kvm/gmap.c b/arch/s390/kvm/gmap.c index c1140da0689d..08fb806c9c36 100644 --- a/arch/s390/kvm/gmap.c +++ b/arch/s390/kvm/gmap.c @@ -1053,6 +1053,7 @@ int gmap_protect_rmap(struct kvm_s390_mmu_cache *mc, = struct gmap *sg, gfn_t p_gf pte.h.p =3D 1; pgste =3D _gmap_ptep_xchg(sg->parent, ptep, pte, pgste, p_gfn, false); pgste.vsie_notif =3D 1; + pgste.vsie_gmem |=3D level =3D=3D TABLE_TYPE_PAGE_TABLE; pgste_set_unlock(ptep, pgste); =20 return 0; diff --git a/arch/s390/kvm/gmap.h b/arch/s390/kvm/gmap.h index 96ee1395a592..f4caa3f42c0e 100644 --- a/arch/s390/kvm/gmap.h +++ b/arch/s390/kvm/gmap.h @@ -167,6 +167,13 @@ static inline bool gmap_unmap_prefix(struct gmap *gmap= , gfn_t gfn, gfn_t end) return _gmap_unmap_prefix(gmap, gfn, end, false); } =20 +static inline bool needs_unshadow(union pte oldpte, union pte newpte, unio= n pgste pgste) +{ + if (pgste.vsie_gmem) + return (oldpte.h.p !=3D newpte.h.p) || newpte.h.i; + return (oldpte.h.p && !newpte.h.p) || !newpte.s.pr; +} + static inline union pgste _gmap_ptep_xchg(struct gmap *gmap, union pte *pt= ep, union pte newpte, union pgste pgste, gfn_t gfn, bool needs_lock) { @@ -180,8 +187,9 @@ static inline union pgste _gmap_ptep_xchg(struct gmap *= gmap, union pte *ptep, un pgste.prefix_notif =3D 0; gmap_unmap_prefix(gmap, gfn, gfn + 1); } - if (pgste.vsie_notif && (ptep->h.p !=3D newpte.h.p || newpte.h.i)) { + if (pgste.vsie_notif && needs_unshadow(*ptep, newpte, pgste)) { pgste.vsie_notif =3D 0; + pgste.vsie_gmem =3D 0; if (needs_lock) gmap_handle_vsie_unshadow_event(gmap, gfn); else @@ -217,7 +225,7 @@ static inline bool __must_check _gmap_crstep_xchg_atomi= c(struct gmap *gmap, unio gmap_unmap_prefix(gmap, gfn, gfn + align); } if (crste_leaf(oldcrste) && oldcrste.s.fc1.vsie_notif && - (newcrste.h.p || newcrste.h.i || !newcrste.s.fc1.vsie_notif)) { + ((newcrste.h.p !=3D oldcrste.h.p) || newcrste.h.i || !newcrste.s.fc1.= vsie_notif)) { newcrste.s.fc1.vsie_notif =3D 0; if (needs_lock) gmap_handle_vsie_unshadow_event(gmap, gfn); --=20 2.54.0