From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 85ED0A0A0E; Thu, 29 Apr 2021 04:10:41 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 5164B410E5; Thu, 29 Apr 2021 04:10:41 +0200 (CEST) Received: from szxga06-in.huawei.com (szxga06-in.huawei.com [45.249.212.32]) by mails.dpdk.org (Postfix) with ESMTP id CD89340697 for ; Thu, 29 Apr 2021 04:10:38 +0200 (CEST) Received: from DGGEMS405-HUB.china.huawei.com (unknown [172.30.72.60]) by szxga06-in.huawei.com (SkyGuard) with ESMTP id 4FVzSL0xRvzlblx; Thu, 29 Apr 2021 10:08:34 +0800 (CST) Received: from localhost.localdomain (10.69.192.56) by DGGEMS405-HUB.china.huawei.com (10.3.19.205) with Microsoft SMTP Server id 14.3.498.0; Thu, 29 Apr 2021 10:10:34 +0800 From: "Min Hu (Connor)" To: CC: , , , Date: Thu, 29 Apr 2021 10:10:41 +0800 Message-ID: <1619662241-61955-1-git-send-email-humin29@huawei.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1619597563-56716-1-git-send-email-humin29@huawei.com> References: <1619597563-56716-1-git-send-email-humin29@huawei.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.69.192.56] X-CFilter-Loop: Reflected Subject: [dpdk-dev] [PATCH v2] eal: fix use wrong time API X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Currently, the mp uses gettimeofday() API to get the time, and used as timeout parameter. But the time which gets from gettimeofday() API isn't monotonically increasing. The process may fail if the system time is changed. This fixes it by using clock_gettime() API with monotonic attribution. Fixes: 783b6e54971d ("eal: add synchronous multi-process communication") Fixes: f05e26051c15 ("eal: add IPC asynchronous request") Cc: stable@dpdk.org Signed-off-by: Chengwen Feng Signed-off-by: Min Hu (Connor) --- v2: * get rid of the CLOCK_TYPE_ID definition and use CLOCK_MONOTONIC instead. --- lib/eal/common/eal_common_proc.c | 39 +++++++++++++-------------------------- 1 file changed, 13 insertions(+), 26 deletions(-) diff --git a/lib/eal/common/eal_common_proc.c b/lib/eal/common/eal_common_proc.c index 6d1af3c..6af8ba2 100644 --- a/lib/eal/common/eal_common_proc.c +++ b/lib/eal/common/eal_common_proc.c @@ -490,14 +490,8 @@ async_reply_handle_thread_unsafe(void *arg) struct pending_request *req = (struct pending_request *)arg; enum async_action action; struct timespec ts_now; - struct timeval now; - if (gettimeofday(&now, NULL) < 0) { - RTE_LOG(ERR, EAL, "Cannot get current time\n"); - goto no_trigger; - } - ts_now.tv_nsec = now.tv_usec * 1000; - ts_now.tv_sec = now.tv_sec; + clock_gettime(CLOCK_MONOTONIC, &ts_now); action = process_async_request(req, &ts_now); @@ -896,6 +890,7 @@ mp_request_sync(const char *dst, struct rte_mp_msg *req, struct rte_mp_reply *reply, const struct timespec *ts) { int ret; + pthread_condattr_t attr; struct rte_mp_msg msg, *tmp; struct pending_request pending_req, *exist; @@ -904,7 +899,9 @@ mp_request_sync(const char *dst, struct rte_mp_msg *req, strlcpy(pending_req.dst, dst, sizeof(pending_req.dst)); pending_req.request = req; pending_req.reply = &msg; - pthread_cond_init(&pending_req.sync.cond, NULL); + pthread_condattr_init(&attr); + pthread_condattr_setclock(&attr, CLOCK_MONOTONIC); + pthread_cond_init(&pending_req.sync.cond, &attr); exist = find_pending_request(dst, req->name); if (exist) { @@ -967,8 +964,7 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply, int dir_fd, ret = -1; DIR *mp_dir; struct dirent *ent; - struct timeval now; - struct timespec end; + struct timespec now, end; const struct internal_config *internal_conf = eal_get_internal_configuration(); @@ -987,15 +983,10 @@ rte_mp_request_sync(struct rte_mp_msg *req, struct rte_mp_reply *reply, return -1; } - if (gettimeofday(&now, NULL) < 0) { - RTE_LOG(ERR, EAL, "Failed to get current time\n"); - rte_errno = errno; - goto end; - } - - end.tv_nsec = (now.tv_usec * 1000 + ts->tv_nsec) % 1000000000; + clock_gettime(CLOCK_MONOTONIC, &now); + end.tv_nsec = (now.tv_nsec + ts->tv_nsec) % 1000000000; end.tv_sec = now.tv_sec + ts->tv_sec + - (now.tv_usec * 1000 + ts->tv_nsec) / 1000000000; + (now.tv_nsec + ts->tv_nsec) / 1000000000; /* for secondary process, send request to the primary process only */ if (rte_eal_process_type() == RTE_PROC_SECONDARY) { @@ -1069,7 +1060,7 @@ rte_mp_request_async(struct rte_mp_msg *req, const struct timespec *ts, int dir_fd, ret = 0; DIR *mp_dir; struct dirent *ent; - struct timeval now; + struct timespec now; struct timespec *end; bool dummy_used = false; const struct internal_config *internal_conf = @@ -1086,11 +1077,6 @@ rte_mp_request_async(struct rte_mp_msg *req, const struct timespec *ts, return -1; } - if (gettimeofday(&now, NULL) < 0) { - RTE_LOG(ERR, EAL, "Failed to get current time\n"); - rte_errno = errno; - return -1; - } copy = calloc(1, sizeof(*copy)); dummy = calloc(1, sizeof(*dummy)); param = calloc(1, sizeof(*param)); @@ -1108,9 +1094,10 @@ rte_mp_request_async(struct rte_mp_msg *req, const struct timespec *ts, end = ¶m->end; reply = ¶m->user_reply; - end->tv_nsec = (now.tv_usec * 1000 + ts->tv_nsec) % 1000000000; + clock_gettime(CLOCK_MONOTONIC, &now); + end->tv_nsec = (now.tv_nsec + ts->tv_nsec) % 1000000000; end->tv_sec = now.tv_sec + ts->tv_sec + - (now.tv_usec * 1000 + ts->tv_nsec) / 1000000000; + (now.tv_nsec + ts->tv_nsec) / 1000000000; reply->nb_sent = 0; reply->nb_received = 0; reply->msgs = NULL; -- 2.7.4