From patchwork Thu Mar 13 13:03:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Gleixner X-Patchwork-Id: 873350 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 55A902690E3; Thu, 13 Mar 2025 13:03:55 +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=1741871036; cv=none; b=LC94Fhy39A4h/DJE0Y5LgO7uxSukzkNkHzIIGZn8vcvRsQUg8jBxOOgd3mbFLEH/sPPmuRyfUds7+fdSaSdjeDwgkcwd3SfvQNRElcG2n6Xm14kCAS88GHrRmbzjBei4WMeOh+zH7imNXalIgOuKEFm5YA2iLeXv+qASEBja6x0= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1741871036; c=relaxed/simple; bh=ziAUb6xXmsqMxAmD+XpOIfqe60CvD7tMtpsaSqUF2VQ=; h=Message-ID:From:To:Cc:Subject:References:MIME-Version: Content-Type:Date; b=pE3o78bHXDpMG6L8HVr/82YMSubZkuByI2REt+yf3WkweDIp2CaZOCsCKVV6rwIgWyj+hYzCYssROW9M+8RKlfiQPSNT0fMK7VeyfTQffgkDXiFtesOFIXZLiogLn1560V6NdZPaE0jq1+5jbU0eM7EbkUMwNXtrIOhwUI7+vzY= 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=M/g2FUp4; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b=3KqNIfwg; 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="M/g2FUp4"; dkim=permerror (0-bit key) header.d=linutronix.de header.i=@linutronix.de header.b="3KqNIfwg" Message-ID: <20250313130322.027190131@linutronix.de> DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020; t=1741871034; 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=syj4DKiPqVRJ4tJ6hdHCsNz/PeEgBfCP7TCfi1O9n7E=; b=M/g2FUp4+d4KQi+pVi/iNrEY7yyofNEj4PYtueo0XHrGtIfUZD7Eu7cZ0CPzXYK5SKZfYh Rfh0IFuqq9zUzMWWgGuA7ZEaSAcH3l7zn2BHAwvZ3IQOQDyujLMXR54lzBxNRK83xTSe0N qcFjDActCUwtJzM50bZKHn/hedwdah4TddOJrZjxuWTBZDAocdnxnfNwWdNTq/av1lIHhg XbZdgdTFudwQgFu5BQ5cQkZeTv/V9Vzq73Z0pbMj6gWpWooZF8bmAjGdz/ckMoe1QIcuKA /nKd9bNsdS23IWakjntm6ieGx4xYCb2ZWxuXgSQsWNJwCKHUj/cPzRNoxcuiHw== DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=linutronix.de; s=2020e; t=1741871034; 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=syj4DKiPqVRJ4tJ6hdHCsNz/PeEgBfCP7TCfi1O9n7E=; b=3KqNIfwgh2+pPnJQB0EsGRiw7nUHYBApMvIUzU2PhcfESPiI0Bf0dlcX7sRrf8NMWh0FF+ 7ZXowdA74cpHjtAA== From: Thomas Gleixner To: LKML Cc: Marc Zyngier , Jonathan Cameron , Peter Zijlstra , Nishanth Menon , Jonathan Cameron , Dhruva Gole , Tero Kristo , Santosh Shilimkar , Logan Gunthorpe , Dave Jiang , Jon Mason , Allen Hubbe , ntb@lists.linux.dev, Bjorn Helgaas , linux-pci@vger.kernel.org, Michael Kelley , Wei Liu , Haiyang Zhang , linux-hyperv@vger.kernel.org, Wei Huang , Manivannan Sadhasivam , "James E.J. Bottomley" , "Martin K. Petersen" , linux-scsi@vger.kernel.org Subject: [patch V2 10/10] genirq/msi: Rename msi_[un]lock_descs() References: <20250313130212.450198939@linutronix.de> Precedence: bulk X-Mailing-List: linux-scsi@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Date: Thu, 13 Mar 2025 14:03:53 +0100 (CET) Now that all abuse is gone and the legit users are converted to guard(msi_descs_lock), rename the lock functions and document them as internal. No functional change. Signed-off-by: Thomas Gleixner Reviewed-by: Jonathan Cameron --- include/linux/msi.h | 8 ++++---- kernel/irq/msi.c | 16 ++++++++++------ 2 files changed, 14 insertions(+), 10 deletions(-) --- a/include/linux/msi.h +++ b/include/linux/msi.h @@ -224,11 +224,11 @@ struct msi_dev_domain { int msi_setup_device_data(struct device *dev); -void msi_lock_descs(struct device *dev); -void msi_unlock_descs(struct device *dev); +void __msi_lock_descs(struct device *dev); +void __msi_unlock_descs(struct device *dev); -DEFINE_LOCK_GUARD_1(msi_descs_lock, struct device, msi_lock_descs(_T->lock), - msi_unlock_descs(_T->lock)); +DEFINE_LOCK_GUARD_1(msi_descs_lock, struct device, __msi_lock_descs(_T->lock), + __msi_unlock_descs(_T->lock)); struct msi_desc *msi_domain_first_desc(struct device *dev, unsigned int domid, enum msi_desc_filter filter); --- a/kernel/irq/msi.c +++ b/kernel/irq/msi.c @@ -337,26 +337,30 @@ int msi_setup_device_data(struct device } /** - * msi_lock_descs - Lock the MSI descriptor storage of a device + * __msi_lock_descs - Lock the MSI descriptor storage of a device * @dev: Device to operate on + * + * Internal function for guard(msi_descs_lock). Don't use in code. */ -void msi_lock_descs(struct device *dev) +void __msi_lock_descs(struct device *dev) { mutex_lock(&dev->msi.data->mutex); } -EXPORT_SYMBOL_GPL(msi_lock_descs); +EXPORT_SYMBOL_GPL(__msi_lock_descs); /** - * msi_unlock_descs - Unlock the MSI descriptor storage of a device + * __msi_unlock_descs - Unlock the MSI descriptor storage of a device * @dev: Device to operate on + * + * Internal function for guard(msi_descs_lock). Don't use in code. */ -void msi_unlock_descs(struct device *dev) +void __msi_unlock_descs(struct device *dev) { /* Invalidate the index which was cached by the iterator */ dev->msi.data->__iter_idx = MSI_XA_MAX_INDEX; mutex_unlock(&dev->msi.data->mutex); } -EXPORT_SYMBOL_GPL(msi_unlock_descs); +EXPORT_SYMBOL_GPL(__msi_unlock_descs); static struct msi_desc *msi_find_desc(struct msi_device_data *md, unsigned int domid, enum msi_desc_filter filter)