Patch Detail
get:
Show a patch.
patch:
Update a patch.
put:
Update a patch.
GET /api/patches/136769/?format=api
{ "id": 136769, "url": "http://patches.dpdk.org/api/patches/136769/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/patch/1707928564-28796-11-git-send-email-roretzla@linux.microsoft.com/", "project": { "id": 1, "url": "http://patches.dpdk.org/api/projects/1/?format=api", "name": "DPDK", "link_name": "dpdk", "list_id": "dev.dpdk.org", "list_email": "dev@dpdk.org", "web_url": "http://core.dpdk.org", "scm_url": "git://dpdk.org/dpdk", "webscm_url": "http://git.dpdk.org/dpdk", "list_archive_url": "https://inbox.dpdk.org/dev", "list_archive_url_format": "https://inbox.dpdk.org/dev/{}", "commit_url_format": "" }, "msgid": "<1707928564-28796-11-git-send-email-roretzla@linux.microsoft.com>", "list_archive_url": "https://inbox.dpdk.org/dev/1707928564-28796-11-git-send-email-roretzla@linux.microsoft.com", "date": "2024-02-14T16:35:35", "name": "[v4,10/39] eventdev: use C11 alignas", "commit_ref": null, "pull_url": null, "state": "superseded", "archived": true, "hash": "9ae7506f996fabd8761740e949a78e9e91d22ce8", "submitter": { "id": 2077, "url": "http://patches.dpdk.org/api/people/2077/?format=api", "name": "Tyler Retzlaff", "email": "roretzla@linux.microsoft.com" }, "delegate": { "id": 24651, "url": "http://patches.dpdk.org/api/users/24651/?format=api", "username": "dmarchand", "first_name": "David", "last_name": "Marchand", "email": "david.marchand@redhat.com" }, "mbox": "http://patches.dpdk.org/project/dpdk/patch/1707928564-28796-11-git-send-email-roretzla@linux.microsoft.com/mbox/", "series": [ { "id": 31107, "url": "http://patches.dpdk.org/api/series/31107/?format=api", "web_url": "http://patches.dpdk.org/project/dpdk/list/?series=31107", "date": "2024-02-14T16:35:25", "name": "use C11 alignas and normalize type alignment", "version": 4, "mbox": "http://patches.dpdk.org/series/31107/mbox/" } ], "comments": "http://patches.dpdk.org/api/patches/136769/comments/", "check": "warning", "checks": "http://patches.dpdk.org/api/patches/136769/checks/", "tags": {}, "related": [], "headers": { "Return-Path": "<dev-bounces@dpdk.org>", "X-Original-To": "patchwork@inbox.dpdk.org", "Delivered-To": "patchwork@inbox.dpdk.org", "Received": [ "from mails.dpdk.org (mails.dpdk.org [217.70.189.124])\n\tby inbox.dpdk.org (Postfix) with ESMTP id 6853143B38;\n\tWed, 14 Feb 2024 17:37:53 +0100 (CET)", "from mails.dpdk.org (localhost [127.0.0.1])\n\tby mails.dpdk.org (Postfix) with ESMTP id EFB7643276;\n\tWed, 14 Feb 2024 17:36:27 +0100 (CET)", "from linux.microsoft.com (linux.microsoft.com [13.77.154.182])\n by mails.dpdk.org (Postfix) with ESMTP id E401E42E1F\n for <dev@dpdk.org>; Wed, 14 Feb 2024 17:36:07 +0100 (CET)", "by linux.microsoft.com (Postfix, from userid 1086)\n id 6874420B200A; Wed, 14 Feb 2024 08:36:06 -0800 (PST)" ], "DKIM-Filter": "OpenDKIM Filter v2.11.0 linux.microsoft.com 6874420B200A", "DKIM-Signature": "v=1; a=rsa-sha256; c=relaxed/relaxed; d=linux.microsoft.com;\n s=default; t=1707928566;\n bh=EUULW1R3VxZYklPYv9ygVN/t9s2kdM/QkEZndOfrNMU=;\n h=From:To:Cc:Subject:Date:In-Reply-To:References:From;\n b=AWAklsMF3oTVdfw56b/kaPmq8g/NltC3XMWJEBiyaw45iI7esfyFNBHYJJriH4uGG\n lwrkZZGaKfeKVkOyo4L76m9yxU0kaJA9iLQb0fIMTaClKR5+HSUtLS67KckmCiGlJm\n c/pxAgT/gU8Qm8e/aHaU1KKWAJY169vFIrk50CCI=", "From": "Tyler Retzlaff <roretzla@linux.microsoft.com>", "To": "dev@dpdk.org", "Cc": "Andrew Rybchenko <andrew.rybchenko@oktetlabs.ru>,\n Bruce Richardson <bruce.richardson@intel.com>,\n Chengwen Feng <fengchengwen@huawei.com>,\n Cristian Dumitrescu <cristian.dumitrescu@intel.com>,\n David Christensen <drc@linux.vnet.ibm.com>,\n David Hunt <david.hunt@intel.com>, Ferruh Yigit <ferruh.yigit@amd.com>,\n Honnappa Nagarahalli <honnappa.nagarahalli@arm.com>,\n Jasvinder Singh <jasvinder.singh@intel.com>,\n Jerin Jacob <jerinj@marvell.com>, Kevin Laatz <kevin.laatz@intel.com>,\n Konstantin Ananyev <konstantin.v.ananyev@yandex.ru>,\n Min Zhou <zhoumin@loongson.cn>, Ruifeng Wang <ruifeng.wang@arm.com>,\n Sameh Gobriel <sameh.gobriel@intel.com>,\n Stanislaw Kardach <kda@semihalf.com>,\n Thomas Monjalon <thomas@monjalon.net>,\n Vladimir Medvedkin <vladimir.medvedkin@intel.com>,\n Yipeng Wang <yipeng1.wang@intel.com>,\n Tyler Retzlaff <roretzla@linux.microsoft.com>", "Subject": "[PATCH v4 10/39] eventdev: use C11 alignas", "Date": "Wed, 14 Feb 2024 08:35:35 -0800", "Message-Id": "<1707928564-28796-11-git-send-email-roretzla@linux.microsoft.com>", "X-Mailer": "git-send-email 1.8.3.1", "In-Reply-To": "<1707928564-28796-1-git-send-email-roretzla@linux.microsoft.com>", "References": "<1707873986-29352-1-git-send-email-roretzla@linux.microsoft.com>\n <1707928564-28796-1-git-send-email-roretzla@linux.microsoft.com>", "MIME-Version": "1.0", "Content-Type": "text/plain; charset=UTF-8", "Content-Transfer-Encoding": "8bit", "X-BeenThere": "dev@dpdk.org", "X-Mailman-Version": "2.1.29", "Precedence": "list", "List-Id": "DPDK patches and discussions <dev.dpdk.org>", "List-Unsubscribe": "<https://mails.dpdk.org/options/dev>,\n <mailto:dev-request@dpdk.org?subject=unsubscribe>", "List-Archive": "<http://mails.dpdk.org/archives/dev/>", "List-Post": "<mailto:dev@dpdk.org>", "List-Help": "<mailto:dev-request@dpdk.org?subject=help>", "List-Subscribe": "<https://mails.dpdk.org/listinfo/dev>,\n <mailto:dev-request@dpdk.org?subject=subscribe>", "Errors-To": "dev-bounces@dpdk.org" }, "content": "* Move __rte_aligned from the end of {struct,union} definitions to\n be between {struct,union} and tag.\n\n The placement between {struct,union} and the tag allows the desired\n alignment to be imparted on the type regardless of the toolchain being\n used for all of GCC, LLVM, MSVC compilers building both C and C++.\n\n* Replace use of __rte_aligned(a) on variables/fields with alignas(a).\n\nSigned-off-by: Tyler Retzlaff <roretzla@linux.microsoft.com>\nAcked-by: Morten Brørup <mb@smartsharesystems.com>\n---\n lib/eventdev/event_timer_adapter_pmd.h | 4 ++--\n lib/eventdev/eventdev_pmd.h | 8 ++++----\n lib/eventdev/rte_event_crypto_adapter.c | 16 ++++++++--------\n lib/eventdev/rte_event_dma_adapter.c | 16 ++++++++--------\n lib/eventdev/rte_event_eth_rx_adapter.c | 8 ++++----\n lib/eventdev/rte_event_eth_tx_adapter.c | 4 ++--\n lib/eventdev/rte_event_timer_adapter.c | 9 +++++----\n lib/eventdev/rte_event_timer_adapter.h | 8 ++++----\n lib/eventdev/rte_eventdev.h | 8 ++++----\n lib/eventdev/rte_eventdev_core.h | 4 ++--\n 10 files changed, 43 insertions(+), 42 deletions(-)", "diff": "diff --git a/lib/eventdev/event_timer_adapter_pmd.h b/lib/eventdev/event_timer_adapter_pmd.h\nindex 65b421b..cd5127f 100644\n--- a/lib/eventdev/event_timer_adapter_pmd.h\n+++ b/lib/eventdev/event_timer_adapter_pmd.h\n@@ -86,7 +86,7 @@ struct event_timer_adapter_ops {\n * @internal Adapter data; structure to be placed in shared memory to be\n * accessible by various processes in a multi-process configuration.\n */\n-struct rte_event_timer_adapter_data {\n+struct __rte_cache_aligned rte_event_timer_adapter_data {\n \tuint8_t id;\n \t/**< Event timer adapter ID */\n \tuint8_t event_dev_id;\n@@ -110,7 +110,7 @@ struct rte_event_timer_adapter_data {\n \n \tuint8_t started : 1;\n \t/**< Flag to indicate adapter started. */\n-} __rte_cache_aligned;\n+};\n \n #ifdef __cplusplus\n }\ndiff --git a/lib/eventdev/eventdev_pmd.h b/lib/eventdev/eventdev_pmd.h\nindex c415624..3934d8e 100644\n--- a/lib/eventdev/eventdev_pmd.h\n+++ b/lib/eventdev/eventdev_pmd.h\n@@ -107,7 +107,7 @@ struct rte_eventdev_global {\n * This structure is safe to place in shared memory to be common among\n * different processes in a multi-process configuration.\n */\n-struct rte_eventdev_data {\n+struct __rte_cache_aligned rte_eventdev_data {\n \tint socket_id;\n \t/**< Socket ID where memory is allocated */\n \tuint8_t dev_id;\n@@ -146,10 +146,10 @@ struct rte_eventdev_data {\n \n \tuint64_t reserved_64s[4]; /**< Reserved for future fields */\n \tvoid *reserved_ptrs[4];\t /**< Reserved for future fields */\n-} __rte_cache_aligned;\n+};\n \n /** @internal The data structure associated with each event device. */\n-struct rte_eventdev {\n+struct __rte_cache_aligned rte_eventdev {\n \tstruct rte_eventdev_data *data;\n \t/**< Pointer to device data */\n \tstruct eventdev_ops *dev_ops;\n@@ -189,7 +189,7 @@ struct rte_eventdev {\n \n \tuint64_t reserved_64s[3]; /**< Reserved for future fields */\n \tvoid *reserved_ptrs[3];\t /**< Reserved for future fields */\n-} __rte_cache_aligned;\n+};\n \n extern struct rte_eventdev *rte_eventdevs;\n /** @internal The pool of rte_eventdev structures. */\ndiff --git a/lib/eventdev/rte_event_crypto_adapter.c b/lib/eventdev/rte_event_crypto_adapter.c\nindex d46595d..6bc2769 100644\n--- a/lib/eventdev/rte_event_crypto_adapter.c\n+++ b/lib/eventdev/rte_event_crypto_adapter.c\n@@ -42,7 +42,7 @@\n \n #define ECA_ADAPTER_ARRAY \"crypto_adapter_array\"\n \n-struct crypto_ops_circular_buffer {\n+struct __rte_cache_aligned crypto_ops_circular_buffer {\n \t/* index of head element in circular buffer */\n \tuint16_t head;\n \t/* index of tail element in circular buffer */\n@@ -53,9 +53,9 @@ struct crypto_ops_circular_buffer {\n \tuint16_t size;\n \t/* Pointer to hold rte_crypto_ops for batching */\n \tstruct rte_crypto_op **op_buffer;\n-} __rte_cache_aligned;\n+};\n \n-struct event_crypto_adapter {\n+struct __rte_cache_aligned event_crypto_adapter {\n \t/* Event device identifier */\n \tuint8_t eventdev_id;\n \t/* Event port identifier */\n@@ -98,10 +98,10 @@ struct event_crypto_adapter {\n \tuint16_t nb_qps;\n \t/* Adapter mode */\n \tenum rte_event_crypto_adapter_mode mode;\n-} __rte_cache_aligned;\n+};\n \n /* Per crypto device information */\n-struct crypto_device_info {\n+struct __rte_cache_aligned crypto_device_info {\n \t/* Pointer to cryptodev */\n \tstruct rte_cryptodev *dev;\n \t/* Pointer to queue pair info */\n@@ -118,15 +118,15 @@ struct crypto_device_info {\n \t * be invoked if not already invoked\n \t */\n \tuint16_t num_qpairs;\n-} __rte_cache_aligned;\n+};\n \n /* Per queue pair information */\n-struct crypto_queue_pair_info {\n+struct __rte_cache_aligned crypto_queue_pair_info {\n \t/* Set to indicate queue pair is enabled */\n \tbool qp_enabled;\n \t/* Circular buffer for batching crypto ops to cdev */\n \tstruct crypto_ops_circular_buffer cbuf;\n-} __rte_cache_aligned;\n+};\n \n static struct event_crypto_adapter **event_crypto_adapter;\n \ndiff --git a/lib/eventdev/rte_event_dma_adapter.c b/lib/eventdev/rte_event_dma_adapter.c\nindex 4196164..24dff55 100644\n--- a/lib/eventdev/rte_event_dma_adapter.c\n+++ b/lib/eventdev/rte_event_dma_adapter.c\n@@ -26,7 +26,7 @@\n \t} while (0)\n \n /* DMA ops circular buffer */\n-struct dma_ops_circular_buffer {\n+struct __rte_cache_aligned dma_ops_circular_buffer {\n \t/* Index of head element */\n \tuint16_t head;\n \n@@ -41,19 +41,19 @@ struct dma_ops_circular_buffer {\n \n \t/* Pointer to hold rte_event_dma_adapter_op for processing */\n \tstruct rte_event_dma_adapter_op **op_buffer;\n-} __rte_cache_aligned;\n+};\n \n /* Vchan information */\n-struct dma_vchan_info {\n+struct __rte_cache_aligned dma_vchan_info {\n \t/* Set to indicate vchan queue is enabled */\n \tbool vq_enabled;\n \n \t/* Circular buffer for batching DMA ops to dma_dev */\n \tstruct dma_ops_circular_buffer dma_buf;\n-} __rte_cache_aligned;\n+};\n \n /* DMA device information */\n-struct dma_device_info {\n+struct __rte_cache_aligned dma_device_info {\n \t/* Pointer to vchan queue info */\n \tstruct dma_vchan_info *vchanq;\n \n@@ -81,9 +81,9 @@ struct dma_device_info {\n \t * transfer uses a hardware mechanism\n \t */\n \tuint8_t internal_event_port;\n-} __rte_cache_aligned;\n+};\n \n-struct event_dma_adapter {\n+struct __rte_cache_aligned event_dma_adapter {\n \t/* Event device identifier */\n \tuint8_t eventdev_id;\n \n@@ -145,7 +145,7 @@ struct event_dma_adapter {\n \n \t/* Per instance stats structure */\n \tstruct rte_event_dma_adapter_stats dma_stats;\n-} __rte_cache_aligned;\n+};\n \n static struct event_dma_adapter **event_dma_adapter;\n \ndiff --git a/lib/eventdev/rte_event_eth_rx_adapter.c b/lib/eventdev/rte_event_eth_rx_adapter.c\nindex 1b83a55..3ee20d9 100644\n--- a/lib/eventdev/rte_event_eth_rx_adapter.c\n+++ b/lib/eventdev/rte_event_eth_rx_adapter.c\n@@ -72,7 +72,7 @@ struct eth_rx_poll_entry {\n \tuint16_t eth_rx_qid;\n };\n \n-struct eth_rx_vector_data {\n+struct __rte_cache_aligned eth_rx_vector_data {\n \tTAILQ_ENTRY(eth_rx_vector_data) next;\n \tuint16_t port;\n \tuint16_t queue;\n@@ -82,7 +82,7 @@ struct eth_rx_vector_data {\n \tuint64_t vector_timeout_ticks;\n \tstruct rte_mempool *vector_pool;\n \tstruct rte_event_vector *vector_ev;\n-} __rte_cache_aligned;\n+};\n \n TAILQ_HEAD(eth_rx_vector_data_list, eth_rx_vector_data);\n \n@@ -103,7 +103,7 @@ struct eth_event_enqueue_buffer {\n \tuint16_t last_mask;\n };\n \n-struct event_eth_rx_adapter {\n+struct __rte_cache_aligned event_eth_rx_adapter {\n \t/* RSS key */\n \tuint8_t rss_key_be[RSS_KEY_SIZE];\n \t/* Event device identifier */\n@@ -188,7 +188,7 @@ struct event_eth_rx_adapter {\n \tuint8_t rxa_started;\n \t/* Adapter ID */\n \tuint8_t id;\n-} __rte_cache_aligned;\n+};\n \n /* Per eth device */\n struct eth_device_info {\ndiff --git a/lib/eventdev/rte_event_eth_tx_adapter.c b/lib/eventdev/rte_event_eth_tx_adapter.c\nindex 56435be..67fff8b 100644\n--- a/lib/eventdev/rte_event_eth_tx_adapter.c\n+++ b/lib/eventdev/rte_event_eth_tx_adapter.c\n@@ -109,7 +109,7 @@ struct txa_service_queue_info {\n };\n \n /* PMD private structure */\n-struct txa_service_data {\n+struct __rte_cache_aligned txa_service_data {\n \t/* Max mbufs processed in any service function invocation */\n \tuint32_t max_nb_tx;\n \t/* Number of Tx queues in adapter */\n@@ -144,7 +144,7 @@ struct txa_service_data {\n \tint64_t service_id;\n \t/* Memory allocation name */\n \tchar mem_name[TXA_MEM_NAME_LEN];\n-} __rte_cache_aligned;\n+};\n \n /* Per eth device structure */\n struct txa_service_ethdev {\ndiff --git a/lib/eventdev/rte_event_timer_adapter.c b/lib/eventdev/rte_event_timer_adapter.c\nindex e6d3492..5d3e37f 100644\n--- a/lib/eventdev/rte_event_timer_adapter.c\n+++ b/lib/eventdev/rte_event_timer_adapter.c\n@@ -4,6 +4,7 @@\n */\n \n #include <ctype.h>\n+#include <stdalign.h>\n #include <string.h>\n #include <inttypes.h>\n #include <stdbool.h>\n@@ -512,11 +513,11 @@ struct rte_event_timer_adapter *\n \n #define EXP_TIM_BUF_SZ 128\n \n-struct event_buffer {\n+struct __rte_cache_aligned event_buffer {\n \tsize_t head;\n \tsize_t tail;\n \tstruct rte_event events[EVENT_BUFFER_SZ];\n-} __rte_cache_aligned;\n+};\n \n static inline bool\n event_buffer_full(struct event_buffer *bufp)\n@@ -632,9 +633,9 @@ struct swtim {\n \t/* Identifier of timer data instance */\n \tuint32_t timer_data_id;\n \t/* Track which cores have actually armed a timer */\n-\tstruct {\n+\talignas(RTE_CACHE_LINE_SIZE) struct {\n \t\tRTE_ATOMIC(uint16_t) v;\n-\t} __rte_cache_aligned in_use[RTE_MAX_LCORE];\n+\t} in_use[RTE_MAX_LCORE];\n \t/* Track which cores' timer lists should be polled */\n \tRTE_ATOMIC(unsigned int) poll_lcores[RTE_MAX_LCORE];\n \t/* The number of lists that should be polled */\ndiff --git a/lib/eventdev/rte_event_timer_adapter.h b/lib/eventdev/rte_event_timer_adapter.h\nindex c133dec..0bd1b30 100644\n--- a/lib/eventdev/rte_event_timer_adapter.h\n+++ b/lib/eventdev/rte_event_timer_adapter.h\n@@ -473,7 +473,7 @@ enum rte_event_timer_state {\n * The generic *rte_event_timer* structure to hold the event timer attributes\n * for arm and cancel operations.\n */\n-struct rte_event_timer {\n+struct __rte_cache_aligned rte_event_timer {\n \tstruct rte_event ev;\n \t/**<\n \t * Expiry event attributes. On successful event timer timeout,\n@@ -504,7 +504,7 @@ struct rte_event_timer {\n \t/**< Memory to store user specific metadata.\n \t * The event timer adapter implementation should not modify this area.\n \t */\n-} __rte_cache_aligned;\n+};\n \n typedef uint16_t (*rte_event_timer_arm_burst_t)(\n \t\tconst struct rte_event_timer_adapter *adapter,\n@@ -526,7 +526,7 @@ typedef uint16_t (*rte_event_timer_cancel_burst_t)(\n /**\n * @internal Data structure associated with each event timer adapter.\n */\n-struct rte_event_timer_adapter {\n+struct __rte_cache_aligned rte_event_timer_adapter {\n \trte_event_timer_arm_burst_t arm_burst;\n \t/**< Pointer to driver arm_burst function. */\n \trte_event_timer_arm_tmo_tick_burst_t arm_tmo_tick_burst;\n@@ -540,7 +540,7 @@ struct rte_event_timer_adapter {\n \n \tuint8_t allocated : 1;\n \t/**< Flag to indicate that this adapter has been allocated */\n-} __rte_cache_aligned;\n+};\n \n #define ADAPTER_VALID_OR_ERR_RET(adapter, retval) do {\t\t\\\n \tif (adapter == NULL || !adapter->allocated)\t\t\\\ndiff --git a/lib/eventdev/rte_eventdev.h b/lib/eventdev/rte_eventdev.h\nindex ec9b024..ff143c7 100644\n--- a/lib/eventdev/rte_eventdev.h\n+++ b/lib/eventdev/rte_eventdev.h\n@@ -1078,7 +1078,7 @@ int rte_event_dev_stop_flush_callback_register(uint8_t dev_id,\n /**\n * Event vector structure.\n */\n-struct rte_event_vector {\n+struct __rte_aligned(16) rte_event_vector {\n \tuint16_t nb_elem;\n \t/**< Number of elements valid in this event vector. */\n \tuint16_t elem_offset : 12;\n@@ -1118,19 +1118,19 @@ struct rte_event_vector {\n \t * value to share between dequeue and enqueue operation.\n \t * The application should not modify this field.\n \t */\n-\tunion {\n+\tunion __rte_aligned(16) {\n #endif\n \t\tstruct rte_mbuf *mbufs[0];\n \t\tvoid *ptrs[0];\n \t\tuint64_t u64s[0];\n #ifndef __cplusplus\n-\t} __rte_aligned(16);\n+\t};\n #endif\n \t/**< Start of the vector array union. Depending upon the event type the\n \t * vector array can be an array of mbufs or pointers or opaque u64\n \t * values.\n \t */\n-} __rte_aligned(16);\n+};\n \n /* Scheduler type definitions */\n #define RTE_SCHED_TYPE_ORDERED 0\ndiff --git a/lib/eventdev/rte_eventdev_core.h b/lib/eventdev/rte_eventdev_core.h\nindex 5b40551..fc8e155 100644\n--- a/lib/eventdev/rte_eventdev_core.h\n+++ b/lib/eventdev/rte_eventdev_core.h\n@@ -49,7 +49,7 @@ typedef uint16_t (*event_dma_adapter_enqueue_t)(void *port, struct rte_event ev[\n typedef int (*event_profile_switch_t)(void *port, uint8_t profile);\n /**< @internal Switch active link profile on the event port. */\n \n-struct rte_event_fp_ops {\n+struct __rte_cache_aligned rte_event_fp_ops {\n \tvoid **data;\n \t/**< points to array of internal port data pointers */\n \tevent_enqueue_t enqueue;\n@@ -77,7 +77,7 @@ struct rte_event_fp_ops {\n \tevent_profile_switch_t profile_switch;\n \t/**< PMD Event switch profile function. */\n \tuintptr_t reserved[4];\n-} __rte_cache_aligned;\n+};\n \n extern struct rte_event_fp_ops rte_event_fp_ops[RTE_EVENT_MAX_DEVS];\n \n", "prefixes": [ "v4", "10/39" ] }