Re: [patch 06/10] PCI: hv: Switch MSI descriptor locking to guard()

Wei Liu
2025-03-10T16:52:29Z

On Sun, Mar 09, 2025 at 09:41:51AM +0100, Thomas Gleixner wrote:
> Convert the code to use the new guard(msi_descs_lock).
>
> No functional change intended.
>
> Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
> Cc: Haiyang Zhang <haiyangz@microsoft.com>
> Cc: Wei Liu <wei.liu@kernel.org>
> Cc: Bjorn Helgaas <bhelgaas@google.com>
> Cc: linux-hyperv@vger.kernel.org
> Cc: linux-pci@vger.kernel.org

Acked-by: Wei Liu <wei.liu@kernel.org>

> ---
> drivers/pci/controller/pci-hyperv.c | 14 ++++----------
> 1 file changed, 4 insertions(+), 10 deletions(-)
>
> --- a/drivers/pci/controller/pci-hyperv.c
> +++ b/drivers/pci/controller/pci-hyperv.c
> @@ -3976,24 +3976,18 @@ static int hv_pci_restore_msi_msg(struct
> {
> struct irq_data *irq_data;
> struct msi_desc *entry;
> - int ret = 0;
>
> if (!pdev->msi_enabled && !pdev->msix_enabled)
> return 0;
>
> - msi_lock_descs(&pdev->dev);
> + guard(msi_descs_lock)(&pdev->dev);
> msi_for_each_desc(entry, &pdev->dev, MSI_DESC_ASSOCIATED) {
> irq_data = irq_get_irq_data(entry->irq);
> - if (WARN_ON_ONCE(!irq_data)) {
> - ret = -EINVAL;
> - break;
> - }
> -
> + if (WARN_ON_ONCE(!irq_data))
> + return -EINVAL;
> hv_compose_msi_msg(irq_data, &entry->msg);
> }
> - msi_unlock_descs(&pdev->dev);
> -
> - return ret;
> + return 0;
> }
>
> /*
>