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 7BEDA43CAD for ; Thu, 14 Mar 2024 01:10:21 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 75D8C42E50; Thu, 14 Mar 2024 01:10:21 +0100 (CET) Received: from mail-wr1-f41.google.com (mail-wr1-f41.google.com [209.85.221.41]) by mails.dpdk.org (Postfix) with ESMTP id 2B79942E41 for ; Thu, 14 Mar 2024 01:10:20 +0100 (CET) Received: by mail-wr1-f41.google.com with SMTP id ffacd0b85a97d-33e796cc90dso165310f8f.1 for ; Wed, 13 Mar 2024 17:10:20 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1710375020; x=1710979820; darn=dpdk.org; 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=kfIj55xXfCDTdTMTxp08hLPG1UbgK1gBOOnMrJtzBu4=; b=gG+nKgfEotV0i7shgA8J0VDvFs1ygmzabTMIxoOaRuhIcCYHUyhIkWzXruQwreBUwA zRbWD4Uyhdlw+AsADJbvYliXIsgSOX4oe9jZgCNrTMm5+BkGSPZOY0T9XjXYoXsYnPLa ocbruwUnaqB3we5k1mHZ3TUGvNORJuNDiQp5oOFXxZYy3e1EqSY6zJcyG+LlnxKYs8bx Uk/qTotIiJIulFMbtyktlYBUNPmXto9JYuYxasf6+xFDAoRsh+lVZqHgxKD3U+pmMDpO RRCILKBsOuSdzrLnARoaXNQy34nU9Wcbmg+6/qLVmybbKlg0zTYEZ/oFNvQ3wUblhR3K 0aKg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710375020; x=1710979820; 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=kfIj55xXfCDTdTMTxp08hLPG1UbgK1gBOOnMrJtzBu4=; b=r/Z4iNz84nQ1HOEyoZeTjMy+PHK1L8N20QDtpCgRx3QJ8CJ5BGhwGGe++Y9bddBWNi za7QBfGFEXnw15ziPHCT0WJn5B2gFgXGBBEio8JShEW1L/bPKdts1GMrsH2kYyFHLcUl upg+Bp4MbA5+76oL9RuuYXdaiqQPEENy61zDntpaZfMjOgV03y6YFTxmmen9SxtZSusa X7cyPBg1ZuAeb/e9Aa5FBOcynK9ZcpDXD5d928RztsiSZjAbLIItDX+Q3E7fTgykSV5q /DeblAPATHQUQfBR0BiiJk7HfUzlyP0S4uOUhPS/PlUrJyWl4TvJhJGmwK91ZjtdxvNR sOKA== X-Forwarded-Encrypted: i=1; AJvYcCWaystZNfIGmYHx6PW+HGTLSAWgYd0kNsrW4utzWSbFS9NEBZUQyskUfxtxnt5KrmoNXo/r0WHYoq0OQDcepOU= X-Gm-Message-State: AOJu0YxzBGzR9Uk+3PgrzxUm1MvIcvV8pHF8C2ZrQNctPHgcByjpuEMs +UKjGKFZE1DWMSif6Vogh0mZ/us2s1HxajaZiGNlHO+/Inj3O03pASMGN6cq X-Google-Smtp-Source: AGHT+IG40nDPzBklnxPlYpFF0NdB/RytvLVyvlqb23S8SKP7B7sJx/NjgfmqJadZOkvOLEbyo7Ujdg== X-Received: by 2002:a5d:414e:0:b0:33e:c528:c900 with SMTP id c14-20020a5d414e000000b0033ec528c900mr60055wrq.55.1710375019846; Wed, 13 Mar 2024 17:10:19 -0700 (PDT) Received: from localhost ([2a01:4b00:d036:ae00:7aef:1aaa:3dff:d546]) by smtp.gmail.com with ESMTPSA id l9-20020a5d5609000000b0033e7eba040dsm279748wrv.97.2024.03.13.17.10.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Mar 2024 17:10:19 -0700 (PDT) From: luca.boccassi@gmail.com 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 22.11.5 Date: Thu, 14 Mar 2024 00:09:04 +0000 Message-Id: <20240314000957.2810803-8-luca.boccassi@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240314000957.2810803-1-luca.boccassi@gmail.com> References: <20240307013159.1735343-102-luca.boccassi@gmail.com> <20240314000957.2810803-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 22.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 03/16/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/bluca/dpdk-stable This queued commit can be viewed at: https://github.com/bluca/dpdk-stable/commit/7a45bfba9c57745fd83c19169660acf1f70d396e Thanks. Luca Boccassi --- >From 7a45bfba9c57745fd83c19169660acf1f70d396e 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 695a1f636c..d0e2463bb8 100644 --- a/lib/eventdev/rte_eventdev.h +++ b/lib/eventdev/rte_eventdev.h @@ -1107,10 +1107,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. */ @@ -1139,7 +1137,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.39.2 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2024-03-14 00:09:21.173719460 +0000 +++ 0008-eventdev-fix-Doxygen-processing-of-vector-struct.patch 2024-03-14 00:09:20.573614427 +0000 @@ -1 +1 @@ -From f5746d3fa2f9f08179878c22a0ec1f598a7f15a1 Mon Sep 17 00:00:00 2001 +From 7a45bfba9c57745fd83c19169660acf1f70d396e 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 695a1f636c..d0e2463bb8 100644 @@ -29 +30 @@ -@@ -1358,10 +1358,8 @@ struct rte_event_vector { +@@ -1107,10 +1107,8 @@ struct rte_event_vector { @@ -42 +43 @@ -@@ -1390,7 +1388,11 @@ struct rte_event_vector { +@@ -1139,7 +1137,11 @@ struct rte_event_vector {