From: Nicolin Chen <nicolinc@nvidia.com>
To: <will@kernel.org>, <robin.murphy@arm.com>, <joro@8bytes.org>
Cc: <thunder.leizhen@huawei.com>, <jgg@ziepe.ca>,
<tglx@linutronix.de>, <john.garry@huawei.com>,
<jean-philippe@linaro.org>, <christophe.jaillet@wanadoo.fr>,
<linux-arm-kernel@lists.infradead.org>,
<iommu@lists.linux-foundation.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH] iommu/arm-smmu-v3: Align size in __arm_smmu_tlb_inv_range
Date: Tue, 12 Apr 2022 21:17:45 -0700 [thread overview]
Message-ID: <20220413041745.35174-1-nicolinc@nvidia.com> (raw)
To calculate num_pages, the size should be aligned with
"page size", determined by the tg value. Otherwise, its
following "while (iova < end)" might become an infinite
loop if unaligned size is slightly greater than 1 << tg.
Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
---
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 627a3ed5ee8f..8249dad5ae44 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -1879,7 +1879,7 @@ static void __arm_smmu_tlb_inv_range(struct arm_smmu_cmdq_ent *cmd,
/* Determine what level the granule is at */
cmd->tlbi.ttl = 4 - ((ilog2(granule) - 3) / (tg - 3));
- num_pages = size >> tg;
+ num_pages = ALIGN(size, 1 << tg) >> tg;
}
cmds.num = 0;
--
2.17.1
WARNING: multiple messages have this Message-ID (diff)
From: Nicolin Chen via iommu <iommu@lists.linux-foundation.org>
To: <will@kernel.org>, <robin.murphy@arm.com>, <joro@8bytes.org>
Cc: jean-philippe@linaro.org, linux-kernel@vger.kernel.org,
jgg@ziepe.ca, iommu@lists.linux-foundation.org,
christophe.jaillet@wanadoo.fr, tglx@linutronix.de,
linux-arm-kernel@lists.infradead.org
Subject: [PATCH] iommu/arm-smmu-v3: Align size in __arm_smmu_tlb_inv_range
Date: Tue, 12 Apr 2022 21:17:45 -0700 [thread overview]
Message-ID: <20220413041745.35174-1-nicolinc@nvidia.com> (raw)
To calculate num_pages, the size should be aligned with
"page size", determined by the tg value. Otherwise, its
following "while (iova < end)" might become an infinite
loop if unaligned size is slightly greater than 1 << tg.
Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
---
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 627a3ed5ee8f..8249dad5ae44 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -1879,7 +1879,7 @@ static void __arm_smmu_tlb_inv_range(struct arm_smmu_cmdq_ent *cmd,
/* Determine what level the granule is at */
cmd->tlbi.ttl = 4 - ((ilog2(granule) - 3) / (tg - 3));
- num_pages = size >> tg;
+ num_pages = ALIGN(size, 1 << tg) >> tg;
}
cmds.num = 0;
--
2.17.1
_______________________________________________
iommu mailing list
iommu@lists.linux-foundation.org
https://lists.linuxfoundation.org/mailman/listinfo/iommu
WARNING: multiple messages have this Message-ID (diff)
From: Nicolin Chen <nicolinc@nvidia.com>
To: <will@kernel.org>, <robin.murphy@arm.com>, <joro@8bytes.org>
Cc: <thunder.leizhen@huawei.com>, <jgg@ziepe.ca>,
<tglx@linutronix.de>, <john.garry@huawei.com>,
<jean-philippe@linaro.org>, <christophe.jaillet@wanadoo.fr>,
<linux-arm-kernel@lists.infradead.org>,
<iommu@lists.linux-foundation.org>,
<linux-kernel@vger.kernel.org>
Subject: [PATCH] iommu/arm-smmu-v3: Align size in __arm_smmu_tlb_inv_range
Date: Tue, 12 Apr 2022 21:17:45 -0700 [thread overview]
Message-ID: <20220413041745.35174-1-nicolinc@nvidia.com> (raw)
To calculate num_pages, the size should be aligned with
"page size", determined by the tg value. Otherwise, its
following "while (iova < end)" might become an infinite
loop if unaligned size is slightly greater than 1 << tg.
Signed-off-by: Nicolin Chen <nicolinc@nvidia.com>
---
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 627a3ed5ee8f..8249dad5ae44 100644
--- a/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
+++ b/drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c
@@ -1879,7 +1879,7 @@ static void __arm_smmu_tlb_inv_range(struct arm_smmu_cmdq_ent *cmd,
/* Determine what level the granule is at */
cmd->tlbi.ttl = 4 - ((ilog2(granule) - 3) / (tg - 3));
- num_pages = size >> tg;
+ num_pages = ALIGN(size, 1 << tg) >> tg;
}
cmds.num = 0;
--
2.17.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next reply other threads:[~2022-04-13 4:17 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-04-13 4:17 Nicolin Chen [this message]
2022-04-13 4:17 ` [PATCH] iommu/arm-smmu-v3: Align size in __arm_smmu_tlb_inv_range Nicolin Chen
2022-04-13 4:17 ` Nicolin Chen via iommu
2022-04-13 13:40 ` Robin Murphy
2022-04-13 13:40 ` Robin Murphy
2022-04-13 13:40 ` Robin Murphy
2022-04-13 20:19 ` Nicolin Chen
2022-04-13 20:19 ` Nicolin Chen
2022-04-13 20:19 ` Nicolin Chen via iommu
2022-04-14 10:32 ` Robin Murphy
2022-04-14 10:32 ` Robin Murphy
2022-04-14 10:32 ` Robin Murphy
2022-04-15 3:56 ` Nicolin Chen
2022-04-15 3:56 ` Nicolin Chen
2022-04-15 3:56 ` Nicolin Chen via iommu
2022-04-16 2:03 ` Nicolin Chen via iommu
2022-04-16 2:03 ` Nicolin Chen
2022-04-16 2:03 ` Nicolin Chen
2022-04-19 20:02 ` Jason Gunthorpe
2022-04-19 20:02 ` Jason Gunthorpe
2022-04-19 20:02 ` Jason Gunthorpe
2022-04-19 20:05 ` Nicolin Chen
2022-04-19 20:05 ` Nicolin Chen
2022-04-19 20:05 ` Nicolin Chen via iommu
2022-04-19 20:15 ` Robin Murphy
2022-04-19 20:15 ` Robin Murphy
2022-04-19 20:15 ` Robin Murphy
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=20220413041745.35174-1-nicolinc@nvidia.com \
--to=nicolinc@nvidia.com \
--cc=christophe.jaillet@wanadoo.fr \
--cc=iommu@lists.linux-foundation.org \
--cc=jean-philippe@linaro.org \
--cc=jgg@ziepe.ca \
--cc=john.garry@huawei.com \
--cc=joro@8bytes.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=robin.murphy@arm.com \
--cc=tglx@linutronix.de \
--cc=thunder.leizhen@huawei.com \
--cc=will@kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.