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 C85B441D53 for ; Thu, 23 Feb 2023 16:07:46 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id C38A743271; Thu, 23 Feb 2023 16:07:46 +0100 (CET) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by mails.dpdk.org (Postfix) with ESMTP id 964FE4325F for ; Thu, 23 Feb 2023 16:07:43 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1677164863; 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=adNfau38Jxw3cGVIX+mOh9HBRp1fAwFZruWNasZhJp4=; b=MD4+lcxRI/R7fnC1Z1MeJ3rnJH3a4fHuunuuMOwWgqOb2mG4CYFUbNspOgFYUuwaAvyC03 HDsBW86vBpaA8Z68TGz8MHjfFIrstoKf96fDVYTzwcL7Zz+Hv1hoYh07iJa6Qe2tXYI+Sa BxWwslgLqv60WmID2YKbqF5XdKVtPKY= Received: from mimecast-mx02.redhat.com (mx3-rdu2.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-624-eMzvfPiIMQyWPXPHjOoLuA-1; Thu, 23 Feb 2023 10:07:40 -0500 X-MC-Unique: eMzvfPiIMQyWPXPHjOoLuA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 408871C05AF5; Thu, 23 Feb 2023 15:07:36 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.192.53]) by smtp.corp.redhat.com (Postfix) with ESMTP id A25CF2166B29; Thu, 23 Feb 2023 15:07:35 +0000 (UTC) From: Kevin Traynor To: Pavan Nikhilesh Cc: dpdk stable Subject: patch 'event/cnxk: fix timer operations in secondary process' has been queued to stable release 21.11.4 Date: Thu, 23 Feb 2023 15:05:30 +0000 Message-Id: <20230223150631.723699-39-ktraynor@redhat.com> In-Reply-To: <20230223150631.723699-1-ktraynor@redhat.com> References: <20230223150631.723699-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.6 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.4 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 02/28/23. 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/9b7ac0283708ebb7a5372d4d704a4db1f379b827 Thanks. Kevin --- >From 9b7ac0283708ebb7a5372d4d704a4db1f379b827 Mon Sep 17 00:00:00 2001 From: Pavan Nikhilesh Date: Sun, 5 Feb 2023 12:03:47 +0530 Subject: [PATCH] event/cnxk: fix timer operations in secondary process [ upstream commit 5f3d1c4ad7c35fb1eeb654b27019798ee6245a4b ] Fix event timer fast-path ops not being initialized in secondary process. Fixes: dd519f83dd96 ("event/cnxk: add timer adapter capabilities") Signed-off-by: Pavan Nikhilesh --- drivers/event/cnxk/cnxk_tim_evdev.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/drivers/event/cnxk/cnxk_tim_evdev.c b/drivers/event/cnxk/cnxk_tim_evdev.c index 99b3acee7c..ffecdb7448 100644 --- a/drivers/event/cnxk/cnxk_tim_evdev.c +++ b/drivers/event/cnxk/cnxk_tim_evdev.c @@ -357,4 +357,5 @@ cnxk_tim_caps_get(const struct rte_eventdev *evdev, uint64_t flags, { struct cnxk_tim_evdev *dev = cnxk_tim_priv_get(); + struct cnxk_tim_ring *tim_ring; RTE_SET_USED(flags); @@ -377,4 +378,10 @@ cnxk_tim_caps_get(const struct rte_eventdev *evdev, uint64_t flags, dev->event_dev = (struct rte_eventdev *)(uintptr_t)evdev; *caps = RTE_EVENT_TIMER_ADAPTER_CAP_INTERNAL_PORT; + + tim_ring = ((struct rte_event_timer_adapter_data + *)((char *)caps - offsetof(struct rte_event_timer_adapter_data, caps))) + ->adapter_priv; + if (tim_ring != NULL && rte_eal_process_type() == RTE_PROC_SECONDARY) + cnxk_tim_set_fp_ops(tim_ring); *ops = &cnxk_tim_ops; -- 2.39.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-23 14:46:24.772153390 +0000 +++ 0039-event-cnxk-fix-timer-operations-in-secondary-process.patch 2023-02-23 14:46:23.760235931 +0000 @@ -1 +1 @@ -From 5f3d1c4ad7c35fb1eeb654b27019798ee6245a4b Mon Sep 17 00:00:00 2001 +From 9b7ac0283708ebb7a5372d4d704a4db1f379b827 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 5f3d1c4ad7c35fb1eeb654b27019798ee6245a4b ] + @@ -10 +11,0 @@ -Cc: stable@dpdk.org @@ -18 +19 @@ -index 6ff3ca72f7..f2862f3292 100644 +index 99b3acee7c..ffecdb7448 100644 @@ -21 +22 @@ -@@ -379,4 +379,5 @@ cnxk_tim_caps_get(const struct rte_eventdev *evdev, uint64_t flags, +@@ -357,4 +357,5 @@ cnxk_tim_caps_get(const struct rte_eventdev *evdev, uint64_t flags, @@ -27,3 +28,3 @@ -@@ -401,4 +402,10 @@ cnxk_tim_caps_get(const struct rte_eventdev *evdev, uint64_t flags, - *caps = RTE_EVENT_TIMER_ADAPTER_CAP_INTERNAL_PORT | - RTE_EVENT_TIMER_ADAPTER_CAP_PERIODIC; +@@ -377,4 +378,10 @@ cnxk_tim_caps_get(const struct rte_eventdev *evdev, uint64_t flags, + dev->event_dev = (struct rte_eventdev *)(uintptr_t)evdev; + *caps = RTE_EVENT_TIMER_ADAPTER_CAP_INTERNAL_PORT;