From patchwork Thu Nov 6 14:48:47 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: lxu X-Patchwork-Id: 1176 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id A67617F18; Thu, 6 Nov 2014 15:39:32 +0100 (CET) Received: from out1134-227.mail.aliyun.com (out1134-227.mail.aliyun.com [42.120.134.227]) by dpdk.org (Postfix) with ESMTP id 310E87EC4 for ; Thu, 6 Nov 2014 15:39:26 +0100 (CET) X-Alimail-AntiSpam: AC=CONTINUE; BC=0.02410913|-1; FP=0|0|0|0|0|-1|-1|-1; HT=r41g08149; MF=liang.xu@cinfotech.cn; PH=DW; RN=2; RT=2; SR=0; Received: from WS-web (liang.xu@cinfotech.cn[222.65.239.251]) by r41g06011.xy2.aliyun.com at Thu, 06 Nov 2014 22:48:47 +0800 Date: Thu, 06 Nov 2014 22:48:47 +0800 From: "=?UTF-8?B?5b6Q5Lqu?=" To: "=?UTF-8?B?QnVyYWtvdiwgQW5hdG9seQ==?=" , "dev@dpdk.org" Message-ID: <69a73749-cfb8-43fd-89be-b5d533ad7e8f@cinfotech.cn> X-Mailer: Alimail-Mailagent revision 2667797 MIME-Version: 1.0 References: <1415193919-17361-1-git-send-email-liang.xu@cinfotech.cn> <1415283104-29970-1-git-send-email-liang.xu@cinfotech.cn>, b4328080-b71e-4cb4-b41b-ccdf8523a0ea@alibaba.com In-Reply-To: b4328080-b71e-4cb4-b41b-ccdf8523a0ea@alibaba.com x-aliyun-mail-creator: Webmail4_2670074_M3LTW96aWxsYS81LjAgKE1hY2ludG9zaDsgSW50ZWwgTWFjIE9TIFggMTBfMTBfMCkgQXBwbGVXZWJLaXQvNTM3LjM2IChLSFRNTCwgbGlrZSBHZWNrbykgQ2hyb21lLzM4LjAuMjEyNS4xMTEgU2FmYXJpLzUzNy4zNg==vN X-Content-Filtered-By: Mailman/MimeDel 2.1.15 Subject: [dpdk-dev] =?utf-8?b?562U5aSN77yaW1BBVENIIHYyXSBlYWw6IG1hcCB1aW8g?= =?utf-8?q?resources_after_hugepages_when_the_base=5Fvirtaddr_is_configure?= =?utf-8?q?d=2E?= X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list Reply-To: =?UTF-8?B?5b6Q5Lqu?= List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" When user configure base_virtaddr, we should believe they can take care it. In my case, I always check /proc/xxxx/maps to find a huge free address space, such as 0x20 0000 0000, to map all the hugepages and uio resource.  ------------------------------------------------------------------发件人：Burakov, Anatoly 发送时间：2014年11月6日(星期四) 22:29收件人：徐亮 ，dev@dpdk.org 主　题：RE: [PATCH v2] eal: map uio resources after hugepages when the base_virtaddr is configured. Few nitpicks. Static variables are always initialized to 0, so "= NULL" isn't necessary, a declaration will suffice. Also, we have a macro RTE_PTR_ADD to add numbers to pointers, I think it would be better to use those. Otherwise, looks fine to me. I still feel uneasy about depending on nothing being mapped directly after hugepages (perhaps we could do mmap(bar_size) before trying pci_map_resource, and increment requested_addr until we find a free spot?), but I imagine this case would be quite rare, so probably it's not worth the added kludge. Thanks, Anatoly -----Original Message----- From: lxu [mailto:liang.xu@cinfotech.cn] Sent: Thursday, November 6, 2014 2:12 PM To: dev@dpdk.org Cc: Burakov, Anatoly Subject: [PATCH v2] eal: map uio resources after hugepages when the base_virtaddr is configured. --- lib/librte_eal/linuxapp/eal/eal_pci_uio.c | 29 ++++++++++++++++++++++++++++- 1 file changed, 28 insertions(+), 1 deletion(-) diff --git a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c index 7e62266..a591da3 100644 --- a/lib/librte_eal/linuxapp/eal/eal_pci_uio.c +++ b/lib/librte_eal/linuxapp/eal/eal_pci_uio.c @@ -273,6 +273,24 @@ pci_get_uio_dev(struct rte_pci_device *dev, char *dstbuf, return uio_num; } +static inline const struct rte_memseg * +get_physmem_last(void) +{ + const struct rte_memseg * seg = rte_eal_get_physmem_layout(); + const struct rte_memseg * last = seg; + unsigned i = 0; + + for (i=0; iaddr == NULL) + break; + + if(seg->addr > last->addr) + last = seg; + + } + return last; +} + /* map the PCI resource of a PCI device in virtual memory */ int pci_uio_map_resource(struct rte_pci_device *dev) @@ -290,6 +308,13 @@ pci_uio_map_resource(struct rte_pci_device *dev) struct mapped_pci_resource *uio_res; struct pci_map *maps; + /* map uio resource into user required virtual address */ + static void * requested_addr = NULL; + if (internal_config.base_virtaddr && NULL == requested_addr) { + const struct rte_memseg * last = get_physmem_last(); + requested_addr = (void *)(last->addr_64 + last->len); + } + dev->intr_handle.fd = -1; dev->intr_handle.type = RTE_INTR_HANDLE_UNKNOWN; @@ -371,10 +396,12 @@ pci_uio_map_resource(struct rte_pci_device *dev) if (maps[j].addr != NULL) fail = 1; else { - mapaddr = pci_map_resource(NULL, fd, (off_t)offset, + mapaddr = pci_map_resource(requested_addr, fd, (off_t)offset, (size_t)maps[j].size); if (mapaddr == NULL) fail = 1; + else if (NULL != requested_addr) + requested_addr = (uint8_t *)mapaddr + maps[j].size; } if (fail) {