From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 19961A00BE for ; Wed, 8 Jul 2020 07:08:24 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id C91951DAC2; Wed, 8 Jul 2020 07:08:23 +0200 (CEST) Received: from mail-wr1-f67.google.com (mail-wr1-f67.google.com [209.85.221.67]) by dpdk.org (Postfix) with ESMTP id C5A7B1DAC2 for ; Wed, 8 Jul 2020 07:08:21 +0200 (CEST) Received: by mail-wr1-f67.google.com with SMTP id s10so47410915wrw.12 for ; Tue, 07 Jul 2020 22:08:21 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=emumba-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qCTl8iNKA842LjTmEJsdI9txSZowQ8+P2ueJsMOZ79s=; b=AOKeR9TkE5h6CzkxzewRCZg/vW531MpeJmvpYiZTKagYwbGVDQGhzDcc2Y/7WyP7Y3 YSMdanpL0m8Wlj6Ah+eNE+eN4tj959AeYYilj5hADD8XPgeKc337gtXS4JTFW/GS55cY JxUpYOQ6RqzHiFeAWp2kaWZpCkjnP2wW0WqbtGAEAhBZ/b4mcarIxQooVjqfjeleuPvV NVa3Q6m+aQJqSOO1uRR8X/Akk1YXDVXV+RXkOdvg9PW5tj6C9frN3x6JAMxMDeCuefq3 f2ycrwTqscVCLNvsEpz6N80jTroZM52/8s+Ae5yj1OmqQfzzRmr23SOxvE9Y1vjBU5IF Ohjg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=qCTl8iNKA842LjTmEJsdI9txSZowQ8+P2ueJsMOZ79s=; b=cdBeM/8jkH7zBiNtOJrq+Qlh30KnNRh0dvEPODRPNro7eG4fTlIm7Q6cj2Gp/PIqPr Hf17OXceLheDc8+Y4CUu7zGrkDwWGD0A8nj1kG5uKJ0j9xi2vfD7lj5Asu6yH6Mtgt7r Kwx30ZiyywwRzcHDvS+POeL4Yw+mTqbyFRM6ij1JFuefNUehfr6yLSlgtLDxh+K6Mwng ASxdwWlcYLdYhy1dBtbGEBhEBhJ9ZHU+ykY/vRxJY3efawNTZYJ7fWwfyCdw1wFVGjhV nR80ON6YHlf3ICPxcTfGH0mqWdS3GG1do51ocEHysBK/9lLjet04PyDLzxKV4ONccitn 0r1w== X-Gm-Message-State: AOAM530jtUM8c/XJ4/g/76fDCr9RSBH+8AiLJ9zSBjUHCyn28KbaSLIW Fsq2y0EEbZugUfieaLvoal3EFQ== X-Google-Smtp-Source: ABdhPJy1f3EEeIEa3CYWzwdvPTH3QMPe7UISoHYZMixiH+7ik+VZTXGFXivz5VsnLD75bDN+vep6ow== X-Received: by 2002:adf:de12:: with SMTP id b18mr60917748wrm.390.1594184901444; Tue, 07 Jul 2020 22:08:21 -0700 (PDT) Received: from localhost.localdomain ([39.40.116.181]) by smtp.gmail.com with ESMTPSA id c11sm3630184wmb.45.2020.07.07.22.08.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 22:08:20 -0700 (PDT) From: Sarosh Arif To: rsanford@akamai.com, erik.g.carrillo@intel.com, dev@dpdk.org Cc: stable@dpdk.org, Sarosh Arif , h.mikita89@gmail.com Date: Wed, 8 Jul 2020 10:06:26 +0500 Message-Id: <20200708050626.23512-1-sarosh.arif@emumba.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20200707090320.2463-1-sarosh.arif@emumba.com> References: <20200707090320.2463-1-sarosh.arif@emumba.com> Subject: [dpdk-stable] [PATCH v2] lib/librte_timer:fix corruption with reset X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Sender: "stable" If the user tries to reset/stop some other timer in it's callback function, which is also about to expire, using rte_timer_reset_sync/rte_timer_stop_sync the application goes into an infinite loop. This happens because rte_timer_reset_sync/rte_timer_stop_sync loop until the timer resets/stops and there is check inside timer_set_config_state which prevents a running timer from being reset/stopped by not it's own timer_cb. Therefore timer_set_config_state returns -1 due to which rte_timer_reset returns -1 and rte_timer_reset_sync goes into an infinite loop. The soloution to this problem is to return -1 from rte_timer_reset_sync/rte_timer_stop_sync in case the user tries to reset/stop some other timer in it's callback function. Bugzilla ID: 491 Fixes: 20d159f20543 ("timer: fix corruption with reset") Cc: h.mikita89@gmail.com Signed-off-by: Sarosh Arif --- v2: remove line continuations --- lib/librte_timer/rte_timer.c | 25 +++++++++++++++++++++++-- lib/librte_timer/rte_timer.h | 4 ++-- 2 files changed, 25 insertions(+), 4 deletions(-) diff --git a/lib/librte_timer/rte_timer.c b/lib/librte_timer/rte_timer.c index 6d19ce469..be86385a1 100644 --- a/lib/librte_timer/rte_timer.c +++ b/lib/librte_timer/rte_timer.c @@ -576,14 +576,24 @@ rte_timer_alt_reset(uint32_t timer_data_id, struct rte_timer *tim, } /* loop until rte_timer_reset() succeed */ -void +int rte_timer_reset_sync(struct rte_timer *tim, uint64_t ticks, enum rte_timer_type type, unsigned tim_lcore, rte_timer_cb_t fct, void *arg) { + struct rte_timer_data *timer_data; + TIMER_DATA_VALID_GET_OR_ERR_RET(default_data_id, timer_data, -EINVAL); + + if (tim->status.state == RTE_TIMER_RUNNING && + (tim->status.owner != (uint16_t)tim_lcore || + tim != timer_data->priv_timer[tim_lcore].running_tim)) + return -1; + while (rte_timer_reset(tim, ticks, type, tim_lcore, fct, arg) != 0) rte_pause(); + + return 0; } static int @@ -642,11 +652,22 @@ rte_timer_alt_stop(uint32_t timer_data_id, struct rte_timer *tim) } /* loop until rte_timer_stop() succeed */ -void +int rte_timer_stop_sync(struct rte_timer *tim) { + struct rte_timer_data *timer_data; + TIMER_DATA_VALID_GET_OR_ERR_RET(default_data_id, timer_data, -EINVAL); + unsigned int lcore_id = rte_lcore_id(); + + if (tim->status.state == RTE_TIMER_RUNNING && + (tim->status.owner != (uint16_t)lcore_id || + tim != timer_data->priv_timer[lcore_id].running_tim)) + return -1; + while (rte_timer_stop(tim) != 0) rte_pause(); + + return 0; } /* Test the PENDING status of the timer handle tim */ diff --git a/lib/librte_timer/rte_timer.h b/lib/librte_timer/rte_timer.h index c6b3d450d..392ca423d 100644 --- a/lib/librte_timer/rte_timer.h +++ b/lib/librte_timer/rte_timer.h @@ -275,7 +275,7 @@ int rte_timer_reset(struct rte_timer *tim, uint64_t ticks, * @param arg * The user argument of the callback function. */ -void +int rte_timer_reset_sync(struct rte_timer *tim, uint64_t ticks, enum rte_timer_type type, unsigned tim_lcore, rte_timer_cb_t fct, void *arg); @@ -314,7 +314,7 @@ int rte_timer_stop(struct rte_timer *tim); * @param tim * The timer handle. */ -void rte_timer_stop_sync(struct rte_timer *tim); +int rte_timer_stop_sync(struct rte_timer *tim); /** * Test if a timer is pending. -- 2.17.1