From patchwork Tue Jul 7 09:03:20 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sarosh Arif X-Patchwork-Id: 73379 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: X-Original-To: patchwork@inbox.dpdk.org Delivered-To: patchwork@inbox.dpdk.org Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id DFBB3A00BE; Tue, 7 Jul 2020 11:03:39 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BDB261DB3E; Tue, 7 Jul 2020 11:03:39 +0200 (CEST) Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by dpdk.org (Postfix) with ESMTP id 545F11DB3E for ; Tue, 7 Jul 2020 11:03:38 +0200 (CEST) Received: by mail-wr1-f66.google.com with SMTP id k6so44330941wrn.3 for ; Tue, 07 Jul 2020 02:03:38 -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=idyQxuPkBPd8uAxKINzHdkeo6jukVaRn9lwd38gTnpvCLrXB9tLXjVlFLFwfQnxwFx R+1h+xqJmXkCbShngsmpP21kWO48b3dzb3sv2oZDnxO41juM1I7OVX7xfdOqeLXZ1m7H uRZ2TqsdAK0aWmb73Dr/VxuursCbI1tQoWc8kpcgSWhdePj5MHy9yXfE/72WD+MdjuGJ 2/PlnTMVrCvV9KmccG3B8LCnyVvCbjCxmho8Acmv7zbRLVpyVAKRMRu9GJxigMaU9XA+ 1KBLvCNqkAlEZLWzz/cEqI7wXs05HEwLXOzuG3H211y/rzIALH9av7jpIKou/scNVS4P GaZw== 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=snMFjQNxzL1TnkqsRewEl4tYW5U/lh5rC2EDgBFK/eOxlesItQ1mekncUrtx/xHQrm LTQ/42KYkWgigp94mMy1zpEUsFdPF/lGqSkppQslhTNOB6h5wWgvgHsyVGqsvUeYFYbA Wt/nteyZ8dZcNs8DxeGOHX3M4WHdP9+STzv5DyMHZK2WLnnYMJSvbGRhOFFnY6Ddt+29 0VkhNEiDomWnRahVq6oA8QZFkLvvzekq3+lpBBV75ow+NmIGSvkGl5MJ/90HeCjolS7L FvPkkEoOATP+6yefauFmd9Y6UgFc4j92RZVAkXa4sFGBZ9yWt01eDlaRqQ9yCKWaA+En Oudg== X-Gm-Message-State: AOAM5303zPbZmLmETPqbFpD5/d5wIAhtvB8nH59p16/Hw0kbXQJZmKwO bbsch8UIctJxp9ZTFEYk+qIkRQ== X-Google-Smtp-Source: ABdhPJyRWtffNM+1LvJ1XDgS/ZzQ9f8HgLCcPzfa0iZqPMtrHQU5PNqA5LkhADsbJyj3AB9bCda7aw== X-Received: by 2002:a5d:5084:: with SMTP id a4mr54624044wrt.191.1594112618033; Tue, 07 Jul 2020 02:03:38 -0700 (PDT) Received: from localhost.localdomain ([39.40.116.181]) by smtp.gmail.com with ESMTPSA id 1sm187544wmf.21.2020.07.07.02.03.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 07 Jul 2020 02:03:37 -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: Tue, 7 Jul 2020 14:03:20 +0500 Message-Id: <20200707090320.2463-1-sarosh.arif@emumba.com> X-Mailer: git-send-email 2.17.1 Subject: [dpdk-dev] [PATCH] lib/librte_timer:fix corruption with reset 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" 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.