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 4BC53A00BE for ; Tue, 7 Jul 2020 10:58:50 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 4266A1D96A; Tue, 7 Jul 2020 10:58:50 +0200 (CEST) Received: from mail-wm1-f65.google.com (mail-wm1-f65.google.com [209.85.128.65]) by dpdk.org (Postfix) with ESMTP id 232021D96A for ; Tue, 7 Jul 2020 10:58:49 +0200 (CEST) Received: by mail-wm1-f65.google.com with SMTP id a6so1267364wmm.0 for ; Tue, 07 Jul 2020 01:58:49 -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; bh=0gWkV/fCAqx4M3JH8PXCSXRIEPpN0MOoGGuhybwuPhY=; b=UiK+/+sccOXjjqRelot87mymGrlZoAS6TzrepC3crI+BnfRflBj4HxizJVgK7PudcD iP4czxifTorSjAZiFKstHnk7cXQHyZYl0JSIvwZMZavcyesIlPqLSzJD/3qxMozBPO7X kTLEiRNzZcmKHq3RrRGBei0Q2VwZLoRwKnp3sVvsvmRHo6f7hQ1kExP1JNBgXo4zY2bX i7qtDxPJaxuzq5GviILmr6vKajYxAJH1JiLxr1g6hMMLM5JsPBmFBokt2s0XR0EyDG9Q dcHnB+LLvVDOLPBnjRDq7cSpWbq535DZ+0qtN8NTRxkESBTIMmBMPQrNQnUrr7azKqeS o3yQ== 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; bh=0gWkV/fCAqx4M3JH8PXCSXRIEPpN0MOoGGuhybwuPhY=; b=RiOc4fFVGCW9ebBWr+Hh0S+V2bOCZc1sVtlPsyyrThDK3dgpErIQAUcYz3jcawYif8 1VGTVbAFdw3HuuijNPonylGBwmbRdFeRwvMcyhbTHo8Tu60yE+8vyeWVbkQ6kUirsbpx tNLTOg4GfYaT3zvSP1zD90qbfR4/IgIR1i7aBTWyhxZDDiiH/fhiqx8Z+jwV5UrhAKgP p2qrH6LnsKi1FpEnQRdpD20N7LEfBQ219FDmVpzrzo6utoMC3HyXMsbIbxMfoAcOwYtz Yo0LfePqIhhXbtkI6ZKQzBIBPViJS5UFpYSoUBydKWSdTAq/vBoqRU2SMrSb1znL20Sr zYFw== X-Gm-Message-State: AOAM530GkP4b2JfiV47FKNDYVTp8b7rpLsz0jF2LcE7atiW2y1G/eTX9 XX7rQN7B0htYteszwMO9ykRqAg== X-Google-Smtp-Source: ABdhPJyZ1YtJkxDV38nAOFQMfbzL9RczIuVAbI5ou2dQmRfpwpgplxbZwv5wox80VNiRK1QXDAI+zA== X-Received: by 2002:a1c:de07:: with SMTP id v7mr3118458wmg.56.1594112328727; Tue, 07 Jul 2020 01:58:48 -0700 (PDT) Received: from localhost.localdomain ([39.40.116.181]) by smtp.gmail.com with ESMTPSA id r28sm98651wrr.20.2020.07.07.01.58.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 01:58:47 -0700 (PDT) From: Sarosh Arif To: rsanford@akamai.com, erik.g.carrillo@intel.com Cc: stable@dpdk.org, Sarosh Arif , h.mikita89@gmail.com Date: Tue, 7 Jul 2020 13:58:01 +0500 Message-Id: <20200707085801.2164-1-sarosh.arif@emumba.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-stable] [PATCH] 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 --- 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..ed48bcbfd 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