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 437F043B67 for ; Fri, 8 Mar 2024 15:29:54 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3671243373; Fri, 8 Mar 2024 15:29:54 +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 36C8F40E2D for ; Fri, 8 Mar 2024 15:29:53 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1709908192; 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=3apQ5aT3P6C8ETFJZbFpGy9eDVJW/ScPaqtK1jXdYBA=; b=Oc9oL0TsXmd99mmtj5eBXxNBJWAKMbk4ldEKeCfg5wQSJYQDJX8CshOTyOVAp6O2PmrHQj HQWvTur4ObEKZpR89nto5HQqGAJNXK1xAvcQOcHhbypszo5JdTo3OuuM3OEhx5w7k89Ln5 JLxRzfD63nk2W4uMuiugKJ89fiDvjm8= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-65-7Lrnh91XOGygIAiADk3wWg-1; Fri, 08 Mar 2024 09:29:49 -0500 X-MC-Unique: 7Lrnh91XOGygIAiADk3wWg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (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 4798529AC003; Fri, 8 Mar 2024 14:29:49 +0000 (UTC) Received: from rh.redhat.com (unknown [10.39.194.94]) by smtp.corp.redhat.com (Postfix) with ESMTP id CE17437FC; Fri, 8 Mar 2024 14:29:47 +0000 (UTC) From: Kevin Traynor To: Bruce Richardson Cc: Pavan Nikhilesh , Jerin Jacob , dpdk stable Subject: patch 'eventdev: fix Doxygen processing of vector struct' has been queued to stable release 21.11.7 Date: Fri, 8 Mar 2024 14:27:53 +0000 Message-ID: <20240308142824.528417-5-ktraynor@redhat.com> In-Reply-To: <20240308142824.528417-1-ktraynor@redhat.com> References: <20240308142824.528417-1-ktraynor@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 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/13/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/c735ad16ff581429884b15d6b32d2dc402d2e55c Thanks. Kevin --- >From c735ad16ff581429884b15d6b32d2dc402d2e55c Mon Sep 17 00:00:00 2001 From: Bruce Richardson Date: Wed, 21 Feb 2024 10:32:21 +0000 Subject: [PATCH] eventdev: fix Doxygen processing of vector struct [ upstream commit f5746d3fa2f9f08179878c22a0ec1f598a7f15a1 ] The event vector struct was missing comments on two members, and also was inadvertently creating a local variable called "__rte_aligned" in the doxygen output. Correct the comment markers to fix the former issue, and fix the latter by putting "#ifdef __DOXYGEN" around the alignment constraint. Fixes: 1cc44d409271 ("eventdev: introduce event vector capability") Fixes: 3c838062b91f ("eventdev: introduce event vector Rx capability") Fixes: 699155f2d4e2 ("eventdev: fix clang C++ include") Signed-off-by: Bruce Richardson Acked-by: Pavan Nikhilesh Acked-by: Jerin Jacob --- lib/eventdev/rte_eventdev.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h index dfaa3e9cb1..f09ea4a9d1 100644 --- a/lib/eventdev/rte_eventdev.h +++ b/lib/eventdev/rte_eventdev.h @@ -992,8 +992,6 @@ struct rte_event_vector { */ struct { - uint16_t port; - /* Ethernet device port id. */ - uint16_t queue; - /* Ethernet device queue id. */ + uint16_t port; /**< Ethernet device port id. */ + uint16_t queue; /**< Ethernet device queue id. */ }; }; @@ -1024,5 +1022,9 @@ struct rte_event_vector { * values. */ +#ifndef __DOXYGEN__ } __rte_aligned(16); +#else +}; +#endif /* Scheduler type definitions */ -- 2.43.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-08 13:47:49.220530717 +0000 +++ 0005-eventdev-fix-Doxygen-processing-of-vector-struct.patch 2024-03-08 13:47:48.987686570 +0000 @@ -1 +1 @@ -From f5746d3fa2f9f08179878c22a0ec1f598a7f15a1 Mon Sep 17 00:00:00 2001 +From c735ad16ff581429884b15d6b32d2dc402d2e55c Mon Sep 17 00:00:00 2001 @@ -5,0 +6,2 @@ +[ upstream commit f5746d3fa2f9f08179878c22a0ec1f598a7f15a1 ] + @@ -16 +17,0 @@ -Cc: stable@dpdk.org @@ -26 +27 @@ -index 913fe38974..3af46864df 100644 +index dfaa3e9cb1..f09ea4a9d1 100644 @@ -29 +30 @@ -@@ -1359,8 +1359,6 @@ struct rte_event_vector { +@@ -992,8 +992,6 @@ struct rte_event_vector { @@ -40 +41 @@ -@@ -1391,5 +1389,9 @@ struct rte_event_vector { +@@ -1024,5 +1022,9 @@ struct rte_event_vector {