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 727E148B6C; Fri, 21 Nov 2025 18:10:04 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id BCBB6402ED; Fri, 21 Nov 2025 18:09:57 +0100 (CET) Received: from mail-pg1-f172.google.com (mail-pg1-f172.google.com [209.85.215.172]) by mails.dpdk.org (Postfix) with ESMTP id BAF8D402DB for ; Fri, 21 Nov 2025 18:09:53 +0100 (CET) Received: by mail-pg1-f172.google.com with SMTP id 41be03b00d2f7-bc169af247eso1945196a12.2 for ; Fri, 21 Nov 2025 09:09:53 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=networkplumber-org.20230601.gappssmtp.com; s=20230601; t=1763744993; x=1764349793; 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=CefcNYnobekhEYOU6KHsh/TgSBsiP33nUIdjH1rdj7E=; b=S3cT+0JCNBst/awmCLUz13d9GeD9qS6f/71NrUYtI8K4ehHzQ6fOkzibMd1sN1VXe0 qaKf05JSyc6dZyy/1sZUNTsTGIAWLVYphsF1FoN2iw/6C7ZxuHd3emUIDUE7fZiZCYnq UTbazBud+SV/YAdalqFA3Ojg7mHSwEP0eKlwBwJHvfJcWD1EY3UsDNP/+0LplN+aT5X0 aiZLg8vObIWuup9OLna7Gk7WRj6cwKHB5YWQZk78DzmlnpdsmMvlTtGaSVAGntW64Z8v +u3Bbd7b37w3/USAUrwiTJP1oQPEn3oamNAbVkvtY49mURZMokJC3VYQtDLCRaopHCEL Fr8Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1763744993; x=1764349793; 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=CefcNYnobekhEYOU6KHsh/TgSBsiP33nUIdjH1rdj7E=; b=bQ2MEYv2StwZdD5Vh2PRjVpqNhEoOwRcyNQ/1dytamexoRZiXFInNAZOWAUUJBTc+e GjN+JeNbbTK35OCODIHTmFyV7BbH6mSd2JJ4BICt4b2Cc5I89y4yTQlIcTF7LRiJollj U6JUP5U/tohRWKC5hOXgaZt/EKE+tC7SAMVxbSYa71UZmRVLvAoNL2e5rKCCGfvDdzrV U1sRX0f3oBB4sqsSs6Xjm+rHCdiJcXPRs0P7uQC5e9CYp6RkMQzDQXTdGTgQ8gR3dHjj P3ykUKGu1bCl4OqaLN+xNmymREl0cRmpnETWEFad0ScgJFq2AgO71QXPUsNoZXCwsCT7 RZrA== X-Gm-Message-State: AOJu0YwU5WgWSDQoA/N7kAUaU/jkX8sJfu3C639CV82wQWY9NbXSRLru 6LdjTobJQOuG5eqj6aF+L32mfmdgOQkesQOll/EvPHQbgyg14EURCWEiz7AFtWm001lpNuQLvYn 4GFV9 X-Gm-Gg: ASbGncuEhdw3GR6s6Ybt98wO8KcMyNl+YG3hxQLDRfQtsWi4kIFXXQl3oPz0Lv7Ka2C c5EovxaDp9oYXbtMU3dwKLQyfHD+dgtfnrvnMNo1l3qS5BA3QW5nK1j/6GX0ndqncnePqP8qPwA j9ED5M/7R2/747qqm9qq2sU3khN2tFukz+iAGZk1523EIXjhE9UuitabMebkSnnkMaiFavBSm1j w5mvWOBGv3tukosNxcR6wqPvrS7/ptTQVUjybmISJB8BpzfR3LvQ8NU+DKV6h4a18nSwzMFv3YO 9Y4ffbUzd16Dvfkh836W1sxeeHhuo7JLZgqA5MpcNoj3EQsT6DZXrMDi+NxIW40VMpDBNrTldym AEpUWMm/hEov6HdlPuRNbbi4pjnXsebywBVYeiHcgN1dvJhv6DrOkHfqolpwkx9ZTcxqTrkI4lJ sNq7jk6fEObjyC0xLX+PvsX+QJnKxF3TCgIPYfZfgvdv3g5XTN8g== X-Google-Smtp-Source: AGHT+IGNH2GDEyIY1DpOovgg+sCvgMmPU34KjbeOCs6LsDSRv8/f7sztr6YK0ojNeBqRFRppnYhJ7A== X-Received: by 2002:a05:7300:d944:b0:2a4:3593:96a7 with SMTP id 5a478bee46e88-2a7192d18ebmr920452eec.36.1763744992593; Fri, 21 Nov 2025 09:09:52 -0800 (PST) Received: from phoenix.lan (204-195-96-226.wavecable.com. [204.195.96.226]) by smtp.gmail.com with ESMTPSA id 5a478bee46e88-2a6fc5b122dsm21341544eec.5.2025.11.21.09.09.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 21 Nov 2025 09:09:52 -0800 (PST) From: Stephen Hemminger To: dev@dpdk.org Cc: Stephen Hemminger Subject: [PATCH v5 2/8] test: refactor file prefix arg handling Date: Fri, 21 Nov 2025 09:08:21 -0800 Message-ID: <20251121170947.134502-3-stephen@networkplumber.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251121170947.134502-1-stephen@networkplumber.org> References: <20251110182209.104087-1-stephen@networkplumber.org> <20251121170947.134502-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 Make setting up --file-prefix arg logic into a function, and avoid impossible case of file prefix path causing overflow of string. Signed-off-by: Stephen Hemminger --- app/test/test_eal_flags.c | 126 +++++++++++++------------------------- 1 file changed, 42 insertions(+), 84 deletions(-) diff --git a/app/test/test_eal_flags.c b/app/test/test_eal_flags.c index e32f83d3c8..c2e6c00edb 100644 --- a/app/test/test_eal_flags.c +++ b/app/test/test_eal_flags.c @@ -121,6 +121,8 @@ test_misc_flags(void) #define no_shconf "--no-shconf" #define allow "--allow" #define vdev "--vdev" +#define file_prefix "--file-prefix" + #define memtest "memtest" #define memtest1 "memtest1" #define memtest2 "memtest2" @@ -312,6 +314,25 @@ get_number_of_sockets(void) } #endif +static const char * +get_file_prefix(void) +{ +#ifdef RTE_EXEC_ENV_FREEBSD + /* BSD target doesn't support prefixes at this point */ + return ""; +#else + static char prefix[PATH_MAX + sizeof(file_prefix)]; + char tmp[PATH_MAX]; + + if (get_current_prefix(tmp, sizeof(tmp)) == NULL) { + printf("Error - unable to get current prefix!\n"); + return NULL; + } + snprintf(prefix, sizeof(prefix), file_prefix "=%s", tmp); + return prefix; +#endif +} + /* * Test that the app doesn't run with invalid allow option. * Final tests ensures it does run with valid options as sanity check (one @@ -320,18 +341,10 @@ get_number_of_sockets(void) static int test_allow_flag(void) { - unsigned i; -#ifdef RTE_EXEC_ENV_FREEBSD - /* BSD target doesn't support prefixes at this point */ - const char * prefix = ""; -#else - char prefix[PATH_MAX], tmp[PATH_MAX]; - if (get_current_prefix(tmp, sizeof(tmp)) == NULL) { - printf("Error - unable to get current prefix!\n"); + unsigned int i; + const char *prefix = get_file_prefix(); + if (prefix == NULL) return -1; - } - snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp); -#endif const char *wlinval[][7] = { {prgname, prefix, mp_flag, @@ -387,17 +400,9 @@ test_allow_flag(void) static int test_invalid_b_flag(void) { -#ifdef RTE_EXEC_ENV_FREEBSD - /* BSD target doesn't support prefixes at this point */ - const char * prefix = ""; -#else - char prefix[PATH_MAX], tmp[PATH_MAX]; - if (get_current_prefix(tmp, sizeof(tmp)) == NULL) { - printf("Error - unable to get current prefix!\n"); + const char *prefix = get_file_prefix(); + if (prefix == NULL) return -1; - } - snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp); -#endif const char *blinval[][5] = { {prgname, prefix, mp_flag, "-b", "error"}, @@ -491,17 +496,9 @@ test_invalid_vdev_flag(void) static int test_invalid_r_flag(void) { -#ifdef RTE_EXEC_ENV_FREEBSD - /* BSD target doesn't support prefixes at this point */ - const char * prefix = ""; -#else - char prefix[PATH_MAX], tmp[PATH_MAX]; - if (get_current_prefix(tmp, sizeof(tmp)) == NULL) { - printf("Error - unable to get current prefix!\n"); + const char *prefix = get_file_prefix(); + if (prefix == NULL) return -1; - } - snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp); -#endif const char *rinval[][5] = { {prgname, prefix, mp_flag, "-r", "error"}, @@ -535,17 +532,9 @@ test_invalid_r_flag(void) static int test_missing_c_flag(void) { -#ifdef RTE_EXEC_ENV_FREEBSD - /* BSD target doesn't support prefixes at this point */ - const char * prefix = ""; -#else - char prefix[PATH_MAX], tmp[PATH_MAX]; - if (get_current_prefix(tmp, sizeof(tmp)) == NULL) { - printf("Error - unable to get current prefix!\n"); + const char *prefix = get_file_prefix(); + if (prefix == NULL) return -1; - } - snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp); -#endif /* -c flag but no coremask value */ const char *argv1[] = { prgname, prefix, mp_flag, "-c"}; @@ -694,17 +683,9 @@ test_missing_c_flag(void) static int test_main_lcore_flag(void) { -#ifdef RTE_EXEC_ENV_FREEBSD - /* BSD target doesn't support prefixes at this point */ - const char *prefix = ""; -#else - char prefix[PATH_MAX], tmp[PATH_MAX]; - if (get_current_prefix(tmp, sizeof(tmp)) == NULL) { - printf("Error - unable to get current prefix!\n"); + const char *prefix = get_file_prefix(); + if (prefix == NULL) return -1; - } - snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp); -#endif if (!rte_lcore_is_enabled(0) || !rte_lcore_is_enabled(1)) return TEST_SKIPPED; @@ -751,17 +732,9 @@ test_main_lcore_flag(void) static int test_invalid_n_flag(void) { -#ifdef RTE_EXEC_ENV_FREEBSD - /* BSD target doesn't support prefixes at this point */ - const char * prefix = ""; -#else - char prefix[PATH_MAX], tmp[PATH_MAX]; - if (get_current_prefix(tmp, sizeof(tmp)) == NULL) { - printf("Error - unable to get current prefix!\n"); + const char *prefix = get_file_prefix(); + if (prefix == NULL) return -1; - } - snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp); -#endif /* -n flag but no value */ const char *argv1[] = { prgname, prefix, no_huge, no_shconf, @@ -803,18 +776,12 @@ test_invalid_n_flag(void) static int test_no_hpet_flag(void) { - char prefix[PATH_MAX] = ""; - #ifdef RTE_EXEC_ENV_FREEBSD return 0; #else - char tmp[PATH_MAX]; - if (get_current_prefix(tmp, sizeof(tmp)) == NULL) { - printf("Error - unable to get current prefix!\n"); + const char *prefix = get_file_prefix(); + if (prefix == NULL) return -1; - } - snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp); -#endif /* With --no-hpet */ const char *argv1[] = {prgname, prefix, mp_flag, no_hpet}; @@ -829,6 +796,7 @@ test_no_hpet_flag(void) printf("Error - process did not run ok without --no-hpet flag\n"); return -1; } +# return 0; } @@ -898,6 +866,7 @@ test_no_huge_flag(void) printf("Error - process run ok with --no-huge and --huge-worker-stack=size flags"); return -1; } +#endif return 0; } @@ -913,17 +882,14 @@ test_misc_flags(void) const char * prefix = ""; const char * nosh_prefix = ""; #else - char prefix[PATH_MAX], tmp[PATH_MAX]; + const char *prefix = get_file_prefix(); const char * nosh_prefix = "--file-prefix=noshconf"; FILE * hugedir_handle = NULL; char line[PATH_MAX] = {0}; unsigned i, isempty = 1; - if (get_current_prefix(tmp, sizeof(tmp)) == NULL) { - printf("Error - unable to get current prefix!\n"); + if (prefix == NULL) return -1; - } - snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp); /* * get first valid hugepage path @@ -1525,17 +1491,9 @@ populate_socket_mem_param(int num_sockets, const char *mem, static int test_memory_flags(void) { -#ifdef RTE_EXEC_ENV_FREEBSD - /* BSD target doesn't support prefixes at this point */ - const char * prefix = ""; -#else - char prefix[PATH_MAX], tmp[PATH_MAX]; - if (get_current_prefix(tmp, sizeof(tmp)) == NULL) { - printf("Error - unable to get current prefix!\n"); + const char *prefix = get_file_prefix(); + if (prefix == NULL) return -1; - } - snprintf(prefix, sizeof(prefix), "--file-prefix=%s", tmp); -#endif /* valid -m flag and mp flag */ const char *argv0[] = {prgname, prefix, mp_flag, -- 2.51.0