From patchwork Thu Nov 6 15:07:40 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: lxu X-Patchwork-Id: 1178 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 C92027EC4; Thu, 6 Nov 2014 15:58:30 +0100 (CET) Received: from out1134-226.mail.aliyun.com (out1134-226.mail.aliyun.com [42.120.134.226]) by dpdk.org (Postfix) with ESMTP id BED5B7E80 for ; Thu, 6 Nov 2014 15:58:28 +0100 (CET) X-Alimail-AntiSpam: AC=CONTINUE; BC=0.1495008|-1; FP=9733018898799600691|4|2|5|0|-1|-1|-1; HT=r41g08152; MF=liang.xu@cinfotech.cn; PH=DS; RN=2; RT=2; SR=0; Received: from dev.SSG-140(mailfrom:liang.xu@cinfotech.cn ip:222.65.239.251) by smtp.aliyun-inc.com(10.194.100.229); Thu, 06 Nov 2014 23:07:53 +0800 From: lxu To: dev@dpdk.org Date: Thu, 6 Nov 2014 23:07:40 +0800 Message-Id: <1415286460-14337-1-git-send-email-liang.xu@cinfotech.cn> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1415193919-17361-1-git-send-email-liang.xu@cinfotech.cn> References: <1415193919-17361-1-git-send-email-liang.xu@cinfotech.cn> Subject: [dpdk-dev] [PATCH v4] eal: map uio resources after hugepages when the base_virtaddr is configured. 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: , Errors-To: dev-bounces@dpdk.org Sender: "dev" --- 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..a2c9ab6 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; + if (internal_config.base_virtaddr && NULL == requested_addr) { + const struct rte_memseg * last = get_physmem_last(); + requested_addr = RTE_PTR_ADD(last->addr, 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 = RTE_PTR_ADD(mapaddr, maps[j].size); } if (fail) {