Skip to contentSkip to conversation

test-pmd: go back to using cmdline_interact

RFT Superseded Stephen Hemminger 7 participants 28 messages Mar 13, 2023 – Mar 19, 2023 1 message not in the archive

lore
Share & tools
lore
#0 lore raw

The cmdline library poll function is broken on Windows and was never tested, don't use it.

Instead, use sigaction() to cancel read character on Unix OS's and a new helper to cancel I/O on Windows.

Fixes 0fd1386c30c3 ("app/testpmd: cleanup cleanly from signal")

Bugzilla ID: 1180

---
 app/test-pmd/cmdline.c | 27 ++++++++++++++-------------
 app/test-pmd/testpmd.c | 11 +++++++++++
 lib/cmdline/cmdline.c  | 16 ++++++++++++++++
 lib/cmdline/cmdline.h  |  1 +
 4 files changed, 42 insertions(+), 13 deletions(-)
app/test-pmd/cmdline.c +14 -13
index 6fa870dc329b..072437d9bfcf 100644
@@ -66,6 +66,7 @@
 #include "cmdline_tm.h"
 #include "bpf_cmd.h"
 
+static struct cmdline *testpmd_cl;
 static cmdline_parse_ctx_t *main_ctx;
 static TAILQ_HEAD(, testpmd_driver_commands) driver_commands_head =
 	TAILQ_HEAD_INITIALIZER(driver_commands_head);
@@ -13028,26 +13029,26 @@ cmdline_read_from_file(const char *filename)
 	printf("Read CLI commands from %s\n", filename);
 }
 
+void
+prompt_exit(void)
+{
+	cmdline_cancel(testpmd_cl);
+	cmdline_quit(testpmd_cl);
+}
+
 /* prompt function, called from main on MAIN lcore */
 void
 prompt(void)
 {
-	struct cmdline *cl;
-
-	cl = cmdline_stdin_new(main_ctx, "testpmd> ");
-	if (cl == NULL)
+	testpmd_cl = cmdline_stdin_new(main_ctx, "testpmd> ");
+	if (testpmd_cl == NULL) {
+		fprintf(stderr,
+			"Failed to create stdin based cmdline context\n");
 		return;
-
-	/* loop until signal or quit command */
-	while (f_quit == 0 && cl_quit == 0) {
-		int status = cmdline_poll(cl);
-
-		if (status < 0 || status == RDLINE_EXITED)
-			break;
 	}
 
-	cmdline_quit(cl);
-	cmdline_stdin_exit(cl);
+	cmdline_interact(testpmd_cl);
+	cmdline_stdin_exit(testpmd_cl);
 }
 
 void
app/test-pmd/testpmd.c +11 -0
index 2ce19ed47ab4..5cb6f9252395 100644
@@ -4469,6 +4469,7 @@ static void
 signal_handler(int signum __rte_unused)
 {
 	f_quit = 1;
+	prompt_exit();
 }
 
 int
@@ -4479,8 +4480,18 @@ main(int argc, char** argv)
 	uint16_t count;
 	int ret;
 
+#ifdef RTE_EXEC_ENV_WINDOWS
 	signal(SIGINT, signal_handler);
 	signal(SIGTERM, signal_handler);
+#else
+	/* Want read() not to be restarted on signal */
+	struct sigaction action = {
+		.sa_handler = signal_handler,
+	};
+
+	sigaction(SIGINT, &action, NULL);
+	sigaction(SIGTERM, &action, NULL);
+#endif
 
 	testpmd_logtype = rte_log_register("testpmd");
 	if (testpmd_logtype < 0)
lib/cmdline/cmdline.c +16 -0
index 8ad0690d8533..69b3d9827290 100644
@@ -176,6 +176,22 @@ cmdline_quit(struct cmdline *cl)
 	rdline_quit(&cl->rdl);
 }
 
+void
+cmdline_cancel(struct cmdline *cl)
+{
+	if (!cl)
+		return;
+
+#ifdef RTE_EXEC_ENV_WINDOWS
+	/* force the outstanding read on console to exit */
+	if (cl->oldterm.is_console_input) {
+		HANDLE handle = (HANDLE)_get_osfhandle(cl->s_in);
+
+		CancelIoEx(handle, NULL);
+	}
+#endif
+}
+
 int
 cmdline_poll(struct cmdline *cl)
 {
lib/cmdline/cmdline.h +1 -0
index b14355ef5121..7dac90cfe7eb 100644
@@ -58,6 +58,7 @@ cmdline_get_rdline(struct cmdline *cl);
 int cmdline_poll(struct cmdline *cl);
 
 void cmdline_interact(struct cmdline *cl);
+void cmdline_cancel(struct cmdline *cl);
 void cmdline_quit(struct cmdline *cl);
 
 #ifdef __cplusplus
Signature · 1 line
2.39.2
#1 lore raw

PATCH v2 1/1 test-pmd: go back to using cmdline_interact

The cmdline library poll function is broken on Windows and was never tested, don't use it.

Instead, use sigaction() to cancel read character on Unix OS's and a new helper to cancel I/O on Windows.

---
v2 - make cmdline_cancel an exposed API

 app/test-pmd/cmdline.c           | 27 ++++++++++++++-------------
 app/test-pmd/testpmd.c           | 11 +++++++++++
 lib/cmdline/cmdline.h            | 10 ++++++++++
 lib/cmdline/cmdline_os_unix.c    |  5 +++++
 lib/cmdline/cmdline_os_windows.c | 14 ++++++++++++++
 lib/cmdline/version.map          |  3 +++
 6 files changed, 57 insertions(+), 13 deletions(-)
app/test-pmd/cmdline.c +14 -13
index 6fa870dc329b..072437d9bfcf 100644
@@ -66,6 +66,7 @@
 #include "cmdline_tm.h"
 #include "bpf_cmd.h"
 
+static struct cmdline *testpmd_cl;
 static cmdline_parse_ctx_t *main_ctx;
 static TAILQ_HEAD(, testpmd_driver_commands) driver_commands_head =
 	TAILQ_HEAD_INITIALIZER(driver_commands_head);
@@ -13028,26 +13029,26 @@ cmdline_read_from_file(const char *filename)
 	printf("Read CLI commands from %s\n", filename);
 }
 
+void
+prompt_exit(void)
+{
+	cmdline_cancel(testpmd_cl);
+	cmdline_quit(testpmd_cl);
+}
+
 /* prompt function, called from main on MAIN lcore */
 void
 prompt(void)
 {
-	struct cmdline *cl;
-
-	cl = cmdline_stdin_new(main_ctx, "testpmd> ");
-	if (cl == NULL)
+	testpmd_cl = cmdline_stdin_new(main_ctx, "testpmd> ");
+	if (testpmd_cl == NULL) {
+		fprintf(stderr,
+			"Failed to create stdin based cmdline context\n");
 		return;
-
-	/* loop until signal or quit command */
-	while (f_quit == 0 && cl_quit == 0) {
-		int status = cmdline_poll(cl);
-
-		if (status < 0 || status == RDLINE_EXITED)
-			break;
 	}
 
-	cmdline_quit(cl);
-	cmdline_stdin_exit(cl);
+	cmdline_interact(testpmd_cl);
+	cmdline_stdin_exit(testpmd_cl);
 }
 
 void
app/test-pmd/testpmd.c +11 -0
index 2ce19ed47ab4..5cb6f9252395 100644
@@ -4469,6 +4469,7 @@ static void
 signal_handler(int signum __rte_unused)
 {
 	f_quit = 1;
+	prompt_exit();
 }
 
 int
@@ -4479,8 +4480,18 @@ main(int argc, char** argv)
 	uint16_t count;
 	int ret;
 
+#ifdef RTE_EXEC_ENV_WINDOWS
 	signal(SIGINT, signal_handler);
 	signal(SIGTERM, signal_handler);
+#else
+	/* Want read() not to be restarted on signal */
+	struct sigaction action = {
+		.sa_handler = signal_handler,
+	};
+
+	sigaction(SIGINT, &action, NULL);
+	sigaction(SIGTERM, &action, NULL);
+#endif
 
 	testpmd_logtype = rte_log_register("testpmd");
 	if (testpmd_logtype < 0)
lib/cmdline/cmdline.h +10 -0
index b14355ef5121..2a1721cf9712 100644
@@ -60,6 +60,16 @@ int cmdline_poll(struct cmdline *cl);
 void cmdline_interact(struct cmdline *cl);
 void cmdline_quit(struct cmdline *cl);
 
+
+/**
+ * This function causes the read() in cmdline_interact to exit.
+ *
+ * @param cl
+ *   The command line object.
+ */
+__rte_experimental
+void cmdline_cancel(struct cmdline *cl);
+
 #ifdef __cplusplus
 }
 #endif
lib/cmdline/cmdline_os_unix.c +5 -0
index 755a6141546d..356c5b3f3ca2 100644
@@ -52,3 +52,8 @@ cmdline_vdprintf(int fd, const char *format, va_list op)
 {
 	return vdprintf(fd, format, op);
 }
+
+void
+cmdline_cancel(__rte_unused struct cmdline *cl)
+{
+}
lib/cmdline/cmdline_os_windows.c +14 -0
index be11409029a2..8cff3b175747 100644
@@ -203,3 +203,17 @@ cmdline_vdprintf(int fd, const char *format, va_list op)
 
 	return ret;
 }
