From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by dpdk.org (Postfix) with ESMTP id 0BC3D4CB3 for ; Tue, 27 Feb 2018 15:35:45 +0100 (CET) X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from orsmga006.jf.intel.com ([10.7.209.51]) by orsmga104.jf.intel.com with ESMTP/TLS/DHE-RSA-AES256-GCM-SHA384; 27 Feb 2018 06:35:43 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.47,401,1515484800"; d="scan'208";a="21425176" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by orsmga006.jf.intel.com with ESMTP; 27 Feb 2018 06:35:42 -0800 Received: from sivswdev01.ir.intel.com (sivswdev01.ir.intel.com [10.237.217.45]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id w1REZgD6011885; Tue, 27 Feb 2018 14:35:42 GMT Received: from sivswdev01.ir.intel.com (localhost [127.0.0.1]) by sivswdev01.ir.intel.com with ESMTP id w1REZfeB019140; Tue, 27 Feb 2018 14:35:41 GMT Received: (from aburakov@localhost) by sivswdev01.ir.intel.com with LOCAL id w1REZfg7019136; Tue, 27 Feb 2018 14:35:41 GMT From: Anatoly Burakov To: dev@dpdk.org Cc: jianfeng.tan@intel.com Date: Tue, 27 Feb 2018 14:35:40 +0000 Message-Id: <4be9dbc2f5751e9584f69997d4ef0077992eae52.1519740527.git.anatoly.burakov@intel.com> X-Mailer: git-send-email 1.7.0.7 In-Reply-To: <3f4fab71b0d17fb9d0b15e3634f4fe7d12dd3e92.1519740527.git.anatoly.burakov@intel.com> References: <3f4fab71b0d17fb9d0b15e3634f4fe7d12dd3e92.1519740527.git.anatoly.burakov@intel.com> In-Reply-To: <31f6d9ef676fb1eb0a664c06d62d66f32876dcb6.1519672713.git.anatoly.burakov@intel.com> References: <31f6d9ef676fb1eb0a664c06d62d66f32876dcb6.1519672713.git.anatoly.burakov@intel.com> Subject: [dpdk-dev] [PATCH v3 4/5] eal: prevent secondary process init while sending messages 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: , X-List-Received-Date: Tue, 27 Feb 2018 14:35:46 -0000 Currently, it is possible to spin up a secondary process while either sendmsg or request is in progress. Fix this by adding directory locks during init, sendmsg and requests. Signed-off-by: Anatoly Burakov --- Notes: v3: no changes v2: no changes lib/librte_eal/common/eal_common_proc.c | 47 ++++++++++++++++++++++++++++++++- 1 file changed, 46 insertions(+), 1 deletion(-) diff --git a/lib/librte_eal/common/eal_common_proc.c b/lib/librte_eal/common/eal_common_proc.c index 7c87971..7856a7b 100644 --- a/lib/librte_eal/common/eal_common_proc.c +++ b/lib/librte_eal/common/eal_common_proc.c @@ -507,6 +507,7 @@ rte_mp_channel_init(void) { char thread_name[RTE_MAX_THREAD_NAME_LEN]; char *path; + int dir_fd; pthread_t tid; snprintf(mp_filter, PATH_MAX, ".%s_unix_*", @@ -516,14 +517,32 @@ rte_mp_channel_init(void) snprintf(mp_dir_path, PATH_MAX, "%s", dirname(path)); free(path); + /* lock the directory */ + dir_fd = open(mp_dir_path, O_RDONLY); + if (dir_fd < 0) { + RTE_LOG(ERR, EAL, "failed to open %s: %s\n", + mp_dir_path, strerror(errno)); + return -1; + } + + if (flock(dir_fd, LOCK_EX)) { + RTE_LOG(ERR, EAL, "failed to lock %s: %s\n", + mp_dir_path, strerror(errno)); + close(dir_fd); + return -1; + } + if (rte_eal_process_type() == RTE_PROC_PRIMARY && unlink_sockets(mp_filter)) { RTE_LOG(ERR, EAL, "failed to unlink mp sockets\n"); + close(dir_fd); return -1; } - if (open_socket_fd() < 0) + if (open_socket_fd() < 0) { + close(dir_fd); return -1; + } if (pthread_create(&tid, NULL, mp_handle, NULL) < 0) { RTE_LOG(ERR, EAL, "failed to create mp thead: %s\n", @@ -536,6 +555,11 @@ rte_mp_channel_init(void) /* try best to set thread name */ snprintf(thread_name, RTE_MAX_THREAD_NAME_LEN, "rte_mp_handle"); rte_thread_setname(tid, thread_name); + + /* unlock the directory */ + flock(dir_fd, LOCK_UN); + close(dir_fd); + return 0; } @@ -650,6 +674,14 @@ mp_send(struct rte_mp_msg *msg, const char *peer, int type) return -1; } dir_fd = dirfd(mp_dir); + /* lock the directory to prevent processes spinning up while we send */ + if (flock(dir_fd, LOCK_EX)) { + RTE_LOG(ERR, EAL, "Unable to lock directory %s\n", + mp_dir_path); + rte_errno = errno; + closedir(mp_dir); + return -1; + } while ((ent = readdir(mp_dir))) { char path[PATH_MAX]; const char *peer_name; @@ -673,6 +705,8 @@ mp_send(struct rte_mp_msg *msg, const char *peer, int type) else if (active > 0 && send_msg(path, msg, type) < 0) ret = -1; } + /* unlock the dir */ + flock(dir_fd, LOCK_UN); closedir(mp_dir); return ret; @@ -832,6 +866,15 @@ rte_mp_request(struct rte_mp_msg *req, struct rte_mp_reply *reply, } dir_fd = dirfd(mp_dir); + /* lock the directory to prevent processes spinning up while we send */ + if (flock(dir_fd, LOCK_EX)) { + RTE_LOG(ERR, EAL, "Unable to lock directory %s\n", + mp_dir_path); + closedir(mp_dir); + rte_errno = errno; + return -1; + } + while ((ent = readdir(mp_dir))) { const char *peer_name; char path[PATH_MAX]; @@ -857,6 +900,8 @@ rte_mp_request(struct rte_mp_msg *req, struct rte_mp_reply *reply, if (mp_request_one(path, req, reply, &end)) ret = -1; } + /* unlock the directory */ + flock(dir_fd, LOCK_UN); closedir(mp_dir); return ret; -- 2.7.4