mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: John Garry <john.garry@arm.com>
To: Nicolin Chen <nicolinc@nvidia.com>, will@kernel.org, jgg@nvidia.com
Cc: robin.murphy@arm.com, joro@8bytes.org, praan@google.com,
	kevin.tian@intel.com, smostafa@google.com,
	linux-arm-kernel@lists.infradead.org, iommu@lists.linux.dev,
	linux-kernel@vger.kernel.org, jamien@nvidia.com, kas@kernel.org,
	Cristian Prundeanu <cpru@amazon.com>,
	Breno Leitao <leitao@kernel.org>,
	xueshuai@linux.alibaba.com
Subject: Re: [PATCH v12 04/12] iommu/arm-smmu-v3: Pack the MSI vectors of the used sources
Date: Mon, 16 Nov 2026 10:29:46 +0000	[thread overview]
Message-ID: <db4f83f3-d35b-49b7-8570-04e158125b53@arm.com> (raw)
In-Reply-To: <0d28afd67694fc6882e0ff5f054027488b1cf816.1793593923.git.nicolinc@nvidia.com>

On 11/2/26 05:19, Nicolin Chen wrote:
> arm_smmu_setup_msis() skips the PRIQ vector by decreasing nvec, which only
> works since PRIQ_MSI_INDEX is the last index. A subsequent change will make
> the EVTQ optional for kdump, whose index is 0, so that trick won't work.
> 
> Pack the vectors of the used sources instead, and record the source of each
> vector in a new msi_map, for arm_smmu_write_msi_msg() to find the register
> set, regardless of the sources in use.
> 
> No functional change intended.

I just have a few comments/questions on this patch, below.

Thanks,
John

