From: Jianfeng Tan <jianfeng.tan@intel.com>
To: dev@dpdk.org
Cc: nakajima.yoshihiro@lab.ntt.co.jp, mst@redhat.com,
ann.zhuangyanying@huawei.com
Subject: [dpdk-dev] [PATCH v2 2/5] mem: add API to obtain memory-backed file info
Date: Fri, 5 Feb 2016 19:20:25 +0800 [thread overview]
Message-ID: <1454671228-33284-3-git-send-email-jianfeng.tan@intel.com> (raw)
In-Reply-To: <1454671228-33284-1-git-send-email-jianfeng.tan@intel.com>
A new API named rte_eal_get_backfile_info() and a new data
struct back_file is added to obstain information of memory-
backed file info.
Signed-off-by: Huawei Xie <huawei.xie@intel.com>
Signed-off-by: Jianfeng Tan <jianfeng.tan@intel.com>
---
lib/librte_eal/common/include/rte_memory.h | 16 ++++++++++++
lib/librte_eal/linuxapp/eal/eal_memory.c | 40 +++++++++++++++++++++++++++++-
2 files changed, 55 insertions(+), 1 deletion(-)
diff --git a/lib/librte_eal/common/include/rte_memory.h b/lib/librte_eal/common/include/rte_memory.h
index 587a25d..b09397e 100644
--- a/lib/librte_eal/common/include/rte_memory.h
+++ b/lib/librte_eal/common/include/rte_memory.h
@@ -109,6 +109,22 @@ struct rte_memseg {
} __rte_packed;
/**
+ * This struct is used to store information about memory-backed file that
+ * we mapped in memory initialization.
+ */
+struct back_file {
+ void *addr; /**< virtual addr */
+ size_t size; /**< the page size */
+ char filepath[PATH_MAX]; /**< path to backing file on filesystem */
+};
+
+/**
+ * Get the hugepage file information. Caller to free.
+ * Return number of hugepage files used.
+ */
+int rte_eal_get_backfile_info(struct back_file **);
+
+/**
* Lock page in physical memory and prevent from swapping.
*
* @param virt
diff --git a/lib/librte_eal/linuxapp/eal/eal_memory.c b/lib/librte_eal/linuxapp/eal/eal_memory.c
index 68ef49a..a6b3616 100644
--- a/lib/librte_eal/linuxapp/eal/eal_memory.c
+++ b/lib/librte_eal/linuxapp/eal/eal_memory.c
@@ -743,6 +743,9 @@ sort_by_physaddr(struct hugepage_file *hugepg_tbl, struct hugepage_info *hpi)
return 0;
}
+static struct hugepage_file *hugepage_files;
+static int num_hugepage_files;
+
/*
* Uses mmap to create a shared memory area for storage of data
* Used in this file to store the hugepage file map on disk
@@ -760,9 +763,30 @@ create_shared_memory(const char *filename, const size_t mem_size)
}
retval = mmap(NULL, mem_size, PROT_READ | PROT_WRITE, MAP_SHARED, fd, 0);
close(fd);
+
+ hugepage_files = retval;
+ num_hugepage_files = mem_size / (sizeof(struct hugepage_file));
+
return retval;
}
+int
+rte_eal_get_backfile_info(struct back_file **p)
+{
+ struct back_file *backfiles;
+ int i, num_backfiles = num_hugepage_files;
+
+ backfiles = malloc(sizeof(struct back_file) * num_backfiles);
+ for (i = 0; i < num_backfiles; ++i) {
+ backfiles[i].addr = hugepage_files[i].final_va;
+ backfiles[i].size = hugepage_files[i].size;
+ strcpy(backfiles[i].filepath, hugepage_files[i].filepath);
+ }
+
+ *p = backfiles;
+ return num_backfiles;
+}
+
/*
* this copies *active* hugepages from one hugepage table to another.
* destination is typically the shared memory.
@@ -1148,8 +1172,22 @@ rte_eal_hugepage_init(void)
mcfg->memseg[0].len = internal_config.memory;
mcfg->memseg[0].socket_id = socket_id;
- close(fd);
+ hugepage = create_shared_memory(eal_hugepage_info_path(),
+ sizeof(struct hugepage_file));
+ hugepage->orig_va = addr;
+ hugepage->final_va = addr;
+ hugepage->physaddr = rte_mem_virt2phy(addr);
+ /* Suppose we have a very huge hugefile here */
+ hugepage->size = internal_config.memory;
+ hugepage->socket_id = socket_id;
+ hugepage->file_id = 0;
+ hugepage->memseg_id = 0;
+#ifdef RTE_EAL_SINGLE_FILE_SEGMENTS
+ hugepage->repeated = internal_config.memory / pagesize;
+#endif
+ strncpy(hugepage->filepath, filepath, MAX_HUGEPAGE_PATH);
+ close(fd);
return 0;
}
--
2.1.4
next prev parent reply other threads:[~2016-02-05 18:21 UTC|newest]
Thread overview: 196+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-11-05 18:31 [dpdk-dev] [RFC 0/5] virtio support for container Jianfeng Tan
2015-11-05 18:31 ` [dpdk-dev] [RFC 1/5] virtio/container: add handler for ioport rd/wr Jianfeng Tan
2015-11-05 18:31 ` [dpdk-dev] [RFC 2/5] virtio/container: add a new virtual device named eth_cvio Jianfeng Tan
2015-11-05 18:31 ` [dpdk-dev] [RFC 3/5] virtio/container: unify desc->addr assignment Jianfeng Tan
2015-11-05 18:31 ` [dpdk-dev] [RFC 4/5] virtio/container: adjust memory initialization process Jianfeng Tan
2015-11-06 16:21 ` Ananyev, Konstantin
2015-11-08 11:18 ` Tan, Jianfeng
2015-11-09 13:32 ` Ananyev, Konstantin
2015-11-09 14:13 ` Tan, Jianfeng
2015-11-05 18:31 ` [dpdk-dev] [RFC 5/5] vhost/container: change mode of vhost listening socket Jianfeng Tan
2015-11-09 3:54 ` Yuanhan Liu
2015-11-09 5:15 ` Tan, Jianfeng
2015-11-09 5:40 ` Yuanhan Liu
2015-11-09 5:46 ` Tan, Jianfeng
2015-11-24 3:53 ` [dpdk-dev] [RFC 0/5] virtio support for container Zhuangyanying
2015-11-24 6:19 ` Tan, Jianfeng
2016-01-10 11:42 ` [dpdk-dev] [PATCH 0/4] " Jianfeng Tan
2016-01-10 11:42 ` [dpdk-dev] [PATCH 1/4] mem: add --single-file to create single mem-backed file Jianfeng Tan
2016-01-21 1:57 ` Xie, Huawei
2016-01-10 11:43 ` [dpdk-dev] [PATCH 2/4] mem: add API to obstain memory-backed file info Jianfeng Tan
2016-01-11 11:43 ` Pavel Fedin
2016-01-11 20:26 ` Rich Lane
2016-01-12 9:12 ` Tan, Jianfeng
2016-01-12 10:04 ` Pavel Fedin
2016-01-12 10:48 ` Tan, Jianfeng
2016-01-12 11:00 ` Pavel Fedin
2016-01-12 11:07 ` Sergio Gonzalez Monroy
2016-01-12 11:37 ` Pavel Fedin
2016-01-12 12:12 ` Sergio Gonzalez Monroy
2016-01-12 13:57 ` Pavel Fedin
2016-01-12 14:13 ` Sergio Gonzalez Monroy
2016-01-12 11:44 ` Sergio Gonzalez Monroy
2016-01-12 11:22 ` Pavel Fedin
2016-01-12 11:33 ` Sergio Gonzalez Monroy
2016-01-12 12:01 ` Pavel Fedin
2016-01-12 13:39 ` Sergio Gonzalez Monroy
2016-01-10 11:43 ` [dpdk-dev] [PATCH 3/4] virtio/vdev: add ways to interact with vhost Jianfeng Tan
2016-01-11 10:42 ` Pavel Fedin
2016-01-11 14:02 ` Pavel Fedin
2016-01-21 2:18 ` Xie, Huawei
2016-01-10 11:43 ` [dpdk-dev] [PATCH 4/4] virtio/vdev: add a new vdev named eth_cvio Jianfeng Tan
2016-01-12 7:45 ` Pavel Fedin
2016-01-12 7:59 ` Yuanhan Liu
2016-01-12 8:39 ` Tan, Jianfeng
2016-01-12 9:15 ` Tan, Jianfeng
2016-01-27 3:10 ` Qiu, Michael
2016-01-11 14:21 ` [dpdk-dev] [PATCH 0/4] virtio support for container Pavel Fedin
2016-01-11 15:53 ` Tan, Jianfeng
2016-01-12 7:38 ` Pavel Fedin
2016-01-12 8:14 ` Rich Lane
2016-01-12 8:39 ` Pavel Fedin
2016-01-12 8:51 ` Tan, Jianfeng
2016-01-12 10:48 ` Pavel Fedin
2016-01-12 14:45 ` Amit Tomer
2016-01-12 14:50 ` Pavel Fedin
2016-01-12 14:58 ` Amit Tomer
2016-01-12 14:53 ` Tan, Jianfeng
2016-01-12 15:11 ` Amit Tomer
2016-01-12 16:18 ` Tan, Jianfeng
2016-01-13 15:00 ` Amit Tomer
2016-01-13 18:41 ` Tan, Jianfeng
2016-01-14 9:34 ` Amit Tomer
2016-01-14 11:41 ` Tan, Jianfeng
2016-01-14 12:03 ` Amit Tomer
2016-01-15 6:39 ` Tan, Jianfeng
2016-01-20 15:19 ` Amit Tomer
2016-01-22 6:04 ` Tan, Jianfeng
2016-01-12 5:36 ` Tetsuya Mukawa
2016-01-12 5:46 ` Tan, Jianfeng
2016-01-12 6:01 ` Tetsuya Mukawa
2016-01-12 6:14 ` Yuanhan Liu
2016-01-12 6:26 ` Tetsuya Mukawa
2016-01-12 6:29 ` Yuanhan Liu
2016-01-20 3:48 ` Xie, Huawei
2016-01-26 6:02 ` Qiu, Michael
2016-01-26 6:09 ` Tan, Jianfeng
2016-02-05 11:20 ` [dpdk-dev] [PATCH v2 0/5] " Jianfeng Tan
2016-02-05 11:20 ` [dpdk-dev] [PATCH v2 1/5] mem: add --single-file to create single mem-backed file Jianfeng Tan
2016-03-07 13:13 ` Yuanhan Liu
2016-03-08 1:55 ` Tan, Jianfeng
2016-03-08 2:44 ` Yuanhan Liu
2016-03-09 14:44 ` Tan, Jianfeng
2016-03-08 8:49 ` Panu Matilainen
2016-03-08 9:04 ` Yuanhan Liu
2016-03-08 10:30 ` Thomas Monjalon
2016-03-08 10:57 ` Burakov, Anatoly
2016-03-14 13:53 ` Traynor, Kevin
2016-03-14 14:45 ` Thomas Monjalon
2016-03-14 18:21 ` Traynor, Kevin
2016-02-05 11:20 ` Jianfeng Tan [this message]
2016-03-07 13:22 ` [dpdk-dev] [PATCH v2 2/5] mem: add API to obtain memory-backed file info Yuanhan Liu
2016-03-08 2:31 ` Tan, Jianfeng
2016-03-08 2:53 ` Yuanhan Liu
2016-02-05 11:20 ` [dpdk-dev] [PATCH v2 3/5] virtio/vdev: add embeded device emulation Jianfeng Tan
2016-02-07 10:47 ` Michael S. Tsirkin
2016-02-08 6:59 ` Tetsuya Mukawa
2016-02-16 2:47 ` Tan, Jianfeng
2016-02-16 2:40 ` Tan, Jianfeng
2016-02-05 11:20 ` [dpdk-dev] [PATCH v2 4/5] virtio/vdev: add a new vdev named eth_cvio Jianfeng Tan
2016-02-05 11:20 ` [dpdk-dev] [PATCH v2 5/5] docs: add release note for virtio for container Jianfeng Tan
2016-03-23 19:17 ` [dpdk-dev] [PATCH v2 0/5] virtio support " Neil Horman
2016-03-24 3:10 ` Tan, Jianfeng
2016-03-24 13:45 ` Neil Horman
2016-03-25 1:25 ` Tan, Jianfeng
2016-03-25 11:06 ` Neil Horman
2016-04-13 16:14 ` Thomas Monjalon
2016-04-14 6:08 ` Tan, Jianfeng
2016-04-21 2:56 ` [dpdk-dev] [PATCH v3 0/2] " Jianfeng Tan
2016-04-21 2:56 ` [dpdk-dev] [PATCH v3 1/2] virtio/vdev: add embeded device emulation Jianfeng Tan
2016-04-21 22:01 ` Yuanhan Liu
2016-04-22 10:12 ` Tan, Jianfeng
2016-04-22 10:17 ` Thomas Monjalon
2016-04-22 17:27 ` Yuanhan Liu
2016-04-21 2:56 ` [dpdk-dev] [PATCH v3 2/2] virtio/vdev: add a new vdev named eth_cvio Jianfeng Tan
2016-04-21 8:51 ` David Marchand
2016-04-22 5:15 ` Tan, Jianfeng
2016-04-22 7:36 ` David Marchand
2016-04-22 10:25 ` Tan, Jianfeng
2016-04-21 10:05 ` Thomas Monjalon
2016-04-22 7:26 ` Tan, Jianfeng
2016-04-22 8:30 ` Thomas Monjalon
2016-04-21 22:14 ` Yuanhan Liu
2016-04-22 10:12 ` Tan, Jianfeng
2016-04-29 1:18 ` [dpdk-dev] [PATCH v4 0/8] virtio support for container Jianfeng Tan
2016-04-29 1:18 ` [dpdk-dev] [PATCH v4 1/8] virtio: hide phys addr check inside pci ops Jianfeng Tan
2016-05-11 23:05 ` Yuanhan Liu
2016-04-29 1:18 ` [dpdk-dev] [PATCH v4 2/8] virtio: abstract vring hdr desc init as a method Jianfeng Tan
2016-04-29 1:18 ` [dpdk-dev] [PATCH v4 3/8] virtio: enable use virtual address to fill desc Jianfeng Tan
2016-04-29 1:18 ` [dpdk-dev] [PATCH v4 4/8] virtio-user: add vhost adapter layer Jianfeng Tan
2016-04-29 1:18 ` [dpdk-dev] [PATCH v4 5/8] virtio-user: add device emulation layer APIs Jianfeng Tan
2016-05-12 1:05 ` Yuanhan Liu
2016-04-29 1:18 ` [dpdk-dev] [PATCH v4 6/8] virtio-user: add new virtual pci driver for virtio Jianfeng Tan
2016-05-12 2:12 ` Yuanhan Liu
2016-05-12 7:08 ` Tan, Jianfeng
2016-05-12 16:40 ` Yuanhan Liu
2016-05-13 1:54 ` Tan, Jianfeng
2016-05-13 4:45 ` Yuanhan Liu
2016-05-16 1:48 ` Tan, Jianfeng
2016-05-16 2:51 ` Yuanhan Liu
2016-05-12 17:02 ` Michael S. Tsirkin
2016-05-13 2:00 ` Tan, Jianfeng
2016-04-29 1:18 ` [dpdk-dev] [PATCH v4 7/8] virtio-user: add a new virtual device named virtio-user Jianfeng Tan
2016-04-29 1:18 ` [dpdk-dev] [PATCH v4 8/8] doc: update doc for virtio-user Jianfeng Tan
2016-04-29 1:35 ` [dpdk-dev] [PATCH v4 0/8] virtio support for container Tan, Jianfeng
2016-05-30 10:55 ` [dpdk-dev] [PATCH v5 " Jianfeng Tan
2016-05-30 10:55 ` [dpdk-dev] [PATCH v5 1/8] virtio: hide phys addr check inside pci ops Jianfeng Tan
2016-05-30 10:55 ` [dpdk-dev] [PATCH v5 2/8] virtio: clean up virtio_dev_queue_setup Jianfeng Tan
2016-06-01 7:38 ` Yuanhan Liu
2016-06-01 7:44 ` Tan, Jianfeng
2016-06-01 7:58 ` Yuanhan Liu
2016-05-30 10:55 ` [dpdk-dev] [PATCH v5 3/8] virtio: enable use virtual address to fill desc Jianfeng Tan
2016-06-01 8:03 ` Yuanhan Liu
2016-05-30 10:55 ` [dpdk-dev] [PATCH v5 4/8] virtio-user: add vhost adapter layer Jianfeng Tan
2016-05-30 10:55 ` [dpdk-dev] [PATCH v5 5/8] virtio-user: add device emulation layer APIs Jianfeng Tan
2016-05-30 10:55 ` [dpdk-dev] [PATCH v5 6/8] virtio-user: add new virtual pci driver for virtio Jianfeng Tan
2016-06-01 8:21 ` Yuanhan Liu
2016-05-30 10:55 ` [dpdk-dev] [PATCH v5 7/8] virtio-user: add a new vdev named virtio-user Jianfeng Tan
2016-06-01 8:26 ` Yuanhan Liu
2016-06-02 1:27 ` Tan, Jianfeng
2016-05-30 10:55 ` [dpdk-dev] [PATCH v5 8/8] doc: update doc for virtio-user Jianfeng Tan
2016-06-01 8:30 ` Yuanhan Liu
2016-06-02 9:54 ` [dpdk-dev] [PATCH v6 0/7] virtio support for container Jianfeng Tan
2016-06-02 9:54 ` [dpdk-dev] [PATCH v6 1/7] virtio: hide phys addr check inside pci ops Jianfeng Tan
2016-06-02 9:54 ` [dpdk-dev] [PATCH v6 2/7] virtio: clean up virtio_dev_queue_setup Jianfeng Tan
2016-06-02 9:54 ` [dpdk-dev] [PATCH v6 3/7] virtio: enable use virtual address to fill desc Jianfeng Tan
2016-06-02 9:54 ` [dpdk-dev] [PATCH v6 4/7] virtio-user: add vhost adapter layer Jianfeng Tan
2016-06-02 9:54 ` [dpdk-dev] [PATCH v6 5/7] virtio-user: add device emulation layer APIs Jianfeng Tan
2016-06-02 9:54 ` [dpdk-dev] [PATCH v6 6/7] virtio-user: add new virtual pci driver for virtio Jianfeng Tan
2016-06-06 8:01 ` Yuanhan Liu
2016-06-06 8:31 ` Tan, Jianfeng
2016-06-02 9:54 ` [dpdk-dev] [PATCH v6 7/7] virtio-user: add a new vdev named virtio-user Jianfeng Tan
2016-06-12 0:35 ` [dpdk-dev] [PATCH v7 0/6] virtio support for container Jianfeng Tan
2016-06-12 0:35 ` [dpdk-dev] [PATCH v7 1/6] virtio: hide phys addr check inside pci ops Jianfeng Tan
2016-06-12 0:35 ` [dpdk-dev] [PATCH v7 2/6] virtio: enable use virtual address to fill desc Jianfeng Tan
2016-06-12 0:35 ` [dpdk-dev] [PATCH v7 3/6] virtio-user: add vhost adapter layer Jianfeng Tan
2016-06-12 0:35 ` [dpdk-dev] [PATCH v7 4/6] virtio-user: add device emulation layer APIs Jianfeng Tan
2016-06-12 0:35 ` [dpdk-dev] [PATCH v7 5/6] virtio-user: add new virtual pci driver for virtio Jianfeng Tan
2016-06-12 0:35 ` [dpdk-dev] [PATCH v7 6/6] virtio-user: add a new vdev named virtio-user Jianfeng Tan
2016-06-13 6:38 ` [dpdk-dev] [PATCH v8 0/6] virtio support for container Jianfeng Tan
2016-06-13 6:38 ` [dpdk-dev] [PATCH v8 1/6] virtio: hide phys addr check inside pci ops Jianfeng Tan
2016-06-13 6:38 ` [dpdk-dev] [PATCH v8 2/6] virtio: enable use virtual address to fill desc Jianfeng Tan
2016-06-13 6:39 ` [dpdk-dev] [PATCH v8 3/6] virtio-user: add vhost user adapter layer Jianfeng Tan
2016-06-13 6:39 ` [dpdk-dev] [PATCH v8 4/6] virtio-user: add device emulation layer APIs Jianfeng Tan
2016-06-13 6:39 ` [dpdk-dev] [PATCH v8 5/6] virtio-user: add new virtual pci driver for virtio Jianfeng Tan
2016-06-13 6:39 ` [dpdk-dev] [PATCH v8 6/6] virtio-user: add a new vdev named virtio-user Jianfeng Tan
2016-06-14 8:34 ` [dpdk-dev] [PATCH v8 0/6] virtio support for container Yuanhan Liu
2016-06-15 9:03 ` [dpdk-dev] [PATCH v9 " Jianfeng Tan
2016-06-15 9:03 ` [dpdk-dev] [PATCH v9 1/6] virtio: hide phys addr check inside PCI ops Jianfeng Tan
2016-06-15 9:03 ` [dpdk-dev] [PATCH v9 2/6] virtio: enable use virtual address to fill desc Jianfeng Tan
2016-06-15 9:03 ` [dpdk-dev] [PATCH v9 3/6] virtio-user: add vhost user adapter layer Jianfeng Tan
2016-06-23 9:01 ` Ferruh Yigit
2016-06-24 1:18 ` Tan, Jianfeng
2016-06-15 9:03 ` [dpdk-dev] [PATCH v9 4/6] virtio-user: add device emulation layer APIs Jianfeng Tan
2016-06-15 9:03 ` [dpdk-dev] [PATCH v9 5/6] virtio-user: add new virtual PCI driver for virtio Jianfeng Tan
2016-06-15 9:03 ` [dpdk-dev] [PATCH v9 6/6] virtio-user: add a new vdev named virtio-user Jianfeng Tan
2016-06-15 9:54 ` [dpdk-dev] [PATCH v9 0/6] virtio support for container Yuanhan Liu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1454671228-33284-3-git-send-email-jianfeng.tan@intel.com \
--to=jianfeng.tan@intel.com \
--cc=ann.zhuangyanying@huawei.com \
--cc=dev@dpdk.org \
--cc=mst@redhat.com \
--cc=nakajima.yoshihiro@lab.ntt.co.jp \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).