+
+void
+cmdline_cancel(struct cmdline *cl)
+{
+	if (!cl)
+		return;
+
+	/* force the outstanding read on console to exit */
+	if (cl->oldterm.is_console_input) {
+		HANDLE handle = (HANDLE)_get_osfhandle(cl->s_in);
+
+		CancelIoEx(handle, NULL);
+	}
+}
lib/cmdline/version.map +3 -0
index e3d59aaf8d61..a8a417cd6ff1 100644
@@ -84,5 +84,8 @@ EXPERIMENTAL {
 	# added in 22.07
 	cmdline_parse_check;
 
+	# added in 23.03
+	cmdline_cancel;
+
 	local: *;
 };
Signature · 1 line
2.39.2
Tested-by on v2 1/1
#2 lore raw
Quoted 7 lines

-----Original Message-----
From: Stephen Hemminger <[email protected]>
Sent: Tuesday, March 14, 2023 5:39 AM
To: [email protected]
Cc: Stephen Hemminger <[email protected]>
Subject: [RFT v2] test-pmd: go back to using cmdline_interact

Quoted 8 lines

The cmdline library poll function is broken on Windows and was never tested, don't use it.

Instead, use sigaction() to cancel read character on Unix OS's and a new helper to cancel I/O on Windows.

---

A message that is not in the archive (sent off-list or not yet received): MW4PR12MB56684FA660218F925D64BE09A4BE9@MW4PR12MB5668.namprd12.prod.outlook.com

Tested-by
#4 lore raw
Quoted 5 lines

Subject: [RFT v2] test-pmd: go back to using cmdline_interact

External email: Use caution opening links or attachments

Quoted 7 lines

The cmdline library poll function is broken on Windows and was never tested, don't use it.

Instead, use sigaction() to cancel read character on Unix OS's and a new helper to cancel I/O on Windows.

Confirmed that this patch fixes Bug: 1180 on Windows.

#5 lore raw

v3 cover testpmd control C fixes

In reply to Stephen Hemminger

Resolve issues around using control-C in testpmd. Using cmdline_poll() is broken and won't work right so don't use it. Instead use cmdline_interact() and fix the signal handling.

Stephen Hemminger (3):
testpmd: go back to using cmdline_interact
testpmd: use sig_atomic_t for flag
testpmd: enable interrupt in interactive mode

 app/test-pmd/cmdline.c           | 27 ++++++++++++++-------------
 app/test-pmd/testpmd.c           | 17 ++++++++++++-----
 app/test-pmd/testpmd.h           |  3 ++-
 lib/cmdline/cmdline.h            | 10 ++++++++++
 lib/cmdline/cmdline_os_unix.c    |  8 +++++++-
 lib/cmdline/cmdline_os_windows.c | 18 ++++++++++++++++--
 lib/cmdline/cmdline_private.h    |  2 +-
 lib/cmdline/version.map          |  3 +++
 8 files changed, 65 insertions(+), 23 deletions(-)
Signature · 1 line
2.39.2
#6 lore raw

PATCH v3 1/3 testpmd: go back to using cmdline_interact

The cmdline library poll function is broken on Windows and was never tested, don't use it.

Instead, use sigaction() to cancel read character on Unix OS's and a new helper to cancel I/O on Windows.

Fixes 0fd1386c30c3 ("app/testpmd: cleanup cleanly from signal")

Bugzilla ID: 1180

---
 app/test-pmd/cmdline.c           | 27 ++++++++++++++-------------
 app/test-pmd/testpmd.c           | 11 +++++++++++
 lib/cmdline/cmdline.h            | 10 ++++++++++
 lib/cmdline/cmdline_os_unix.c    |  5 +++++
 lib/cmdline/cmdline_os_windows.c | 14 ++++++++++++++
 lib/cmdline/cmdline_private.h    |  2 +-
 lib/cmdline/version.map          |  3 +++
 7 files changed, 58 insertions(+), 14 deletions(-)
app/test-pmd/cmdline.c +14 -13
index 6fa870dc329b..072437d9bfcf 100644
@@ -66,6 +66,7 @@
 #include "cmdline_tm.h"
 #include "bpf_cmd.h"
 
+static struct cmdline *testpmd_cl;
 static cmdline_parse_ctx_t *main_ctx;
 static TAILQ_HEAD(, testpmd_driver_commands) driver_commands_head =
 	TAILQ_HEAD_INITIALIZER(driver_commands_head);
@@ -13028,26 +13029,26 @@ cmdline_read_from_file(const char *filename)
 	printf("Read CLI commands from %s\n", filename);
 }
 
+void
+prompt_exit(void)
+{
+	cmdline_cancel(testpmd_cl);
+	cmdline_quit(testpmd_cl);
+}
+
 /* prompt function, called from main on MAIN lcore */
 void
 prompt(void)
 {
-	struct cmdline *cl;
-
-	cl = cmdline_stdin_new(main_ctx, "testpmd> ");
-	if (cl == NULL)
+	testpmd_cl = cmdline_stdin_new(main_ctx, "testpmd> ");
+	if (testpmd_cl == NULL) {
+		fprintf(stderr,
+			"Failed to create stdin based cmdline context\n");
 		return;
-
-	/* loop until signal or quit command */
-	while (f_quit == 0 && cl_quit == 0) {
-		int status = cmdline_poll(cl);
-
-		if (status < 0 || status == RDLINE_EXITED)
-			break;
 	}
 
-	cmdline_quit(cl);
-	cmdline_stdin_exit(cl);
+	cmdline_interact(testpmd_cl);
+	cmdline_stdin_exit(testpmd_cl);
 }
 
 void
app/test-pmd/testpmd.c +11 -0
index 2ce19ed47ab4..5cb6f9252395 100644
@@ -4469,6 +4469,7 @@ static void
 signal_handler(int signum __rte_unused)
 {
 	f_quit = 1;
+	prompt_exit();
 }
 
 int
@@ -4479,8 +4480,18 @@ main(int argc, char** argv)
 	uint16_t count;
 	int ret;
 
+#ifdef RTE_EXEC_ENV_WINDOWS
 	signal(SIGINT, signal_handler);
 	signal(SIGTERM, signal_handler);
+#else
+	/* Want read() not to be restarted on signal */
+	struct sigaction action = {
+		.sa_handler = signal_handler,
+	};
+
+	sigaction(SIGINT, &action, NULL);
+	sigaction(SIGTERM, &action, NULL);
+#endif
 
 	testpmd_logtype = rte_log_register("testpmd");
 	if (testpmd_logtype < 0)
lib/cmdline/cmdline.h +10 -0
index b14355ef5121..2a1721cf9712 100644
@@ -60,6 +60,16 @@ int cmdline_poll(struct cmdline *cl);
 void cmdline_interact(struct cmdline *cl);
 void cmdline_quit(struct cmdline *cl);
 
+
+/**
+ * This function causes the read() in cmdline_interact to exit.
+ *
+ * @param cl
+ *   The command line object.
+ */
+__rte_experimental
+void cmdline_cancel(struct cmdline *cl);
+
 #ifdef __cplusplus
 }
 #endif
lib/cmdline/cmdline_os_unix.c +5 -0
index 64a945a34fb3..5f9839a15f98 100644
@@ -51,3 +51,8 @@ cmdline_vdprintf(int fd, const char *format, va_list op)
 {
 	return vdprintf(fd, format, op);
 }
+
+void
+cmdline_cancel(__rte_unused struct cmdline *cl)
+{
+}
lib/cmdline/cmdline_os_windows.c +14 -0
index 73ed9ba290b8..80863bfc8a00 100644
@@ -203,3 +203,17 @@ cmdline_vdprintf(int fd, const char *format, va_list op)
 
 	return ret;
 }
