From mboxrd@z Thu Jan 1 00:00:00 1970 Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.remote-ip=100.103.45.18 ARC-Seal: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; cv=none; t=1794046267; b=d0H4kzV1h7AEMNSWTO1VJFMuTTtaM2b9kH5ASev0e8/wHKCgZFMhB8mgi7YqibORV0pB dIW9x0JdNzhyfKL8Y+IfF1qy4P08O7X7auBxiX80qQC0K2V9ZTQL5uwiASmxZeuoZEMIP LaRaCmMasoU1iHO6ftEfUipIk+T/b4oaQWLnYV0+zhmOM/DsX7X2SyeNvQPSm3CiB/zB2 cq7sv+nwmlEuzzSqabonMpCD55zekxahj+tsG6xiLjzY80WPtmxWbA+LPuDzcYIoF1tjg Zp1sG3gLNTXbb91j5tLcSHh4f1jMtR39AppRO2ywchCnx4t7jXJTdCOYKOyilZ5j9Ow== ARC-Message-Signature: i=1; d=subspace.kernel.org; s=arc20261015; a=rsa-sha256; c=relaxed/relaxed; t=1794046267; h=Received:DKIM-Signature:From:To:Cc:Subject:Date:Message-ID:X-Mailer: MIME-Version:Content-Type:Content-Transfer-Encoding; bh=632i2OTal7rxCcmgGF/KI5fogj4IbaYhtB7UXafHEd8=; b=csoZxw8LUnhe/WsK505P2m+Dgd6CgPOBti1flNjd+Th9gbitlKvY+IW45ho23roWr5wS V0Y+VdUZAnG7mAl+6jlbIt8S3J+EwVp6CUg5qyOsAOnAnsmaMiK0ZihSr2450skqJdrLf fNSVSHLyzkJB3q847j9AqIMwFXvBtTKCcdFy7RgdPMDJPheud7ys0Ardh+f+Ydxb1w9Xq HRytaVk/daLx++b5YUVj6iiIiwNQ9bgIB1Xp4hYYgHUydCAREZwVVJKSBAnQqXKMgGVPx p936H/AoniOUS236jsjkOeRu2G+wfHkqNLTVLMCydxrynIom25foj087MUuJWd9ELmw== ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=fdDMtaOl; arc=none smtp.remote-ip=100.103.45.18 Received: from smtp.kernel.org (quasi.space.kernel.org [100.103.45.18]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (prime256v1)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 30DB4606A32C for ; Sat, 7 Nov 2026 10:11:06 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20260515 header.b=fdDMtaOl Received: by smtp.kernel.org (Postfix) with ESMTPSA id 392D21F0089F; Sat, 7 Nov 2026 10:11:06 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kernel.org; s=k20260515; t=1794046266; bh=632i2OTal7rxCcmgGF/KI5fogj4IbaYhtB7UXafHEd8=; h=From:To:Cc:Subject:Date; b=fdDMtaOlMweifM4PECXjtL8PNpdH0zdMii3H8Im9Stx5lUoq6z3hkqaMCRz8txRKy oOl7wyfFnotJqQx+XLCmw6pfxUH4HuKFARAGhfV0B85PzBI+mu6Ul8fPwU2a5DF3rA e/BbC9zfEDtRRU61HiOKv7wGUr89Jn4XVWN0axixGTw+PzvWE5XyQtDEC55wUz475Z Gr6e7ONF0pky3Q25VukXxl19B68AaCMbnZHgtvTVdX8VpIGcrZJLQFdfyyVLmu5l8Z OqKTV1aTIUdUpWjFYBx1e0VFzay/UTTk4erqlubr60jm1Ehg+5ypi9cu9xxIPF4+mE JiEFw/Ykkndiw== From: Sasha Levin To: ts@linux.ibm.com, schnelle@linux.ibm.com, hca@linux.ibm.com Cc: stable@vger.kernel.org Subject: FAILED: patch "[PATCH] s390/pci: Add error cleanup in zpci_directed_irq_init()" failed to apply to 6.18-stable tree Date: Sat, 7 Nov 2026 05:11:05 -0500 Message-ID: <20261107051105-failed-6.18-769f66f595c1@kernel.org> X-Mailer: git-send-email 2.53.0 X-Mailing-List: stable@vger.kernel.org List-Id: List-Post: List-Help: List-Subscribe: List-Unsubscribe: List-Owner: Precedence: list MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The patch below does not apply to the 6.18-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to . To reproduce the conflict and resubmit, you may use the following commands: git fetch https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/ linux-6.18.y git checkout FETCH_HEAD git cherry-pick -x 769f66f595c11185c66913ea5d96420504bfebc3 # git commit -s git send-email --to '' --in-reply-to '20261107051105-failed-6.18-769f66f595c1@kernel.org' --subject-prefix 'PATCH 6.18.y' 'HEAD^..' Thanks, Sasha ------------------ original commit in Linus's tree ------------------ >From 769f66f595c11185c66913ea5d96420504bfebc3 Mon Sep 17 00:00:00 2001 From: Tobias Schumacher Date: Fri, 9 Oct 2026 08:15:52 +0200 Subject: [PATCH] s390/pci: Add error cleanup in zpci_directed_irq_init() If per-CPU airq_iv allocation fails in the loop, previously allocated vectors and arrays leak. Add proper error path to release all resources on failure. The error path frees zpci_sbv, but SIC_IRQ_MODE_DIRECT has already programmed its address into the hardware. Set the directed interrupt mode only after all allocations have succeeded, so a failed init leaves no freed memory registered with the hardware. Fixes: e979ce7bced2 ("s390/pci: provide support for CPU directed interrupts") Cc: stable@vger.kernel.org Signed-off-by: Tobias Schumacher Reviewed-by: Niklas Schnelle Signed-off-by: Heiko Carstens --- arch/s390/pci/pci_irq.c | 26 +++++++++++++++++++------- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/arch/s390/pci/pci_irq.c b/arch/s390/pci/pci_irq.c index c5fabad381395..bcf11585df8d8 100644 --- a/arch/s390/pci/pci_irq.c +++ b/arch/s390/pci/pci_irq.c @@ -569,14 +569,9 @@ static int __init zpci_directed_irq_init(void) if (!zpci_sbv) return -ENOMEM; - iib.diib.isc = PCI_ISC; - iib.diib.nr_cpus = num_possible_cpus(); - iib.diib.disb_addr = virt_to_phys(zpci_sbv->vector); - zpci_set_irq_ctrl(SIC_IRQ_MODE_DIRECT, 0, &iib); - zpci_dibv = kzalloc_objs(*zpci_dibv, num_possible_cpus()); if (!zpci_dibv) - return -ENOMEM; + goto out_free_sbv; for_each_possible_cpu(cpu) { /* @@ -589,13 +584,30 @@ static int __init zpci_directed_irq_init(void) AIRQ_IV_CACHELINE | (!cpu ? AIRQ_IV_ALLOC : 0), NULL); if (!zpci_dibv[cpu]) - return -ENOMEM; + goto out_free_dibv; } + + iib.diib.isc = PCI_ISC; + iib.diib.nr_cpus = num_possible_cpus(); + iib.diib.disb_addr = virt_to_phys(zpci_sbv->vector); + zpci_set_irq_ctrl(SIC_IRQ_MODE_DIRECT, 0, &iib); on_each_cpu(cpu_enable_directed_irq, NULL, 1); zpci_irq_chip.irq_set_affinity = zpci_set_irq_affinity; return 0; + +out_free_dibv: + for_each_possible_cpu(cpu) { + if (zpci_dibv[cpu]) + airq_iv_release(zpci_dibv[cpu]); + } + kfree(zpci_dibv); + zpci_dibv = NULL; +out_free_sbv: + airq_iv_release(zpci_sbv); + zpci_sbv = NULL; + return -ENOMEM; } static int __init zpci_floating_irq_init(void) -- 2.53.0