From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:41251) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIbuY-0003Ac-Kw for qemu-devel@nongnu.org; Mon, 22 Apr 2019 12:35:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hIboj-0007ZC-Q5 for qemu-devel@nongnu.org; Mon, 22 Apr 2019 12:29:18 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:36622) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hIboj-0007Yp-K9 for qemu-devel@nongnu.org; Mon, 22 Apr 2019 12:29:17 -0400 Received: by mail-wr1-f67.google.com with SMTP id b1so5050479wru.3 for ; Mon, 22 Apr 2019 09:29:17 -0700 (PDT) References: <20190420161446.2274-1-liq3ea@163.com> <20190420161446.2274-4-liq3ea@163.com> <4eb444fe-7e45-1072-770b-17f0db493b6d@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Message-ID: Date: Mon, 22 Apr 2019 18:29:14 +0200 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 8bit Subject: Re: [Qemu-devel] [PATCH v2 3/3] edu: uses uint64_t in dma operation List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Li Qiang Cc: Li Qiang , Jiri Slaby , Paolo Bonzini , Qemu Developers On 4/22/19 3:21 AM, Li Qiang wrote: > > > Philippe Mathieu-Daudé > 于 > 2019年4月21日周日 下午6:32写道： > > On 4/20/19 6:14 PM, Li Qiang wrote: > > The dma related variable is dma_addr_t, it is uint64_t in > > x64 platform. Change these usage from uint32_to uint64_t to > > avoid trancation. > > "to avoid address truncation"? > > > > The dma.dst/src/cnt..is from guest and is 64-bits. But in 'edu_dma_timer', > it is assigned to uint32_t, If it is 0xffffffff 00000000, it will be ok > by the check > but it is of course not allowed.  > > Though this is just an edu device, I think we should avoid this. I agree with you, I was just trying to correct your English ;) > Thanks, > Li Qiang > >   > > > > > Signed-off-by: Li Qiang > > > --- > > Change since v1: > > Fix format compile error on Windows > > > >  hw/misc/edu.c | 15 ++++++++------- > >  1 file changed, 8 insertions(+), 7 deletions(-) > > > > diff --git a/hw/misc/edu.c b/hw/misc/edu.c > > index 4018dddcb8..f4a6d5f1c5 100644 > > --- a/hw/misc/edu.c > > +++ b/hw/misc/edu.c > > @@ -98,23 +98,24 @@ static void edu_lower_irq(EduState *edu, > uint32_t val) > >      } > >  } > >  > > -static bool within(uint32_t addr, uint32_t start, uint32_t end) > > +static bool within(uint64_t addr, uint64_t start, uint64_t end) > > OK. > > >  { > >      return start <= addr && addr < end; > >  } > >  > > -static void edu_check_range(uint32_t addr, uint32_t size1, > uint32_t start, > > +static void edu_check_range(uint64_t addr, uint64_t size1, > uint64_t start, > >                  uint32_t size2) > > OK for addr. MMIO range is 1MiB so you can keep uint32_t for > size1/size2. Up to the maintainer (personally I'd prefer keep u32). > > Reviewed-by: Philippe Mathieu-Daudé > > > >  { > > -    uint32_t end1 = addr + size1; > > -    uint32_t end2 = start + size2; > > +    uint64_t end1 = addr + size1; > > +    uint64_t end2 = start + size2; > >  > >      if (within(addr, start, end2) && > >              end1 > addr && within(end1, start, end2)) { > >          return; > >      } > >  > > -    hw_error("EDU: DMA range 0x%.8x-0x%.8x out of bounds > (0x%.8x-0x%.8x)!", > > +    hw_error("EDU: DMA range 0x%016"PRIx64"-0x%016"PRIx64 > > +             " out of bounds (0x%016"PRIx64"-0x%016"PRIx64")!", > >              addr, end1 - 1, start, end2 - 1); > >  } > >  > > @@ -139,13 +140,13 @@ static void edu_dma_timer(void *opaque) > >      } > >  > >      if (EDU_DMA_DIR(edu->dma.cmd) == EDU_DMA_FROM_PCI) { > > -        uint32_t dst = edu->dma.dst; > > +        uint64_t dst = edu->dma.dst; > >          edu_check_range(dst, edu->dma.cnt, DMA_START, DMA_SIZE); > >          dst -= DMA_START; > >          pci_dma_read(&edu->pdev, edu_clamp_addr(edu, edu->dma.src), > >                  edu->dma_buf + dst, edu->dma.cnt); > >      } else { > > -        uint32_t src = edu->dma.src; > > +        uint64_t src = edu->dma.src; > >          edu_check_range(src, edu->dma.cnt, DMA_START, DMA_SIZE); > >          src -= DMA_START; > >          pci_dma_write(&edu->pdev, edu_clamp_addr(edu, edu->dma.dst), > > > From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 741E6C10F11 for ; Mon, 22 Apr 2019 16:39:07 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 44713214AE for ; Mon, 22 Apr 2019 16:39:07 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 44713214AE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([127.0.0.1]:39917 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIbyE-0006ZB-Am for qemu-devel@archiver.kernel.org; Mon, 22 Apr 2019 12:39:06 -0400 Received: from eggs.gnu.org ([209.51.188.92]:41251) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hIbuY-0003Ac-Kw for qemu-devel@nongnu.org; Mon, 22 Apr 2019 12:35:19 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hIboj-0007ZC-Q5 for qemu-devel@nongnu.org; Mon, 22 Apr 2019 12:29:18 -0400 Received: from mail-wr1-f67.google.com ([209.85.221.67]:36622) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hIboj-0007Yp-K9 for qemu-devel@nongnu.org; Mon, 22 Apr 2019 12:29:17 -0400 Received: by mail-wr1-f67.google.com with SMTP id b1so5050479wru.3 for ; Mon, 22 Apr 2019 09:29:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:openpgp:message-id :date:user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=KpJ29A5fF/Elysec+P7qYX7F1+TezU4oqix0FhS/SWI=; b=Oex5mYuVL3QUHpEcies9vfqb7EpPT3910+mwHpZgC6co7A/LG7NwSurjKnVR6LTitA 9eQ58fou8BhqlNeHLgZ2s6NNC1CA7gKxq6gTyei3FF0vumueNWDKvWL64n8zsxOe6O/z wWrfR6F0Ag1ceQoIvXGhxuJET/Ge/oaYHN5/YMPnR2FLXcVvI27rpKb1vhyTjpIXctMh PWrgVKvSEg8AVLX58uNLuBmPKUEYxzxjmjWIR9UWuurAnaQCSAG0N7P3MpEPs7boG3iv kJDXeD1LUxK7W1TjP+oLs1dDAV/oYtj5grLY0Xi3v83wiVQgJu7z9XDhVfq0oj9ipq0D cMfg== X-Gm-Message-State: APjAAAUjZMvnj0SuGQzI1ry7LjKJTxranqjb5W7ywxSLvKGcyi5d/F/L bJBoivo9PdJh5wUSWeMLujhN4a9sJugORA== X-Google-Smtp-Source: APXvYqxrIFkV2bJ9vgpJwct0NqIMNGdSeHa9uTpEvrfhzPvg3leOutAH8XsVm+zeGw1rC26rzGlwqw== X-Received: by 2002:a5d:6384:: with SMTP id p4mr13295977wru.208.1555950556471; Mon, 22 Apr 2019 09:29:16 -0700 (PDT) Received: from [192.168.1.25] (atoulouse-656-1-803-163.w86-221.abo.wanadoo.fr. [86.221.12.163]) by smtp.gmail.com with ESMTPSA id b8sm4923940wrf.21.2019.04.22.09.29.15 (version=TLS1_3 cipher=AEAD-AES128-GCM-SHA256 bits=128/128); Mon, 22 Apr 2019 09:29:15 -0700 (PDT) To: Li Qiang References: <20190420161446.2274-1-liq3ea@163.com> <20190420161446.2274-4-liq3ea@163.com> <4eb444fe-7e45-1072-770b-17f0db493b6d@redhat.com> From: =?UTF-8?Q?Philippe_Mathieu-Daud=c3=a9?= Openpgp: id=89C1E78F601EE86C867495CBA2A3FD6EDEADC0DE; url=http://pgp.mit.edu/pks/lookup?op=get&search=0xA2A3FD6EDEADC0DE Message-ID: Date: Mon, 22 Apr 2019 18:29:14 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset="UTF-8" Content-Language: en-US Content-Transfer-Encoding: 8bit X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.85.221.67 Subject: Re: [Qemu-devel] [PATCH v2 3/3] edu: uses uint64_t in dma operation X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Jiri Slaby , Li Qiang , Qemu Developers , Paolo Bonzini Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Message-ID: <20190422162914.FPWCU_FYLCPMWiQQMERA7VIu78ZPtadxQaS1iaOu-v8@z> On 4/22/19 3:21 AM, Li Qiang wrote: > > > Philippe Mathieu-Daudé > 于 > 2019年4月21日周日 下午6:32写道： > > On 4/20/19 6:14 PM, Li Qiang wrote: > > The dma related variable is dma_addr_t, it is uint64_t in > > x64 platform. Change these usage from uint32_to uint64_t to > > avoid trancation. > > "to avoid address truncation"? > > > > The dma.dst/src/cnt..is from guest and is 64-bits. But in 'edu_dma_timer', > it is assigned to uint32_t, If it is 0xffffffff 00000000, it will be ok > by the check > but it is of course not allowed.  > > Though this is just an edu device, I think we should avoid this. I agree with you, I was just trying to correct your English ;) > Thanks, > Li Qiang > >   > > > > > Signed-off-by: Li Qiang > > > --- > > Change since v1: > > Fix format compile error on Windows > > > >  hw/misc/edu.c | 15 ++++++++------- > >  1 file changed, 8 insertions(+), 7 deletions(-) > > > > diff --git a/hw/misc/edu.c b/hw/misc/edu.c > > index 4018dddcb8..f4a6d5f1c5 100644 > > --- a/hw/misc/edu.c > > +++ b/hw/misc/edu.c > > @@ -98,23 +98,24 @@ static void edu_lower_irq(EduState *edu, > uint32_t val) > >      } > >  } > >  > > -static bool within(uint32_t addr, uint32_t start, uint32_t end) > > +static bool within(uint64_t addr, uint64_t start, uint64_t end) > > OK. > > >  { > >      return start <= addr && addr < end; > >  } > >  > > -static void edu_check_range(uint32_t addr, uint32_t size1, > uint32_t start, > > +static void edu_check_range(uint64_t addr, uint64_t size1, > uint64_t start, > >                  uint32_t size2) > > OK for addr. MMIO range is 1MiB so you can keep uint32_t for > size1/size2. Up to the maintainer (personally I'd prefer keep u32). > > Reviewed-by: Philippe Mathieu-Daudé > > > >  { > > -    uint32_t end1 = addr + size1; > > -    uint32_t end2 = start + size2; > > +    uint64_t end1 = addr + size1; > > +    uint64_t end2 = start + size2; > >  > >      if (within(addr, start, end2) && > >              end1 > addr && within(end1, start, end2)) { > >          return; > >      } > >  > > -    hw_error("EDU: DMA range 0x%.8x-0x%.8x out of bounds > (0x%.8x-0x%.8x)!", > > +    hw_error("EDU: DMA range 0x%016"PRIx64"-0x%016"PRIx64 > > +             " out of bounds (0x%016"PRIx64"-0x%016"PRIx64")!", > >              addr, end1 - 1, start, end2 - 1); > >  } > >  > > @@ -139,13 +140,13 @@ static void edu_dma_timer(void *opaque) > >      } > >  > >      if (EDU_DMA_DIR(edu->dma.cmd) == EDU_DMA_FROM_PCI) { > > -        uint32_t dst = edu->dma.dst; > > +        uint64_t dst = edu->dma.dst; > >          edu_check_range(dst, edu->dma.cnt, DMA_START, DMA_SIZE); > >          dst -= DMA_START; > >          pci_dma_read(&edu->pdev, edu_clamp_addr(edu, edu->dma.src), > >                  edu->dma_buf + dst, edu->dma.cnt); > >      } else { > > -        uint32_t src = edu->dma.src; > > +        uint64_t src = edu->dma.src; > >          edu_check_range(src, edu->dma.cnt, DMA_START, DMA_SIZE); > >          src -= DMA_START; > >          pci_dma_write(&edu->pdev, edu_clamp_addr(edu, edu->dma.dst), > > >