From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932598AbdCaDcC (ORCPT ); Thu, 30 Mar 2017 23:32:02 -0400 Received: from szxga03-in.huawei.com ([45.249.212.189]:4931 "EHLO dggrg03-dlp.huawei.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S1753900AbdCaDcB (ORCPT ); Thu, 30 Mar 2017 23:32:01 -0400 Subject: Re: [PATCH 1/7] iommu/iova: fix incorrect variable types To: Robin Murphy , Joerg Roedel , iommu , David Woodhouse , Sudeep Dutt , Ashutosh Dixit , linux-kernel , Joerg Roedel References: <1490164067-12552-1-git-send-email-thunder.leizhen@huawei.com> <1490164067-12552-2-git-send-email-thunder.leizhen@huawei.com> <5fd3cc4b-44c1-e300-6254-892a6dfa435c@arm.com> <58D48401.10009@huawei.com> CC: Zefan Li , Xinwei Hu , "Tianhong Ding" , Hanjun Guo From: "Leizhen (ThunderTown)" Message-ID: <58DDCD4B.8070607@huawei.com> Date: Fri, 31 Mar 2017 11:30:19 +0800 User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:38.0) Gecko/20100101 Thunderbird/38.5.1 MIME-Version: 1.0 In-Reply-To: <58D48401.10009@huawei.com> Content-Type: text/plain; charset="windows-1252" Content-Transfer-Encoding: 7bit X-Originating-IP: [10.177.23.164] X-CFilter-Loop: Reflected X-Mirapoint-Virus-RAPID-Raw: score=unknown(0), refid=str=0001.0A090202.58DDCD54.0098,ss=1,re=0.000,recu=0.000,reip=0.000,cl=1,cld=1,fgs=0, ip=0.0.0.0, so=2014-11-16 11:51:01, dmn=2013-03-21 17:37:32 X-Mirapoint-Loop-Id: a53d590c3616e00c657c6846d79aa0ac Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On 2017/3/24 10:27, Leizhen (ThunderTown) wrote: > > > On 2017/3/23 19:42, Robin Murphy wrote: >> On 22/03/17 06:27, Zhen Lei wrote: >>> Keep these four variables type consistent with the paramters of function >>> __alloc_and_insert_iova_range and the members of struct iova: >>> >>> 1. static int __alloc_and_insert_iova_range(struct iova_domain *iovad, >>> unsigned long size, unsigned long limit_pfn, >>> >>> 2. struct iova { >>> unsigned long pfn_hi; >>> unsigned long pfn_lo; >>> >>> In fact, limit_pfn is most likely larger than 32 bits on DMA64. >> >> FWIW if pad_size manages to overflow an int something's probably gone >> horribly wrong, but there's no harm in making it consistent with >> everything else here. However, given that patch #6 makes this irrelevant >> anyway, do we really need to bother? > > Because I'm not sure whether patch #6 can be applied or not. So if Patch #6 can be applied, I can merge this patch and patch #6 into one. > >> >> Robin. >> >>> Signed-off-by: Zhen Lei >>> --- >>> drivers/iommu/iova.c | 6 +++--- >>> 1 file changed, 3 insertions(+), 3 deletions(-) >>> >>> diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c >>> index b7268a1..8ba8b496 100644 >>> --- a/drivers/iommu/iova.c >>> +++ b/drivers/iommu/iova.c >>> @@ -104,8 +104,8 @@ __cached_rbnode_delete_update(struct iova_domain *iovad, struct iova *free) >>> * Computes the padding size required, to make the start address >>> * naturally aligned on the power-of-two order of its size >>> */ >>> -static unsigned int >>> -iova_get_pad_size(unsigned int size, unsigned int limit_pfn) >>> +static unsigned long >>> +iova_get_pad_size(unsigned long size, unsigned long limit_pfn) >>> { >>> return (limit_pfn + 1 - size) & (__roundup_pow_of_two(size) - 1); >>> } >>> @@ -117,7 +117,7 @@ static int __alloc_and_insert_iova_range(struct iova_domain *iovad, >>> struct rb_node *prev, *curr = NULL; >>> unsigned long flags; >>> unsigned long saved_pfn; >>> - unsigned int pad_size = 0; >>> + unsigned long pad_size = 0; >>> >>> /* Walk the tree backwards */ >>> spin_lock_irqsave(&iovad->iova_rbtree_lock, flags); >>> >> >> >> . >> > -- Thanks! BestRegards From mboxrd@z Thu Jan 1 00:00:00 1970 From: "Leizhen (ThunderTown)" Subject: Re: [PATCH 1/7] iommu/iova: fix incorrect variable types Date: Fri, 31 Mar 2017 11:30:19 +0800 Message-ID: <58DDCD4B.8070607@huawei.com> References: <1490164067-12552-1-git-send-email-thunder.leizhen@huawei.com> <1490164067-12552-2-git-send-email-thunder.leizhen@huawei.com> <5fd3cc4b-44c1-e300-6254-892a6dfa435c@arm.com> <58D48401.10009@huawei.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <58D48401.10009-hv44wF8Li93QT0dZR+AlfA@public.gmane.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org Errors-To: iommu-bounces-cunTk1MwBs9QetFLy7KEm3xJsTq8ys+cHZ5vskTnxNA@public.gmane.org To: Robin Murphy , Joerg Roedel , iommu , David Woodhouse , Sudeep Dutt , Ashutosh Dixit , linux-kernel , Joerg Roedel Cc: Xinwei Hu , Zefan Li , Hanjun Guo , Tianhong Ding List-Id: iommu@lists.linux-foundation.org On 2017/3/24 10:27, Leizhen (ThunderTown) wrote: > > > On 2017/3/23 19:42, Robin Murphy wrote: >> On 22/03/17 06:27, Zhen Lei wrote: >>> Keep these four variables type consistent with the paramters of function >>> __alloc_and_insert_iova_range and the members of struct iova: >>> >>> 1. static int __alloc_and_insert_iova_range(struct iova_domain *iovad, >>> unsigned long size, unsigned long limit_pfn, >>> >>> 2. struct iova { >>> unsigned long pfn_hi; >>> unsigned long pfn_lo; >>> >>> In fact, limit_pfn is most likely larger than 32 bits on DMA64. >> >> FWIW if pad_size manages to overflow an int something's probably gone >> horribly wrong, but there's no harm in making it consistent with >> everything else here. However, given that patch #6 makes this irrelevant >> anyway, do we really need to bother? > > Because I'm not sure whether patch #6 can be applied or not. So if Patch #6 can be applied, I can merge this patch and patch #6 into one. > >> >> Robin. >> >>> Signed-off-by: Zhen Lei >>> --- >>> drivers/iommu/iova.c | 6 +++--- >>> 1 file changed, 3 insertions(+), 3 deletions(-) >>> >>> diff --git a/drivers/iommu/iova.c b/drivers/iommu/iova.c >>> index b7268a1..8ba8b496 100644 >>> --- a/drivers/iommu/iova.c >>> +++ b/drivers/iommu/iova.c >>> @@ -104,8 +104,8 @@ __cached_rbnode_delete_update(struct iova_domain *iovad, struct iova *free) >>> * Computes the padding size required, to make the start address >>> * naturally aligned on the power-of-two order of its size >>> */ >>> -static unsigned int >>> -iova_get_pad_size(unsigned int size, unsigned int limit_pfn) >>> +static unsigned long >>> +iova_get_pad_size(unsigned long size, unsigned long limit_pfn) >>> { >>> return (limit_pfn + 1 - size) & (__roundup_pow_of_two(size) - 1); >>> } >>> @@ -117,7 +117,7 @@ static int __alloc_and_insert_iova_range(struct iova_domain *iovad, >>> struct rb_node *prev, *curr = NULL; >>> unsigned long flags; >>> unsigned long saved_pfn; >>> - unsigned int pad_size = 0; >>> + unsigned long pad_size = 0; >>> >>> /* Walk the tree backwards */ >>> spin_lock_irqsave(&iovad->iova_rbtree_lock, flags); >>> >> >> >> . >> > -- Thanks! BestRegards