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 1C2EAA00C4 for ; Fri, 18 Nov 2022 00:10:35 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 1146E4067B; Fri, 18 Nov 2022 00:10:35 +0100 (CET) Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by mails.dpdk.org (Postfix) with ESMTP id 9FE2B4021F for ; Fri, 18 Nov 2022 00:10:33 +0100 (CET) Received: by mail-wm1-f50.google.com with SMTP id c65-20020a1c3544000000b003cfffd00fc0so2253047wma.1 for ; Thu, 17 Nov 2022 15:10:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; 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=pLGwZpQZmR3cxqtgI8rrOuRrCzK3L+/2jW+XSWuJGcA=; b=VEdXYZyA34jEzwLy2coKwv+Gk5P8mDqbFARAtRh4CEO+RKyQSX/MrYPZ7+80CdcogT bTUxN3I+eDeQaIi0LCECnsdnykv0Cy25tuBIMAk5LFQujkyVxwF033Wlp2wQfaW8EV8D WPzofkSQN8nQ7KZtkoxukJL9CFoTYuuhrLPjUe+WnjFWJJUKtCbV72q86YOoaLLUxc6x scNO9zCkaAZZZb51ATauE/JnywM+diqrLn7azX7O1P+YbD1L6AQdoXmqsi4ZoEjVbkK1 6HxS/5dMV7W94huqXSqn0GssQaetflpHg/oUqn0NIpWfXtSJ1cruAeWqTSdhedl5ioXC jhxA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; 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=pLGwZpQZmR3cxqtgI8rrOuRrCzK3L+/2jW+XSWuJGcA=; b=zeL5E4FXo8x6hTiGbuIOS6XIpo/5WJlR6R3jEGxMziHggxjgQoXtpa65WExgorh6+a MrlswEG4ukaCYcXoxROvc2Mzy/el3L09WkdW9nKSseswhdpOapgM4ACAicdV+YCxs7gp KiHkv4EDBQxqivg1Wv/yZxnt5ID2i7O4MadCD9C3yPkcz33QeOXL512x1RYcx+jCtT2Q DmZx/Shf3ny8UQu6+qEFEN8KOmbUXinvGHjjcS7pYcm/tDw3ePG2x+xdmY9mFywDZOCf z+S4IARD5x1MHyREjTPCJScsaMnpHKjb183Dbsm+W0YenXU5aWf4MgItZaPLgg6GVzzZ /m1g== X-Gm-Message-State: ANoB5pk8XfH6El0rBCtvjGFKN5DvsemKh7GGwU6xtUjpaWUzYxOGQXZF 0DjnJhmXDRSRBjr0vMoGimbWCqbnurM= X-Google-Smtp-Source: AA0mqf4x4rroVrJhea5/XTObyrmwnk9ugGQ6pUn77xRHwH2QU6oGFM6dX61smslUY4J50I/jEx588A== X-Received: by 2002:a1c:7909:0:b0:3c6:f83e:d1b3 with SMTP id l9-20020a1c7909000000b003c6f83ed1b3mr6907474wme.190.1668726633280; Thu, 17 Nov 2022 15:10:33 -0800 (PST) Received: from localhost ([2a01:4b00:d307:1000:f1d3:eb5e:11f4:a7d9]) by smtp.gmail.com with ESMTPSA id u10-20020a7bc04a000000b003c6bd12ac27sm2437472wmc.37.2022.11.17.15.10.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Nov 2022 15:10:32 -0800 (PST) From: luca.boccassi@gmail.com To: =?UTF-8?q?Mattias=20R=C3=B6nnblom?= Cc: Erik Gabriel Carrillo , dpdk stable Subject: patch 'doc: fix event timer adapter guide' has been queued to stable release 20.11.7 Date: Thu, 17 Nov 2022 23:08:49 +0000 Message-Id: <20221117230859.611465-25-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221117230859.611465-1-luca.boccassi@gmail.com> References: <20221105171146.1520039-47-luca.boccassi@gmail.com> <20221117230859.611465-1-luca.boccassi@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 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 20.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 11/19/22. 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/ee9f2135b591690dddd9b4f7de6530ff67750548 Thanks. Luca Boccassi --- >From ee9f2135b591690dddd9b4f7de6530ff67750548 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mattias=20R=C3=B6nnblom?= Date: Fri, 4 Nov 2022 07:52:37 +0100 Subject: [PATCH] doc: fix event timer adapter guide MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit [ upstream commit 4109d71e5211e107e0524c40f77bccc32af7a3d8 ] In the example: * Properly initialize the socket id field. * Remove comments redundant and/or not consistent with the code. 180 seconds is not 2 minutes. * Remove redundant pointer initialization. In both the example and text, the flags field of the conf struct was erroneously referred to as timer_adapter_flags and the max_tmo_ns field as max_tmo_nsec. Fixes: 30e7fbd62839 ("doc: add event timer adapter guide") Signed-off-by: Mattias Rönnblom Acked-by: Erik Gabriel Carrillo --- doc/guides/prog_guide/event_timer_adapter.rst | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/doc/guides/prog_guide/event_timer_adapter.rst b/doc/guides/prog_guide/event_timer_adapter.rst index a95efbe0d8..5364db1ed6 100644 --- a/doc/guides/prog_guide/event_timer_adapter.rst +++ b/doc/guides/prog_guide/event_timer_adapter.rst @@ -107,18 +107,19 @@ to ``rte_event_timer_adapter_create()``. .. code-block:: c - #define NSECPERSEC 1E9 // No of ns in 1 sec + #define NSECPERSEC 1E9 const struct rte_event_timer_adapter_conf adapter_config = { .event_dev_id = event_dev_id, .timer_adapter_id = 0, + .socket_id = rte_socket_id(), .clk_src = RTE_EVENT_TIMER_ADAPTER_CPU_CLK, - .timer_tick_ns = NSECPERSEC / 10, // 100 milliseconds - .max_tmo_nsec = 180 * NSECPERSEC // 2 minutes + .timer_tick_ns = NSECPERSEC / 10, + .max_tmo_ns = 180 * NSECPERSEC, .nb_timers = 40000, - .timer_adapter_flags = 0, + .flags = 0, }; - struct rte_event_timer_adapter *adapter = NULL; + struct rte_event_timer_adapter *adapter; adapter = rte_event_timer_adapter_create(&adapter_config); if (adapter == NULL) { ... }; -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-11-17 23:07:56.558250105 +0000 +++ 0025-doc-fix-event-timer-adapter-guide.patch 2022-11-17 23:07:55.532331268 +0000 @@ -1 +1 @@ -From 4109d71e5211e107e0524c40f77bccc32af7a3d8 Mon Sep 17 00:00:00 2001 +From ee9f2135b591690dddd9b4f7de6530ff67750548 Mon Sep 17 00:00:00 2001 @@ -8,0 +9,2 @@ +[ upstream commit 4109d71e5211e107e0524c40f77bccc32af7a3d8 ] + @@ -20 +21,0 @@ -Cc: stable@dpdk.org @@ -25,2 +26,2 @@ - doc/guides/prog_guide/event_timer_adapter.rst | 15 ++++++++------- - 1 file changed, 8 insertions(+), 7 deletions(-) + doc/guides/prog_guide/event_timer_adapter.rst | 11 ++++++----- + 1 file changed, 6 insertions(+), 5 deletions(-) @@ -29 +30 @@ -index 7547059a05..d7307a29bb 100644 +index a95efbe0d8..5364db1ed6 100644 @@ -57,12 +57,0 @@ -@@ -145,9 +146,9 @@ to support timers of the respective type. A periodic timer expires at a fixed - time interval repeatedly till it is cancelled. A non-periodic timer expires only - once. The periodic capability flag, ``RTE_EVENT_TIMER_ADAPTER_CAP_PERIODIC``, - can be set for implementations that support periodic mode if desired. To --configure an adapter in periodic mode, ``timer_adapter_flags`` of -+configure an adapter in periodic mode, ``flags`` of - ``rte_event_timer_adapter_conf`` is set to include the periodic flag --``RTE_EVENT_TIMER_ADAPTER_F_PERIODIC``. Maximum timeout (``max_tmo_nsec``) does -+``RTE_EVENT_TIMER_ADAPTER_F_PERIODIC``. Maximum timeout (``max_tmo_ns``) does - not apply to periodic mode. - - Retrieve Event Timer Adapter Contextual Information