diff mbox series

[v4,1/2] telemetry: fix missing check for thread creation

Message ID 1618561106-26716-2-git-send-email-humin29@huawei.com (mailing list archive)
State Accepted
Delegated to: David Marchand
Headers show
Series fix missing check for thread creation | expand

Checks

Context Check Description
ci/checkpatch success coding style OK

Commit Message

Min Hu (Connor) April 16, 2021, 8:18 a.m. UTC
From: Chengwen Feng <fengchengwen@huawei.com>

Add result check and message print out for thread creation after
failure.

Fixes: b80fe1805eee ("telemetry: introduce backward compatibility")
Cc: stable@dpdk.org

Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
---
 lib/librte_telemetry/telemetry.c        | 37 ++++++++++++++++++++++++++++++---
 lib/librte_telemetry/telemetry_legacy.c | 11 ++++++++--
 2 files changed, 43 insertions(+), 5 deletions(-)

Comments

Power, Ciara April 19, 2021, 8:49 a.m. UTC | #1
Hi Connor,

>-----Original Message-----
>From: Min Hu (Connor) <humin29@huawei.com>
>Sent: Friday 16 April 2021 09:18
>To: dev@dpdk.org
>Cc: Yigit, Ferruh <ferruh.yigit@intel.com>; Power, Ciara
><ciara.power@intel.com>; Pattan, Reshma <reshma.pattan@intel.com>;
>david.marchand@redhat.com
>Subject: [PATCH v4 1/2] telemetry: fix missing check for thread creation
>
>From: Chengwen Feng <fengchengwen@huawei.com>
>
>Add result check and message print out for thread creation after failure.
>
>Fixes: b80fe1805eee ("telemetry: introduce backward compatibility")
>Cc: stable@dpdk.org
>
>Signed-off-by: Chengwen Feng <fengchengwen@huawei.com>
>Signed-off-by: Min Hu (Connor) <humin29@huawei.com>
>---
> lib/librte_telemetry/telemetry.c        | 37
>++++++++++++++++++++++++++++++---
> lib/librte_telemetry/telemetry_legacy.c | 11 ++++++++--
> 2 files changed, 43 insertions(+), 5 deletions(-)
>
>diff --git a/lib/librte_telemetry/telemetry.c
>b/lib/librte_telemetry/telemetry.c
>index 7e08afd..08ce189 100644
>--- a/lib/librte_telemetry/telemetry.c
>+++ b/lib/librte_telemetry/telemetry.c
>@@ -350,6 +350,7 @@ socket_listener(void *socket)  {
> 	while (1) {
> 		pthread_t th;
>+		int rc;
> 		struct socket *s = (struct socket *)socket;
> 		int s_accepted = accept(s->sock, NULL, NULL);
> 		if (s_accepted < 0) {
>@@ -366,7 +367,17 @@ socket_listener(void *socket)
> 			__atomic_add_fetch(s->num_clients, 1,
> 					__ATOMIC_RELAXED);
> 		}
>-		pthread_create(&th, NULL, s->fn, (void
>*)(uintptr_t)s_accepted);
>+		rc = pthread_create(&th, NULL, s->fn,
>+				    (void *)(uintptr_t)s_accepted);
>+		if (rc != 0) {
>+			TMTY_LOG(ERR, "Error with create client thread:
>%s\n",
>+				 strerror(rc));
>+			close(s_accepted);
>+			if (s->num_clients != NULL)
>+				__atomic_sub_fetch(s->num_clients, 1,
>+						   __ATOMIC_RELAXED);
>+			continue;
>+		}
> 		pthread_detach(th);
> 	}
> 	return NULL;
>@@ -425,6 +436,7 @@ static int
> telemetry_legacy_init(void)
> {
> 	pthread_t t_old;
>+	int rc;
>
> 	if (num_legacy_callbacks == 1) {
> 		TMTY_LOG(WARNING, "No legacy callbacks, legacy socket
>not created\n"); @@ -440,7 +452,16 @@ telemetry_legacy_init(void)
> 	v1_socket.sock = create_socket(v1_socket.path);
> 	if (v1_socket.sock < 0)
> 		return -1;
>-	pthread_create(&t_old, NULL, socket_listener, &v1_socket);
>+	rc = pthread_create(&t_old, NULL, socket_listener, &v1_socket);
>+	if (rc != 0) {
>+		TMTY_LOG(ERR, "Error with create legcay socket thread:
>%s\n",
>+			 strerror(rc));
>+		close(v1_socket.sock);
>+		v1_socket.sock = -1;
>+		unlink(v1_socket.path);
>+		v1_socket.path[0] = '\0';
>+		return -1;
>+	}
> 	pthread_setaffinity_np(t_old, sizeof(*thread_cpuset), thread_cpuset);
>
> 	TMTY_LOG(DEBUG, "Legacy telemetry socket initialized ok\n"); @@
>-451,6 +472,7 @@ static int
> telemetry_v2_init(void)
> {
> 	pthread_t t_new;
>+	int rc;
>
> 	v2_socket.num_clients = &v2_clients;
> 	rte_telemetry_register_cmd("/", list_commands, @@ -469,7 +491,16
>@@ telemetry_v2_init(void)
> 	v2_socket.sock = create_socket(v2_socket.path);
> 	if (v2_socket.sock < 0)
> 		return -1;
>-	pthread_create(&t_new, NULL, socket_listener, &v2_socket);
>+	rc = pthread_create(&t_new, NULL, socket_listener, &v2_socket);
>+	if (rc != 0) {
>+		TMTY_LOG(ERR, "Error with create socket thread: %s\n",
>+			 strerror(rc));
>+		close(v2_socket.sock);
>+		v2_socket.sock = -1;
>+		unlink(v2_socket.path);
>+		v2_socket.path[0] = '\0';
>+		return -1;
>+	}
> 	pthread_setaffinity_np(t_new, sizeof(*thread_cpuset),
>thread_cpuset);
> 	atexit(unlink_sockets);
>
>diff --git a/lib/librte_telemetry/telemetry_legacy.c
>b/lib/librte_telemetry/telemetry_legacy.c
>index 5e9af37..b7cd1bd 100644
>--- a/lib/librte_telemetry/telemetry_legacy.c
>+++ b/lib/librte_telemetry/telemetry_legacy.c
>@@ -83,6 +83,7 @@ register_client(const char *cmd __rte_unused, const
>char *params,
> 	pthread_t th;
> 	char data[BUF_SIZE];
> 	int fd;
>+	int rc;
> 	struct sockaddr_un addrs;
> #endif /* !RTE_EXEC_ENV_WINDOWS */
>
>@@ -112,8 +113,14 @@ register_client(const char *cmd __rte_unused,
>const char *params,
> 		close(fd);
> 		return -1;
> 	}
>-	pthread_create(&th, NULL, &legacy_client_handler,
>-			(void *)(uintptr_t)fd);
>+	rc = pthread_create(&th, NULL, &legacy_client_handler,
>+				(void *)(uintptr_t)fd);
>+	if (rc != 0) {
>+		fprintf(stderr, "Failed to create legacy client thread: %s\n",
>+			strerror(rc));
>+		close(fd);
>+		return -1;
>+	}
> #endif /* !RTE_EXEC_ENV_WINDOWS */
> 	return 0;
> }
>--
>2.7.4

I think there is a Fixes tag missing for commit:
Fixes: 6dd571fd07c3 ("telemetry: introduce new functionality")

With that added in, the code changes look good to me,
Acked-by: Ciara Power <ciara.power@intel.com> 

Thanks!
diff mbox series

Patch

diff --git a/lib/librte_telemetry/telemetry.c b/lib/librte_telemetry/telemetry.c
index 7e08afd..08ce189 100644
--- a/lib/librte_telemetry/telemetry.c
+++ b/lib/librte_telemetry/telemetry.c
@@ -350,6 +350,7 @@  socket_listener(void *socket)
 {
 	while (1) {
 		pthread_t th;
+		int rc;
 		struct socket *s = (struct socket *)socket;
 		int s_accepted = accept(s->sock, NULL, NULL);
 		if (s_accepted < 0) {
@@ -366,7 +367,17 @@  socket_listener(void *socket)
 			__atomic_add_fetch(s->num_clients, 1,
 					__ATOMIC_RELAXED);
 		}
-		pthread_create(&th, NULL, s->fn, (void *)(uintptr_t)s_accepted);
+		rc = pthread_create(&th, NULL, s->fn,
+				    (void *)(uintptr_t)s_accepted);
+		if (rc != 0) {
+			TMTY_LOG(ERR, "Error with create client thread: %s\n",
+				 strerror(rc));
+			close(s_accepted);
+			if (s->num_clients != NULL)
+				__atomic_sub_fetch(s->num_clients, 1,
+						   __ATOMIC_RELAXED);
+			continue;
+		}
 		pthread_detach(th);
 	}
 	return NULL;
@@ -425,6 +436,7 @@  static int
 telemetry_legacy_init(void)
 {
 	pthread_t t_old;
+	int rc;
 
 	if (num_legacy_callbacks == 1) {
 		TMTY_LOG(WARNING, "No legacy callbacks, legacy socket not created\n");
@@ -440,7 +452,16 @@  telemetry_legacy_init(void)
 	v1_socket.sock = create_socket(v1_socket.path);
 	if (v1_socket.sock < 0)
 		return -1;
-	pthread_create(&t_old, NULL, socket_listener, &v1_socket);
+	rc = pthread_create(&t_old, NULL, socket_listener, &v1_socket);
+	if (rc != 0) {
+		TMTY_LOG(ERR, "Error with create legcay socket thread: %s\n",
+			 strerror(rc));
+		close(v1_socket.sock);
+		v1_socket.sock = -1;
+		unlink(v1_socket.path);
+		v1_socket.path[0] = '\0';
+		return -1;
+	}
 	pthread_setaffinity_np(t_old, sizeof(*thread_cpuset), thread_cpuset);
 
 	TMTY_LOG(DEBUG, "Legacy telemetry socket initialized ok\n");
@@ -451,6 +472,7 @@  static int
 telemetry_v2_init(void)
 {
 	pthread_t t_new;
+	int rc;
 
 	v2_socket.num_clients = &v2_clients;
 	rte_telemetry_register_cmd("/", list_commands,
@@ -469,7 +491,16 @@  telemetry_v2_init(void)
 	v2_socket.sock = create_socket(v2_socket.path);
 	if (v2_socket.sock < 0)
 		return -1;
-	pthread_create(&t_new, NULL, socket_listener, &v2_socket);
+	rc = pthread_create(&t_new, NULL, socket_listener, &v2_socket);
+	if (rc != 0) {
+		TMTY_LOG(ERR, "Error with create socket thread: %s\n",
+			 strerror(rc));
+		close(v2_socket.sock);
+		v2_socket.sock = -1;
+		unlink(v2_socket.path);
+		v2_socket.path[0] = '\0';
+		return -1;
+	}
 	pthread_setaffinity_np(t_new, sizeof(*thread_cpuset), thread_cpuset);
 	atexit(unlink_sockets);
 
diff --git a/lib/librte_telemetry/telemetry_legacy.c b/lib/librte_telemetry/telemetry_legacy.c
index 5e9af37..b7cd1bd 100644
--- a/lib/librte_telemetry/telemetry_legacy.c
+++ b/lib/librte_telemetry/telemetry_legacy.c
@@ -83,6 +83,7 @@  register_client(const char *cmd __rte_unused, const char *params,
 	pthread_t th;
 	char data[BUF_SIZE];
 	int fd;
+	int rc;
 	struct sockaddr_un addrs;
 #endif /* !RTE_EXEC_ENV_WINDOWS */
 
@@ -112,8 +113,14 @@  register_client(const char *cmd __rte_unused, const char *params,
 		close(fd);
 		return -1;
 	}
-	pthread_create(&th, NULL, &legacy_client_handler,
-			(void *)(uintptr_t)fd);
+	rc = pthread_create(&th, NULL, &legacy_client_handler,
+				(void *)(uintptr_t)fd);
+	if (rc != 0) {
+		fprintf(stderr, "Failed to create legacy client thread: %s\n",
+			strerror(rc));
+		close(fd);
+		return -1;
+	}
 #endif /* !RTE_EXEC_ENV_WINDOWS */
 	return 0;
 }