+
+void
+cmdline_cancel(struct cmdline *cl)
+{
+	if (!cl)
+		return;
+
+	/* force the outstanding read on console to exit */
+	if (cl->oldterm.is_console_input) {
+		HANDLE handle = (HANDLE)_get_osfhandle(cl->s_in);
+
+		CancelIoEx(handle, NULL);
+	}
+}
lib/cmdline/cmdline_private.h +1 -1
index a3271c76934a..7ec42ac3c78f 100644
@@ -24,7 +24,7 @@
 #define RDLINE_HISTORY_MAX_LINE 64
 
 struct rdline {
-	enum rdline_status status;
+	volatile enum rdline_status status;
 	/* rdline bufs */
 	struct cirbuf left;
 	struct cirbuf right;
lib/cmdline/version.map +3 -0
index e3d59aaf8d61..a8a417cd6ff1 100644
@@ -84,5 +84,8 @@ EXPERIMENTAL {
 	# added in 22.07
 	cmdline_parse_check;
 
+	# added in 23.03
+	cmdline_cancel;
+
 	local: *;
 };
Signature · 1 line
2.39.2
#7 lore raw

PATCH v3 2/3 testpmd: use sig_atomic_t for flag

In reply to Stephen Hemminger

Standard conforming signal handling in applications should use sig_atomic_t for flags set by signal handler.
https://www.gnu.org/software/libc/manual/html_node/Atomic-Data-Access.html

This is really just a fancy way of saying ''int'' but adds to platform portablilty for DPDK.

---
 app/test-pmd/testpmd.c | 6 +-----
 app/test-pmd/testpmd.h | 3 ++-
 2 files changed, 3 insertions(+), 6 deletions(-)
app/test-pmd/testpmd.c +1 -5
index 5cb6f9252395..aee926571f53 100644
@@ -228,11 +228,7 @@ struct rte_eth_xstat_name *xstats_display;
 
 unsigned int xstats_display_num; /**< Size of extended statistics to show */
 
-/*
- * In container, it cannot terminate the process which running with 'stats-period'
- * option. Set flag to exit stats period loop after received SIGINT/SIGTERM.
- */
-volatile uint8_t f_quit;
+volatile sig_atomic_t f_quit;	/* Quit testpmd from signal */
 uint8_t cl_quit; /* Quit testpmd from cmdline. */
 
 /*
app/test-pmd/testpmd.h +2 -1
index bdfbfd36d3c5..5c11d4f86301 100644
@@ -6,6 +6,7 @@
 #define _TESTPMD_H_
 
 #include <stdbool.h>
+#include <signal.h>
 
 #ifdef RTE_LIB_GRO
 #include <rte_gro.h>
@@ -34,7 +35,7 @@
 #define RTE_PORT_HANDLING       (uint16_t)3
 
 extern uint8_t cl_quit;
-extern volatile uint8_t f_quit;
+extern volatile sig_atomic_t f_quit;
 
 /*
  * It is used to allocate the memory for hash key.
Signature · 1 line
2.39.2
#8 lore raw

Re: [PATCH v3 2/3] testpmd: use sig_atomic_t for flag

Quoted 8 lines · On Tue, 14 Mar 2023 10:36:47 -0700 Stephen Hemminger…

Standard conforming signal handling in applications should use sig_atomic_t for flags set by signal handler.
https://www.gnu.org/software/libc/manual/html_node/Atomic-Data-Access.html

This is really just a fancy way of saying ''int'' but adds to platform portablilty for DPDK.

Apparently, this fails on some distros because signal.h ends up including some compatibility definitions that clash with the same definitions in the ixgbe testpmd base code. Since fixing either base code or the distro is a PIA not worth doing.

#9 lore raw

PATCH v3 3/3 testpmd: enable interrupt in interactive mode

In reply to Stephen Hemminger

The setting in terminal handling for both Unix style and Windows was not ensuring that Ctrl-C character would cause interrupt.

This is a first release bug. Testpmd interactive mode has always disabled control-c handling on Linux.

Fixes af75078fece3 ("first public release")
---
 lib/cmdline/cmdline_os_unix.c    | 3 ++-
 lib/cmdline/cmdline_os_windows.c | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)
lib/cmdline/cmdline_os_unix.c +2 -1
index 5f9839a15f98..356c5b3f3ca2 100644
@@ -16,7 +16,8 @@ terminal_adjust(struct cmdline *cl)
 	tcgetattr(0, &cl->oldterm);
 
 	memcpy(&term, &cl->oldterm, sizeof(term));
-	term.c_lflag &= ~(ICANON | ECHO | ISIG);
+	term.c_lflag &= ~(ICANON | ECHO);
+	term.c_lflag |= ISIG;
 	tcsetattr(0, TCSANOW, &term);
 
 	setbuf(stdin, NULL);
lib/cmdline/cmdline_os_windows.c +2 -2
index 80863bfc8a00..8cff3b175747 100644
@@ -32,10 +32,10 @@ terminal_adjust(struct cmdline *cl)
 		mode &= ~(
 			ENABLE_LINE_INPUT |      /* no line buffering */
 			ENABLE_ECHO_INPUT |      /* no echo */
-			ENABLE_PROCESSED_INPUT | /* pass Ctrl+C to program */
 			ENABLE_MOUSE_INPUT |     /* no mouse events */
 			ENABLE_WINDOW_INPUT);    /* no window resize events */
-		mode |= ENABLE_VIRTUAL_TERMINAL_INPUT;
+		mode |= ENABLE_VIRTUAL_TERMINAL_INPUT |
+			ENABLE_PROCESSED_INPUT; /* Ctrl C processed by the system */
 		SetConsoleMode(handle, mode);
 	}
 
Signature · 1 line
2.39.2
#10 lore raw

Re: [PATCH v3 0/3] testpmd control C fixes

In reply to Stephen Hemminger
Quoted 10 lines · On Tue, 14 Mar 2023 10:36:45 -0700 Stephen Hemminger…

Resolve issues around using control-C in testpmd. Using cmdline_poll() is broken and won't work right so don't use it. Instead use cmdline_interact() and fix the signal handling.

Stephen Hemminger (3):
testpmd: go back to using cmdline_interact
testpmd: use sig_atomic_t for flag
testpmd: enable interrupt in interactive mode

Quoted 10 lines
 app/test-pmd/cmdline.c           | 27 ++++++++++++++-------------
 app/test-pmd/testpmd.c           | 17 ++++++++++++-----
 app/test-pmd/testpmd.h           |  3 ++-
 lib/cmdline/cmdline.h            | 10 ++++++++++
 lib/cmdline/cmdline_os_unix.c    |  8 +++++++-
 lib/cmdline/cmdline_os_windows.c | 18 ++++++++++++++++--
 lib/cmdline/cmdline_private.h    |  2 +-
 lib/cmdline/version.map          |  3 +++
 8 files changed, 65 insertions(+), 23 deletions(-)

This patch is failing the CI tests from something that seems unrelated. Looks like recent cyrptodev or ixgbe change broke something.

-Idrivers/net/ice/base -I../drivers/net/ice/base -Idrivers/net/ice/../../common/iavf -I../drivers/net/ice/../../common/iavf -Idrivers/common/iavf -I../drivers/common/iavf -Idrivers/net/mlx5 -I../drivers/net/mlx5 -Idrivers/net/mlx5/linux -I../drivers/net/mlx5/linux -Idrivers/net/mlx5/hws -I../drivers/net/mlx5/hws -Idrivers/common/mlx5 -I../drivers/common/mlx5 -Idrivers/common/mlx5/linux -I../drivers/common/mlx5/linux -Idrivers/bus/auxiliary -I../drivers/bus/auxiliary -I/usr/include/libnl3 -fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall -Winvalid-pch -Wextra -Werror -O3 -include rte_config.h -Wcast-qual -Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security -Wmissing-declarations -Wmissing-prototypes -Wnested-externs -Wold-style-definition -Wpointer-arith -Wsign-compare -Wstrict-prototyp es -Wundef -Wwrite-strings -Wno-address-of-packed-member -Wno-packed-not-aligned -Wno-missing-field-initializers -Wno-zero-length-bounds -D_GNU_SOURCE -march=armv8-a+crc+crypto -march=armv8-a+crc -moutline-atomics -DALLOW_EXPERIMENTAL_API -Wno-deprecated-declarations -MD -MQ 'app/a172ced@@dpdk-testpmd@exe/.._drivers_net_ixgbe_ixgbe_testpmd.c.o' -MF 'app/a172ced@@dpdk-testpmd@exe/.._drivers_net_ixgbe_ixgbe_testpmd.c.o.d' -o 'app/a172ced@@dpdk-testpmd@exe/.._drivers_net_ixgbe_ixgbe_testpmd.c.o' -c ../drivers/net/ixgbe/ixgbe_testpmd.c
In file included from ../drivers/net/ixgbe/ixgbe_ethdev.h:11,
from ../drivers/net/ixgbe/ixgbe_testpmd.c:9:
../drivers/net/ixgbe/base/ixgbe_type.h:2945:17: error: conflicting types for 'u64'
2945 | #define __le64 u64
| ^~~
In file included from ../drivers/net/ixgbe/base/ixgbe_type.h:46,
from ../drivers/net/ixgbe/ixgbe_ethdev.h:11,
from ../drivers/net/ixgbe/ixgbe_testpmd.c:9:
../drivers/net/ixgbe/base/ixgbe_osdep.h:94:18: note: previous declaration of 'u64' was here
94 | typedef uint64_t u64;
| ^~~
[2968/3157] Compiling C object 'app/test/3062f5d@@dpdk-test@exe/test_alarm.c.o'.
[2969/3157] Compiling C object 'app/a172ced@@dpdk-testpmd@exe/.._drivers_net_mlx5_mlx5_testpmd.c.o'.
[2970/3157] Compiling C object 'drivers/a715181@@tmp_rte_event_cnxk@sta/event_cnxk_tx_cn10k_tx_112_127_seg.c.o'.
ninja: build stopped: subcommand failed.
==== End log output ====

#11 lore raw

Re: [PATCH v3 0/3] testpmd control C fixes

Quoted 25 lines · Stephen Hemminger
Quoted 10 lines · On Tue, 14 Mar 2023 10:36:45 -0700 Stephen Hemminger…

Resolve issues around using control-C in testpmd. Using cmdline_poll() is broken and won't work right so don't use it. Instead use cmdline_interact() and fix the signal handling.

Stephen Hemminger (3):
testpmd: go back to using cmdline_interact
testpmd: use sig_atomic_t for flag
testpmd: enable interrupt in interactive mode

