From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id C2430468C8; Tue, 10 Jun 2025 15:13:57 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 9A18C402D4; Tue, 10 Jun 2025 15:13:57 +0200 (CEST) Received: from dkmailrelay1.smartsharesystems.com (smartserver.smartsharesystems.com [77.243.40.215]) by mails.dpdk.org (Postfix) with ESMTP id D375C4026D for ; Tue, 10 Jun 2025 15:13:55 +0200 (CEST) Received: from smartserver.smartsharesystems.com (smartserver.smartsharesys.local [192.168.4.10]) by dkmailrelay1.smartsharesystems.com (Postfix) with ESMTP id 83D9020544; Tue, 10 Jun 2025 15:13:55 +0200 (CEST) Received: from dkrd4.smartsharesys.local ([192.168.4.26]) by smartserver.smartsharesystems.com with Microsoft SMTPSVC(6.0.3790.4675); Tue, 10 Jun 2025 15:13:55 +0200 From: =?UTF-8?q?Morten=20Br=C3=B8rup?= To: Tyler Retzlaff , Anatoly Burakov , Bruce Richardson , Maxime Coquelin , Chenbo Xia , dev@dpdk.org Cc: =?UTF-8?q?Morten=20Br=C3=B8rup?= Subject: [PATCH] eal: handle sysconf() negative return value Date: Tue, 10 Jun 2025 13:13:48 +0000 Message-ID: <20250610131348.248800-1-mb@smartsharesystems.com> X-Mailer: git-send-email 2.43.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-OriginalArrivalTime: 10 Jun 2025 13:13:55.0026 (UTC) FILETIME=[84826320:01DBDA09] X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Coverity reports some defects, where the root cause seems to be negative return value from sysconf() not being handled. rte_mem_page_size() has been updated to handle negative return value from sysconf(_SC_PAGESIZE). All other functions calling sysconf(_SC_PAGESIZE) directly have been updated to call rte_mem_page_size() instead. At this time, no other calls to sysconf() have been found in DPDK. Also, an unrelated drive-by minor fix in eal_mem_set_dump(): When madvise() failed, an incorrect reason was logged. Signed-off-by: Morten Brørup --- 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 | 16 ++++++++++++++-- lib/vhost/vduse.c | 3 ++- 5 files changed, 23 insertions(+), 9 deletions(-) diff --git a/lib/eal/freebsd/eal.c b/lib/eal/freebsd/eal.c index d6fffa2170..ce7f5c3d65 100644 --- a/lib/eal/freebsd/eal.c +++ b/lib/eal/freebsd/eal.c @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -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 #include +#include #include #include #include @@ -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 20f777b8b0..ad6de9b7ee 100644 --- a/lib/eal/linux/eal.c +++ b/lib/eal/linux/eal.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -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 c540f1e838..51de6780f2 100644 --- a/lib/eal/unix/eal_unix_memory.c +++ b/lib/eal/unix/eal_unix_memory.c @@ -85,7 +85,7 @@ eal_mem_set_dump(void *virt, size_t size, bool dump) int ret = madvise(virt, size, flags); if (ret) { EAL_LOG(DEBUG, "madvise(%p, %#zx, %d) failed: %s", - virt, size, flags, strerror(rte_errno)); + virt, size, flags, strerror(errno)); rte_errno = errno; } return ret; @@ -141,8 +141,20 @@ rte_mem_page_size(void) { static size_t page_size; - if (!page_size) + if (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 #include +#include #include #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