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 25D6643829 for ; Tue, 5 Mar 2024 16:35:50 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 20541415D7; Tue, 5 Mar 2024 16:35:50 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 80E43402AF for ; Tue, 5 Mar 2024 16:35:48 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709652947; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qq8JrITOUU86bjmYusHhVRqCuz93gruPXTkeuHxl6NM=; b=LwnkDLEnfcD0nRK5/SHEytgrJYXKtL/ksAv3guMgs/u6Vo9fHvjbOk2bMOrOnixQVwwk1V LiJmRuvQtPqVhY/0w9o9NfHHY3aObEa/xENtGY4E9ZatwPyjF7edAEwW+8PNWspouoST3P pgS8Gsp3nb5v0PeavZzfvYohMCc9azc= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-75-wA1jEsv2OdeZ73qDf6t5ZQ-1; Tue, 05 Mar 2024 10:35:44 -0500 X-MC-Unique: wA1jEsv2OdeZ73qDf6t5ZQ-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 165CC101A523; Tue, 5 Mar 2024 15:35:44 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.197]) by smtp.corp.redhat.com (Postfix) with ESMTP id 672BC200AFA5; Tue, 5 Mar 2024 15:35:43 +0000 (UTC) From: Kevin Traynor To: Pavan Nikhilesh Cc: dpdk stable Subject: patch 'event/cnxk: fix dequeue timeout configuration' has been queued to stable release 21.11.7 Date: Tue, 5 Mar 2024 15:34:09 +0000 Message-ID: <20240305153449.263666-36-ktraynor@redhat.com> In-Reply-To: <20240305153449.263666-1-ktraynor@redhat.com> References: <20240305153449.263666-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII"; x-default=true 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 21.11.7 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/11/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/kevintraynor/dpdk-stable This queued commit can be viewed at: https://github.com/kevintraynor/dpdk-stable/commit/d84482b4ce1de2429f7e17e8c3b06d39c344cf98 Thanks. Kevin --- >From d84482b4ce1de2429f7e17e8c3b06d39c344cf98 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 | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/event/cnxk/cnxk_eventdev.c b/drivers/event/cnxk/cnxk_eventdev.c index 19164f7b86..2d422aea07 100644 --- a/drivers/event/cnxk/cnxk_eventdev.c +++ b/drivers/event/cnxk/cnxk_eventdev.c @@ -244,14 +244,15 @@ 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; -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-05 14:08:55.529764883 +0000 +++ 0036-event-cnxk-fix-dequeue-timeout-configuration.patch 2024-03-05 14:08:54.650520765 +0000 @@ -1 +1 @@ -From efcf81e1a89fa7b20aae17accfcb4a8e7ddc3d02 Mon Sep 17 00:00:00 2001 +From d84482b4ce1de2429f7e17e8c3b06d39c344cf98 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit efcf81e1a89fa7b20aae17accfcb4a8e7ddc3d02 ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -14,2 +15,2 @@ - drivers/event/cnxk/cnxk_eventdev.c | 13 +++++++------ - 1 file changed, 7 insertions(+), 6 deletions(-) + drivers/event/cnxk/cnxk_eventdev.c | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) @@ -18 +19 @@ -index 1ec281e735..20f7f0d6df 100644 +index 19164f7b86..2d422aea07 100644 @@ -21 +22 @@ -@@ -163,14 +163,15 @@ cnxk_sso_dev_validate(const struct rte_eventdev *event_dev, uint32_t deq_depth, +@@ -244,14 +244,15 @@ cnxk_sso_dev_validate(const struct rte_eventdev *event_dev) @@ -42,7 +42,0 @@ -@@ -667,5 +668,5 @@ 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;