Quoted 10 lines
 app/test-pmd/cmdline.c           | 27 ++++++++++++++-------------
 app/test-pmd/testpmd.c           | 17 ++++++++++++-----
 app/test-pmd/testpmd.h           |  3 ++-
 lib/cmdline/cmdline.h            | 10 ++++++++++
 lib/cmdline/cmdline_os_unix.c    |  8 +++++++-
 lib/cmdline/cmdline_os_windows.c | 18 ++++++++++++++++--
 lib/cmdline/cmdline_private.h    |  2 +-
 lib/cmdline/version.map          |  3 +++
 8 files changed, 65 insertions(+), 23 deletions(-)
Quoted 2 lines

This patch is failing the CI tests from something that seems unrelated. Looks like recent cyrptodev or ixgbe change broke something.

There was no recent change in ixgbe.
The build issue is due to added inclusion of signal.h in testpmd.h in patch 2.

root@eb72fb63faec:~/dpdk# git stash
Saved working directory and index state WIP on main: baf13c3135
version: 23.03-rc2
root@eb72fb63faec:~/dpdk# ninja -C build-mini-aarch64
ninja: Entering directory `build-mini-aarch64'
[104/104] Linking target app/dpdk-testpmd.
root@eb72fb63faec:~/dpdk# git stash pop
On branch main
Your branch is up to date with 'origin/main'.

Changes not staged for commit:
(use "git add <file>..." to update what will be committed) (use "git restore <file>..." to discard changes in working directory)
modified: app/test-pmd/testpmd.h

no changes added to commit (use "git add" and/or "git commit -a") Dropped refs/stash@{0} (71b7fa29df19c6e8c553ca53e62cf89d1ef1ea97)

root@eb72fb63faec:~/dpdk# git diff
app/test-pmd/testpmd.h +1 -0
index bdfbfd36d3..ada1d7b438 100644
@@ -6,6 +6,7 @@
 #define _TESTPMD_H_
 
 #include <stdbool.h>
+#include <signal.h>
 
 #ifdef RTE_LIB_GRO
 #include <rte_gro.h>
root@eb72fb63faec:~/dpdk# ninja -C build-mini-aarch64
ninja: Entering directory `build-mini-aarch64'
[24/25] Compiling C object
'app/a172ced@@dpdk-testpmd@exe/.._drivers_net_ixgbe_ixgbe_testpmd.c.o'.
FAILED: app/a172ced@@dpdk-testpmd@exe/.._drivers_net_ixgbe_ixgbe_testpmd.c.o
ccache aarch64-linux-gnu-gcc -Iapp/a172ced@@dpdk-testpmd@exe -Iapp
-I../app -Iapp/test-pmd -I../app/test-pmd -Ilib/ethdev -I../lib/ethdev
-I. -I../ -Iconfig -I../config -Ilib/eal/include -I../lib/eal/include
-Ilib/eal/linux/include -I../lib/eal/linux/include
-Ilib/eal/arm/include -I../lib/eal/arm/include -Ilib/eal/common
-I../lib/eal/common -Ilib/eal -I../lib/eal -Ilib/kvargs
-I../lib/kvargs -Ilib/telemetry/../metrics
-I../lib/telemetry/../metrics -Ilib/telemetry -I../lib/telemetry
-Ilib/net -I../lib/net -Ilib/mbuf -I../lib/mbuf -Ilib/mempool
-I../lib/mempool -Ilib/ring -I../lib/ring -Ilib/meter -I../lib/meter
-Ilib/cmdline -I../lib/cmdline -Ilib/bitratestats
-I../lib/bitratestats -Ilib/metrics -I../lib/metrics -Ilib/bpf
-I../lib/bpf -Ilib/gro -I../lib/gro -Ilib/gso -I../lib/gso
-Ilib/latencystats -I../lib/latencystats -Ilib/pdump -I../lib/pdump
-Ilib/pcapng -I../lib/pcapng -Idrivers/net/ixgbe
-I../drivers/net/ixgbe -Idrivers/net/ixgbe/base
-I../drivers/net/ixgbe/base -Idrivers/bus/pci -I../drivers/bus/pci
-I../drivers/bus/pci/linux -Ilib/pci -I../lib/pci -Idrivers/bus/vdev
-I../drivers/bus/vdev -Ilib/hash -I../lib/hash -Ilib/rcu -I../lib/rcu
-Ilib/security -I../lib/security -Ilib/cryptodev -I../lib/cryptodev
-fdiagnostics-color=always -pipe -D_FILE_OFFSET_BITS=64 -Wall
-Winvalid-pch -Wextra -O3 -include rte_config.h -Wcast-qual
-Wdeprecated -Wformat -Wformat-nonliteral -Wformat-security
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs
-Wold-style-definition -Wpointer-arith -Wsign-compare
-Wstrict-prototypes -Wundef -Wwrite-strings
-Wno-address-of-packed-member -Wno-packed-not-aligned
-Wno-missing-field-initializers -D_GNU_SOURCE -march=armv8-a+crc
-moutline-atomics -DALLOW_EXPERIMENTAL_API
-Wno-deprecated-declarations -MD -MQ
'app/a172ced@@dpdk-testpmd@exe/.._drivers_net_ixgbe_ixgbe_testpmd.c.o'
-MF 'app/a172ced@@dpdk-testpmd@exe/.._drivers_net_ixgbe_ixgbe_testpmd.c.o.d'
-o 'app/a172ced@@dpdk-testpmd@exe/.._drivers_net_ixgbe_ixgbe_testpmd.c.o'
-c ../drivers/net/ixgbe/ixgbe_testpmd.c
In file included from ../drivers/net/ixgbe/ixgbe_ethdev.h:11,
                 from ../drivers/net/ixgbe/ixgbe_testpmd.c:9:
../drivers/net/ixgbe/base/ixgbe_type.h:2945:17: error: conflicting
types for 'u64'
 2945 | #define __le64  u64
      |                 ^~~
In file included from ../drivers/net/ixgbe/base/ixgbe_type.h:46,
                 from ../drivers/net/ixgbe/ixgbe_ethdev.h:11,
                 from ../drivers/net/ixgbe/ixgbe_testpmd.c:9:
../drivers/net/ixgbe/base/ixgbe_osdep.h:94:18: note: previous
declaration of 'u64' was here
   94 | typedef uint64_t u64;
      |                  ^~~
ninja: build stopped: subcommand failed.
Signature · 1 line
David Marchand
#12 lore raw

v4 cover Fix testpmd interrupt regression

In reply to Stephen Hemminger

Resolve issues from using control-C in testpmd. Fixes regression from recent change to use cmdline_poll().

v4 - drop sig_atomic_t. Not required requires changes on
some platforms.

Stephen Hemminger (2):
testpmd: go back to using cmdline_interact
testpmd: enable interrupt in interactive mode

 app/test-pmd/cmdline.c           | 27 ++++++++++++++-------------
 app/test-pmd/testpmd.c           | 11 +++++++++++
 lib/cmdline/cmdline.h            | 10 ++++++++++
 lib/cmdline/cmdline_os_unix.c    |  8 +++++++-
 lib/cmdline/cmdline_os_windows.c | 18 ++++++++++++++++--
 lib/cmdline/cmdline_private.h    |  2 +-
 lib/cmdline/version.map          |  3 +++
 7 files changed, 62 insertions(+), 17 deletions(-)
Signature · 1 line
2.39.2
#13 lore raw

PATCH v4 1/2 testpmd: go back to using cmdline_interact

The cmdline library poll function is broken on Windows and was never tested, don't use it.

Instead, use sigaction() to cancel read character on Unix OS's and a new helper to cancel I/O on Windows.

Fixes 0fd1386c30c3 ("app/testpmd: cleanup cleanly from signal")

Bugzilla ID: 1180

---
 app/test-pmd/cmdline.c           | 27 ++++++++++++++-------------
 app/test-pmd/testpmd.c           | 11 +++++++++++
 lib/cmdline/cmdline.h            | 10 ++++++++++
 lib/cmdline/cmdline_os_unix.c    |  5 +++++
 lib/cmdline/cmdline_os_windows.c | 14 ++++++++++++++
 lib/cmdline/cmdline_private.h    |  2 +-
 lib/cmdline/version.map          |  3 +++
 7 files changed, 58 insertions(+), 14 deletions(-)
app/test-pmd/cmdline.c +14 -13
index 6fa870dc329b..072437d9bfcf 100644
@@ -66,6 +66,7 @@
 #include "cmdline_tm.h"
 #include "bpf_cmd.h"
 
+static struct cmdline *testpmd_cl;
 static cmdline_parse_ctx_t *main_ctx;
 static TAILQ_HEAD(, testpmd_driver_commands) driver_commands_head =
 	TAILQ_HEAD_INITIALIZER(driver_commands_head);
@@ -13028,26 +13029,26 @@ cmdline_read_from_file(const char *filename)
 	printf("Read CLI commands from %s\n", filename);
 }
 
