From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-dl1-f45.google.com (mail-dl1-f45.google.com [74.125.82.45]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A713D3D0937 for ; Mon, 16 Mar 2026 17:22:16 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=74.125.82.45 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773681738; cv=none; b=K6m2clewC/Z/xpH5fabRtcRiGMKEB7zZfU5pYn6fuoSorp1x4+FCcW1fbiC/eqG04+Rc4Bw3ME1jIXAxOM6KoFxOKxRr1Dtxj3Z/tjGMl954hdmSLkjX2qemxGHHjw5R0yGjQlm2vXROK9QDgu8fxq+r6LLjO3kM5jEUfWfWT5s= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1773681738; c=relaxed/simple; bh=H8t5YEnICOpSsT2ERpsq3rX2bQWH81XTh0Q4JzBgHVo=; h=Date:From:To:Cc:Subject:Message-ID:References:MIME-Version: Content-Type:Content-Disposition:In-Reply-To; b=O+6LpItRJvbIS0GL93v1NeWmAjMTmB6FYe/QK8w5gzTgjH1Nekv6x9jK9J5e4KXgcAhXYXY3k5XQTh+h7lQ2+X2/XJGhDVWwZtliBOPofj7QuyZegVbJRBw3TioRRw0XDK0e3UGGZfAko3PdecQa1JS9OAb2B4tQHu5wfui3jvY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=P/fgp7ZU; arc=none smtp.client-ip=74.125.82.45 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=roeck-us.net Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="P/fgp7ZU" Received: by mail-dl1-f45.google.com with SMTP id a92af1059eb24-128d2e3082eso5214964c88.0 for ; Mon, 16 Mar 2026 10:22:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1773681736; x=1774286536; darn=vger.kernel.org; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:from:to:cc:subject:date:message-id :reply-to; bh=OX1FONaTc0mJuFdOB10CRw5D/qrtlfT+txQDt48t6yQ=; b=P/fgp7ZUeNRV4Cj+ea4tpSrEiGW8IBqbaMnQXs4JjLOPxunV5nDpP7dZ+f2oj+evFh TxQDjvoQQQUXnLUDGrpb8vTidWM41l0DvT7kVMn1u5adX2ow2byjOVvU0ZcVugtAth/i pj3vil+Rd3zmtV3caPaI5UbFiLYhSUPQxrW6uFYMLCcWWyvpmYrytjjojL0gg4G2b2iy A+1MDLSBiWeDorXGog1Buz8YxNQ40xFxCXQxEt4bUy/5BSF2gigYQxiQRxb2lEMjNh9W ORcqRqhqpng7QezsXiUgzHWi2EcoaT/MX5PjDUie95xzrM/+5fQ0dNsfB8gJ/ZAsnvrd x+ww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1773681736; x=1774286536; h=in-reply-to:content-disposition:mime-version:references:message-id :subject:cc:to:from:date:sender:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=OX1FONaTc0mJuFdOB10CRw5D/qrtlfT+txQDt48t6yQ=; b=CH3VkXFO1POpqqtM/TOPFg9j5H4G6eoDmk7YsLprdGGkSxZ7wN6TR6BlmEs6GMg51S MXkV46fP3Ql0bK0IeflF6Y/IloM5H/U/U3WI7QZx+uXpIXPyEhXvzor7+TX5HSrcamXz 7P0pg8qPMY+wSVXuwb4SdE6THcrD5rH5kmWNfJuXAdAwbzDcsBBaA9UjgFH1C97hQ6CN GQ+Q5CppqKG95w2X+pjIBdfNCd78b3QOLcC8qVS4h/NYqj12tq8zq1af4MC18AFtakRh N2n9serHGq9Sb9siIf7Hn7V7hiPXkPTH24jppUaaI9clDYugxlIEA7fiAy/x1CmN2Fss cRMQ== X-Forwarded-Encrypted: i=1; AJvYcCW68p+Q4QlTV4pr/LsTWUJoinyWNAoRcdOeB3+3b9tg5i4bVY5q0y36ZENrBxZbUtZBj//H9bwWp7ihvMc=@vger.kernel.org X-Gm-Message-State: AOJu0Yx+ea8vsln+Y2Gv2YB1RD+VTQvJLbJSPFN8tACUor6j4FLsU+rP DYRClbysHdv+P7cwOyNegIbHso+Pb8DQd/QCtaP7wCftPw4//uscUK+g X-Gm-Gg: ATEYQzz8L6wxt9s6grXFo8V5RUZf3o8ZWO02980nCz0UUarzuNT8NsZRUkM+xNcLcgi lq6N9jXCqamX1kKUkYAKcc5r3tEe3/UzcH80Zj/mGqKP6rzbYEM8op673AnrSFtXXribYJxlIFR /p1bN0xkH3wpnXMrhI4uidsuUUiRn0e6SjsZhKzLPigeCaGMxT8HPFApv84wodf3FS4iTNtdZp7 z1kBUI1aNjdhPB7B3D3uOzAAaV9iOpMZDN5slemO/8/jBIj9MR6epE9BZEynhcSweUQvCFA7AGQ 3PuztuHT7eelA7z9kaPJ+b+y05Ght02IiRrG1u2OjaH7GkMq2DUrCIRfBYZS7SahJ4gI5yB26eG ltXBWNxMyqgQPDCpNV+B8u/L57/dKjp6I16k68wZ4PshIsDpPvfPqzZ8lEHz4ObNYlg4La6FmG8 hznwYnl6EdyxXoi/T9DLo/nmAS6aE2k6uUgSgZ+4MsuFJ2eTA= X-Received: by 2002:a05:7022:41a6:b0:11f:3483:bba6 with SMTP id a92af1059eb24-128f3d4aaa4mr5869223c88.13.1773681735077; Mon, 16 Mar 2026 10:22:15 -0700 (PDT) Received: from server.roeck-us.net ([2600:1700:e321:62f0:da43:aeff:fecc:bfd5]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2beab57588asm16144029eec.31.2026.03.16.10.22.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 16 Mar 2026 10:22:14 -0700 (PDT) Sender: Guenter Roeck Date: Mon, 16 Mar 2026 10:22:12 -0700 From: Guenter Roeck To: Haoxiang Li Cc: bhelgaas@google.com, tglx@linutronix.de, jgross@suse.com, hans.zhang@cixtech.com, himanshu.madhani@oracle.com, roger.pau@citrix.com, chrisl@kernel.org, linux-pci@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH] PCI/MSI: add iounmap in msix_capability_init() Message-ID: 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 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20260125144452.2103812-1-lihaoxiang@isrc.iscas.ac.cn> Hi, On Sun, Jan 25, 2026 at 10:44:52PM +0800, Haoxiang Li wrote: > In msix_capability_init(), if msix_setup_interrupts() > fails, call iounmap() to release the memory allocated > by msix_map_region(). > Really ? AI review provided the following feedback. Looking into the code, I think it has a point. Thanks, Guenter > Signed-off-by: Haoxiang Li > --- > 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 34d664139f48..e010ecd9f90d 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, struct msix_entry *entries, > > ret = msix_setup_interrupts(dev, entries, nvec, affd); > if (ret) > - goto out_disable; > + goto out_unmap; Does msix_setup_interrupts() already unmap this region? If it fails, msix_setup_interrupts() calls pci_free_msi_irqs(), which appears to already call iounmap(dev->msix_base) and sets dev->msix_base to NULL. > > /* Disable INTX */ > pci_intx_for_msi(dev, 0); > @@ -758,6 +758,8 @@ static int msix_capability_init(struct pci_dev *dev, struct msix_entry *entries, > pcibios_free_irq(dev); > return 0; > > +out_unmap: > + iounmap(dev->msix_base); If dev->msix_base was already set to NULL by pci_free_msi_irqs() during the msix_setup_interrupts() error path, does this result in iounmap(NULL)? > out_disable: > dev->msix_enabled = 0; > pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_MASKALL | PCI_MSIX_FLAGS_ENABLE, 0); > -- > 2.25.1 >