linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Yong Wu <yong.wu@mediatek.com>
To: Joerg Roedel <joro@8bytes.org>, Will Deacon <will@kernel.org>,
	Robin Murphy <robin.murphy@arm.com>
Cc: Matthias Brugger <matthias.bgg@gmail.com>,
	Krzysztof Kozlowski <krzk@kernel.org>,
	Tomasz Figa <tfiga@google.com>,
	<linux-mediatek@lists.infradead.org>,
	<srv_heupstream@mediatek.com>, <linux-kernel@vger.kernel.org>,
	<linux-arm-kernel@lists.infradead.org>,
	<iommu@lists.linux-foundation.org>, <yong.wu@mediatek.com>,
	<youlin.pei@mediatek.com>,
	Nicolas Boichat <drinkcat@chromium.org>, <anan.sun@mediatek.com>,
	<chao.hao@mediatek.com>, Greg Kroah-Hartman <gregkh@google.com>,
	<kernel-team@android.com>
Subject: [PATCH v3 4/7] iommu: Switch gather->end to unsigned long long
Date: Wed, 16 Dec 2020 18:36:04 +0800	[thread overview]
Message-ID: <20201216103607.23050-5-yong.wu@mediatek.com> (raw)
In-Reply-To: <20201216103607.23050-1-yong.wu@mediatek.com>

Currently gather->end is "unsigned long" which may be overflow in
arch32 in the corner case: 0xfff00000 + 0x100000(iova + size).
Although it doesn't affect the size(end - start), it affects the checking
"gather->end < end"

Fixes: a7d20dc19d9e ("iommu: Introduce struct iommu_iotlb_gather for batching TLB flushes")
Signed-off-by: Yong Wu <yong.wu@mediatek.com>
---
 include/linux/iommu.h | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/linux/iommu.h b/include/linux/iommu.h
index 794d4085edd3..6e907a95d981 100644
--- a/include/linux/iommu.h
+++ b/include/linux/iommu.h
@@ -178,7 +178,7 @@ enum iommu_dev_features {
  */
 struct iommu_iotlb_gather {
 	unsigned long		start;
-	unsigned long		end;
+	unsigned long long	end;
 	size_t			pgsize;
 };
 
@@ -537,7 +537,8 @@ static inline void iommu_iotlb_gather_add_page(struct iommu_domain *domain,
 					       struct iommu_iotlb_gather *gather,
 					       unsigned long iova, size_t size)
 {
-	unsigned long start = iova, end = start + size;
+	unsigned long start = iova;
+	unsigned long long end = start + size;
 
 	/*
 	 * If the new page is disjoint from the current range or is mapped at
-- 
2.18.0


  parent reply	other threads:[~2020-12-16 10:37 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-12-16 10:36 [PATCH v3 0/7] MediaTek IOMMU improve tlb flush performance in map/unmap Yong Wu
2020-12-16 10:36 ` [PATCH v3 1/7] iommu: Move iotlb_sync_map out from __iommu_map Yong Wu
2020-12-23  8:51   ` Christoph Hellwig
2020-12-24 11:27     ` Yong Wu
2020-12-16 10:36 ` [PATCH v3 2/7] iommu: Add iova and size as parameters in iotlb_sync_map Yong Wu
2020-12-16 10:36 ` [PATCH v3 3/7] iommu/mediatek: Add iotlb_sync_map to sync whole the iova range Yong Wu
2020-12-16 10:36 ` Yong Wu [this message]
2020-12-16 11:03   ` [PATCH v3 4/7] iommu: Switch gather->end to unsigned long long David Laight
2020-12-17  2:26     ` Yong Wu
2020-12-16 12:10   ` Robin Murphy
2020-12-17  2:26     ` Yong Wu
2020-12-16 10:36 ` [PATCH v3 5/7] iommu: Allow io_pgtable_tlb ops optional Yong Wu
2021-01-18 16:18   ` Robin Murphy
2020-12-16 10:36 ` [PATCH v3 6/7] iommu/mediatek: Gather iova in iommu_unmap to achieve tlb sync once Yong Wu
2020-12-23  8:56   ` Tomasz Figa
2020-12-23 11:00     ` Robin Murphy
2021-01-08  9:56       ` Tomasz Figa
2021-01-08  9:56       ` Tomasz Figa
2021-01-18 16:35   ` Robin Murphy
2021-01-18 16:58     ` Will Deacon
2021-01-18 17:14       ` Robin Murphy
2020-12-16 10:36 ` [PATCH v3 7/7] iommu/mediatek: Remove the tlb-ops for v7s Yong Wu
2021-01-18 16:39   ` 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=20201216103607.23050-5-yong.wu@mediatek.com \
    --to=yong.wu@mediatek.com \
    --cc=anan.sun@mediatek.com \
    --cc=chao.hao@mediatek.com \
    --cc=drinkcat@chromium.org \
    --cc=gregkh@google.com \
    --cc=iommu@lists.linux-foundation.org \
    --cc=joro@8bytes.org \
    --cc=kernel-team@android.com \
    --cc=krzk@kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mediatek@lists.infradead.org \
    --cc=matthias.bgg@gmail.com \
    --cc=robin.murphy@arm.com \
    --cc=srv_heupstream@mediatek.com \
    --cc=tfiga@google.com \
    --cc=will@kernel.org \
    --cc=youlin.pei@mediatek.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;
as well as URLs for NNTP newsgroup(s).