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 9BD4843E57 for ; Sat, 13 Apr 2024 14:51:13 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 95B7C402CD; Sat, 13 Apr 2024 14:51:13 +0200 (CEST) Received: from NAM04-MW2-obe.outbound.protection.outlook.com (mail-mw2nam04on2063.outbound.protection.outlook.com [40.107.101.63]) by mails.dpdk.org (Postfix) with ESMTP id 2C2BF400D6 for ; Sat, 13 Apr 2024 14:51:12 +0200 (CEST) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=alJ7cwLG3DesLsZ4FKZCjYanNHgTKEMjzq0nXr1s+67FZA7QSy5AVQuFG6eOv0a1VT/drwPWb0JzpAR6f6qAYNbf6VceooCvmXcw1RhN5Fyh58bOWYaZKMigTF2ptRCBag0XtiAAXz/95GQ3kx9pP3+1qgXZdUcigCHDD/D8OA4C5o0hIW58/ZHfx2msDRQnwk9YXw5vTDTJvbOaV0fUwS/Oka5ZW6o8x3AqpV2e33dWOcLe9zVDuZr/tjEHv1h/HGXADuO55S0UH/45piak3TUFWDG7Zq+qgVcJBtql6cOkT5PUNbXOaV6SFQ/6HllDBRdHQFL/U0XScw4alOYmsw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=BjZVQVJ/zR4CETtpOhe9Jc3DZrgRXHVKiZWDAKvT7JQ=; b=a1dSzR+8YKABWlCkJQd5NdhU9fNLB+ikEUL30Gk2nsJP/nj1MkqpAraRgjIgyWcu9vTiiBEt0zdvJhbEsGDPOAtLB6WTrLLXGcq/W4zSMOGZEootbL5Rnhil78P6lhva7s2Kmn5etms4GK3TRvDWLfVYV1oPf+PUEBqQZ0CWnHddx5DtoQiIpLFZPidZhsagMEOFDmBD4soR8Yk1u+o6kcOKKsgzDeAashMkpyzmFhCz0VcLpEOMire2rvq4WlTTlSPda7wuXGEtzLk85AAvKhndNDp15omC71cRAYxNT7IsexIgWZuiRtXuUHuU/EMidXb6wKNurYOWt70o51wXMQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.160) smtp.rcpttodomain=intel.com smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none (0) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=BjZVQVJ/zR4CETtpOhe9Jc3DZrgRXHVKiZWDAKvT7JQ=; b=GXTt9GGn6o29ZRQADVNBOHhGl1Jj947CQJAzWkipSihKkgeojEtzBJgIcjyQY3k13W6vLTWpGdxhO3QBKnrZSaDX5X1GN8miwU4NPRzrF/pBs/JxDh0XB0oEfN2Ld7qAThS2sP4vRCkdE0Qtp6ocmZdsGRV1xMD7vvqVsbHLvBV6pGzWLdvE0kvQefzT+IO5r4rgGmP39XuKFEwCViahO3xRplp/vg/EjSE3kaaHhS2gsgD2H0c3H7TaLq/B0XpnI5pSdXfK/gCCUSYxn3XaNn7oVAvrs4dj6JPQzui9Wt78W2MX+XTvU8YJAxzFInWlNSL9engqyioKjP0QF3+Vgg== Received: from MN2PR12CA0003.namprd12.prod.outlook.com (2603:10b6:208:a8::16) by IA0PR12MB7749.namprd12.prod.outlook.com (2603:10b6:208:432::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7409.54; Sat, 13 Apr 2024 12:51:08 +0000 Received: from BL6PEPF00020E64.namprd04.prod.outlook.com (2603:10b6:208:a8:cafe::c1) by MN2PR12CA0003.outlook.office365.com (2603:10b6:208:a8::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7472.22 via Frontend Transport; Sat, 13 Apr 2024 12:51:08 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.160) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.160 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.160; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.160) by BL6PEPF00020E64.mail.protection.outlook.com (10.167.249.25) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.7452.22 via Frontend Transport; Sat, 13 Apr 2024 12:51:07 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.66) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.41; Sat, 13 Apr 2024 05:50:56 -0700 Received: from nvidia.com (10.126.231.35) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1258.12; Sat, 13 Apr 2024 05:50:54 -0700 From: Xueming Li 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 23.11.1 Date: Sat, 13 Apr 2024 20:48:06 +0800 Message-ID: <20240413125005.725659-6-xuemingl@nvidia.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240413125005.725659-1-xuemingl@nvidia.com> References: <20240305094757.439387-1-xuemingl@nvidia.com> <20240413125005.725659-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.35] X-ClientProxiedBy: rnnvmail201.nvidia.com (10.129.68.8) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL6PEPF00020E64:EE_|IA0PR12MB7749:EE_ X-MS-Office365-Filtering-Correlation-Id: 76c5c647-283b-4f18-4257-08dc5bb86374 X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0a/OSTGSVYDB4q6tFomqiH1g+ppQ1ribvOak6DXE9vBA7uUR2H8BtksVbuwsx8ZKZ+r+x/Pv934qsaKjNNXW1Q2L3Dxath3Fe6s7GVCLKJ6pJlXI0Z+Y/qOimDgRENOqi9lXCEu3/zly/1FADoUQLZ8A3nIqkwp4SJe3ozjiUmJN9T0mm6jzObxOqOUMEsrHFmGBs+Hxd40NrjqNvlpS+NIo4Oc4f16uUpYxY8ug3Ems7mqMaXHzNpf5FniNwYSFg3SzjSj6X/uKDtK2Yn7+5Fk9jUpH0reAl3+yVdubuOIny5e/FvTVp+tY8z/olqN27cZ37rNxiJGswu5h5UJlYGJEJggXieeA66T66blBdzatypaxQyKbfWNLf4D8aRIdl7QuTXCD2MqIB+wTs1bTQ/OrY0h1gOwbC0ppaI1W2M2EpIL9KLx4uQVEx/vzbqXP95KN9sZG4S8VNYn5Lea+qQpO0V00MVsKkWAGLGnusYc2+C+X1THVGx24wXVQOOhGVj6u4MhSXEsL/FFFHcXoASemgc8Yw/G8wP2ox2BBJI+0/ypmizFVk8wF3A4WYrzPyrWe1U9z2SFcxoHxW3ZOSW1+7t8tRkf4hx+Fm1HiPVk7yV5OpQgiMiYImqTeuhIetpzxRhEYdhZnGICwZIxBfAao4xiB35xN/jYcL5OS9NXL7/OAKhbg9IUrZvXkecXXocy4ruWAEBMtBX6iKg18NQNKLC4zH+GVnS0ulRzwNEoW83uDYind3p2tCHR7xl1b X-Forefront-Antispam-Report: CIP:216.228.117.160; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge1.nvidia.com; CAT:NONE; SFS:(13230031)(376005)(82310400014)(36860700004)(1800799015); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Apr 2024 12:51:07.8410 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 76c5c647-283b-4f18-4257-08dc5bb86374 X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.160]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL6PEPF00020E64.namprd04.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: IA0PR12MB7749 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 23.11.1 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 04/15/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://git.dpdk.org/dpdk-stable/log/?h=23.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=23.11-staging&id=e5ed46471041c6777095d01f2f4d057c1be2b3af Thanks. Xueming Li --- >From e5ed46471041c6777095d01f2f4d057c1be2b3af 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 Cc: Xueming Li [ 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 a3e2f9f862..7fd9016ca7 100644 --- a/lib/eventdev/rte_eventdev.h +++ b/lib/eventdev/rte_eventdev.h @@ -1111,10 +1111,8 @@ struct rte_event_vector { * port and queue of the mbufs in the 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. */ }; }; /**< Union to hold common attributes of the vector array. */ @@ -1143,7 +1141,11 @@ struct rte_event_vector { * vector array can be an array of mbufs or pointers or opaque u64 * values. */ +#ifndef __DOXYGEN__ } __rte_aligned(16); +#else +}; +#endif /* Scheduler type definitions */ #define RTE_SCHED_TYPE_ORDERED 0 -- 2.34.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-04-13 20:43:05.379822833 +0800 +++ 0006-eventdev-fix-Doxygen-processing-of-vector-struct.patch 2024-04-13 20:43:04.907754049 +0800 @@ -1 +1 @@ -From f5746d3fa2f9f08179878c22a0ec1f598a7f15a1 Mon Sep 17 00:00:00 2001 +From e5ed46471041c6777095d01f2f4d057c1be2b3af Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit f5746d3fa2f9f08179878c22a0ec1f598a7f15a1 ] @@ -16 +18,0 @@ -Cc: stable@dpdk.org @@ -26 +28 @@ -index 913fe38974..3af46864df 100644 +index a3e2f9f862..7fd9016ca7 100644 @@ -29 +31 @@ -@@ -1358,10 +1358,8 @@ struct rte_event_vector { +@@ -1111,10 +1111,8 @@ struct rte_event_vector { @@ -42 +44 @@ -@@ -1390,7 +1388,11 @@ struct rte_event_vector { +@@ -1143,7 +1141,11 @@ struct rte_event_vector {