From patchwork Sun Mar 9 08:41:48 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 14008187 X-Patchwork-Delegate: bhelgaas@google.com 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 191CC1991CA; Sun, 9 Mar 2025 08:41:49 +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=1741509711; cv=none; b=GU6QViRzRNrzkDSHw2dirrcy4GsSZhHk5iEkJXloIqBuwDoV0/25/ansXXyW20IlmJn/DGPjD3OtWj50iWJjwvw96jsbdXdZxoQTfFf6tK1p/LfyZGIotQ5ObxrDTfotEOrDucbH62CAqquh0iMyOq2R8C87DDMevPqqLWYEi+4= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741509711; c=relaxed/simple; bh=+nP7eP6u8+unwJo2Ta244xNpgGRfZY4L4xYimrXTSHk=; h=Message-ID:From:To:Cc:Subject:References:MIME-Version: Content-Type:Date; b=npdGnkHi+eMgHT+zV1nyQZE+5WDhb9fxH//bzukIHVzLzElhVE7TxhfBsOohr+nvIZMTzE/rEqFybeP494kV+30F/iy5SrRbpOZZ0oXWMptekyYZ2iSmnrlyMGYJOEG/lgIc5yj1mrzLuDBgj4f0bRUYdIdV9QIGv+h+CI2FYI4= 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=bfi+HSmu; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=ykUCCtEe; 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="bfi+HSmu"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="ykUCCtEe" Message-ID: <20250309084110.394142327@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1741509708; 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=2Dbb0NJg9q7mf2SMbVQRSf39fkQi4mCO/oJygH7cKIA=; b=bfi+HSmuLMVZOrItd8U/XNpRymRRtOknOMYGqASLZsL6TC+eCkKv6Ek3fwX482iWUl1F6h 1yPo5cLnNSlsBM6zj5pzzzq1gCPO5eY8QA0u6HuLky+8J0FFTH2+PwFisK8bSxE3dlIz2t k71w6aBFI699T1VHP27O055Sy9HF5BxPHsW/AU7hcHTCD9uDVfkRKzFj+Lxn7JKy7mKeM0 nM6hOi2uCxlkX43WbHCP4EuGMY/JgjZhjTBH26uSUwBAqh8XFVt2kGmOCuYAAuR+214hze W1xhI9gwUAGpLks4yvt6Nc3inyj3o6qDYm7AMOV8yWu7y13eBHV4B+QLMGLRjA== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1741509708; 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=2Dbb0NJg9q7mf2SMbVQRSf39fkQi4mCO/oJygH7cKIA=; b=ykUCCtEeVl3qZ/zFxc0YkYwXZgmyPG0vJjLKbGWVhfUb95jQetBHEJH46hQzHPTC+I0+GX e+OWsd+zwIQVw/Bg== From: Thomas Gleixner To: LKML Cc: Marc Zyngier , Jon Mason , Dave Jiang , Allen Hubbe , ntb@lists.linux.dev, Nishanth Menon , Tero Kristo , Santosh Shilimkar , Bjorn Helgaas , linux-pci@vger.kernel.org, Haiyang Zhang , Wei Liu , linux-hyperv@vger.kernel.org, Wei Huang , Manivannan Sadhasivam , "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org Subject: [patch 04/10] NTB/msi: Switch MSI descriptor locking to lock guard() References: <20250309083453.900516105@linutronix.de> Precedence: bulk X-Mailing-List: linux-pci@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Sun, 9 Mar 2025 09:41:48 +0100 (CET) Convert the code to use the new guard(msi_descs_lock). No functional change intended. Signed-off-by: Thomas Gleixner Cc: Jon Mason Cc: Dave Jiang Cc: Allen Hubbe Cc: ntb@lists.linux.dev Acked-by: Dave Jiang Reviewed-by: Logan Gunthorpe Reviewed-by: Jonathan Cameron --- drivers/ntb/msi.c | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) --- a/drivers/ntb/msi.c +++ b/drivers/ntb/msi.c @@ -106,10 +106,10 @@ int ntb_msi_setup_mws(struct ntb_dev *nt if (!ntb->msi) return -EINVAL; - msi_lock_descs(&ntb->pdev->dev); - desc = msi_first_desc(&ntb->pdev->dev, MSI_DESC_ASSOCIATED); - addr = desc->msg.address_lo + ((uint64_t)desc->msg.address_hi << 32); - msi_unlock_descs(&ntb->pdev->dev); + scoped_guard (msi_descs_lock, &ntb->pdev->dev) { + desc = msi_first_desc(&ntb->pdev->dev, MSI_DESC_ASSOCIATED); + addr = desc->msg.address_lo + ((uint64_t)desc->msg.address_hi << 32); + } for (peer = 0; peer < ntb_peer_port_count(ntb); peer++) { peer_widx = ntb_peer_highest_mw_idx(ntb, peer); @@ -289,7 +289,7 @@ int ntbm_msi_request_threaded_irq(struct if (!ntb->msi) return -EINVAL; - msi_lock_descs(dev); + guard(msi_descs_lock)(dev); msi_for_each_desc(entry, dev, MSI_DESC_ASSOCIATED) { if (irq_has_action(entry->irq)) continue; @@ -307,17 +307,11 @@ int ntbm_msi_request_threaded_irq(struct ret = ntbm_msi_setup_callback(ntb, entry, msi_desc); if (ret) { devm_free_irq(&ntb->dev, entry->irq, dev_id); - goto unlock; + return ret; } - - ret = entry->irq; - goto unlock; + return entry->irq; } - ret = -ENODEV; - -unlock: - msi_unlock_descs(dev); - return ret; + return -ENODEV; } EXPORT_SYMBOL(ntbm_msi_request_threaded_irq);