From patchwork Thu Apr 19 06:01:08 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnon Warshavsky X-Patchwork-Id: 38459 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 02D377CB1; Thu, 19 Apr 2018 08:01:55 +0200 (CEST) Received: from mta.qwilt.com (mta.qwilt.com [52.9.191.255]) by dpdk.org (Postfix) with ESMTP id 124A47272 for ; Thu, 19 Apr 2018 08:01:47 +0200 (CEST) Received: from localhost (localhost [127.0.0.1]) by mta.qwilt.com (Postfix) with ESMTP id 58F058070A1; Thu, 19 Apr 2018 06:01:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at qwilt.com Received: from mta.qwilt.com ([127.0.0.1]) by localhost (mta.qwilt.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lp5yy8ObvQVj; Thu, 19 Apr 2018 06:01:45 +0000 (UTC) Received: from rd01.it.qwilt.com.qwilt.com (80.179.204.39.cable.012.net.il [80.179.204.39]) by mta.qwilt.com (Postfix) with ESMTPSA id E82DB8070AF; Thu, 19 Apr 2018 06:01:42 +0000 (UTC) From: Arnon Warshavsky To: thomas@monjalon.net, anatoly.burakov@intel.com, wenzhuo.lu@intel.com, declan.doherty@intel.com, jerin.jacob@caviumnetworks.com, bruce.richardson@intel.com, ferruh.yigit@intel.com Cc: dev@dpdk.org, arnon@qwilt.com Date: Thu, 19 Apr 2018 09:01:08 +0300 Message-Id: <1524117669-25729-11-git-send-email-arnon@qwilt.com> X-Mailer: git-send-email 1.8.3.1 In-Reply-To: <1524117669-25729-1-git-send-email-arnon@qwilt.com> References: <1524117669-25729-1-git-send-email-arnon@qwilt.com> Subject: [dpdk-dev] [PATCH v4 10/11] eal: replace rte_panic instances in init sequence X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Local functions to this file, changing from void to int are non-abi-breaking. For handling the single function that cannot change from void to int due to abi, where this is the only place it is called in, I added a state variable that is being checked right after the call to this function. --- v4 - fix split literal strings in log messages Signed-off-by: Arnon Warshavsky --- lib/librte_eal/bsdapp/eal/eal.c | 86 ++++++++++++++------- lib/librte_eal/bsdapp/eal/eal_thread.c | 65 +++++++++++----- lib/librte_eal/common/eal_common_launch.c | 21 ++++++ lib/librte_eal/common/include/rte_debug.h | 12 +++ lib/librte_eal/linuxapp/eal/eal.c | 120 ++++++++++++++++++++---------- lib/librte_eal/linuxapp/eal/eal_thread.c | 65 +++++++++++----- 6 files changed, 270 insertions(+), 99 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/eal.c b/lib/librte_eal/bsdapp/eal/eal.c index d996190..9c2f6f1 100644 --- a/lib/librte_eal/bsdapp/eal/eal.c +++ b/lib/librte_eal/bsdapp/eal/eal.c @@ -151,7 +151,7 @@ enum rte_iova_mode * We also don't lock the whole file, so that in future we can use read-locks * on other parts, e.g. memzones, to detect if there are running secondary * processes. */ -static void +static int rte_eal_config_create(void) { void *rte_mem_cfg_addr; @@ -160,60 +160,78 @@ enum rte_iova_mode const char *pathname = eal_runtime_config_path(); if (internal_config.no_shconf) - return; + return 0; if (mem_cfg_fd < 0){ mem_cfg_fd = open(pathname, O_RDWR | O_CREAT, 0660); - if (mem_cfg_fd < 0) - rte_panic("Cannot open '%s' for rte_mem_config\n", pathname); + if (mem_cfg_fd < 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot open '%s' for rte_mem_config\n", + __func__, pathname); + return -1; + } } retval = ftruncate(mem_cfg_fd, sizeof(*rte_config.mem_config)); if (retval < 0){ close(mem_cfg_fd); - rte_panic("Cannot resize '%s' for rte_mem_config\n", pathname); + RTE_LOG(CRIT, EAL, "%s(): Cannot resize '%s' for rte_mem_config\n", + __func__, pathname); + return -1; } retval = fcntl(mem_cfg_fd, F_SETLK, &wr_lock); if (retval < 0){ close(mem_cfg_fd); - rte_exit(EXIT_FAILURE, "Cannot create lock on '%s'. Is another primary " - "process running?\n", pathname); + RTE_LOG(CRIT, EAL, "%s(): Cannot create lock on '%s'. Is another primary process running?\n", + __func__, pathname); + return -1; } rte_mem_cfg_addr = mmap(NULL, sizeof(*rte_config.mem_config), PROT_READ | PROT_WRITE, MAP_SHARED, mem_cfg_fd, 0); if (rte_mem_cfg_addr == MAP_FAILED){ - rte_panic("Cannot mmap memory for rte_config\n"); + RTE_LOG(CRIT, EAL, "%s(): Cannot mmap memory for rte_config\n", + __func__); + return -1; } memcpy(rte_mem_cfg_addr, &early_mem_config, sizeof(early_mem_config)); rte_config.mem_config = rte_mem_cfg_addr; + + return 0; } /* attach to an existing shared memory config */ -static void +static int rte_eal_config_attach(void) { void *rte_mem_cfg_addr; const char *pathname = eal_runtime_config_path(); if (internal_config.no_shconf) - return; + return 0; if (mem_cfg_fd < 0){ mem_cfg_fd = open(pathname, O_RDWR); - if (mem_cfg_fd < 0) - rte_panic("Cannot open '%s' for rte_mem_config\n", pathname); + if (mem_cfg_fd < 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot open '%s' for rte_mem_config\n", + __func__, pathname); + return -1; + } } rte_mem_cfg_addr = mmap(NULL, sizeof(*rte_config.mem_config), PROT_READ | PROT_WRITE, MAP_SHARED, mem_cfg_fd, 0); close(mem_cfg_fd); - if (rte_mem_cfg_addr == MAP_FAILED) - rte_panic("Cannot mmap memory for rte_config\n"); + if (rte_mem_cfg_addr == MAP_FAILED) { + RTE_LOG(CRIT, EAL, "%s(): Cannot mmap memory for rte_config\n", + __func__); + return -1; + } rte_config.mem_config = rte_mem_cfg_addr; + + return 0; } /* Detect if we are a primary or a secondary process */ @@ -237,23 +255,28 @@ enum rte_proc_type_t } /* Sets up rte_config structure with the pointer to shared memory config.*/ -static void +static int rte_config_init(void) { rte_config.process_type = internal_config.process_type; switch (rte_config.process_type){ case RTE_PROC_PRIMARY: - rte_eal_config_create(); + if (rte_eal_config_create()) + return -1; break; case RTE_PROC_SECONDARY: - rte_eal_config_attach(); + if (rte_eal_config_attach()) + return -1; rte_eal_mcfg_wait_complete(rte_config.mem_config); break; case RTE_PROC_AUTO: case RTE_PROC_INVALID: - rte_panic("Invalid process type\n"); + RTE_LOG(CRIT, EAL, "%s(): Invalid process type %d\n", + __func__, rte_config.process_type); + return -1; } + return 0; } /* display usage */ @@ -595,7 +618,8 @@ static void rte_eal_init_alert(const char *msg) rte_srand(rte_rdtsc()); - rte_config_init(); + if (rte_config_init() != 0) + return -1; if (rte_mp_channel_init() < 0) { rte_eal_init_alert("failed to init mp channel\n"); @@ -652,7 +676,8 @@ static void rte_eal_init_alert(const char *msg) eal_check_mem_on_local_socket(); - eal_thread_init_master(rte_config.master_lcore); + if (eal_thread_init_master(rte_config.master_lcore) != 0) + return -1; ret = eal_thread_dump_affinity(cpuset, RTE_CPU_AFFINITY_STR_LEN); @@ -666,18 +691,27 @@ static void rte_eal_init_alert(const char *msg) * create communication pipes between master thread * and children */ - if (pipe(lcore_config[i].pipe_master2slave) < 0) - rte_panic("Cannot create pipe\n"); - if (pipe(lcore_config[i].pipe_slave2master) < 0) - rte_panic("Cannot create pipe\n"); + if (pipe(lcore_config[i].pipe_master2slave) < 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot create pipe\n", + __func__); + return -1; + } + if (pipe(lcore_config[i].pipe_slave2master) < 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot create pipe\n", + __func__); + return -1; + } lcore_config[i].state = WAIT; /* create a thread for each lcore */ ret = pthread_create(&lcore_config[i].thread_id, NULL, eal_thread_loop, NULL); - if (ret != 0) - rte_panic("Cannot create thread\n"); + if (ret != 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot create thread\n", + __func__); + return -1; + } /* Set thread_name for aid in debugging. */ snprintf(thread_name, RTE_MAX_THREAD_NAME_LEN, diff --git a/lib/librte_eal/bsdapp/eal/eal_thread.c b/lib/librte_eal/bsdapp/eal/eal_thread.c index d602daf..5c3947c 100644 --- a/lib/librte_eal/bsdapp/eal/eal_thread.c +++ b/lib/librte_eal/bsdapp/eal/eal_thread.c @@ -51,16 +51,22 @@ n = 0; while (n == 0 || (n < 0 && errno == EINTR)) n = write(m2s, &c, 1); - if (n < 0) - rte_panic("cannot write on configuration pipe\n"); + if (n < 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot write on configuration pipe\n", + __func__); + return -1; + } /* wait ack */ do { n = read(s2m, &c, 1); } while (n < 0 && errno == EINTR); - if (n <= 0) - rte_panic("cannot read on configuration pipe\n"); + if (n <= 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot read on configuration pipe\n", + __func__); + return -1; + } return 0; } @@ -84,8 +90,19 @@ void eal_thread_init_master(unsigned lcore_id) RTE_PER_LCORE(_lcore_id) = lcore_id; /* set CPU affinity */ - if (eal_thread_set_affinity() < 0) - rte_panic("cannot set affinity\n"); + if (eal_thread_set_affinity() < 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot set affinity\n", __func__); + rte_move_to_panic_state(); + } +} + +/* move to panic state and do not return */ +static __attribute__((noreturn)) void +defunct_and_remain_in_endless_loop(void) +{ + rte_move_to_panic_state(); + while (1) + sleep(1); } /* main loop of threads */ @@ -106,8 +123,11 @@ void eal_thread_init_master(unsigned lcore_id) if (thread_id == lcore_config[lcore_id].thread_id) break; } - if (lcore_id == RTE_MAX_LCORE) - rte_panic("cannot retrieve lcore id\n"); + if (lcore_id == RTE_MAX_LCORE) { + RTE_LOG(CRIT, EAL, "%s(): Cannot retrieve lcore id\n", + __func__); + defunct_and_remain_in_endless_loop(); + } m2s = lcore_config[lcore_id].pipe_master2slave[0]; s2m = lcore_config[lcore_id].pipe_slave2master[1]; @@ -116,8 +136,10 @@ void eal_thread_init_master(unsigned lcore_id) RTE_PER_LCORE(_lcore_id) = lcore_id; /* set CPU affinity */ - if (eal_thread_set_affinity() < 0) - rte_panic("cannot set affinity\n"); + if (eal_thread_set_affinity() < 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot set affinity\n", __func__); + defunct_and_remain_in_endless_loop(); + } ret = eal_thread_dump_affinity(cpuset, RTE_CPU_AFFINITY_STR_LEN); @@ -133,8 +155,11 @@ void eal_thread_init_master(unsigned lcore_id) n = read(m2s, &c, 1); } while (n < 0 && errno == EINTR); - if (n <= 0) - rte_panic("cannot read on configuration pipe\n"); + if (n <= 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot read on configuration pipe\n", + __func__); + defunct_and_remain_in_endless_loop(); + } lcore_config[lcore_id].state = RUNNING; @@ -142,11 +167,17 @@ void eal_thread_init_master(unsigned lcore_id) n = 0; while (n == 0 || (n < 0 && errno == EINTR)) n = write(s2m, &c, 1); - if (n < 0) - rte_panic("cannot write on configuration pipe\n"); - - if (lcore_config[lcore_id].f == NULL) - rte_panic("NULL function pointer\n"); + if (n < 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot write on configuration pipe\n", + __func__); + defunct_and_remain_in_endless_loop(); + } + + if (lcore_config[lcore_id].f == NULL) { + RTE_LOG(CRIT, EAL, "%s(): NULL function pointer\n", + __func__); + defunct_and_remain_in_endless_loop(); + } /* call the function and store the return value */ fct_arg = lcore_config[lcore_id].arg; diff --git a/lib/librte_eal/common/eal_common_launch.c b/lib/librte_eal/common/eal_common_launch.c index fe0ba3f..6f8bd46 100644 --- a/lib/librte_eal/common/eal_common_launch.c +++ b/lib/librte_eal/common/eal_common_launch.c @@ -14,6 +14,7 @@ #include #include #include +#include /* * Wait until a lcore finished its job. @@ -88,3 +89,23 @@ enum rte_lcore_state_t rte_eal_wait_lcore(lcore_id); } } + +/* panic state */ +static int _panic_state; + +/** + * Check if the system is in panic state + * @return int + */ +int rte_get_panic_state(void) +{ + return _panic_state; +} + +/** + * Move the system to be in panic state + */ +void rte_move_to_panic_state(void) +{ + _panic_state = 1; +} diff --git a/lib/librte_eal/common/include/rte_debug.h b/lib/librte_eal/common/include/rte_debug.h index 272df49..b421d33 100644 --- a/lib/librte_eal/common/include/rte_debug.h +++ b/lib/librte_eal/common/include/rte_debug.h @@ -79,4 +79,16 @@ void __rte_panic(const char *funcname , const char *format, ...) } #endif +/** + * Check if the system is in panic state + * @return int + */ +int rte_get_panic_state(void); + +/** + * Move the system to be in panic state + */ +void rte_move_to_panic_state(void); + + #endif /* _RTE_DEBUG_H_ */ diff --git a/lib/librte_eal/linuxapp/eal/eal.c b/lib/librte_eal/linuxapp/eal/eal.c index 21afa73..393441a 100644 --- a/lib/librte_eal/linuxapp/eal/eal.c +++ b/lib/librte_eal/linuxapp/eal/eal.c @@ -160,7 +160,7 @@ enum rte_iova_mode * We also don't lock the whole file, so that in future we can use read-locks * on other parts, e.g. memzones, to detect if there are running secondary * processes. */ -static void +static int rte_eal_config_create(void) { void *rte_mem_cfg_addr; @@ -169,7 +169,7 @@ enum rte_iova_mode const char *pathname = eal_runtime_config_path(); if (internal_config.no_shconf) - return; + return 0; /* map the config before hugepage address so that we don't waste a page */ if (internal_config.base_virtaddr != 0) @@ -179,30 +179,39 @@ enum rte_iova_mode else rte_mem_cfg_addr = NULL; - if (mem_cfg_fd < 0){ + if (mem_cfg_fd < 0) { mem_cfg_fd = open(pathname, O_RDWR | O_CREAT, 0660); - if (mem_cfg_fd < 0) - rte_panic("Cannot open '%s' for rte_mem_config\n", pathname); + if (mem_cfg_fd < 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot open '%s' for rte_mem_config\n", + __func__, pathname); + return -1; + } } retval = ftruncate(mem_cfg_fd, sizeof(*rte_config.mem_config)); - if (retval < 0){ + if (retval < 0) { close(mem_cfg_fd); - rte_panic("Cannot resize '%s' for rte_mem_config\n", pathname); + RTE_LOG(CRIT, EAL, "%s(): Cannot resize '%s' for rte_mem_config\n", + __func__, pathname); + return -1; } retval = fcntl(mem_cfg_fd, F_SETLK, &wr_lock); - if (retval < 0){ + if (retval < 0) { close(mem_cfg_fd); - rte_exit(EXIT_FAILURE, "Cannot create lock on '%s'. Is another primary " - "process running?\n", pathname); + RTE_LOG(CRIT, EAL, "%s(): Cannot create lock on '%s'." + " Is another primary process running?\n", + __func__, pathname); + return -1; } rte_mem_cfg_addr = mmap(rte_mem_cfg_addr, sizeof(*rte_config.mem_config), PROT_READ | PROT_WRITE, MAP_SHARED, mem_cfg_fd, 0); - if (rte_mem_cfg_addr == MAP_FAILED){ - rte_panic("Cannot mmap memory for rte_config\n"); + if (rte_mem_cfg_addr == MAP_FAILED) { + RTE_LOG(CRIT, EAL, "%s(): Cannot mmap memory for rte_config\n", + __func__); + return -1; } memcpy(rte_mem_cfg_addr, &early_mem_config, sizeof(early_mem_config)); rte_config.mem_config = rte_mem_cfg_addr; @@ -211,10 +220,11 @@ enum rte_iova_mode * processes could later map the config into this exact location */ rte_config.mem_config->mem_cfg_addr = (uintptr_t) rte_mem_cfg_addr; + return 0; } /* attach to an existing shared memory config */ -static void +static int rte_eal_config_attach(void) { struct rte_mem_config *mem_config; @@ -222,33 +232,40 @@ enum rte_iova_mode const char *pathname = eal_runtime_config_path(); if (internal_config.no_shconf) - return; + return 0; - if (mem_cfg_fd < 0){ + if (mem_cfg_fd < 0) { mem_cfg_fd = open(pathname, O_RDWR); - if (mem_cfg_fd < 0) - rte_panic("Cannot open '%s' for rte_mem_config\n", pathname); + if (mem_cfg_fd < 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot open '%s' for rte_mem_config\n", + __func__, pathname); + return -1; + } } /* map it as read-only first */ mem_config = (struct rte_mem_config *) mmap(NULL, sizeof(*mem_config), PROT_READ, MAP_SHARED, mem_cfg_fd, 0); - if (mem_config == MAP_FAILED) - rte_panic("Cannot mmap memory for rte_config! error %i (%s)\n", - errno, strerror(errno)); + if (mem_config == MAP_FAILED) { + RTE_LOG(CRIT, EAL, "%s(): Cannot mmap memory for rte_config! error %i (%s)\n", + __func__, errno, strerror(errno)); + return -1; + } rte_config.mem_config = mem_config; + + return 0; } /* reattach the shared config at exact memory location primary process has it */ -static void +static int rte_eal_config_reattach(void) { struct rte_mem_config *mem_config; void *rte_mem_cfg_addr; if (internal_config.no_shconf) - return; + return 0; /* save the address primary process has mapped shared config to */ rte_mem_cfg_addr = (void *) (uintptr_t) rte_config.mem_config->mem_cfg_addr; @@ -263,16 +280,21 @@ enum rte_iova_mode if (mem_config == MAP_FAILED || mem_config != rte_mem_cfg_addr) { if (mem_config != MAP_FAILED) /* errno is stale, don't use */ - rte_panic("Cannot mmap memory for rte_config at [%p], got [%p]" - " - please use '--base-virtaddr' option\n", - rte_mem_cfg_addr, mem_config); + RTE_LOG(CRIT, EAL, "%s(): Cannot mmap memory for " + "rte_config at [%p], got [%p] - please use " + "'--base-virtaddr' option\n", + __func__, rte_mem_cfg_addr, mem_config); else - rte_panic("Cannot mmap memory for rte_config! error %i (%s)\n", - errno, strerror(errno)); + RTE_LOG(CRIT, EAL, "%s(): Cannot mmap memory for " + "rte_config! error %i (%s)\n", + __func__, errno, strerror(errno)); + return -1; } close(mem_cfg_fd); rte_config.mem_config = mem_config; + + return 0; } /* Detect if we are a primary or a secondary process */ @@ -296,24 +318,31 @@ enum rte_proc_type_t } /* Sets up rte_config structure with the pointer to shared memory config.*/ -static void +static int rte_config_init(void) { rte_config.process_type = internal_config.process_type; switch (rte_config.process_type){ case RTE_PROC_PRIMARY: - rte_eal_config_create(); + if (rte_eal_config_create() != 0) + return -1; break; case RTE_PROC_SECONDARY: - rte_eal_config_attach(); + if (rte_eal_config_attach() != 0) + return -1; rte_eal_mcfg_wait_complete(rte_config.mem_config); - rte_eal_config_reattach(); + if (rte_eal_config_reattach() != 0) + return -1; break; case RTE_PROC_AUTO: case RTE_PROC_INVALID: - rte_panic("Invalid process type\n"); + RTE_LOG(CRIT, EAL, "%s(): Invalid process type %d\n", + __func__, rte_config.process_type); + return -1; } + + return 0; } /* Unlocks hugepage directories that were locked by eal_hugepage_info_init */ @@ -820,7 +849,8 @@ static void rte_eal_init_alert(const char *msg) rte_srand(rte_rdtsc()); - rte_config_init(); + if (rte_config_init() != 0) + return -1; if (rte_eal_log_init(logid, internal_config.syslog_facility) < 0) { rte_eal_init_alert("Cannot init logging."); @@ -892,6 +922,9 @@ static void rte_eal_init_alert(const char *msg) eal_thread_init_master(rte_config.master_lcore); + if (rte_get_panic_state()) + return -1; + ret = eal_thread_dump_affinity(cpuset, RTE_CPU_AFFINITY_STR_LEN); RTE_LOG(DEBUG, EAL, "Master lcore %u is ready (tid=%x;cpuset=[%s%s])\n", @@ -909,18 +942,27 @@ static void rte_eal_init_alert(const char *msg) * create communication pipes between master thread * and children */ - if (pipe(lcore_config[i].pipe_master2slave) < 0) - rte_panic("Cannot create pipe\n"); - if (pipe(lcore_config[i].pipe_slave2master) < 0) - rte_panic("Cannot create pipe\n"); + if (pipe(lcore_config[i].pipe_master2slave) < 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot create pipe\n", + __func__); + return -1; + } + if (pipe(lcore_config[i].pipe_slave2master) < 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot create pipe\n", + __func__); + return -1; + } lcore_config[i].state = WAIT; /* create a thread for each lcore */ ret = pthread_create(&lcore_config[i].thread_id, NULL, eal_thread_loop, NULL); - if (ret != 0) - rte_panic("Cannot create thread\n"); + if (ret != 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot create thread\n", + __func__); + return -1; + } /* Set thread_name for aid in debugging. */ snprintf(thread_name, RTE_MAX_THREAD_NAME_LEN, diff --git a/lib/librte_eal/linuxapp/eal/eal_thread.c b/lib/librte_eal/linuxapp/eal/eal_thread.c index 08e150b..3afcee5 100644 --- a/lib/librte_eal/linuxapp/eal/eal_thread.c +++ b/lib/librte_eal/linuxapp/eal/eal_thread.c @@ -51,16 +51,22 @@ n = 0; while (n == 0 || (n < 0 && errno == EINTR)) n = write(m2s, &c, 1); - if (n < 0) - rte_panic("cannot write on configuration pipe\n"); + if (n < 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot write on configuration pipe\n", + __func__); + return -1; + } /* wait ack */ do { n = read(s2m, &c, 1); } while (n < 0 && errno == EINTR); - if (n <= 0) - rte_panic("cannot read on configuration pipe\n"); + if (n <= 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot read on configuration pipe\n", + __func__); + return -1; + } return 0; } @@ -84,8 +90,19 @@ void eal_thread_init_master(unsigned lcore_id) RTE_PER_LCORE(_lcore_id) = lcore_id; /* set CPU affinity */ - if (eal_thread_set_affinity() < 0) - rte_panic("cannot set affinity\n"); + if (eal_thread_set_affinity() < 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot set affinity\n", __func__); + rte_move_to_panic_state(); + } +} + +/* move to panic state and do not return */ +static __attribute__((noreturn)) void +defunct_and_remain_in_endless_loop(void) +{ + rte_move_to_panic_state(); + while (1) + sleep(1); } /* main loop of threads */ @@ -106,8 +123,11 @@ void eal_thread_init_master(unsigned lcore_id) if (thread_id == lcore_config[lcore_id].thread_id) break; } - if (lcore_id == RTE_MAX_LCORE) - rte_panic("cannot retrieve lcore id\n"); + if (lcore_id == RTE_MAX_LCORE) { + RTE_LOG(CRIT, EAL, "%s(): Cannot retrieve lcore id\n", + __func__); + defunct_and_remain_in_endless_loop(); + } m2s = lcore_config[lcore_id].pipe_master2slave[0]; s2m = lcore_config[lcore_id].pipe_slave2master[1]; @@ -116,8 +136,10 @@ void eal_thread_init_master(unsigned lcore_id) RTE_PER_LCORE(_lcore_id) = lcore_id; /* set CPU affinity */ - if (eal_thread_set_affinity() < 0) - rte_panic("cannot set affinity\n"); + if (eal_thread_set_affinity() < 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot set affinity\n", __func__); + defunct_and_remain_in_endless_loop(); + } ret = eal_thread_dump_affinity(cpuset, RTE_CPU_AFFINITY_STR_LEN); @@ -133,8 +155,11 @@ void eal_thread_init_master(unsigned lcore_id) n = read(m2s, &c, 1); } while (n < 0 && errno == EINTR); - if (n <= 0) - rte_panic("cannot read on configuration pipe\n"); + if (n <= 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot read on configuration pipe\n", + __func__); + defunct_and_remain_in_endless_loop(); + } lcore_config[lcore_id].state = RUNNING; @@ -142,11 +167,17 @@ void eal_thread_init_master(unsigned lcore_id) n = 0; while (n == 0 || (n < 0 && errno == EINTR)) n = write(s2m, &c, 1); - if (n < 0) - rte_panic("cannot write on configuration pipe\n"); - - if (lcore_config[lcore_id].f == NULL) - rte_panic("NULL function pointer\n"); + if (n < 0) { + RTE_LOG(CRIT, EAL, "%s(): Cannot write on configuration pipe\n", + __func__); + defunct_and_remain_in_endless_loop(); + } + + if (lcore_config[lcore_id].f == NULL) { + RTE_LOG(CRIT, EAL, "%s(): NULL function pointer\n", + __func__); + defunct_and_remain_in_endless_loop(); + } /* call the function and store the return value */ fct_arg = lcore_config[lcore_id].arg;