+void
+prompt_exit(void)
+{
+	cmdline_cancel(testpmd_cl);
+	cmdline_quit(testpmd_cl);
+}
+
 /* prompt function, called from main on MAIN lcore */
 void
 prompt(void)
 {
-	struct cmdline *cl;
-
-	cl = cmdline_stdin_new(main_ctx, "testpmd> ");
-	if (cl == NULL)
+	testpmd_cl = cmdline_stdin_new(main_ctx, "testpmd> ");
+	if (testpmd_cl == NULL) {
+		fprintf(stderr,
+			"Failed to create stdin based cmdline context\n");
 		return;
-
-	/* loop until signal or quit command */
-	while (f_quit == 0 && cl_quit == 0) {
-		int status = cmdline_poll(cl);
-
-		if (status < 0 || status == RDLINE_EXITED)
-			break;
 	}
 
-	cmdline_quit(cl);
-	cmdline_stdin_exit(cl);
+	cmdline_interact(testpmd_cl);
+	cmdline_stdin_exit(testpmd_cl);
 }
 
 void
app/test-pmd/testpmd.c +11 -0
index 2ce19ed47ab4..5cb6f9252395 100644
@@ -4469,6 +4469,7 @@ static void
 signal_handler(int signum __rte_unused)
 {
 	f_quit = 1;
+	prompt_exit();
 }
 
 int
@@ -4479,8 +4480,18 @@ main(int argc, char** argv)
 	uint16_t count;
 	int ret;
 
+#ifdef RTE_EXEC_ENV_WINDOWS
 	signal(SIGINT, signal_handler);
 	signal(SIGTERM, signal_handler);
+#else
+	/* Want read() not to be restarted on signal */
+	struct sigaction action = {
+		.sa_handler = signal_handler,
+	};
+
+	sigaction(SIGINT, &action, NULL);
+	sigaction(SIGTERM, &action, NULL);
+#endif
 
 	testpmd_logtype = rte_log_register("testpmd");
 	if (testpmd_logtype < 0)
lib/cmdline/cmdline.h +10 -0
index b14355ef5121..2a1721cf9712 100644
@@ -60,6 +60,16 @@ int cmdline_poll(struct cmdline *cl);
 void cmdline_interact(struct cmdline *cl);
 void cmdline_quit(struct cmdline *cl);
 
+
+/**
+ * This function causes the read() in cmdline_interact to exit.
+ *
+ * @param cl
+ *   The command line object.
+ */
+__rte_experimental
+void cmdline_cancel(struct cmdline *cl);
+
 #ifdef __cplusplus
 }
 #endif
lib/cmdline/cmdline_os_unix.c +5 -0
index 64a945a34fb3..5f9839a15f98 100644
@@ -51,3 +51,8 @@ cmdline_vdprintf(int fd, const char *format, va_list op)
 {
 	return vdprintf(fd, format, op);
 }
+
+void
+cmdline_cancel(__rte_unused struct cmdline *cl)
+{
+}
lib/cmdline/cmdline_os_windows.c +14 -0
index 73ed9ba290b8..80863bfc8a00 100644
@@ -203,3 +203,17 @@ cmdline_vdprintf(int fd, const char *format, va_list op)
 
 	return ret;
 }
+
+void
+cmdline_cancel(struct cmdline *cl)
+{
+	if (!cl)
+		return;
+
+	/* force the outstanding read on console to exit */
+	if (cl->oldterm.is_console_input) {
+		HANDLE handle = (HANDLE)_get_osfhandle(cl->s_in);
+
+		CancelIoEx(handle, NULL);
+	}
+}
lib/cmdline/cmdline_private.h +1 -1
index a3271c76934a..7ec42ac3c78f 100644
@@ -24,7 +24,7 @@
 #define RDLINE_HISTORY_MAX_LINE 64
 
 struct rdline {
-	enum rdline_status status;
+	volatile enum rdline_status status;
 	/* rdline bufs */
 	struct cirbuf left;
 	struct cirbuf right;
lib/cmdline/version.map +3 -0
index e3d59aaf8d61..a8a417cd6ff1 100644
@@ -84,5 +84,8 @@ EXPERIMENTAL {
 	# added in 22.07
 	cmdline_parse_check;
 
+	# added in 23.03
+	cmdline_cancel;
+
 	local: *;
 };
Signature · 1 line
2.39.2
#14 lore raw

Re: [PATCH v4 1/2] testpmd: go back to using cmdline_interact

Hi Stephen,

Thank you for having a look at this.

Quoted 89 lines · Stephen Hemminger

The cmdline library poll function is broken on Windows and was never tested, don't use it.

Instead, use sigaction() to cancel read character on Unix OS's and a new helper to cancel I/O on Windows.

Fixes 0fd1386c30c3 ("app/testpmd: cleanup cleanly from signal")

Bugzilla ID: 1180

---
 app/test-pmd/cmdline.c           | 27 ++++++++++++++-------------
 app/test-pmd/testpmd.c           | 11 +++++++++++
 lib/cmdline/cmdline.h            | 10 ++++++++++
 lib/cmdline/cmdline_os_unix.c    |  5 +++++
 lib/cmdline/cmdline_os_windows.c | 14 ++++++++++++++
 lib/cmdline/cmdline_private.h    |  2 +-
 lib/cmdline/version.map          |  3 +++
 7 files changed, 58 insertions(+), 14 deletions(-)
app/test-pmd/cmdline.c +14 -13
index 6fa870dc329b..072437d9bfcf 100644
@@ -66,6 +66,7 @@
 #include "cmdline_tm.h"
 #include "bpf_cmd.h"
 
+static struct cmdline *testpmd_cl;
 static cmdline_parse_ctx_t *main_ctx;
 static TAILQ_HEAD(, testpmd_driver_commands) driver_commands_head =
 	TAILQ_HEAD_INITIALIZER(driver_commands_head);
@@ -13028,26 +13029,26 @@ cmdline_read_from_file(const char *filename)
 	printf("Read CLI commands from %s\n", filename);
 }
 
+void
+prompt_exit(void)
+{
+	cmdline_cancel(testpmd_cl);
+	cmdline_quit(testpmd_cl);
+}
+
 /* prompt function, called from main on MAIN lcore */
 void
 prompt(void)
 {
-	struct cmdline *cl;
-
-	cl = cmdline_stdin_new(main_ctx, "testpmd> ");
-	if (cl == NULL)
+	testpmd_cl = cmdline_stdin_new(main_ctx, "testpmd> ");
+	if (testpmd_cl == NULL) {
+		fprintf(stderr,
+			"Failed to create stdin based cmdline context\n");
 		return;
-
-	/* loop until signal or quit command */
-	while (f_quit == 0 && cl_quit == 0) {
-		int status = cmdline_poll(cl);
-
-		if (status < 0 || status == RDLINE_EXITED)
-			break;
 	}
 
-	cmdline_quit(cl);
-	cmdline_stdin_exit(cl);
+	cmdline_interact(testpmd_cl);
+	cmdline_stdin_exit(testpmd_cl);
 }
 
 void
app/test-pmd/testpmd.c +2 -0
index 2ce19ed47ab4..5cb6f9252395 100644
@@ -4469,6 +4469,7 @@ static void
 signal_handler(int signum __rte_unused)
 {
 	f_quit = 1;
+	prompt_exit();
 }
 
 int
@@ -4479,8 +4480,18 @@ main(int argc, char** argv)
 	uint16_t count;
 	int ret;
 
+#ifdef RTE_EXEC_ENV_WINDOWS
 	signal(SIGINT, signal_handler);

app/test-pmd/testpmd.c main(int argc, char** argv) · line 4494

Quoted 10 lines
app/test-pmd/testpmd.c +9 -0
 	signal(SIGTERM, signal_handler);
+#else
+	/* Want read() not to be restarted on signal */
+	struct sigaction action = {
+		.sa_handler = signal_handler,
+	};
+
+	sigaction(SIGINT, &action, NULL);
+	sigaction(SIGTERM, &action, NULL);
+#endif

If we have to change this in testpmd, we'll have to do the same in other applications.

See my comment in patch 2.

Quoted 11 lines
app/test-pmd/testpmd.c +0 -0
 	testpmd_logtype = rte_log_register("testpmd");
 	if (testpmd_logtype < 0)
lib/cmdline/cmdline.h +0 -0
index b14355ef5121..2a1721cf9712 100644
@@ -60,6 +60,16 @@ int cmdline_poll(struct cmdline *cl);
 void cmdline_interact(struct cmdline *cl);
 void cmdline_quit(struct cmdline *cl);
 

lib/cmdline/cmdline.h int cmdline_poll(struct cmdline *cl); · line 72

Quoted 10 lines
lib/cmdline/cmdline.h +10 -0
+
+/**
+ * This function causes the read() in cmdline_interact to exit.
+ *
+ * @param cl
+ *   The command line object.
+ */
+__rte_experimental
+void cmdline_cancel(struct cmdline *cl);
+

The help says this function causes the read() in cmdline_interact to exit, but the unix implementation is empty.

Maybe we should instead explain in what condition this function must called. Also, shouldn't this function call cmdline_quit() too to avoid the user to do it?

Quoted 67 lines
lib/cmdline/cmdline.h +0 -0
 #ifdef __cplusplus
 }
 #endif
lib/cmdline/cmdline_os_unix.c +5 -0
index 64a945a34fb3..5f9839a15f98 100644
@@ -51,3 +51,8 @@ cmdline_vdprintf(int fd, const char *format, va_list op)
 {
 	return vdprintf(fd, format, op);
 }
+
+void
+cmdline_cancel(__rte_unused struct cmdline *cl)
+{
+}
lib/cmdline/cmdline_os_windows.c +14 -0
index 73ed9ba290b8..80863bfc8a00 100644
@@ -203,3 +203,17 @@ cmdline_vdprintf(int fd, const char *format, va_list op)
 
 	return ret;
 }
