From patchwork Sun Mar 9 08:41:51 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 872102 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 CAADD1AF0C0; Sun, 9 Mar 2025 08:41:53 +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=1741509715; cv=none; b=KCwOTg1TDGnFB/ICXWVyYh7oWO1o0L+AtR7v9Uv5Qy5lwBbFUNnm9JhXiCt0h0nkO+yDE/RngCgGfPzwKv0SYSIJcXX6QL5TFOA1TW7Wxn/Ir9f0vukk4XH1FAR+bGAfvKW/GsPNu9T5PO1WJJwZF2fBgHGR5VxO2RMbTorCjQo= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741509715; c=relaxed/simple; bh=cmacTxXIxce5OuCOlsFeMKlTtcskqKZQBd5w4CspMG8=; h=Message-ID:From:To:Cc:Subject:References:MIME-Version: Content-Type:Date; b=M3JXv9sMUXB8gRjAOhAZErBdKGD9fxUBUHMjXAja8w96XpTYO5SK88Yeb2DHpMZXHQ6cXvahCIaZdtlsyYrUViMMV8g7W+nI+8fFreoBEAlaVr/QvP3h9ZxPKc2UoDxhxxdv8e2NFVbIku8w9yODzxT9fO+PPHFdu5H9fpWDJdk= 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=K2YtWH0a; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=+V1semF3; 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="K2YtWH0a"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="+V1semF3" Message-ID: <20250309084110.521468021@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1741509712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=orv27tW3w4e5gK89wOdnKXG8n73hJW7aZdj9rhy7feg=; b=K2YtWH0a4l+FQiItA7EWn9vQ8BmUgGpW9GgnLLsG7Ge0el1FPT+aFS4WbjfJRR09H4jqwa BZh49etMSqqHMW3C2mLlpGIt91iqNvGWFS6PBtp5gC9tq93M2z6tqz7bRi6/fombnAxpON 0Zv6d6Wsulr6J9bwES9NF10PmCVS1qijcyP9PRJg3rPDxIjVrHAgHwTRLzUX1dpiFwd5xr fig+ldA2rmmPp/zDn8PrxB+0Tt45RYknA7jRV9DqZA8Ayj+VmSQewIRaQQlcuuvhOk1PQG vG32ed/TxJU4hh6khEDrNQ2k+rZRd0/J57VfD0wtM4TMdpOoif3nlz/ANTy5HQ== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1741509712; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: references:references; bh=orv27tW3w4e5gK89wOdnKXG8n73hJW7aZdj9rhy7feg=; b=+V1semF33MS8lCzLlGKkqy2+J7ifQfxoM0OqN2kWXuIrVrxHCl2aQhamUsLy4eUkbgawVh vik9ycw1n1h/YHAA== From: Thomas Gleixner To: LKML Cc: Marc Zyngier , Haiyang Zhang , Wei Liu , Bjorn Helgaas , linux-hyperv@vger.kernel.org, linux-pci@vger.kernel.org, Nishanth Menon , Tero Kristo , Santosh Shilimkar , Jon Mason , Dave Jiang , Allen Hubbe , ntb@lists.linux.dev, Wei Huang , Manivannan Sadhasivam , "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org Subject: [patch 06/10] PCI: hv: Switch MSI descriptor locking to guard() References: <20250309083453.900516105@linutronix.de> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Sun, 9 Mar 2025 09:41:51 +0100 (CET) Convert the code to use the new guard(msi_descs_lock). No functional change intended. Signed-off-by: Thomas Gleixner Cc: Haiyang Zhang Cc: Wei Liu Cc: Bjorn Helgaas Cc: linux-hyperv@vger.kernel.org Cc: linux-pci@vger.kernel.org Acked-by: Wei Liu Reviewed-by: Michael Kelley --- 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; } /*