From: Anatoly Burakov <anatoly.burakov@intel.com> To: dev@dpdk.org Cc: Bruce Richardson <bruce.richardson@intel.com>, david.marchand@redhat.com, stephen@networkplumber.org, han.li1@zte.com.cn, stable@dpdk.org Subject: [dpdk-stable] [PATCH v5 2/2] eal: use base address hint to reserve space for mem config Date: Thu, 24 Oct 2019 13:36:50 +0100 Message-ID: <e8d1128c93881950d23d44913ebec32cf3e5313e.1571920604.git.anatoly.burakov@intel.com> (raw) In-Reply-To: <ea8457f47a25f20f59bb1f37dcf2a1f0bf340c9d.1571920604.git.anatoly.burakov@intel.com> In-Reply-To: <09c3f9d74e1e49aa5b3608d4bf4a773d086e83ff.1564577214.git.anatoly.burakov@intel.com> Currently, mem config will be mapped without using the virtual area reservation infrastructure, which means it will be mapped at an arbitrary location. This may cause failures to map the shared config in secondary process due to things like PCI whitelist arguments allocating memory in a space where the primary has allocated the shared mem config. Fix this by using virtual area reservation to reserve space for the mem config, thereby avoiding the problem and reserving the shared config (hopefully) far away from any normal memory allocations. Cc: stable@dpdk.org Signed-off-by: Anatoly Burakov <anatoly.burakov@intel.com> --- Notes: v4: - Fix mem config length to always be page-aligned v3: - Fix alignment issues with base address v2: - Fix issue with unneeded ADDR_IS_HINT flag that broke things on 32-bit builds lib/librte_eal/freebsd/eal/eal.c | 28 +++++++++++++++++++++------ lib/librte_eal/linux/eal/eal.c | 33 +++++++++++++++++++++++--------- 2 files changed, 46 insertions(+), 15 deletions(-) diff --git a/lib/librte_eal/freebsd/eal/eal.c b/lib/librte_eal/freebsd/eal/eal.c index f86e9aa318..5b869b895a 100644 --- a/lib/librte_eal/freebsd/eal/eal.c +++ b/lib/librte_eal/freebsd/eal/eal.c @@ -218,7 +218,10 @@ eal_parse_sysfs_value(const char *filename, unsigned long *val) static int rte_eal_config_create(void) { - void *rte_mem_cfg_addr; + size_t page_sz = sysconf(_SC_PAGE_SIZE); + size_t cfg_len = sizeof(*rte_config.mem_config); + size_t cfg_len_aligned = RTE_ALIGN(cfg_len, page_sz); + void *rte_mem_cfg_addr, *mapped_mem_cfg_addr; int retval; const char *pathname = eal_runtime_config_path(); @@ -235,7 +238,7 @@ rte_eal_config_create(void) } } - retval = ftruncate(mem_cfg_fd, sizeof(*rte_config.mem_config)); + retval = ftruncate(mem_cfg_fd, cfg_len); if (retval < 0){ close(mem_cfg_fd); mem_cfg_fd = -1; @@ -253,15 +256,28 @@ rte_eal_config_create(void) return -1; } - rte_mem_cfg_addr = mmap(NULL, sizeof(*rte_config.mem_config), - PROT_READ | PROT_WRITE, MAP_SHARED, mem_cfg_fd, 0); - - if (rte_mem_cfg_addr == MAP_FAILED){ + /* reserve space for config */ + rte_mem_cfg_addr = eal_get_virtual_area(NULL, &cfg_len_aligned, page_sz, + 0, 0); + if (rte_mem_cfg_addr == NULL) { RTE_LOG(ERR, EAL, "Cannot mmap memory for rte_config\n"); close(mem_cfg_fd); mem_cfg_fd = -1; return -1; } + + /* remap the actual file into the space we've just reserved */ + mapped_mem_cfg_addr = mmap(rte_mem_cfg_addr, + cfg_len_aligned, PROT_READ | PROT_WRITE, + MAP_SHARED | MAP_FIXED, mem_cfg_fd, 0); + if (mapped_mem_cfg_addr == MAP_FAILED) { + RTE_LOG(ERR, EAL, "Cannot remap memory for rte_config\n"); + munmap(rte_mem_cfg_addr, cfg_len); + close(mem_cfg_fd); + mem_cfg_fd = -1; + return -1; + } + memcpy(rte_mem_cfg_addr, &early_mem_config, sizeof(early_mem_config)); rte_config.mem_config = rte_mem_cfg_addr; diff --git a/lib/librte_eal/linux/eal/eal.c b/lib/librte_eal/linux/eal/eal.c index f39720637f..6488171010 100644 --- a/lib/librte_eal/linux/eal/eal.c +++ b/lib/librte_eal/linux/eal/eal.c @@ -306,7 +306,10 @@ eal_parse_sysfs_value(const char *filename, unsigned long *val) static int rte_eal_config_create(void) { - void *rte_mem_cfg_addr; + size_t page_sz = sysconf(_SC_PAGE_SIZE); + size_t cfg_len = sizeof(*rte_config.mem_config); + size_t cfg_len_aligned = RTE_ALIGN(cfg_len, page_sz); + void *rte_mem_cfg_addr, *mapped_mem_cfg_addr; int retval; const char *pathname = eal_runtime_config_path(); @@ -318,7 +321,7 @@ rte_eal_config_create(void) if (internal_config.base_virtaddr != 0) rte_mem_cfg_addr = (void *) RTE_ALIGN_FLOOR(internal_config.base_virtaddr - - sizeof(struct rte_mem_config), sysconf(_SC_PAGE_SIZE)); + sizeof(struct rte_mem_config), page_sz); else rte_mem_cfg_addr = NULL; @@ -331,7 +334,7 @@ rte_eal_config_create(void) } } - retval = ftruncate(mem_cfg_fd, sizeof(*rte_config.mem_config)); + retval = ftruncate(mem_cfg_fd, cfg_len); if (retval < 0){ close(mem_cfg_fd); mem_cfg_fd = -1; @@ -349,13 +352,25 @@ rte_eal_config_create(void) return -1; } - rte_mem_cfg_addr = mmap(rte_mem_cfg_addr, sizeof(*rte_config.mem_config), - PROT_READ | PROT_WRITE, MAP_SHARED, mem_cfg_fd, 0); - - if (rte_mem_cfg_addr == MAP_FAILED){ - close(mem_cfg_fd); - mem_cfg_fd = -1; + /* reserve space for config */ + rte_mem_cfg_addr = eal_get_virtual_area(rte_mem_cfg_addr, + &cfg_len_aligned, page_sz, 0, 0); + if (rte_mem_cfg_addr == NULL) { RTE_LOG(ERR, EAL, "Cannot mmap memory for rte_config\n"); + close(mem_cfg_fd); + mem_cfg_fd = -1; + return -1; + } + + /* remap the actual file into the space we've just reserved */ + mapped_mem_cfg_addr = mmap(rte_mem_cfg_addr, + cfg_len_aligned, PROT_READ | PROT_WRITE, + MAP_SHARED | MAP_FIXED, mem_cfg_fd, 0); + if (mapped_mem_cfg_addr == MAP_FAILED) { + munmap(rte_mem_cfg_addr, cfg_len); + close(mem_cfg_fd); + mem_cfg_fd = -1; + RTE_LOG(ERR, EAL, "Cannot remap memory for rte_config\n"); return -1; } -- 2.17.1
next prev parent reply other threads:[~2019-10-24 12:36 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2019-07-29 12:42 [dpdk-stable] [PATCH 1/2] eal: make base address hint OS-specific Anatoly Burakov 2019-07-29 11:10 ` Anatoly Burakov 2019-07-29 11:18 ` Anatoly Burakov 2019-07-29 12:42 ` [dpdk-stable] [PATCH 2/2] eal: use base address hint to reserve space for mem config Anatoly Burakov 2019-07-29 11:10 ` Anatoly Burakov 2019-07-29 11:18 ` Anatoly Burakov 2019-07-29 13:13 ` [dpdk-stable] [dpdk-dev] " Burakov, Anatoly 2019-07-30 15:37 ` [dpdk-stable] [PATCH v2 1/2] eal: make base address hint OS-specific Anatoly Burakov 2019-07-30 15:51 ` [dpdk-stable] [PATCH v3 " Anatoly Burakov 2019-07-31 12:47 ` [dpdk-stable] [PATCH v4 " Anatoly Burakov 2019-10-02 11:41 ` [dpdk-stable] [dpdk-dev] " David Marchand 2019-10-02 14:42 ` Stephen Hemminger 2019-10-24 12:32 ` Burakov, Anatoly 2019-10-24 12:32 ` Burakov, Anatoly 2019-10-24 12:36 ` [dpdk-stable] [PATCH v5 " Anatoly Burakov 2019-10-26 16:02 ` David Marchand 2019-10-24 12:36 ` Anatoly Burakov [this message] 2019-10-26 16:02 ` [dpdk-stable] [PATCH v5 2/2] eal: use base address hint to reserve space for mem config David Marchand 2019-07-31 12:47 ` [dpdk-stable] [PATCH v4 " Anatoly Burakov 2019-07-30 15:51 ` [dpdk-stable] [PATCH v3 " Anatoly Burakov 2019-07-30 15:37 ` [dpdk-stable] [PATCH v2 " Anatoly Burakov
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=e8d1128c93881950d23d44913ebec32cf3e5313e.1571920604.git.anatoly.burakov@intel.com \ --to=anatoly.burakov@intel.com \ --cc=bruce.richardson@intel.com \ --cc=david.marchand@redhat.com \ --cc=dev@dpdk.org \ --cc=han.li1@zte.com.cn \ --cc=stable@dpdk.org \ --cc=stephen@networkplumber.org \ /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
patches for DPDK stable branches This inbox may be cloned and mirrored by anyone: git clone --mirror http://inbox.dpdk.org/stable/0 stable/git/0.git # If you have public-inbox 1.1+ installed, you may # initialize and index your mirror using the following commands: public-inbox-init -V2 stable stable/ http://inbox.dpdk.org/stable \ stable@dpdk.org public-inbox-index stable Example config snippet for mirrors. Newsgroup available over NNTP: nntp://inbox.dpdk.org/inbox.dpdk.stable AGPL code for this site: git clone https://public-inbox.org/public-inbox.git