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 2574148BFE; Mon, 1 Dec 2025 23:04:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C8F0940656; Mon, 1 Dec 2025 23:04:32 +0100 (CET) Received: from mail-qk1-f177.google.com (mail-qk1-f177.google.com [209.85.222.177]) by mails.dpdk.org (Postfix) with ESMTP id 4B2B440655 for ; Mon, 1 Dec 2025 23:04:31 +0100 (CET) Received: by mail-qk1-f177.google.com with SMTP id af79cd13be357-8b25dd7ab33so296124485a.1 for ; Mon, 01 Dec 2025 14:04:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1764626670; x=1765231470; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=VYIPoS2jk5cVhYLvr+QH0OG/6ojstUDaect/34kp80U=; b=xIE+hT3d25Gm0NnCHD8vzJUP3jngwl4ZU3C+MUA9n4+rKov6fG1UeZsv5IPm9UEMRo KJ4Ek6zBrLdytpEvYeVHXuOJqbjmGmFAfW02tJCqaUNxH7iN2A7Bec8RSUa9Uq/Kw92T 0/wZqqpCtCb4IbQVCpHEX5Shvqo8T14lmIOtAVk7TtlRTcIm+TDSLIrC8gNQuv7ZtAnL 6MbkvW4S/TfdbAE0AYGDiWr5Dsuw55dWNRILDLNhw+YPAiOwta2mFnzyDsPwYsKOuzTz 6kdlPqonFbG+0qNiF0WyKKaUKnJK+8llbpmOonw4p4emW3IV/U7GGhxd4qsXlb5GPcpi tmLg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1764626670; x=1765231470; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=VYIPoS2jk5cVhYLvr+QH0OG/6ojstUDaect/34kp80U=; b=J3deGlHJ3xpSnrCGIao5LsmHDWe8syFcfAcQadzV/Vi9ywBdS4eZXSzDKwzjRuqdp/ OTxXPqd4Nn0z+Fe8FmuG+pY5Z56NsNuJ2pLG/gIq9wY/UCuePfpx3LyiN8xL6r1dTlbT IhWHOKKUY5PcTJ1gmr3CHcs79gm2FPl4Nil1zfvRb++QMeWLUZC9ogfdjlqk6ZCMm/RV y6/iGvqHoXTizWxqJBBHXTGf2ySZ3qy1YckSBVpJOTIawZIxbS8orYYM8irVwUImjizR Hf4/iF3AcMD+Sx7EZvmaHpWJnGqSJWO47Egkkb7TYJE2vZSk/u69BrCdmAcZaXTZgU/0 xDZA== X-Gm-Message-State: AOJu0YxQI2Rpkk96IIbrALaiJ3z1L/GAx0GmVbSVK4s/HY6xQ2dmdctB FPL6X0RHvMx7GcgP00nzfZFCRPkdt/Kn0yFTEHlNuO5TOl7/tAhyDF7RtiZXSsJuyR5hxljayr4 MURJe X-Gm-Gg: ASbGnctc+c9+biKSrkLuDkNSvS1q8QaB7UdfWdnlOziCju1zwZ3scPGm9ZYDDY0J7Li jPPUp+1UhKiUfIPxS3HIXMySr0wmXLxbED0cyiDJs0w9NbyOvOBcMCibvogJ7mKsHmlMYeMxPJV kuz9UqYb3EcYXTntIHz8nIwP1IuidFVWEr1cG5tRM84jCndIlmjC//uXTuZcW/6+Mx6CznmLSGV 5hS8ASjUwDtp1N6w77iglA+V00EZE4bo0nEeGbQhPMM4lu/VtBxbSfXpppkLt7T6hkku5JQEyDz u07fZaGf/E0954uwVANXHIWcxpyHLQHn4IuSDLEYMB9kBjg0/b5G6VoSOgQ5sxvfYkt0CXHUpgU fafT2n5v8i8v18JMIS1/uhMBpF96tdc39wTNzHP4WmPIjepoE5Z/0FFnjgarcx4mkO0Jx6M6nBa zgL+23kFD1o0T2ScE5Ph/oTgulGtWZinD4xYJaqrMAu3VzD3IA0A== X-Google-Smtp-Source: AGHT+IGZ28Yg1JeD+ROfcvgV3ynkZ6ls3See65pOnsh+JKiCLGBwVMzWXenAP1O9uwECMILrPpozlA== X-Received: by 2002:a05:620a:404f:b0:8b2:6eba:c43f with SMTP id af79cd13be357-8b4ebdad55emr3889630085a.70.1764626670487; Mon, 01 Dec 2025 14:04:30 -0800 (PST) Received: from phoenix.lan (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id af79cd13be357-8b52a1cad4esm934398885a.45.2025.12.01.14.04.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 01 Dec 2025 14:04:30 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v9 4/9] test: avoid overflowing huge directory path Date: Mon, 1 Dec 2025 14:02:02 -0800 Message-ID: <20251201220421.207285-5-stephen@networkplumber.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251201220421.207285-1-stephen@networkplumber.org> References: <20251110182209.104087-1-stephen@networkplumber.org> <20251201220421.207285-1-stephen@networkplumber.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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 Modify the part of the test that is scanning for hugepages mount point to use existing getmntent library calls. As a result, the maximum mount path is smaller which is ok since this is all handled by the standard library. And the resulting huge path arguments don't overflow. Hugepages aren't used on Window or FreeBSD so this is skipped there. Signed-off-by: Stephen Hemminger --- app/test/test_eal_flags.c | 136 ++++++++++++++++---------------------- 1 file changed, 58 insertions(+), 78 deletions(-) diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c index c3723ee0b8..fbdc972240 100644 --- a/app/test/test_eal_flags.c +++ b/app/test/test_eal_flags.c @@ -123,12 +123,17 @@ test_misc_flags(void) #define vdev "--vdev" #define file_prefix "--file-prefix" +#define FS_HUGETLB "hugetlbfs" + #define memtest "memtest" #define memtest1 "memtest1" #define memtest2 "memtest2" #define SOCKET_MEM_STRLEN (RTE_MAX_NUMA_NODES * 20) #define launch_proc(ARGV) process_dup(ARGV, RTE_DIM(ARGV), __func__) +#ifdef RTE_EXEC_ENV_LINUX +#include + enum hugepage_action { HUGEPAGE_CHECK_EXISTS = 0, HUGEPAGE_CHECK_LOCKED, @@ -136,24 +141,6 @@ enum hugepage_action { HUGEPAGE_INVALID }; -/* if string contains a hugepage path */ -static int -get_hugepage_path(char * src, int src_len, char * dst, int dst_len) -{ -#define NUM_TOKENS 4 - char *tokens[NUM_TOKENS]; - - /* if we couldn't properly split the string */ - if (rte_strsplit(src, src_len, tokens, NUM_TOKENS, ' ') < NUM_TOKENS) - return 0; - - if (strncmp(tokens[2], "hugetlbfs", sizeof("hugetlbfs")) == 0) { - strlcpy(dst, tokens[1], dst_len); - return 1; - } - return 0; -} - /* * Cycles through hugepage directories and looks for hugepage * files associated with a given prefix. Depending on value of @@ -165,45 +152,39 @@ get_hugepage_path(char * src, int src_len, char * dst, int dst_len) * Returns -1 if it encounters an error */ static int -process_hugefiles(const char * prefix, enum hugepage_action action) +process_hugefiles(const char *prefix, enum hugepage_action action) { - FILE * hugedir_handle = NULL; - DIR * hugepage_dir = NULL; - struct dirent *dirent = NULL; - - char hugefile_prefix[PATH_MAX] = {0}; - char hugedir[PATH_MAX] = {0}; - char line[PATH_MAX] = {0}; - - int fd, lck_result, result = 0; + const struct mntent *entry; + char hugefile_prefix[PATH_MAX]; + int result = 0; - const int prefix_len = snprintf(hugefile_prefix, - sizeof(hugefile_prefix), "%smap_", prefix); - if (prefix_len <= 0 || prefix_len >= (int)sizeof(hugefile_prefix) - || prefix_len >= (int)sizeof(dirent->d_name)) { + const int prefix_len = snprintf(hugefile_prefix, sizeof(hugefile_prefix), "%smap_", prefix); + if (prefix_len <= 0 || prefix_len >= NAME_MAX) { printf("Error creating hugefile filename prefix\n"); return -1; } /* get hugetlbfs mountpoints from /proc/mounts */ - hugedir_handle = fopen("/proc/mounts", "r"); - - if (hugedir_handle == NULL) { + FILE *mounts = setmntent("/proc/mounts", "r"); + if (mounts == NULL) { printf("Error parsing /proc/mounts!\n"); return -1; } - /* read and parse script output */ - while (fgets(line, sizeof(line), hugedir_handle) != NULL) { + /* foreach mountpoint */ + while ((entry = getmntent(mounts)) != NULL) { + DIR *hugepage_dir; + struct dirent *dirent; - /* check if we have a hugepage filesystem path */ - if (!get_hugepage_path(line, sizeof(line), hugedir, sizeof(hugedir))) + /* only want hugetlbfs filesystems */ + if (strcmp(entry->mnt_type, FS_HUGETLB) != 0) continue; /* check if directory exists */ - if ((hugepage_dir = opendir(hugedir)) == NULL) { - fclose(hugedir_handle); - printf("Error reading %s: %s\n", hugedir, strerror(errno)); + hugepage_dir = opendir(entry->mnt_dir); + if (hugepage_dir == NULL) { + endmntent(mounts); + printf("Error reading %s: %s\n", entry->mnt_dir, strerror(errno)); return -1; } @@ -222,10 +203,10 @@ process_hugefiles(const char * prefix, enum hugepage_action action) break; case HUGEPAGE_DELETE: { - char file_path[PATH_MAX] = {0}; + char file_path[PATH_MAX]; snprintf(file_path, sizeof(file_path), - "%s/%s", hugedir, dirent->d_name); + "%s/%s", entry->mnt_dir, dirent->d_name); /* remove file */ if (remove(file_path) < 0) { @@ -240,6 +221,8 @@ process_hugefiles(const char * prefix, enum hugepage_action action) break; case HUGEPAGE_CHECK_LOCKED: { + int fd; + /* try and lock the file */ fd = openat(dirfd(hugepage_dir), dirent->d_name, O_RDONLY); @@ -253,10 +236,7 @@ process_hugefiles(const char * prefix, enum hugepage_action action) } /* non-blocking lock */ - lck_result = flock(fd, LOCK_EX | LOCK_NB); - - /* if lock succeeds, there's something wrong */ - if (lck_result != -1) { + if (flock(fd, LOCK_EX | LOCK_NB) != -1) { result = 0; /* unlock the resulting lock */ @@ -278,11 +258,10 @@ process_hugefiles(const char * prefix, enum hugepage_action action) closedir(hugepage_dir); } /* read /proc/mounts */ end: - fclose(hugedir_handle); + endmntent(mounts); return result; } -#ifdef RTE_EXEC_ENV_LINUX /* * count the number of "node*" files in /sys/devices/system/node/ */ @@ -854,10 +833,10 @@ test_no_huge_flag(void) static int test_misc_flags(void) { - char hugepath[PATH_MAX] = {0}; - char hugepath_dir[PATH_MAX] = {0}; - char hugepath_dir2[PATH_MAX] = {0}; - char hugepath_dir3[PATH_MAX] = {0}; + const char *hugepath = ""; + char hugepath_dir[PATH_MAX]; + char hugepath_dir2[PATH_MAX]; + char hugepath_dir3[PATH_MAX]; #ifdef RTE_EXEC_ENV_FREEBSD /* BSD target doesn't support prefixes at this point */ const char * prefix = ""; @@ -865,9 +844,7 @@ test_misc_flags(void) #else const char *prefix = file_prefix_arg(); const char * nosh_prefix = "--file-prefix=noshconf"; - FILE * hugedir_handle = NULL; - char line[PATH_MAX] = {0}; - unsigned i, isempty = 1; + struct mntent *entry; if (prefix == NULL) return -1; @@ -877,29 +854,24 @@ test_misc_flags(void) */ /* get hugetlbfs mountpoints from /proc/mounts */ - hugedir_handle = fopen("/proc/mounts", "r"); - - if (hugedir_handle == NULL) { + FILE *mounts = setmntent("/proc/mounts", "r"); + if (mounts == NULL) { printf("Error opening /proc/mounts!\n"); return -1; } - /* read /proc/mounts */ - while (fgets(line, sizeof(line), hugedir_handle) != NULL) { - - /* find first valid hugepath */ - if (get_hugepage_path(line, sizeof(line), hugepath, sizeof(hugepath))) + /* foreach mount point */ + hugepath = NULL; + while ((entry = getmntent(mounts)) != NULL) { + /* only want hugetlbfs filesystems */ + if (strcmp(entry->mnt_type, FS_HUGETLB) == 0) { + hugepath = strdupa(entry->mnt_dir); break; + } } + endmntent(mounts); - fclose(hugedir_handle); - - /* check if path is not empty */ - for (i = 0; i < sizeof(hugepath); i++) - if (hugepath[i] != '\0') - isempty = 0; - - if (isempty) { + if (hugepath == NULL) { printf("No mounted hugepage dir found!\n"); return -1; } @@ -1168,6 +1140,17 @@ test_misc_flags(void) return -1; } +#ifdef RTE_EXEC_ENV_FREEBSD + +static int +test_file_prefix(void) +{ + printf("file_prefix not supported on FreeBSD, skipping test\n"); + return TEST_SKIPPED; +} + +#else + static int test_file_prefix(void) { @@ -1186,16 +1169,12 @@ test_file_prefix(void) * run in legacy mode, and not present at all after run in default * mem mode */ - char prefix[PATH_MAX] = ""; + char prefix[PATH_MAX]; -#ifdef RTE_EXEC_ENV_FREEBSD - return 0; -#else if (get_current_prefix(prefix, sizeof(prefix)) == NULL) { printf("Error - unable to get current prefix!\n"); return -1; } -#endif /* this should fail unless the test itself is run with "memtest" prefix */ const char *argv0[] = {prgname, mp_flag, "-m", @@ -1431,6 +1410,7 @@ test_file_prefix(void) return 0; } +#endif /* This function writes in passed buf pointer a valid --socket-mem= option * for num_sockets then concatenates the provided suffix string. -- 2.51.0