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 A48522E8DEF for ; Fri, 7 Aug 2026 17:45:58 +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=1786124760; cv=none; b=hbvH00G4dbT4YBhd5jJOjrrvjnpdNqlv7ejSjdRnCigFD/tvu5xO71w8EUbRzewH34o6N1DexxQoVPkuQFNmQTumqotFyR/mF5ssYXrgtNEvug2JEnXuV96Cx7DGmVy6YRFiLHZcqtvjHeLIORpW8c85uo89oi/d/CU0OzRjBFw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1786124760; c=relaxed/simple; bh=aubyfu6lGSVqRrCcWw1o6hsZFHPDnDOwBXK+kF/7KDw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=N2s+zebfSnjl63WZI2CIhXAQH8SRbh8LSIXiQgPOpXZQF+AU0g1AsSDUTJygEZNa31ChvWdQjfea2g3DXZs6T1YtWGmGYjlKKClEAfDG3U+UWggs31hUYg421899Gj+VxYRV04LdBcj8yX5iDAs9I6xlAUeHBFct6bQIjP+4NvY= 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=dyVVZgep; 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="dyVVZgep" Received: from pps.filterd (m0353725.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.18.1.11/8.18.1.11) with ESMTP id 677Glh6C1927930; Fri, 7 Aug 2026 17:45:55 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=0P53vGtWG9KL39eU7 IMPPUNzhOpG3jC3EZR0hC4djrU=; b=dyVVZgep+/m4LObqgxrOrv/pdLpM0WNW1 wrAg1rI5Mvrei++6YTdDzd5xxu9w0gjDGjBGeOmNGHxRSIM1BftcWomZovpJAcYM b3bHsy+RSgZfWbFPvhxu667NdoWdeUxBxAee6DdCdpKahdA6B80KYPqIE2IEy6eT NCazbR7Qd31QViUkleO5hsBwCvHFq2HNmq1pZHevEUBYmHMGfdtolHEXToqf2LcV FPGrKchMifywK2uaszaIe/CnP1fM8h61wdGX45fLE1qZTbOyJx+/hsODa4IUpi8y Dg2qyPbu+aJOfcNyWKleLGPFUKB1htcKYgYei6DVdG0/lHpnTIj8A== 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 4fvy02d0gj-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Aug 2026 17:45:55 +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 677HfKkH018284; Fri, 7 Aug 2026 17:45:54 GMT Received: from smtprelay03.wdc07v.mail.ibm.com ([172.16.1.70]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 4fsv4kgr7b-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 07 Aug 2026 17:45:54 +0000 (GMT) Received: from smtpav04.dal12v.mail.ibm.com (smtpav04.dal12v.mail.ibm.com [10.241.53.103]) by smtprelay03.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 677HjFBg6947408 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Fri, 7 Aug 2026 17:45:15 GMT Received: from smtpav04.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 212B75805A; Fri, 7 Aug 2026 17:45:53 +0000 (GMT) Received: from smtpav04.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 99B9F58052; Fri, 7 Aug 2026 17:45:52 +0000 (GMT) Received: from IBM-D32RQW3.ibm.com (unknown [9.61.250.14]) by smtpav04.dal12v.mail.ibm.com (Postfix) with ESMTP; Fri, 7 Aug 2026 17:45:52 +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 v1 3/3] KVM: s390: pci: Fix resource leak on IRQ registration failure Date: Fri, 7 Aug 2026 10:45:50 -0700 Message-ID: <20260807174551.2359-4-alifm@linux.ibm.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20260807174551.2359-1-alifm@linux.ibm.com> References: <20260807174551.2359-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-Authority-Analysis: v=2.4 cv=G6ws1dk5 c=1 sm=1 tr=0 ts=6a7619d3 cx=c_pps a=GFwsV6G8L6GxiO2Y/PsHdQ==:117 a=GFwsV6G8L6GxiO2Y/PsHdQ==:17 a=Sv0fKeRqtYgA:10 a=VkNPw1HP01LnGYTKEx00:22 a=RnoormkPH1_aCDwRdu11:22 a=V8glGbnc2Ofi9Qvn3v5h:22 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=TYCmRUurIKQ9kozAUfwA:9 X-Proofpoint-Spam-Details-Enc: AW1haW4tMjYwODA3MDEzNSBTYWx0ZWRfX2BC51fvMjU3o wGmTQViaFO6AOg5F72+v3va/4xkMnfBqtK8+8an+ibcED7SHyu4EIhi8YZJW/GxX52cR8aVJj9e vQU2zt86HZGxD/4uJnPi/xcIFjFvtDkv3T231xvYXOMnR1AUsL08WMCZr22yMwrEtTJmKMmbIjp AICKmhdSEiPJEnMYvEAspHTyCdIhzy4otCraa87z8dMsFOKu80RIGZOj7jPJc0Vl6r4M2iILYhT vwnnkRNBycrpS4Sc9PnA2/IgrCb9k2AvObGVzJFO2fDJONH9ZjGY2eZLUixS80suPzpywWd3xVC +SbfaGXeWl5PX5w+dREx32mNtPr7vDVBor1nZj9Hby8St13BuvzSFYLNgICRYXUSix2jZM7PTxS x+UOcwBpdjpUxoxCyqnIKiljV/f7ALRwcKa9X0u2L+gFovvgWuvkNXDA4UF74Uq/UcKLawB4KdN h8Ovy7A3ewRnVMH+65w== X-Proofpoint-ORIG-GUID: LHSflfBk980fquuWzZlDQSwIiCjuJ8bD X-Proofpoint-Spam-Info: AW1haW4tMjYwODA3MDEzNSBTYWx0ZWRfXyvs8y3E8G/65 5mTYVjCCf1hYQQtiC0Qlb+npzW8RhcJjqRVsvC6hc6Tff/74xyCLj9eDJx/BNGfUMyPUT2XB+kn JrkZgiTSzRVLJdxC3GPriolaUN/jON0= X-Proofpoint-GUID: LHSflfBk980fquuWzZlDQSwIiCjuJ8bD 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-07_03,2026-08-07_01,2025-10-01_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 impostorscore=0 spamscore=0 lowpriorityscore=0 suspectscore=0 malwarescore=0 phishscore=0 priorityscore=1501 adultscore=0 bulkscore=0 clxscore=1015 classifier=typeunknown authscore=0 authtc= authcc= route=outbound adjust=0 reason=mlx scancount=1 engine=8.22.0-2606150000 definitions=main-2608070135 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 7ee1f892c7fd..8ac383e3def5 100644 --- a/arch/s390/kvm/pci.c +++ b/arch/s390/kvm/pci.c @@ -336,19 +336,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; unlock: if (pcount > 0) -- 2.43.0