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 F3DA340F8ED for ; Wed, 12 Aug 2026 22:13:32 +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=1786572814; cv=none; b=M6gtfRmjtFUoeuGAEcXD3vmXO1NXmfAOdKhlGmsFXnGuAiAQT8IZSWYXYjg58Ky11hgITRyBS3wP3cfkWq64wWXr344R/V+ioiYWRObalcPl9pemNkX09hXfe0imJG53JECpjIpCGi6Em/A8AZgw4gzafgLS/W4fTYUUFQXXB4g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786572814; c=relaxed/simple; bh=SR7FYPbfPxRbiYfrmy0t7UkIl4ca0gR2JBQc8CFfym0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=YgiwHt+fYNhm8KxK8CbY76T/6cb9Ll7IjufNYv1+gINHWYL5/W4IdTXCZqfZ39crYaKX5ZbyXluPirheto9+dGUI02yu6jWP2Ngb1GbgIHoMevHJS25QSwsv3BnYFcaLxqkKGB1sn9d3WProLSppaXg5HrfnULsWuRbLvVt4+zg= 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=m944kL6O; 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="m944kL6O" 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 67CK35K8243867; Wed, 12 Aug 2026 22:13:30 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=naoB1o1sKAHq82S5f O43eSgWAOMgW7/IILO8GIgie9o=; b=m944kL6O5gLfSCpzH2Gu4KR/4WtYmdyLV M9k7hYdX3jPIp6ve/ZOYaD90+M+kHiTVhtJGsB3/+WJyxpILsldxPPah2Dh8/Y6C XjUQX79Er/OaDD7OnVvmhJ7rS+GQtYay55DK4L5tNXPNSWM1+OmAY1hrOQBzywSa AP5yFVjFOrAqh1vFwHZgvI1kg49n7wLf630Cwkpnf01ayCx5+opjC3GsnjRGaWlI ABnV5VMg8pAnqv8e0Juhi7eoRjIKslsnxjyPMq6IbJ4Q5HitactxIjal5BbqFwdo 9ofDobYvP6icVIfuDoQY9mNyc90w/eeTSF+ucyUyNW2an9Su+yr2g== 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 4fwvq9n02c-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Aug 2026 22:13:30 +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 67CMBGXT013634; Wed, 12 Aug 2026 22:13:29 GMT Received: from smtprelay06.wdc07v.mail.ibm.com ([172.16.1.73]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fxfsk0ajb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 12 Aug 2026 22:13:29 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (smtpav03.dal12v.mail.ibm.com [10.241.53.102]) by smtprelay06.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 67CMDSwb25100976 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 12 Aug 2026 22:13:28 GMT Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id EE8FE5803F; Wed, 12 Aug 2026 22:13:27 +0000 (GMT) Received: from smtpav03.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 798685805A; Wed, 12 Aug 2026 22:13:27 +0000 (GMT) Received: from IBM-D32RQW3.ibm.com (unknown [9.61.244.42]) by smtpav03.dal12v.mail.ibm.com (Postfix) with ESMTP; Wed, 12 Aug 2026 22:13:27 +0000 (GMT) From: Farhan Ali To: stable@vger.kernel.org, gregkh@linuxfoundation.org, sashal@kernel.org Cc: alifm@linux.ibm.com, Matthew Rosato , Christian Borntraeger Subject: [PATCH v2 6/8] KVM: s390: pci: Fix resource leak on IRQ registration failure Date: Wed, 12 Aug 2026 15:13:21 -0700 Message-ID: <20260812221323.3645-7-alifm@linux.ibm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260812221323.3645-1-alifm@linux.ibm.com> References: <20260812221323.3645-1-alifm@linux.ibm.com> Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-TM-AS-GCONF: 00 X-Proofpoint-GUID: jY9PlrcxdS-NOLRmzDH9HcLnWFXOSZBm X-Authority-Analysis: v=2.4 cv=PbDPQChd c=1 sm=1 tr=0 ts=6a7cf00a cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=iQ6ETzBq9ecOQQE5vZCe:22 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=TYCmRUurIKQ9kozAUfwA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODEyMDE3NyBTYWx0ZWRfXzuPgRx2Qo0li pq9DhO4svjdz0UWLaO2DtVznvW8MEQWXD0iMPwGrAtmimTD1HJmGNGLR5uDp3Wk+zCq5+ooCMyv zOI7oFk7ICeay1oHakUKL6iBTXGrKtdew5Dd3dmg58VTjCVxyaKEMhqT+Xy/hT4gVBdTdnQ7maS MQS1SVjzAU8PlXNM1k/R0CS9uuLewws/eeI4fSFgwrsSwRASYAinIjaBRLZNst0R2bDNKU9ivAY S0Ip9lOyEydIPlRrvgpwtp6vqJNDrbDgXK12K50Av8rjXf/T8OBLLBgs8psEOwBRqEsSw9BsF8v ziZ5/jadzUTtPCSB7yocR/Qjm6JetOoUrBqiwC7BZCl0oZhanZacZYOfTwPAsfeguPwv1stb98H xm1HDhT+K+Dp7W3gd5ujnyOKCfN2ZThTURx1JiA1RhiNLLMiMNEreL9Dc3Pg4KqwixYAvM0Aj4I FPT9LtPYJ6NLgqLTg2g== X-Proofpoint-ORIG-GUID: jY9PlrcxdS-NOLRmzDH9HcLnWFXOSZBm X-Proofpoint-Spam-Info: AW1haW4tMjYwODEyMDE3NyBTYWx0ZWRfX1Q5g/OivB5Vt d0Y1G+yxwgrjLhJcqoryhqrBLkvfqcvxoADe4QymtnvIft+t2Ph01dZQ2fd5IRg2bNRwECBvHMM lUcofUW4kTzjMTQbEtJLdSC70RNQH7o= 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-12_06,2026-08-12_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 bulkscore=0 impostorscore=0 malwarescore=0 adultscore=0 clxscore=1015 priorityscore=1501 suspectscore=0 phishscore=0 lowpriorityscore=0 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608120177 Currently if kvm_zpci_set_airq() fails, kvm_s390_pci_aif_enable() returns the error code but doesn't do any resource cleanup thus leaking resources. Fix this by cleaning up all the resources such as the GAITE, AIBV, AISB and unpinning any pinned pages. While at it, remove dead code that stored FIB values that were never referenced. As part of the cleanup, we are also holding the aift_lock a bit longer, as we hold the lock while executing the MPCIFC instruction. Though this is not strictly necessary, it means we don't have to drop and re-acquire in the error case. Fixes: 3c5a1b6f0a18 ("KVM: s390: pci: provide routines for enabling/disabling interrupt forwarding") Cc: stable@vger.kernel.org Reviewed-by: Matthew Rosato Reviewed-by: Christian Borntraeger Signed-off-by: Farhan Ali Tested-by: Matthew Rosato Signed-off-by: Christian Borntraeger (cherry picked from commit 5580c9858f1e00f60191eb09c3add359836d60b6) [alifm@linux.ibm.com: Resolved merge conflict] Signed-off-by: Farhan Ali --- arch/s390/kvm/pci.c | 29 +++++++++++++++++++++-------- 1 file changed, 21 insertions(+), 8 deletions(-) diff --git a/arch/s390/kvm/pci.c b/arch/s390/kvm/pci.c index 2a94c4d9f050..d7a2822ee4a0 100644 --- a/arch/s390/kvm/pci.c +++ b/arch/s390/kvm/pci.c @@ -345,19 +345,32 @@ static int kvm_s390_pci_aif_enable(struct zpci_dev *zdev, struct zpci_fib *fib, aift->kzdev[zdev->aisb] = zdev->kzdev; spin_unlock_irq(&aift->gait_lock); - /* Update guest FIB for re-issue */ - fib->fmt0.aisbo = zdev->aisb & 63; - fib->fmt0.aisb = virt_to_phys(aift->sbv->vector + (zdev->aisb / 64) * 8); - fib->fmt0.isc = gisc; - /* Save some guest fib values in the host for later use */ - zdev->kzdev->fib.fmt0.isc = fib->fmt0.isc; + zdev->kzdev->fib.fmt0.isc = gisc; zdev->kzdev->fib.fmt0.aibv = fib->fmt0.aibv; - mutex_unlock(&aift->aift_lock); /* Issue the clp to setup the irq now */ rc = kvm_zpci_set_airq(zdev); - return rc; + if (!rc) { + mutex_unlock(&aift->aift_lock); + return rc; + } + + /* Start cleanup */ + zdev->kzdev->fib.fmt0.isc = 0; + zdev->kzdev->fib.fmt0.aibv = 0; + + spin_lock_irq(&aift->gait_lock); + gaite->count--; + gaite->aisb = 0; + gaite->gisc = 0; + gaite->aisbo = 0; + gaite->gisa = 0; + aift->kzdev[zdev->aisb] = NULL; + spin_unlock_irq(&aift->gait_lock); + + airq_iv_release(zdev->aibv); + zdev->aibv = NULL; free_aisb: airq_iv_free_bit(aift->sbv, zdev->aisb); -- 2.43.0