Coverity reports some defects, where the root cause seems to be negative return value from sysconf(_SC_PAGESIZE) not being handled.
rte_mem_page_size() was updated to handle negative return value from sysconf(_SC_PAGESIZE). All library functions directly calling sysconf(_SC_PAGESIZE) were updated to call rte_mem_page_size() instead. Except the PMU library, because of its dependency chain. (EAL depends on PMU, because Trace is part of EAL, and Trace depends on PMU; so PMU cannot call EAL functions.) Signed-off-by: Morten Brørup <m...@smartsharesystems.com> Acked-by: Anatoly Burakov <anatoly.bura...@intel.com> --- lib/eal/freebsd/eal.c | 3 ++- lib/eal/freebsd/eal_memory.c | 7 +++---- lib/eal/linux/eal.c | 3 ++- lib/eal/unix/eal_unix_memory.c | 14 +++++++++++++- lib/vhost/vduse.c | 3 ++- 5 files changed, 22 insertions(+), 8 deletions(-) diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c index 82382d6e8f..c1ab8d86d2 100644 --- a/lib/eal/freebsd/eal.c +++ b/lib/eal/freebsd/eal.c @@ -26,6 +26,7 @@ #include <rte_launch.h> #include <rte_eal.h> #include <rte_eal_memconfig.h> +#include <rte_eal_paging.h> #include <rte_errno.h> #include <rte_per_lcore.h> #include <rte_lcore.h> @@ -98,7 +99,7 @@ rte_eal_config_create(void) struct rte_config *config = rte_eal_get_configuration(); const struct internal_config *internal_conf = eal_get_internal_configuration(); - size_t page_sz = sysconf(_SC_PAGE_SIZE); + size_t page_sz = rte_mem_page_size(); size_t cfg_len = sizeof(struct rte_mem_config); size_t cfg_len_aligned = RTE_ALIGN(cfg_len, page_sz); void *rte_mem_cfg_addr, *mapped_mem_cfg_addr; diff --git a/lib/eal/freebsd/eal_memory.c b/lib/eal/freebsd/eal_memory.c index 3b72e13506..6d3d46a390 100644 --- a/lib/eal/freebsd/eal_memory.c +++ b/lib/eal/freebsd/eal_memory.c @@ -11,6 +11,7 @@ #include <fcntl.h> #include <rte_eal.h> +#include <rte_eal_paging.h> #include <rte_errno.h> #include <rte_log.h> #include <rte_string_fns.h> @@ -22,8 +23,6 @@ #include "eal_memcfg.h" #include "eal_options.h" -#define EAL_PAGE_SIZE (sysconf(_SC_PAGESIZE)) - uint64_t eal_get_baseaddr(void) { /* @@ -191,7 +190,7 @@ rte_eal_hugepage_init(void) addr = mmap(addr, page_sz, PROT_READ|PROT_WRITE, MAP_SHARED | MAP_FIXED, hpi->lock_descriptor, - j * EAL_PAGE_SIZE); + j * rte_mem_page_size()); if (addr == MAP_FAILED) { EAL_LOG(ERR, "Failed to mmap buffer %u from %s", j, hpi->hugedir); @@ -243,7 +242,7 @@ attach_segment(const struct rte_memseg_list *msl, const struct rte_memseg *ms, addr = mmap(ms->addr, ms->len, PROT_READ | PROT_WRITE, MAP_SHARED | MAP_FIXED, wa->fd_hugepage, - wa->seg_idx * EAL_PAGE_SIZE); + wa->seg_idx * rte_mem_page_size()); if (addr == MAP_FAILED || addr != ms->addr) return -1; wa->seg_idx++; diff --git a/lib/eal/linux/eal.c b/lib/eal/linux/eal.c index 54bee4a2cf..52efb8626b 100644 --- a/lib/eal/linux/eal.c +++ b/lib/eal/linux/eal.c @@ -31,6 +31,7 @@ #include <rte_launch.h> #include <rte_eal.h> #include <rte_eal_memconfig.h> +#include <rte_eal_paging.h> #include <rte_errno.h> #include <rte_lcore.h> #include <rte_service_component.h> @@ -179,7 +180,7 @@ static int rte_eal_config_create(void) { struct rte_config *config = rte_eal_get_configuration(); - size_t page_sz = sysconf(_SC_PAGE_SIZE); + size_t page_sz = rte_mem_page_size(); size_t cfg_len = sizeof(*config->mem_config); size_t cfg_len_aligned = RTE_ALIGN(cfg_len, page_sz); void *rte_mem_cfg_addr, *mapped_mem_cfg_addr; diff --git a/lib/eal/unix/eal_unix_memory.c b/lib/eal/unix/eal_unix_memory.c index 650151facb..55b647c736 100644 --- a/lib/eal/unix/eal_unix_memory.c +++ b/lib/eal/unix/eal_unix_memory.c @@ -147,8 +147,20 @@ rte_mem_page_size(void) { static size_t page_size; - if (!page_size) + if (unlikely(page_size == 0)) { + /* + * When the sysconf value cannot be determined, sysconf() + * returns -1 without setting errno. + * To distinguish an indeterminate value from an error, + * clear errno before calling sysconf(), and check whether + * errno has been set if sysconf() returns -1. + */ + errno = 0; page_size = sysconf(_SC_PAGESIZE); + if ((ssize_t)page_size < 0) + rte_panic("sysconf(_SC_PAGESIZE) failed: %s", + errno == 0 ? "Indeterminate" : strerror(errno)); + } return page_size; } diff --git a/lib/vhost/vduse.c b/lib/vhost/vduse.c index a2a7d73388..9de7f04a4f 100644 --- a/lib/vhost/vduse.c +++ b/lib/vhost/vduse.c @@ -16,6 +16,7 @@ #include <sys/stat.h> #include <rte_common.h> +#include <rte_eal_paging.h> #include <rte_thread.h> #include "fd_man.h" @@ -690,7 +691,7 @@ vduse_device_create(const char *path, bool compliant_ol_flags) dev_config->vendor_id = 0; dev_config->features = features; dev_config->vq_num = total_queues; - dev_config->vq_align = sysconf(_SC_PAGE_SIZE); + dev_config->vq_align = rte_mem_page_size(); dev_config->config_size = sizeof(struct virtio_net_config); memcpy(dev_config->config, &vnet_config, sizeof(vnet_config)); -- 2.43.0