From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (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 1080F1E22E6; Wed, 19 Mar 2025 17:08:18 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742404101; cv=none; b=PTtUmqFVXGZVLopTbwFkAZIwWXFaIBaweGOyRx6Fn9v6SG+ygjfaVIrKNdpAkAlOkko+srduj5WTggWz1o0Ag2x0gOamEcBDzHqyhOxxpYIVuGBFw2SdiU3vPZtElQ2RdFeMPvnJzjJaxz613zyda/T8JVz6Nyc706xPB9fglAE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742404101; c=relaxed/simple; bh=nnCi2z3+hodZj81KTk+zaAwe0gxzfdo68ycMV8BotV4=; h=Date:From:To:Cc:Subject:Message-ID:MIME-Version:Content-Type: Content-Disposition:In-Reply-To; b=Sj355QBZYC2tBKTwQV0DoIusRpEkWq8UU1o5smFOTIXeYlTeHX3nUr/1PCWl1gkVXksJyqW0LzSz+0QejdUzm9Oqf+1xaqQT0PKenDmPvsf70x3xH9gOLwnJyM5RLKJQSDv/t1jA6qmtDxn3QXaj6JzjIRz2IXsTkSb9GZgT/Ko= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=U/FhDhai; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="U/FhDhai" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 52D48C4CEE4; Wed, 19 Mar 2025 17:08:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742404098; bh=nnCi2z3+hodZj81KTk+zaAwe0gxzfdo68ycMV8BotV4=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=U/FhDhaiw+ee08HFCH8h5MKIikEARG9FwNdcM8SBrOj97Z+CjWs2hBgSYUZQSjBYY 3DKHg9SC9L/EKBQ+OkJcmeI9kungjWPU0KAyWi4uOcc0lM0gVOdROfG9zdY+l3tSFW kGKamqJm9rqY3vmXS16btHR0kCzPqutbqkUjF35t6JU5tgtIDuUkw0a/eQ6VNfFPyi QzGmDKm/HMTMBIVGFQma1cKtJZzNY/XpuJ48E3I7TzagAKe7HV49kHD2dJu4u2bz5G mM0Fb/6pQyCQ0H/jVweSJXssajgVCSH/W8J7GKFopdPRBa0tVjcoK5yh1EFUkhi36q R9eYL2DTClZ/g== Date: Wed, 19 Mar 2025 12:08:16 -0500 From: Bjorn Helgaas To: Thomas Gleixner Cc: LKML , Marc Zyngier , Peter Zijlstra , Jonathan Cameron , Nishanth Menon , Dhruva Gole , Tero Kristo , Santosh Shilimkar , Logan Gunthorpe , Dave Jiang , Jon Mason , Allen Hubbe , ntb@lists.linux.dev, Michael Kelley , Wei Liu , Bjorn Helgaas , Haiyang Zhang , linux-hyperv@vger.kernel.org, linux-pci@vger.kernel.org, Wei Huang , Manivannan Sadhasivam , "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org, Jonathan Cameron Subject: Re: [patch V4 05/14] PCI/MSI: Use guard(msi_desc_lock) where applicable Message-ID: <20250319170816.GA1046112@bhelgaas> Precedence: bulk X-Mailing-List: linux-scsi@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: <20250319105506.322536126@linutronix.de> On Wed, Mar 19, 2025 at 11:56:47AM +0100, Thomas Gleixner wrote: > Convert the trivial cases of msi_desc_lock/unlock() pairs. > > No functional change. > > Signed-off-by: Thomas Gleixner Acked-by: Bjorn Helgaas > --- > V4: Split out from the previous combo patch > --- > drivers/pci/msi/api.c | 6 ++---- > drivers/pci/msi/msi.c | 12 ++++++------ > 2 files changed, 8 insertions(+), 10 deletions(-) > > --- a/drivers/pci/msi/api.c > +++ b/drivers/pci/msi/api.c > @@ -53,10 +53,9 @@ void pci_disable_msi(struct pci_dev *dev > if (!pci_msi_enabled() || !dev || !dev->msi_enabled) > return; > > - msi_lock_descs(&dev->dev); > + guard(msi_descs_lock)(&dev->dev); > pci_msi_shutdown(dev); > pci_free_msi_irqs(dev); > - msi_unlock_descs(&dev->dev); > } > EXPORT_SYMBOL(pci_disable_msi); > > @@ -196,10 +195,9 @@ void pci_disable_msix(struct pci_dev *de > if (!pci_msi_enabled() || !dev || !dev->msix_enabled) > return; > > - msi_lock_descs(&dev->dev); > + guard(msi_descs_lock)(&dev->dev); > pci_msix_shutdown(dev); > pci_free_msi_irqs(dev); > - msi_unlock_descs(&dev->dev); > } > EXPORT_SYMBOL(pci_disable_msix); > > --- a/drivers/pci/msi/msi.c > +++ b/drivers/pci/msi/msi.c > @@ -871,13 +871,13 @@ void __pci_restore_msix_state(struct pci > > write_msg = arch_restore_msi_irqs(dev); > > - msi_lock_descs(&dev->dev); > - msi_for_each_desc(entry, &dev->dev, MSI_DESC_ALL) { > - if (write_msg) > - __pci_write_msi_msg(entry, &entry->msg); > - pci_msix_write_vector_ctrl(entry, entry->pci.msix_ctrl); > + scoped_guard (msi_descs_lock, &dev->dev) { > + msi_for_each_desc(entry, &dev->dev, MSI_DESC_ALL) { > + if (write_msg) > + __pci_write_msi_msg(entry, &entry->msg); > + pci_msix_write_vector_ctrl(entry, entry->pci.msix_ctrl); > + } > } > - msi_unlock_descs(&dev->dev); > > pci_msix_clear_and_set_ctrl(dev, PCI_MSIX_FLAGS_MASKALL, 0); > } >