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 7D97A43C60 for ; Thu, 7 Mar 2024 02:35:21 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 6FF3942EE3; Thu, 7 Mar 2024 02:35:21 +0100 (CET) Received: from mail-wr1-f48.google.com (mail-wr1-f48.google.com [209.85.221.48]) by mails.dpdk.org (Postfix) with ESMTP id D93E742EE3 for ; Thu, 7 Mar 2024 02:35:19 +0100 (CET) Received: by mail-wr1-f48.google.com with SMTP id ffacd0b85a97d-33e2774bdc5so208597f8f.2 for ; Wed, 06 Mar 2024 17:35:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1709775319; x=1710380119; darn=dpdk.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=dZ3NG/rn/CP7feQKcAcyUF2f7Lp3u4Iz2f/Ral+0hzU=; b=HNBwm6D6zjPJXnxPWs0SSO1VOf51TbaWrf+ASj2UjDe0yUKKFa7Y5CCnzdGB5PEJg5 b6yTH3OgNcG3wV/oUOlBeKtFJs4PK87xouhmN02oBUmOszp+ivBI5bgOoohJ8Eq2q68M CKWOCi7F/spV9WtzU2b33x4z/HGOl22Tfp7aBYuYxG/QXCqlG5xJ9dHAQ2ruUiX3wYAc U+lYvsmCpLgIhFDn2OH+ttSetX2r/4jlRtjOhwWtGcD+kf3JdWCgD3DjzMvGObfE/NhS qNiGFyoWIWUzCYCC4SOEN9dwNPduNzIn9OQj9MCquWgnoziM+prS8MY9ZvvmWDLC6brE pFhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709775319; x=1710380119; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=dZ3NG/rn/CP7feQKcAcyUF2f7Lp3u4Iz2f/Ral+0hzU=; b=sdpxfZpE/Cv/3f4Aq1Y6hhYaks61dAbzzaKeEJvcL3sFor2X2ngMZqiLiLFFG+BUPD O53Xu7yiEmgsbfY1Y3BPQUntdfKi77bxC2cHD81/dVtyEl0qIP8hxMxrzg0GF3oFs6rf HijpEHPW43c8YygTBXB8O43s6/tKf/OVEyklTVanbYm/53N0RwTHpX0Qo1EnZThYsAh6 gOJQ2v/5X9u9T89zJQa9x+E80nfDdDY+yAHgOGgrhkNkUA1uCCrrfcVTdyWAnUTE3j/L v8qNTHjjhtrhDmFyz7fg7Df4tLeYJZYyx/vVtSk9gv1zoZv5pK5v4SILEbFlQGzgNBL8 KbXw== X-Gm-Message-State: AOJu0Yyny6eMqx9lyM9TbGpbRe8QdL4ktgrWzHguRGaEG5ClfkPIgDdw SpDoF3wd2tlVsDmw7SoYJr9Dy03d0Kh9XXEKnJLtmTp46Fnan4fL X-Google-Smtp-Source: AGHT+IHyCiQ1tLeSpmNqGuAJGdzckejELw7CsUzOBTnZKH4moFFtnqCICe0HoFycdoTjlCoWML8rNQ== X-Received: by 2002:adf:fb8c:0:b0:33e:24c7:78ba with SMTP id a12-20020adffb8c000000b0033e24c778bamr11586296wrr.62.1709775319466; Wed, 06 Mar 2024 17:35:19 -0800 (PST) Received: from localhost ([137.220.120.171]) by smtp.gmail.com with ESMTPSA id b29-20020a05600c4a9d00b00412f4afab4csm1300462wmp.1.2024.03.06.17.35.18 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Mar 2024 17:35:19 -0800 (PST) From: luca.boccassi@gmail.com To: Pavan Nikhilesh Cc: dpdk stable Subject: patch 'event/cnxk: fix dequeue timeout configuration' has been queued to stable release 22.11.5 Date: Thu, 7 Mar 2024 01:31:12 +0000 Message-Id: <20240307013159.1735343-55-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240307013159.1735343-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 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 Hi, FYI, your patch has been queued to stable release 22.11.5 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/09/24. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://github.com/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/8dd3b5b4abc62c68619d4e8545f5fc5a421afc5c Thanks. Luca Boccassi --- >From 8dd3b5b4abc62c68619d4e8545f5fc5a421afc5c Mon Sep 17 00:00:00 2001 From: Pavan Nikhilesh Date: Thu, 7 Dec 2023 12:25:39 +0530 Subject: [PATCH] event/cnxk: fix dequeue timeout configuration [ upstream commit efcf81e1a89fa7b20aae17accfcb4a8e7ddc3d02 ] Allow dequeue timeout to be configured as zero, when RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT is disabled. Fixes: 5512c7de85cd ("event/cnxk: add common configuration validation") Signed-off-by: Pavan Nikhilesh --- drivers/event/cnxk/cnxk_eventdev.c | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/drivers/event/cnxk/cnxk_eventdev.c b/drivers/event/cnxk/cnxk_eventdev.c index 9bf31012df..205cc76572 100644 --- a/drivers/event/cnxk/cnxk_eventdev.c +++ b/drivers/event/cnxk/cnxk_eventdev.c @@ -150,16 +150,17 @@ cnxk_sso_dev_validate(const struct rte_eventdev *event_dev) deq_tmo_ns = conf->dequeue_timeout_ns; - if (deq_tmo_ns == 0) - deq_tmo_ns = dev->min_dequeue_timeout_ns; - if (deq_tmo_ns < dev->min_dequeue_timeout_ns || - deq_tmo_ns > dev->max_dequeue_timeout_ns) { + if (deq_tmo_ns && (deq_tmo_ns < dev->min_dequeue_timeout_ns || + deq_tmo_ns > dev->max_dequeue_timeout_ns)) { plt_err("Unsupported dequeue timeout requested"); return -EINVAL; } - if (conf->event_dev_cfg & RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT) + if (conf->event_dev_cfg & RTE_EVENT_DEV_CFG_PER_DEQUEUE_TIMEOUT) { + if (deq_tmo_ns == 0) + deq_tmo_ns = dev->min_dequeue_timeout_ns; dev->is_timeout_deq = 1; + } dev->deq_tmo_ns = deq_tmo_ns; @@ -590,7 +591,7 @@ cnxk_sso_init(struct rte_eventdev *event_dev) } dev->is_timeout_deq = 0; - dev->min_dequeue_timeout_ns = 0; + dev->min_dequeue_timeout_ns = USEC2NSEC(1); dev->max_dequeue_timeout_ns = USEC2NSEC(0x3FF); dev->max_num_events = -1; dev->nb_event_queues = 0; -- 2.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-07 01:05:39.569703734 +0000 +++ 0055-event-cnxk-fix-dequeue-timeout-configuration.patch 2024-03-07 01:05:34.806940186 +0000 @@ -1 +1 @@ -From efcf81e1a89fa7b20aae17accfcb4a8e7ddc3d02 Mon Sep 17 00:00:00 2001 +From 8dd3b5b4abc62c68619d4e8545f5fc5a421afc5c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit efcf81e1a89fa7b20aae17accfcb4a8e7ddc3d02 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 1ec281e735..20f7f0d6df 100644 +index 9bf31012df..205cc76572 100644 @@ -21 +22 @@ -@@ -162,16 +162,17 @@ cnxk_sso_dev_validate(const struct rte_eventdev *event_dev, uint32_t deq_depth, +@@ -150,16 +150,17 @@ cnxk_sso_dev_validate(const struct rte_eventdev *event_dev) @@ -44 +45 @@ -@@ -666,7 +667,7 @@ cnxk_sso_init(struct rte_eventdev *event_dev) +@@ -590,7 +591,7 @@ cnxk_sso_init(struct rte_eventdev *event_dev)