From nobody Sun Feb 8 13:27:31 2026 Received: from galois.linutronix.de (Galois.linutronix.de [193.142.43.55]) (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 6BDE73090C1; Mon, 26 Jan 2026 08:56:29 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=193.142.43.55 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769417790; cv=none; b=hSVha8K8FaPeTbTTzv/H6EKiMgY8pm3UAsxs+1G46Hcc3IJUxNXE0Cob56fagCua6deZwi+TKzLlCb/K6RXjKT3/uBN9iigXXAhG5p3nGnXvIGDxREySh8O1J/VHFt03vivEG/OTDR+mv6RRoKMyEhIYd9Ro+fjmZcO2vA6yfZ0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1769417790; c=relaxed/simple; bh=q3waURPNTZyOFu2VS+BLwRl1kpZ8nrEkC1WSxwHcihI=; h=Date:From:To:Subject:Cc:In-Reply-To:References:MIME-Version: Message-ID:Content-Type; b=bQFAM3lBzzG3vd+9d3kDuVv26TCI0vnIucXnwhnZEiNgZ01UAELgvkqzOa5C2fhblGCigkg4vBZ6chLhRwbblKdVVg5p5hGKrH62IBS3kDPnBG9nAL5U2w4aEpDt/bc6Nr4rEM5SLdWYEej3QpHwp6xAdBwF0JN3qtiRrDyKrtY= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de; spf=pass smtp.mailfrom=linutronix.de; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=msjTDTky; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=gXRv2sNZ; arc=none smtp.client-ip=193.142.43.55 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linutronix.de Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=linutronix.de Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="msjTDTky"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="gXRv2sNZ" Date: Mon, 26 Jan 2026 08:56:21 -0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1769417788; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NbOA970KGAygUBNOo2GlFDYIjWhsHkV8GNrut60JoIk=; b=msjTDTkyENTER6IJgBiRjmczLv23KFf0Xf0xbOQkJqBEUmJw7mlHzJUKI4DCfyqpJUPHkN Lq7MDJSJk3Bek2Th3L1zcsY8qx3vzQ59ULEWono1c797kBJVN8TgfzIYD0drQhnDaJn27C G9LAN/W2ps0DWcF8gcU+qTTNhGxjPkYhpHCSPyoWGmH991Sl60VaL26GGrHKELqAmjYbdS 5YhOKlW8NTbgPjl27PqIP95gI4s+riLY+yMGsQd0LZclziBn/KLZ7EnjOcsMkRiPyawrQc nLhqFhGIcLx6JjfwPQezYJ8AZm+fDbLingNbtDYSBV9SU2lvjHokgvlahJkKGw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1769417788; h=from:from:sender:sender:reply-to:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=NbOA970KGAygUBNOo2GlFDYIjWhsHkV8GNrut60JoIk=; b=gXRv2sNZbry3DGUvs/H4jpxZxbE+ZQbq6WHsRsb/+HN95uAVSG5ZtHxID1SEixH09qN7lA kB1Us96ezOVPlnDw== From: "tip-bot2 for Haoxiang Li" Sender: tip-bot2@linutronix.de Reply-to: linux-kernel@vger.kernel.org To: linux-tip-commits@vger.kernel.org Subject: [tip: irq/msi] PCI/MSI: Unmap MSI-X region on error Cc: Haoxiang Li , Thomas Gleixner , x86@kernel.org, linux-kernel@vger.kernel.org In-Reply-To: <20260125144452.2103812-1-lihaoxiang@isrc.iscas.ac.cn> References: <20260125144452.2103812-1-lihaoxiang@isrc.iscas.ac.cn> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Message-ID: <176941778179.510.14598280314675299233.tip-bot2@tip-bot2> Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails Precedence: bulk Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable The following commit has been merged into the irq/msi branch of tip: Commit-ID: 1a8d4c6ecb4c81261bcdf13556abd4a958eca202 Gitweb: https://git.kernel.org/tip/1a8d4c6ecb4c81261bcdf13556abd4a95= 8eca202 Author: Haoxiang Li AuthorDate: Sun, 25 Jan 2026 22:44:52 +08:00 Committer: Thomas Gleixner CommitterDate: Mon, 26 Jan 2026 09:46:48 +01:00 PCI/MSI: Unmap MSI-X region on error msix_capability_init() fails to unmap the MSI-X region if msix_setup_interrupts() fails. Add the missing iounmap() for that error path. [ tglx: Massaged change log ] Signed-off-by: Haoxiang Li Signed-off-by: Thomas Gleixner Link: https://patch.msgid.link/20260125144452.2103812-1-lihaoxiang@isrc.isc= as.ac.cn --- drivers/pci/msi/msi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/drivers/pci/msi/msi.c b/drivers/pci/msi/msi.c index 34d6641..e010ecd 100644 --- a/drivers/pci/msi/msi.c +++ b/drivers/pci/msi/msi.c @@ -737,7 +737,7 @@ static int msix_capability_init(struct pci_dev *dev, st= ruct msix_entry *entries, =20 ret =3D msix_setup_interrupts(dev, entries, nvec, affd); if (ret) - goto out_disable; + goto out_unmap; =20 /* Disable INTX */ pci_intx_for_msi(dev, 0); @@ -758,6 +758,8 @@ static int msix_capability_init(struct pci_dev *dev, st= ruct msix_entry *entries, pcibios_free_irq(dev); return 0; =20 +out_unmap: + iounmap(dev->msix_base); out_disable: dev->msix_enabled =3D 0; pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_MASKALL | PCI_MSIX_FLAGS_= ENABLE, 0);