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 E4A6BA0032 for ; Fri, 18 Feb 2022 13:44:39 +0100 (CET) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id DB7D440141; Fri, 18 Feb 2022 13:44:39 +0100 (CET) Received: from mail-wm1-f47.google.com (mail-wm1-f47.google.com [209.85.128.47]) by mails.dpdk.org (Postfix) with ESMTP id E9D1541143 for ; Fri, 18 Feb 2022 13:44:37 +0100 (CET) Received: by mail-wm1-f47.google.com with SMTP id j9-20020a05600c190900b0037bff8a24ebso8512968wmq.4 for ; Fri, 18 Feb 2022 04:44:37 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gAn5bCCFdZcA2odCcJmNOQGaBRz4vMB9Gl4IyicDgCY=; b=l123N7cEWa3Kvskt44Vei7Ch1VqTZo70NeyQFrZQxLGvUUZ0Z+VFvf2X0kq/ZNZ/uR DWO360SDbzvVUrBRUFM4eElp+8i0ISqcMFTrE2oKkJ58HrI/YK64vchb6qFelmd//AbK dyDDYs49X69Mvpfi8HsVwKTdmXUwiuyPRPfuWRitQtRFrhmAJI5zPvHUPFlJMHeVMVF4 XNqzSJKE5+/ooBK/3k/HtF5DxB2Ztzdk6n/F8B/iC5XhVWqZOJmI9KrOpAycADUjO+6j Xa3w/CkVetcHnDjB4YLQXOmnGD42D+yH20dWf2/zB3laslwUEVDrChHt0JJH0G0R0hbF zWXw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gAn5bCCFdZcA2odCcJmNOQGaBRz4vMB9Gl4IyicDgCY=; b=YYpKwiOvYeqDcg7X2HC0dlTLNgoiiO6TfsGktIaVk/Z5UdB6ITvop+dVaaRFKQKO7z I10DdZgY748EnZ+aJUYQ9fMav2hZz8vXkwypuKGwoOEw3YcidbxPa2D47oyrS6TNUTSY jHYMJHHvL1DKjbu7LeCcoJqiq4/Lj3IHn+iDwWv9n4xrgnpwQngG2oSGoYQhZe8jU98A 4WszjBMKs/YmVr6O2mwRSW53RYC/0LnurUpMj/HDkgqXBGl+MIRpAVZM7EGDiMABkJcG 2Wok7GpvpCNkLBLAE3trrjJJbruuY/nlW0qN+ge7g1QcC/w1N7nfQTUAOCIbRGgmNta3 trPQ== X-Gm-Message-State: AOAM532Uv2nLmuoZqIbvC+nMJY+hR7GOzalAKomMlujW1c3wFi4yVYCB Mm1uveU8H3ckb0n0SX91FaU= X-Google-Smtp-Source: ABdhPJzEtyKPeE82m7CLx7jBCC+5tydxcWQZY3h9iVhrfdSX9u7oWeclAgtO3GGT584CrmSDvistZw== X-Received: by 2002:a05:600c:3ca2:b0:37b:8ec9:8170 with SMTP id bg34-20020a05600c3ca200b0037b8ec98170mr7120510wmb.161.1645188277671; Fri, 18 Feb 2022 04:44:37 -0800 (PST) Received: from localhost ([2a01:4b00:f41a:3600:360b:9754:2e3a:c344]) by smtp.gmail.com with ESMTPSA id n20sm4424883wmq.42.2022.02.18.04.44.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 18 Feb 2022 04:44:37 -0800 (PST) From: luca.boccassi@gmail.com To: Bruce Richardson Cc: Jerin Jacob , dpdk stable Subject: patch 'eventdev: fix C++ include' has been queued to stable release 20.11.5 Date: Fri, 18 Feb 2022 12:39:08 +0000 Message-Id: <20220218123931.1749595-99-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20220218123931.1749595-1-luca.boccassi@gmail.com> References: <20220218123931.1749595-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 20.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 02/20/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/48735e1e43eba0ccb3dbdff6dd14a87ea04d9f47 Thanks. Luca Boccassi --- >From 48735e1e43eba0ccb3dbdff6dd14a87ea04d9f47 Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Thu, 10 Feb 2022 15:42:34 +0000 Subject: [PATCH] eventdev: fix C++ include [ upstream commit 153e7d88133cf30e6a042e92dcc6a8a0acfe7a62 ] The eventdev headers had issues when used from C++ * Missing closing "}" for the extern "C" block * No automatic casting to/from void * Fixes: a6562f6d6f8e ("eventdev: introduce event timer adapter") Fixes: 32e326869ed6 ("eventdev: add tracepoints") Signed-off-by: Bruce Richardson Acked-by: Jerin Jacob --- lib/librte_eventdev/rte_event_timer_adapter.h | 4 ++++ lib/librte_eventdev/rte_eventdev.h | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/librte_eventdev/rte_event_timer_adapter.h b/lib/librte_eventdev/rte_event_timer_adapter.h index d2ebcb0909..6919b1de90 100644 --- a/lib/librte_eventdev/rte_event_timer_adapter.h +++ b/lib/librte_eventdev/rte_event_timer_adapter.h @@ -665,4 +665,8 @@ rte_event_timer_cancel_burst(const struct rte_event_timer_adapter *adapter, return adapter->cancel_burst(adapter, evtims, nb_evtims); } +#ifdef __cplusplus +} +#endif + #endif /* __RTE_EVENT_TIMER_ADAPTER_H__ */ diff --git a/lib/librte_eventdev/rte_eventdev.h b/lib/librte_eventdev/rte_eventdev.h index ce1fc2ce0f..bec8f3c0c9 100644 --- a/lib/librte_eventdev/rte_eventdev.h +++ b/lib/librte_eventdev/rte_eventdev.h @@ -1380,7 +1380,7 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id, return 0; } #endif - rte_eventdev_trace_enq_burst(dev_id, port_id, ev, nb_events, fn); + rte_eventdev_trace_enq_burst(dev_id, port_id, ev, nb_events, (void *)fn); /* * Allow zero cost non burst mode routine invocation if application * requests nb_events as const one -- 2.30.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2022-02-18 12:37:41.640886268 +0000 +++ 0099-eventdev-fix-C-include.patch 2022-02-18 12:37:37.830795047 +0000 @@ -1 +1 @@ -From 153e7d88133cf30e6a042e92dcc6a8a0acfe7a62 Mon Sep 17 00:00:00 2001 +From 48735e1e43eba0ccb3dbdff6dd14a87ea04d9f47 Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit 153e7d88133cf30e6a042e92dcc6a8a0acfe7a62 ] + @@ -13 +14,0 @@ -Cc: stable@dpdk.org @@ -18,2 +19,2 @@ - lib/eventdev/rte_event_timer_adapter.h | 4 ++++ - lib/eventdev/rte_eventdev.h | 2 +- + lib/librte_eventdev/rte_event_timer_adapter.h | 4 ++++ + lib/librte_eventdev/rte_eventdev.h | 2 +- @@ -22,5 +23,5 @@ -diff --git a/lib/eventdev/rte_event_timer_adapter.h b/lib/eventdev/rte_event_timer_adapter.h -index 1551741820..e68d02da72 100644 ---- a/lib/eventdev/rte_event_timer_adapter.h -+++ b/lib/eventdev/rte_event_timer_adapter.h -@@ -678,4 +678,8 @@ rte_event_timer_cancel_burst(const struct rte_event_timer_adapter *adapter, +diff --git a/lib/librte_eventdev/rte_event_timer_adapter.h b/lib/librte_eventdev/rte_event_timer_adapter.h +index d2ebcb0909..6919b1de90 100644 +--- a/lib/librte_eventdev/rte_event_timer_adapter.h ++++ b/lib/librte_eventdev/rte_event_timer_adapter.h +@@ -665,4 +665,8 @@ rte_event_timer_cancel_burst(const struct rte_event_timer_adapter *adapter, @@ -35,5 +36,5 @@ -diff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h -index eef47d8acc..25fb7c89dd 100644 ---- a/lib/eventdev/rte_eventdev.h -+++ b/lib/eventdev/rte_eventdev.h -@@ -1805,7 +1805,7 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id, +diff --git a/lib/librte_eventdev/rte_eventdev.h b/lib/librte_eventdev/rte_eventdev.h +index ce1fc2ce0f..bec8f3c0c9 100644 +--- a/lib/librte_eventdev/rte_eventdev.h ++++ b/lib/librte_eventdev/rte_eventdev.h +@@ -1380,7 +1380,7 @@ __rte_event_enqueue_burst(uint8_t dev_id, uint8_t port_id,