+
+void
+cmdline_cancel(struct cmdline *cl)
+{
+	if (!cl)
+		return;
+
+	/* force the outstanding read on console to exit */
+	if (cl->oldterm.is_console_input) {
+		HANDLE handle = (HANDLE)_get_osfhandle(cl->s_in);
+
+		CancelIoEx(handle, NULL);
+	}
+}
lib/cmdline/cmdline_private.h +1 -1
index a3271c76934a..7ec42ac3c78f 100644
@@ -24,7 +24,7 @@
 #define RDLINE_HISTORY_MAX_LINE 64
 
 struct rdline {
-	enum rdline_status status;
+	volatile enum rdline_status status;
 	/* rdline bufs */
 	struct cirbuf left;
 	struct cirbuf right;
lib/cmdline/version.map +3 -0
index e3d59aaf8d61..a8a417cd6ff1 100644
@@ -84,5 +84,8 @@ EXPERIMENTAL {
 	# added in 22.07
 	cmdline_parse_check;
 
+	# added in 23.03
+	cmdline_cancel;
+
 	local: *;
 };
Signature · 1 line
2.39.2
#15 lore raw

Re: [PATCH v4 1/2] testpmd: go back to using cmdline_interact

Quoted 16 lines · On Fri, 17 Mar 2023 17:20:48 +0100 Olivier Matz <[email protected]> wrote:

app/test-pmd/testpmd.c main(int argc, char** argv) · line 4494

Quoted 13 lines
app/test-pmd/testpmd.c +10 -0
+#ifdef RTE_EXEC_ENV_WINDOWS
 	signal(SIGINT, signal_handler);
 	signal(SIGTERM, signal_handler);
+#else
+	/* Want read() not to be restarted on signal */
+	struct sigaction action = {
+		.sa_handler = signal_handler,
+	};
+
+	sigaction(SIGINT, &action, NULL);
+	sigaction(SIGTERM, &action, NULL);
+#endif  

If we have to change this in testpmd, we'll have to do the same in other applications.

The only a couple other program combining signal() and cmdline_interact(). These programs all exit from signal handler and never return from it.

In examples/ntb, the program is using the signal suicide (lets kill myself) model, which will work. Not sure why it bothers just to print a message.

In examples/vdpa, the program is trapping signal and calling close on ports. This is not signal safe, but that is up to the vdpa maintainers to address.

Also, examples/vm_power_management is calling channel_XXX_exit() routines which is not signal safe. Ditto, need the maintainers to address that.

Quoted 10 lines

lib/cmdline/cmdline.h int cmdline_poll(struct cmdline *cl); · line 72

Quoted 3 lines
lib/cmdline/cmdline.h +3 -0
+__rte_experimental
+void cmdline_cancel(struct cmdline *cl);
+  

The help says this function causes the read() in cmdline_interact to exit, but the unix implementation is empty.

Maybe we should instead explain in what condition this function must called. Also, shouldn't this function call cmdline_quit() too to avoid the user to do it?

Prefer to have function not to do implicit quit.

PS: cmdline functions need better documentation.

#16 lore raw

PATCH v4 2/2 testpmd: enable interrupt in interactive mode

In reply to Stephen Hemminger

The setting in terminal handling for both Unix style and Windows was not ensuring that Ctrl-C character would cause interrupt.

This is a first release bug. Testpmd interactive mode has always disabled control-c handling on Linux.

Fixes af75078fece3 ("first public release")
---
 lib/cmdline/cmdline_os_unix.c    | 3 ++-
 lib/cmdline/cmdline_os_windows.c | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)
lib/cmdline/cmdline_os_unix.c +2 -1
index 5f9839a15f98..356c5b3f3ca2 100644
@@ -16,7 +16,8 @@ terminal_adjust(struct cmdline *cl)
 	tcgetattr(0, &cl->oldterm);
 
 	memcpy(&term, &cl->oldterm, sizeof(term));
-	term.c_lflag &= ~(ICANON | ECHO | ISIG);
+	term.c_lflag &= ~(ICANON | ECHO);
+	term.c_lflag |= ISIG;
 	tcsetattr(0, TCSANOW, &term);
 
 	setbuf(stdin, NULL);
lib/cmdline/cmdline_os_windows.c +2 -2
index 80863bfc8a00..8cff3b175747 100644
@@ -32,10 +32,10 @@ terminal_adjust(struct cmdline *cl)
 		mode &= ~(
 			ENABLE_LINE_INPUT |      /* no line buffering */
 			ENABLE_ECHO_INPUT |      /* no echo */
-			ENABLE_PROCESSED_INPUT | /* pass Ctrl+C to program */
 			ENABLE_MOUSE_INPUT |     /* no mouse events */
 			ENABLE_WINDOW_INPUT);    /* no window resize events */
-		mode |= ENABLE_VIRTUAL_TERMINAL_INPUT;
+		mode |= ENABLE_VIRTUAL_TERMINAL_INPUT |
+			ENABLE_PROCESSED_INPUT; /* Ctrl C processed by the system */
 		SetConsoleMode(handle, mode);
 	}
 
Signature · 1 line
2.39.2
#17 lore raw

Re: [PATCH v4 2/2] testpmd: enable interrupt in interactive mode

Quoted 6 lines · Stephen Hemminger

The setting in terminal handling for both Unix style and Windows was not ensuring that Ctrl-C character would cause interrupt.

This is a first release bug. Testpmd interactive mode has always disabled control-c handling on Linux.

This was a design choice, not a bug. This design choice is discussable today (at that time, dpdk was also running in baremetal without signals or interrupt). The idea was to behave like a shell, i.e. ctrl-c just clears the current line.

We may want to change this behavior (I remember an old discussion where Bruce stated that he would prefer ctrl-c to kill the program), but it will have an impact on all cmdline users, so to me it has to be announced.

Quoted 42 lines
Fixes af75078fece3 ("first public release")
---
 lib/cmdline/cmdline_os_unix.c    | 3 ++-
 lib/cmdline/cmdline_os_windows.c | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)
lib/cmdline/cmdline_os_unix.c +2 -1
index 5f9839a15f98..356c5b3f3ca2 100644
@@ -16,7 +16,8 @@ terminal_adjust(struct cmdline *cl)
 	tcgetattr(0, &cl->oldterm);
 
 	memcpy(&term, &cl->oldterm, sizeof(term));
-	term.c_lflag &= ~(ICANON | ECHO | ISIG);
+	term.c_lflag &= ~(ICANON | ECHO);
+	term.c_lflag |= ISIG;
 	tcsetattr(0, TCSANOW, &term);
 
 	setbuf(stdin, NULL);
lib/cmdline/cmdline_os_windows.c +2 -2
index 80863bfc8a00..8cff3b175747 100644
@@ -32,10 +32,10 @@ terminal_adjust(struct cmdline *cl)
 		mode &= ~(
 			ENABLE_LINE_INPUT |      /* no line buffering */
 			ENABLE_ECHO_INPUT |      /* no echo */
-			ENABLE_PROCESSED_INPUT | /* pass Ctrl+C to program */
 			ENABLE_MOUSE_INPUT |     /* no mouse events */
 			ENABLE_WINDOW_INPUT);    /* no window resize events */
-		mode |= ENABLE_VIRTUAL_TERMINAL_INPUT;
+		mode |= ENABLE_VIRTUAL_TERMINAL_INPUT |
+			ENABLE_PROCESSED_INPUT; /* Ctrl C processed by the system */
 		SetConsoleMode(handle, mode);
 	}
 
Signature · 1 line
2.39.2
#18 lore raw

Re: [PATCH v4 2/2] testpmd: enable interrupt in interactive mode

Quoted 13 lines · On Fri, 17 Mar 2023 17:20:59 +0100 Olivier Matz <[email protected]> wrote:
Quoted 6 lines · Stephen Hemminger

The setting in terminal handling for both Unix style and Windows was not ensuring that Ctrl-C character would cause interrupt.

This is a first release bug. Testpmd interactive mode has always disabled control-c handling on Linux.

This was a design choice, not a bug. This design choice is discussable today (at that time, dpdk was also running in baremetal without signals or interrupt). The idea was to behave like a shell, i.e. ctrl-c just clears the current line.

Quoted 4 lines

We may want to change this behavior (I remember an old discussion where Bruce stated that he would prefer ctrl-c to kill the program), but it will have an impact on all cmdline users, so to me it has to be announced.

Ok, my motivation was to be able to test interrupt in testpmd interactive mode. Without this change, it requires sending SIGINT from another process. Plus almost all programs that have an interactive mode accept control-c to interrupt.

I split this patch off since it doesn't impact the bugfix around testpmd and interrupts.

Tested-by on the v4 series
#19 lore raw

RE: [PATCH v4 0/2] Fix testpmd interrupt regression

In reply to Stephen Hemminger
Quoted 22 lines

External email: Use caution opening links or attachments

Resolve issues from using control-C in testpmd. Fixes regression from recent change to use cmdline_poll().

v4 - drop sig_atomic_t. Not required requires changes on
some platforms.

Stephen Hemminger (2):
testpmd: go back to using cmdline_interact
testpmd: enable interrupt in interactive mode

 app/test-pmd/cmdline.c           | 27 ++++++++++++++-------------
 app/test-pmd/testpmd.c           | 11 +++++++++++
 lib/cmdline/cmdline.h            | 10 ++++++++++
 lib/cmdline/cmdline_os_unix.c    |  8 +++++++-
 lib/cmdline/cmdline_os_windows.c | 18 ++++++++++++++++--
 lib/cmdline/cmdline_private.h    |  2 +-
 lib/cmdline/version.map          |  3 +++
 7 files changed, 62 insertions(+), 17 deletions(-)
