From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-pd0-f182.google.com (mail-pd0-f182.google.com [209.85.192.182]) by dpdk.org (Postfix) with ESMTP id AA64937A4 for ; Thu, 26 Mar 2015 03:50:38 +0100 (CET) Received: by pdbcz9 with SMTP id cz9so47984919pdb.3 for ; Wed, 25 Mar 2015 19:50:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:message-id:date:from:user-agent:mime-version:to :cc:subject:references:in-reply-to:content-type :content-transfer-encoding; bh=YKmw+QZLo7QX1dohDH9Fr1bcMlOR3h51ukO2WixflaU=; b=J4loWb8F9UgpLUS0r2QokBYCl/I2aVhgxRh1HcMmcwuN4GRf6f+u7yZYFfEZ13wsLZ xvORc+ga6u1K8UFo0YShVEPZr3lCWYRkdEZ4NBv1bavr+VFwmPt4gzwwD+34iM3Ykhar SqH1lIZeCUoogDwZdFp1Ex8VGtgVX7rbslsea/uflILaS9B7k7jaMIL1K5boCltQkjv4 uqcxYkxAYyGbQFuFK18E2XJEAph7lLAY0lfVKQ7lELLPjd3qjYXxB+R1A4Iwdlfk0Fy6 yO6F46CAy9WoTtrsrPvmLP7ZwMzUEt39RDB6vK9SFSVDcseMIcmV5k5Q0byjjynzWTYz Dkyw== X-Gm-Message-State: ALoCoQnhF/Yc9yD59oYUQ+fA2qWD+/5vFEUzL3KvfF0DENc8BWPgg0OZpPSpSc7yoZ5Cj6s6s3d6 X-Received: by 10.70.90.233 with SMTP id bz9mr22418952pdb.47.1427338237957; Wed, 25 Mar 2015 19:50:37 -0700 (PDT) Received: from [10.16.129.101] (napt.igel.co.jp. [219.106.231.132]) by mx.google.com with ESMTPSA id om6sm3828217pdb.40.2015.03.25.19.50.36 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 25 Mar 2015 19:50:37 -0700 (PDT) Message-ID: <551373FA.9090001@igel.co.jp> Date: Thu, 26 Mar 2015 11:50:34 +0900 From: Tetsuya Mukawa User-Agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:31.0) Gecko/20100101 Thunderbird/31.5.0 MIME-Version: 1.0 To: "Iremonger, Bernard" , "dev@dpdk.org" References: <1426584645-28828-7-git-send-email-mukawa@igel.co.jp> <1427170717-13879-1-git-send-email-mukawa@igel.co.jp> <1427170717-13879-6-git-send-email-mukawa@igel.co.jp> <8CEF83825BEC744B83065625E567D7C204A0245E@IRSMSX108.ger.corp.intel.com> In-Reply-To: <8CEF83825BEC744B83065625E567D7C204A0245E@IRSMSX108.ger.corp.intel.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [dpdk-dev] [PATCH v2 5/6] eal: Use map_idx in pci_uio_map_resource() of bsdapp to work same as linuxapp X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2015 02:50:39 -0000 On 2015/03/26 0:27, Iremonger, Bernard wrote: > >> -----Original Message----- >> From: Tetsuya Mukawa [mailto:mukawa@igel.co.jp] >> Sent: Tuesday, March 24, 2015 4:19 AM >> To: dev@dpdk.org >> Cc: Iremonger, Bernard; Richardson, Bruce; david.marchand@6wind.com; Tetsuya Mukawa >> Subject: [PATCH v2 5/6] eal: Use map_idx in pci_uio_map_resource() of bsdapp to work same as >> linuxapp >> >> This patch changes code that maps pci resources in bsdapp. >> Linuxapp has almost same code. To consolidate both, fix implementation of bsdapp to work same as >> linuxapp. >> >> Signed-off-by: Tetsuya Mukawa >> --- >> lib/librte_eal/bsdapp/eal/eal_pci.c | 24 ++++++++++++------------ >> 1 file changed, 12 insertions(+), 12 deletions(-) >> >> diff --git a/lib/librte_eal/bsdapp/eal/eal_pci.c b/lib/librte_eal/bsdapp/eal/eal_pci.c >> index 85f8671..08b91b4 100644 >> --- a/lib/librte_eal/bsdapp/eal/eal_pci.c >> +++ b/lib/librte_eal/bsdapp/eal/eal_pci.c >> @@ -195,7 +195,7 @@ pci_uio_map_secondary(struct rte_pci_device *dev) static int >> pci_uio_map_resource(struct rte_pci_device *dev) { >> - int i, j; >> + int i, map_idx; >> char devname[PATH_MAX]; /* contains the /dev/uioX */ >> void *mapaddr; >> uint64_t phaddr; >> @@ -247,31 +247,31 @@ pci_uio_map_resource(struct rte_pci_device *dev) >> pagesz = sysconf(_SC_PAGESIZE); >> >> maps = uio_res->maps; >> - for (i = uio_res->nb_maps = 0; i != PCI_MAX_RESOURCE; i++) { >> + for (i = 0, map_idx = 0; i != PCI_MAX_RESOURCE; i++) { >> >> - j = uio_res->nb_maps; >> /* skip empty BAR */ >> if ((phaddr = dev->mem_resource[i].phys_addr) == 0) >> continue; >> >> /* if matching map is found, then use it */ >> offset = i * pagesz; >> - maps[j].offset = offset; >> - maps[j].phaddr = dev->mem_resource[i].phys_addr; >> - maps[j].size = dev->mem_resource[i].len; >> - if (maps[j].addr != NULL || >> - (mapaddr = pci_map_resource(NULL, devname, (off_t)offset, >> - (size_t)maps[j].size) >> - ) == NULL) { >> + maps[map_idx].offset = offset; >> + maps[map_idx].phaddr = dev->mem_resource[i].phys_addr; >> + maps[map_idx].size = dev->mem_resource[i].len; >> + mapaddr = pci_map_resource(NULL, devname, (off_t)offset, >> + (size_t)maps[map_idx].size); >> + if ((maps[map_idx].addr != NULL) || (mapaddr == NULL)) { > Hi Tetsuya, > > Should be checking for if (mapaddr == MAP_FAILED) here. > Seems to be fixed in patch 6/6 though. Hi Bernard, Here, bsdapp still has old pci_map_resource(). Old pci_map_resource() return NULL when mapping is failed. And this behavior will be changed in 6/6. This is why MAP_FAILED is checked in 6/6. Regards, Tetsuya > Regards, > > Bernard. > >> rte_free(uio_res); >> return -1; >> } >> >> - maps[j].addr = mapaddr; >> - uio_res->nb_maps++; >> + maps[map_idx].addr = mapaddr; >> + map_idx++; >> dev->mem_resource[i].addr = mapaddr; >> } >> >> + uio_res->nb_maps = map_idx; >> + >> TAILQ_INSERT_TAIL(uio_res_list, uio_res, next); >> >> return 0; >> -- >> 1.9.1