Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (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 C29EC46D0A4; Tue, 21 Jul 2026 18:26:47 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784658409; cv=none; b=r5vSBf4/FBoIDIhgAL6uCYkx4tRzpQMbUjTCWTk7Oj9HDtF4pIfSzSwxn+HVZ53C/2t2HDbVYzwVJuHsEVmqqSP9OxLd41S1GzRwf0wzjrqGSpkKz71+P4gsYtfHwsSto820DSgY0y1ufvcwNDOknyxPZG3Uxohy+WuAQhNRgdM= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784658409; c=relaxed/simple; bh=rcqCdh1V5MGff6FOULue7fKaml0mWVVvuX5rIZDy4OA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=X50YY6IehYYANGfyfzuqUq1o7Ap8y+VJND8UAz5/Aok+P30jSnovF3gkQss7pzdGEygPnPmxOsAZFO9hg9u5yedQqH6s3NmpTaXAQgZzQI2HUw/qKf2OIpYR5fLys3dMsvq+LVmeTBHkSaHiECZ0B+hGG29iHxGmTkTXLC+2uYI= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=WtpTiTFB; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="WtpTiTFB" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C0CDF1F000E9; Tue, 21 Jul 2026 18:26:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784658407; bh=Ib0GlIwylFds6i0Hl5v4Ot5FsoTF1NrPX3LH1kIZ/xg=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=WtpTiTFBzpKWvE37L8QOcnUJVg3UJF9yisOqltnD/TZZSvD1hZ5Fd3OS/qCwBdMaC PkV0z9/80Uc15IqVtDTA1v7aAqXKr1al5IlZ3/ImOLkZUWCvQe420vKhMWXNRDoKG5 hEiVjVU6OnghFV6XnBTz+yEGB9fG01CEp4bDMJlE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Farhan Ali , Matthew Rosato , Christian Borntraeger Subject: [PATCH 6.18 1132/1611] KVM: s390: pci: Fix handling of AIF enable without AISB Date: Tue, 21 Jul 2026 17:20:48 +0200 Message-ID: <20260721152540.885931373@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152514.750365251@linuxfoundation.org> References: <20260721152514.750365251@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Matthew Rosato commit 3e3aa6da87d30a0064a17b836685cd43c90a3572 upstream. When a guest seeks to register IRQs without a summary bit specified, ensure that the associated GAITE then stores 0 for the guest AISB location instead of virt_to_phys(page_address(NULL)). Fixes: 3c5a1b6f0a18 ("KVM: s390: pci: provide routines for enabling/disabling interrupt forwarding") Cc: stable@vger.kernel.org Reviewed-by: Farhan Ali Signed-off-by: Matthew Rosato Signed-off-by: Christian Borntraeger Signed-off-by: Greg Kroah-Hartman --- arch/s390/kvm/pci.c | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) --- a/arch/s390/kvm/pci.c +++ b/arch/s390/kvm/pci.c @@ -301,9 +301,14 @@ static int kvm_s390_pci_aif_enable(struc gaite->gisc = fib->fmt0.isc; gaite->count++; - gaite->aisbo = fib->fmt0.aisbo; - gaite->aisb = virt_to_phys(page_address(aisb_page) + (fib->fmt0.aisb & - ~PAGE_MASK)); + if (fib->fmt0.sum == 1) { + gaite->aisbo = fib->fmt0.aisbo; + gaite->aisb = virt_to_phys(page_address(aisb_page) + + (fib->fmt0.aisb & ~PAGE_MASK)); + } else { + gaite->aisbo = 0; + gaite->aisb = 0; + } aift->kzdev[zdev->aisb] = zdev->kzdev; spin_unlock_irq(&aift->gait_lock);