Quoted 2 lines

--
2.39.2

Confirming that this patch fixes Bug: 1180 over Windows. And CTRL-C works as expected.

#20 lore raw

Re: [PATCH v4 0/2] Fix testpmd interrupt regression

In reply to Stephen Hemminger
Quoted 10 lines · Stephen Hemminger

Resolve issues from using control-C in testpmd. Fixes regression from recent change to use cmdline_poll().

v4 - drop sig_atomic_t. Not required requires changes on
some platforms.

Stephen Hemminger (2):
testpmd: go back to using cmdline_interact
testpmd: enable interrupt in interactive mode

Quoted 9 lines
 app/test-pmd/cmdline.c           | 27 ++++++++++++++-------------
 app/test-pmd/testpmd.c           | 11 +++++++++++
 lib/cmdline/cmdline.h            | 10 ++++++++++
 lib/cmdline/cmdline_os_unix.c    |  8 +++++++-
 lib/cmdline/cmdline_os_windows.c | 18 ++++++++++++++++--
 lib/cmdline/cmdline_private.h    |  2 +-
 lib/cmdline/version.map          |  3 +++
 7 files changed, 62 insertions(+), 17 deletions(-)

This solution is adding new cmdline API for -rc3 and there are some testpmd changes,
can it be possible to have a simple workaround specific to window for this release and get this set for next release?

#21 lore raw

Re: [PATCH v4 0/2] Fix testpmd interrupt regression

Quoted 21 lines · On Thu, 16 Mar 2023 12:20:41 +0000 Ferruh Yigit <[email protected]> wrote:
Quoted 10 lines · Stephen Hemminger

Resolve issues from using control-C in testpmd. Fixes regression from recent change to use cmdline_poll().

v4 - drop sig_atomic_t. Not required requires changes on
some platforms.

Stephen Hemminger (2):
testpmd: go back to using cmdline_interact
testpmd: enable interrupt in interactive mode

Quoted 9 lines
 app/test-pmd/cmdline.c           | 27 ++++++++++++++-------------
 app/test-pmd/testpmd.c           | 11 +++++++++++
 lib/cmdline/cmdline.h            | 10 ++++++++++
 lib/cmdline/cmdline_os_unix.c    |  8 +++++++-
 lib/cmdline/cmdline_os_windows.c | 18 ++++++++++++++++--
 lib/cmdline/cmdline_private.h    |  2 +-
 lib/cmdline/version.map          |  3 +++
 7 files changed, 62 insertions(+), 17 deletions(-)
Quoted 4 lines

This solution is adding new cmdline API for -rc3 and there are some testpmd changes,
can it be possible to have a simple workaround specific to window for this release and get this set for next release?

Not really. cmdline_poll() is broken in several ways. Don't want to fix it or use it.

#22 lore raw

Re: [PATCH v4 0/2] Fix testpmd interrupt regression

Quoted 24 lines · Stephen Hemminger
Quoted 21 lines · On Thu, 16 Mar 2023 12:20:41 +0000 Ferruh Yigit <[email protected]> wrote:
Quoted 19 lines · Stephen Hemminger

Resolve issues from using control-C in testpmd. Fixes regression from recent change to use cmdline_poll().

v4 - drop sig_atomic_t. Not required requires changes on
some platforms.

Stephen Hemminger (2):
testpmd: go back to using cmdline_interact
testpmd: enable interrupt in interactive mode

 app/test-pmd/cmdline.c           | 27 ++++++++++++++-------------
 app/test-pmd/testpmd.c           | 11 +++++++++++
 lib/cmdline/cmdline.h            | 10 ++++++++++
 lib/cmdline/cmdline_os_unix.c    |  8 +++++++-
 lib/cmdline/cmdline_os_windows.c | 18 ++++++++++++++++--
 lib/cmdline/cmdline_private.h    |  2 +-
 lib/cmdline/version.map          |  3 +++
 7 files changed, 62 insertions(+), 17 deletions(-)
Quoted 8 lines
Quoted 4 lines

This solution is adding new cmdline API for -rc3 and there are some testpmd changes,
can it be possible to have a simple workaround specific to window for this release and get this set for next release?

Not really. cmdline_poll() is broken in several ways. Don't want to fix it or use it.

What about to revert the original fix [^1] in this release and get a new version of it at early next release?

@Thomas, what do you think? I think better to decide before -rc3.

[^1]
Fixes 0fd1386c30c3 ("app/testpmd: cleanup cleanly from signal")
#23 lore raw

Re: [PATCH v4 0/2] Fix testpmd interrupt regression

16/03/2023 18:01, Ferruh Yigit:

Quoted 31 lines · Stephen Hemminger
Quoted 30 lines
Quoted 25 lines · On Thu, 16 Mar 2023 12:20:41 +0000 Ferruh Yigit <[email protected]> wrote:
Quoted 10 lines · Stephen Hemminger

Resolve issues from using control-C in testpmd. Fixes regression from recent change to use cmdline_poll().

v4 - drop sig_atomic_t. Not required requires changes on
some platforms.

Stephen Hemminger (2):
testpmd: go back to using cmdline_interact
testpmd: enable interrupt in interactive mode

Quoted 9 lines
 app/test-pmd/cmdline.c           | 27 ++++++++++++++-------------
 app/test-pmd/testpmd.c           | 11 +++++++++++
 lib/cmdline/cmdline.h            | 10 ++++++++++
 lib/cmdline/cmdline_os_unix.c    |  8 +++++++-
 lib/cmdline/cmdline_os_windows.c | 18 ++++++++++++++++--
 lib/cmdline/cmdline_private.h    |  2 +-
 lib/cmdline/version.map          |  3 +++
 7 files changed, 62 insertions(+), 17 deletions(-)

This solution is adding new cmdline API for -rc3 and there are some testpmd changes,
can it be possible to have a simple workaround specific to window for this release and get this set for next release?

Quoted 7 lines
Quoted 2 lines

Not really. cmdline_poll() is broken in several ways. Don't want to fix it or use it.

What about to revert the original fix [^1] in this release and get a new version of it at early next release?

@Thomas, what do you think? I think better to decide before -rc3.

We should not add risky changes at this stage.
Also I would prefer to see a review from Olivier, the cmdline maintainer.

The reason of this breakage was a cleanup.
I think it is more reasonnable to revert.

#24 lore raw

Re: [PATCH v4 0/2] Fix testpmd interrupt regression

Quoted 38 lines · Thomas Monjalon

16/03/2023 18:01, Ferruh Yigit:

Quoted 37 lines · Stephen Hemminger
Quoted 24 lines
Quoted 21 lines · On Thu, 16 Mar 2023 12:20:41 +0000 Ferruh Yigit <[email protected]> wrote:
Quoted 19 lines · Stephen Hemminger

Resolve issues from using control-C in testpmd. Fixes regression from recent change to use cmdline_poll().

v4 - drop sig_atomic_t. Not required requires changes on
some platforms.

Stephen Hemminger (2):
testpmd: go back to using cmdline_interact
testpmd: enable interrupt in interactive mode

 app/test-pmd/cmdline.c           | 27 ++++++++++++++-------------
 app/test-pmd/testpmd.c           | 11 +++++++++++
 lib/cmdline/cmdline.h            | 10 ++++++++++
 lib/cmdline/cmdline_os_unix.c    |  8 +++++++-
 lib/cmdline/cmdline_os_windows.c | 18 ++++++++++++++++--
 lib/cmdline/cmdline_private.h    |  2 +-
 lib/cmdline/version.map          |  3 +++
 7 files changed, 62 insertions(+), 17 deletions(-)
Quoted 8 lines
Quoted 4 lines

This solution is adding new cmdline API for -rc3 and there are some testpmd changes,
can it be possible to have a simple workaround specific to window for this release and get this set for next release?

Not really. cmdline_poll() is broken in several ways. Don't want to fix it or use it.

What about to revert the original fix [^1] in this release and get a new version of it at early next release?

Quoted 9 lines
Quoted 1 line

@Thomas, what do you think? I think better to decide before -rc3.

We should not add risky changes at this stage.
Also I would prefer to see a review from Olivier, the cmdline maintainer.

The reason of this breakage was a cleanup.
I think it is more reasonnable to revert.

Sent a revert patch [^1], and assigned to Thomas.

[^1]
https://patches.dpdk.org/project/dpdk/patch/[email protected]/

#25 lore raw

PATCH 1/1 app/testpmd: revert cleanup cleanly from signal

In reply to Stephen Hemminger

This reverts commit 0fd1386c30c3ad9365d7fdd2829bf7cb2e1b9dff.

Because of reported issues on Windows [1] and it is risky to fix it at this stage, fixed feature will be considered in next version.

[1]
Bugzilla ID: 1180

---
Cc: Stephen Hemminger <[email protected]>
Cc: Pier Damouny <[email protected]>

---
 app/test-pmd/cmdline.c | 29 ++++++++++------
 app/test-pmd/testpmd.c | 77 ++++++++++++++++++++++--------------------
 app/test-pmd/testpmd.h |  1 -
 3 files changed, 59 insertions(+), 48 deletions(-)