> 
> Suggested-by: Jason Gunthorpe <jgg@nvidia.com>
> Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
> ---
>   drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h |  9 +++++
>   drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 42 +++++++++++----------
>   2 files changed, 32 insertions(+), 19 deletions(-)
> 
> diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
> index 8f2c0b1cc4a8d..bce592fff0b12 100644
> --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
> +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h
> @@ -936,6 +936,13 @@ struct arm_smmu_impl_ops {
>   			  const struct iommu_user_data *user_data);
>   };
>   
> +enum arm_smmu_msi_index {
> +	EVTQ_MSI_INDEX,
> +	GERROR_MSI_INDEX,
> +	PRIQ_MSI_INDEX,
> +	ARM_SMMU_MAX_MSIS,

nit: I don't really think that the trailing ',' is required after 
ARM_SMMU_MAX_MSIS, as I asusme that we will never see any entry added 
after 'max'. I appreciate that this enum is just being relocated in this 
patch.

> +};
> +
>   /* An SMMUv3 instance */
>   struct arm_smmu_device {
>   	struct device			*dev;
> @@ -993,6 +1000,8 @@ struct arm_smmu_device {
>   
>   	int				gerr_irq;
>   	int				combined_irq;
> +	/* MSI vector index to enum arm_smmu_msi_index */
> +	u8				msi_map[ARM_SMMU_MAX_MSIS];

should this be an array of enum arm_smmu_msi_index, as in 
arm_smmu_setup_msi_vector() we write a enum arm_smmu_msi_index? I am 
assuming that is why enum arm_smmu_msi_index was relocated.

>   
>   	unsigned long			oas; /* PA */
>   	unsigned long			pgsize_bitmap;
> diff --git a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
> index cb45bd154c9e5..a312984bc6a0e 100644
> --- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
> +++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
> @@ -56,13 +56,6 @@ static struct iommu_dirty_ops arm_smmu_dirty_ops;
>    */
>   static DEFINE_STATIC_KEY_FALSE(arm_smmu_erratum_repeat_tlbi_cfgi_key);
>   
> -enum arm_smmu_msi_index {
> -	EVTQ_MSI_INDEX,
> -	GERROR_MSI_INDEX,
> -	PRIQ_MSI_INDEX,
> -	ARM_SMMU_MAX_MSIS,
> -};
> -
>   #define NUM_ENTRY_QWORDS 8
>   static_assert(sizeof(struct arm_smmu_ste) == NUM_ENTRY_QWORDS * sizeof(u64));
>   static_assert(sizeof(struct arm_smmu_cd) == NUM_ENTRY_QWORDS * sizeof(u64));
> @@ -4933,7 +4926,7 @@ static void arm_smmu_write_msi_msg(struct msi_desc *desc, struct msi_msg *msg)
>   	phys_addr_t doorbell;
>   	struct device *dev = msi_desc_to_dev(desc);
>   	struct arm_smmu_device *smmu = dev_get_drvdata(dev);
> -	phys_addr_t *cfg = arm_smmu_msi_cfg[desc->msi_index];
> +	phys_addr_t *cfg = arm_smmu_msi_cfg[smmu->msi_map[desc->msi_index]];
>   
>   	doorbell = (((u64)msg->address_hi) << 32) | msg->address_lo;
>   	doorbell &= MSI_CFG0_ADDR_MASK;
> @@ -4943,19 +4936,29 @@ static void arm_smmu_write_msi_msg(struct msi_desc *desc, struct msi_msg *msg)
>   	writel_relaxed(ARM_SMMU_MEMATTR_DEVICE_nGnRE, smmu->base + cfg[2]);
>   }
>   
> +static void arm_smmu_setup_msi_vector(struct arm_smmu_device *smmu,
> +				      unsigned int *vec, unsigned int *nvec,
> +				      enum arm_smmu_msi_index index)

mega nit: "index" as a name is quite vague as we are indexing vec[] and 
smmu->msi_map[] in this function. Maybe "msi_index" would be better.

> +{
> +	writeq_relaxed(0, smmu->base + arm_smmu_msi_cfg[index][0]);
> +	vec[index] = *nvec;
> +	smmu->msi_map[(*nvec)++] = index;
> +}
> +
>   static void arm_smmu_setup_msis(struct arm_smmu_device *smmu)
>   {
> -	int ret, nvec = ARM_SMMU_MAX_MSIS;
> +	unsigned int vec[ARM_SMMU_MAX_MSIS] = {
> +		/* An unused source maps to a vector past nvec */
> +		[0 ... ARM_SMMU_MAX_MSIS - 1] = ARM_SMMU_MAX_MSIS,
> +	};
>   	struct device *dev = smmu->dev;
> +	unsigned int nvec = 0;
> +	int ret;
>   
> -	/* Clear the MSI address regs */
> -	writeq_relaxed(0, smmu->base + ARM_SMMU_GERROR_IRQ_CFG0);
> -	writeq_relaxed(0, smmu->base + ARM_SMMU_EVTQ_IRQ_CFG0);
> -
> +	arm_smmu_setup_msi_vector(smmu, vec, &nvec, EVTQ_MSI_INDEX);
> +	arm_smmu_setup_msi_vector(smmu, vec, &nvec, GERROR_MSI_INDEX);
>   	if (smmu->features & ARM_SMMU_FEAT_PRI)
> -		writeq_relaxed(0, smmu->base + ARM_SMMU_PRIQ_IRQ_CFG0);
> -	else
> -		nvec--;
> +		arm_smmu_setup_msi_vector(smmu, vec, &nvec, PRIQ_MSI_INDEX);
>   
>   	if (!(smmu->features & ARM_SMMU_FEAT_MSI))

In this case (or any other time in which we return early in this 
function), it seems less than ideal - as a coding practice - that we 
have written values in smmu->msi_map and they won't be used.

>   		return;
> @@ -4972,9 +4975,10 @@ static void arm_smmu_setup_msis(struct arm_smmu_device *smmu)
>   		return;
>   	}
>   
> -	smmu->evtq.q.irq = msi_get_virq(dev, EVTQ_MSI_INDEX);
> -	smmu->gerr_irq = msi_get_virq(dev, GERROR_MSI_INDEX);
> -	smmu->priq.q.irq = msi_get_virq(dev, PRIQ_MSI_INDEX);
> +	/* msi_get_virq() returns 0 for an unused source that has no vector */

So are you saying that msi_get_virq(dev, ARM_SMMU_MAX_MSIS) returns 0?

If so, do we really require checks like the following:

if (smmu->features & ARM_SMMU_FEAT_PRI) {
		irq = smmu->priq.q.irq;
		if (irq) {

I am talking about the ARM_SMMU_FEAT_PRI flag check, as smmu->priq.q.irq 
== 0 and ARM_SMMU_FEAT_PRI unset seem equivalent.

> +	smmu->evtq.q.irq = msi_get_virq(dev, vec[EVTQ_MSI_INDEX]);
> +	smmu->gerr_irq = msi_get_virq(dev, vec[GERROR_MSI_INDEX]);
> +	smmu->priq.q.irq = msi_get_virq(dev, vec[PRIQ_MSI_INDEX]);
>   
>   	/* Add callback to free MSIs on teardown */
>   	devm_add_action_or_reset(dev, arm_smmu_free_msis, dev);


  reply	other threads:[~2026-11-16 10:30 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-11-02  5:19 [PATCH v12 00/12] iommu/arm-smmu-v3: Adopt the crashed kernel's stream table for kdump Nicolin Chen
2026-11-02  5:19 ` [PATCH v12 01/12] iommu: Pass in NULL old_domain when attaching a deferred device Nicolin Chen
2026-11-02  5:19 ` [PATCH v12 02/12] iommu/arm-smmu-v3: Init the vmid_map ida before the stream table setup Nicolin Chen
2026-11-16  9:30   ` John Garry
2026-11-02  5:19 ` [PATCH v12 03/12] iommu/arm-smmu-v3: Make the ASID space per SMMU instance Nicolin Chen
2026-11-16  9:46   ` John Garry
2026-11-02  5:19 ` [PATCH v12 04/12] iommu/arm-smmu-v3: Pack the MSI vectors of the used sources Nicolin Chen
2026-11-16 10:29   ` John Garry [this message]
2026-11-02  5:19 ` [PATCH v12 05/12] iommu/arm-smmu-v3: Add ARM_SMMU_FEAT_EVTQ for the event queue Nicolin Chen
2026-11-16 10:59   ` John Garry
2026-11-02  5:19 ` [PATCH v12 06/12] iommu/arm-smmu-v3: Disable the EVTQ and the PRIQ in a kdump kernel Nicolin Chen
2026-11-16 11:08   ` John Garry
2026-11-02  5:19 ` [PATCH v12 07/12] iommu/arm-smmu-v3: Add ARM_SMMU_OPT_KDUMP_ADOPT for " Nicolin Chen
2026-11-02  5:19 ` [PATCH v12 08/12] iommu/arm-smmu-v3-kexec: Reserve crashed kernel's ASIDs and VMIDs Nicolin Chen
2026-11-02  5:19 ` [PATCH v12 09/12] iommu/arm-smmu-v3-kexec: Implement is_attach_deferred() Nicolin Chen
2026-11-02  5:19 ` [PATCH v12 10/12] iommu/arm-smmu-v3: Retain CR0_SMMUEN during kdump device reset Nicolin Chen
2026-11-02  5:19 ` [PATCH v12 11/12] iommu/arm-smmu-v3: Skip RMR bypass for kdump adoption Nicolin Chen
2026-11-02  5:19 ` [PATCH v12 12/12] iommu/arm-smmu-v3: Detect ARM_SMMU_OPT_KDUMP_ADOPT in probe() Nicolin Chen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=db4f83f3-d35b-49b7-8570-04e158125b53@arm.com \
    --to=john.garry@arm.com \
    --cc=cpru@amazon.com \
    --cc=iommu@lists.linux.dev \
    --cc=jamien@nvidia.com \
    --cc=jgg@nvidia.com \
    --cc=joro@8bytes.org \
    --cc=kas@kernel.org \
    --cc=kevin.tian@intel.com \
    --cc=leitao@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nicolinc@nvidia.com \
    --cc=praan@google.com \
    --cc=robin.murphy@arm.com \
    --cc=smostafa@google.com \
    --cc=will@kernel.org \
    --cc=xueshuai@linux.alibaba.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®