app/test-pmd/cmdline.c +18 -11
index 6fa870dc329b..02c72d06b768 100644
@@ -66,6 +66,7 @@
 #include "cmdline_tm.h"
 #include "bpf_cmd.h"
 
+static struct cmdline *testpmd_cl;
 static cmdline_parse_ctx_t *main_ctx;
 static TAILQ_HEAD(, testpmd_driver_commands) driver_commands_head =
 	TAILQ_HEAD_INITIALIZER(driver_commands_head);
@@ -13032,22 +13033,28 @@ cmdline_read_from_file(const char *filename)
 void
 prompt(void)
 {
-	struct cmdline *cl;
+	int ret;
 
-	cl = cmdline_stdin_new(main_ctx, "testpmd> ");
-	if (cl == NULL)
+	testpmd_cl = cmdline_stdin_new(main_ctx, "testpmd> ");
+	if (testpmd_cl == NULL)
 		return;
 
-	/* loop until signal or quit command */
-	while (f_quit == 0 && cl_quit == 0) {
-		int status = cmdline_poll(cl);
+	ret = atexit(prompt_exit);
+	if (ret != 0)
+		fprintf(stderr, "Cannot set exit function for cmdline\n");
 
-		if (status < 0 || status == RDLINE_EXITED)
-			break;
-	}
+	cmdline_interact(testpmd_cl);
+	if (ret != 0)
+		cmdline_stdin_exit(testpmd_cl);
+}
 
-	cmdline_quit(cl);
-	cmdline_stdin_exit(cl);
+void
+prompt_exit(void)
+{
+	if (testpmd_cl != NULL) {
+		cmdline_quit(testpmd_cl);
+		cmdline_stdin_exit(testpmd_cl);
+	}
 }
 
 void
app/test-pmd/testpmd.c +41 -36

119 lines not on this page · raw message

app/test-pmd/testpmd.h +0 -1
index bdfbfd36d3c5..b9215720b615 100644
@@ -34,7 +34,6 @@
 #define RTE_PORT_HANDLING       (uint16_t)3
 
 extern uint8_t cl_quit;
-extern volatile uint8_t f_quit;
 
 /*
  * It is used to allocate the memory for hash key.
Signature · 1 line
2.34.1
#26 lore raw

PATCH v5 1/1 testpmd: go back to using cmdline_interact

In reply to Stephen Hemminger

The cmdline_poll() function is broken and was
not fully tested, don't use it.

Instead, use sigaction() to cancel read character on Unix OS's and a new helper to cancel I/O on Windows.

Fixes 0fd1386c30c3 ("app/testpmd: cleanup cleanly from signal")

Bugzilla ID: 1180

---
v5 - Do not need to expose cmdline_cancel() as user api
can make cmdline_quit() do it.

Change to control C handling is separate issue and should be discussed more.

 app/test-pmd/cmdline.c           | 26 +++++++++++++-------------
 app/test-pmd/testpmd.c           | 11 +++++++++++
 lib/cmdline/cmdline.c            |  1 +
 lib/cmdline/cmdline_os_unix.c    |  6 ++++++
 lib/cmdline/cmdline_os_windows.c | 14 ++++++++++++++
 lib/cmdline/cmdline_private.h    |  5 ++++-
 6 files changed, 49 insertions(+), 14 deletions(-)
app/test-pmd/cmdline.c +13 -13
index 6fa870dc329b..7b20bef4e9ba 100644
@@ -66,6 +66,7 @@
 #include "cmdline_tm.h"
 #include "bpf_cmd.h"
 
+static struct cmdline *testpmd_cl;
 static cmdline_parse_ctx_t *main_ctx;
 static TAILQ_HEAD(, testpmd_driver_commands) driver_commands_head =
 	TAILQ_HEAD_INITIALIZER(driver_commands_head);
@@ -13028,26 +13029,25 @@ cmdline_read_from_file(const char *filename)
 	printf("Read CLI commands from %s\n", filename);
 }
 
+void
+prompt_exit(void)
+{
+	cmdline_quit(testpmd_cl);
+}
+
 /* prompt function, called from main on MAIN lcore */
 void
 prompt(void)
 {
-	struct cmdline *cl;
-
-	cl = cmdline_stdin_new(main_ctx, "testpmd> ");
-	if (cl == NULL)
+	testpmd_cl = cmdline_stdin_new(main_ctx, "testpmd> ");
+	if (testpmd_cl == NULL) {
+		fprintf(stderr,
+			"Failed to create stdin based cmdline context\n");
 		return;
-
-	/* loop until signal or quit command */
-	while (f_quit == 0 && cl_quit == 0) {
-		int status = cmdline_poll(cl);
-
-		if (status < 0 || status == RDLINE_EXITED)
-			break;
 	}
 
-	cmdline_quit(cl);
-	cmdline_stdin_exit(cl);
+	cmdline_interact(testpmd_cl);
+	cmdline_stdin_exit(testpmd_cl);
 }
 
 void
app/test-pmd/testpmd.c +11 -0
index 2ce19ed47ab4..5cb6f9252395 100644
@@ -4469,6 +4469,7 @@ static void
 signal_handler(int signum __rte_unused)
 {
 	f_quit = 1;
+	prompt_exit();
 }
 
 int
@@ -4479,8 +4480,18 @@ main(int argc, char** argv)
 	uint16_t count;
 	int ret;
 
+#ifdef RTE_EXEC_ENV_WINDOWS
 	signal(SIGINT, signal_handler);
 	signal(SIGTERM, signal_handler);
+#else
+	/* Want read() not to be restarted on signal */
+	struct sigaction action = {
+		.sa_handler = signal_handler,
+	};
+
+	sigaction(SIGINT, &action, NULL);
+	sigaction(SIGTERM, &action, NULL);
+#endif
 
 	testpmd_logtype = rte_log_register("testpmd");
 	if (testpmd_logtype < 0)
lib/cmdline/cmdline.c +1 -0
index 8ad0690d8533..355c7d8ca635 100644
@@ -173,6 +173,7 @@ cmdline_quit(struct cmdline *cl)
 {
 	if (!cl)
 		return;
+	cmdline_cancel(cl);
 	rdline_quit(&cl->rdl);
 }
 
lib/cmdline/cmdline_os_unix.c +6 -0
index 64a945a34fb3..9a4ec4e33477 100644
@@ -51,3 +51,9 @@ cmdline_vdprintf(int fd, const char *format, va_list op)
 {
 	return vdprintf(fd, format, op);
 }
+
+/* This function is not needed on Linux, instead use sigaction() */
+void
+cmdline_cancel(__rte_unused struct cmdline *cl)
+{
+}
lib/cmdline/cmdline_os_windows.c +14 -0
index 73ed9ba290b8..80863bfc8a00 100644
@@ -203,3 +203,17 @@ cmdline_vdprintf(int fd, const char *format, va_list op)
 
 	return ret;
 }
+
+void
+cmdline_cancel(struct cmdline *cl)
+{
+	if (!cl)
+		return;
+
+	/* force the outstanding read on console to exit */
+	if (cl->oldterm.is_console_input) {
+		HANDLE handle = (HANDLE)_get_osfhandle(cl->s_in);
+
+		CancelIoEx(handle, NULL);
+	}
+}
lib/cmdline/cmdline_private.h +4 -1
index a3271c76934a..86a46cdea61a 100644
@@ -24,7 +24,7 @@
 #define RDLINE_HISTORY_MAX_LINE 64
 
 struct rdline {
-	enum rdline_status status;
+	volatile enum rdline_status status;
 	/* rdline bufs */
 	struct cirbuf left;
 	struct cirbuf right;
@@ -90,6 +90,9 @@ int cmdline_poll_char(struct cmdline *cl);
 /* Read one character from input. */
 ssize_t cmdline_read_char(struct cmdline *cl, char *c);
 
+/* Force current cmdline read to unblock. */
+void cmdline_cancel(struct cmdline *cl);
+
 /* vdprintf(3) */
 __rte_format_printf(2, 0)
 int cmdline_vdprintf(int fd, const char *format, va_list op);
Signature · 1 line
2.39.2
Acked-by on v5 1/1
#27 lore raw

Re: [PATCH v5] testpmd: go back to using cmdline_interact

Quoted 9 lines · Stephen Hemminger

The cmdline_poll() function is broken and was
not fully tested, don't use it.

Instead, use sigaction() to cancel read character on Unix OS's and a new helper to cancel I/O on Windows.

Fixes 0fd1386c30c3 ("app/testpmd: cleanup cleanly from signal")

Bugzilla ID: 1180

Thank you

#28 lore raw

Re: [PATCH v5] testpmd: go back to using cmdline_interact

17/03/2023 22:12, Olivier Matz:

Quoted 7 lines · Stephen Hemminger
Quoted 6 lines

The cmdline_poll() function is broken and was
not fully tested, don't use it.

Instead, use sigaction() to cancel read character on Unix OS's and a new helper to cancel I/O on Windows.

Quoted 7 lines
Quoted 3 lines
Fixes 0fd1386c30c3 ("app/testpmd: cleanup cleanly from signal")

Bugzilla ID: 1180

Thank you

Applied, thanks.
I hope we won't have new issues with testpmd in -rc3.