From patchwork Wed Mar 27 09:14:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Robin Jarry X-Patchwork-Id: 138850 X-Patchwork-Delegate: thomas@monjalon.net Return-Path: 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]) by inbox.dpdk.org (Postfix) with ESMTP id 3164B43D66; Wed, 27 Mar 2024 10:17:15 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 128BA410FD; Wed, 27 Mar 2024 10:17:14 +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 0BDAB4029F for ; Wed, 27 Mar 2024 10:16:14 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1711530973; 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=RyQg/VR/A9X3CWm/PkCJKLVGVPJw1dS0KgBrbAAodPg=; b=T5VTon/9kNa4bg4j0QmBglYmIOqfS+FN1nwd3gCEYKcEfaoe9vxR/Gi1AWO+dyvWhUD2gZ Syf+mbMWiS8Q8L034oWA0rl3FeiNcZBJ244TtP9IbgCsyCULzVwUhzTvA/o4jokRYbStoj aiRfzO95APKJZVdng/uk2pr4Bg0ZgEY= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-259-llpJsRWOMk2hhUQ9iw_CwQ-1; Wed, 27 Mar 2024 05:16:10 -0400 X-MC-Unique: llpJsRWOMk2hhUQ9iw_CwQ-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 22DEE185A784; Wed, 27 Mar 2024 09:16:09 +0000 (UTC) Received: from ringo.redhat.com (unknown [10.39.208.34]) by smtp.corp.redhat.com (Postfix) with ESMTP id 5CD15492BC8; Wed, 27 Mar 2024 09:16:06 +0000 (UTC) From: Robin Jarry To: dev@dpdk.org, Jerin Jacob , Kiran Kumar K , Nithin Dabilpuram , Zhirun Yan Cc: Tyler Retzlaff Subject: [PATCH v5] graph: expose node context as pointers Date: Wed, 27 Mar 2024 10:14:41 +0100 Message-ID: <20240327091440.1166119-2-rjarry@redhat.com> In-Reply-To: <20240325100500.694748-2-rjarry@redhat.com> References: <20240325100500.694748-2-rjarry@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org In some cases, the node context data is used to store two pointers because the data is larger than the reserved 16 bytes. Having to define intermediate structures just to be able to cast is tedious. And without intermediate structures, casting to opaque pointers is hard without violating strict aliasing rules. Add an unnamed union to allow storing opaque pointers in the node context. Unfortunately, aligning an unnamed union that contains an array produces inconsistent results between C and C++. To preserve ABI/API compatibility in both C and C++, move all fast-path area fields into an unnamed struct which is cache aligned. Use __rte_cache_min_aligned to preserve existing alignment on architectures where cache lines are 128 bytes. Add a static assert to ensure that the unnamed union is not larger than the context array (RTE_NODE_CTX_SZ). Signed-off-by: Robin Jarry --- Notes: v5: * Helper functions to hide casting proved to be harder than expected. Naive casting may even be impossible without breaking strict aliasing rules. The only other option would be to use explicit memcpy calls. * Unnamed union tentative again. As suggested by Tyler (thank you!), using an intermediate unnamed struct to carry the alignment produces consistent ABI in C and C++. * Also, Tyler (thank you!) suggested that the fast path area alignment size may be incorrect for architectures where the cache line is not 64 bytes. There will be a 64 bytes hole in the structure at the end of the unnamed struct before the zero length next nodes array. Use __rte_cache_min_aligned to preserve existing alignment. v4: * Replaced the unnamed union with helper inline functions. v3: * Added __extension__ to the unnamed struct inside the union. * Fixed C++ header checks. * Replaced alignas() with an explicit static_assert. lib/graph/rte_graph_worker_common.h | 27 ++++++++++++++++++++------- 1 file changed, 20 insertions(+), 7 deletions(-) diff --git a/lib/graph/rte_graph_worker_common.h b/lib/graph/rte_graph_worker_common.h index 36d864e2c14e..84d4997bbbf6 100644 --- a/lib/graph/rte_graph_worker_common.h +++ b/lib/graph/rte_graph_worker_common.h @@ -12,7 +12,9 @@ * process, enqueue and move streams of objects to the next nodes. */ +#include #include +#include #include #include @@ -111,14 +113,21 @@ struct __rte_cache_aligned rte_node { } dispatch; }; /* Fast path area */ + __extension__ struct __rte_cache_min_aligned { #define RTE_NODE_CTX_SZ 16 - alignas(RTE_CACHE_LINE_SIZE) uint8_t ctx[RTE_NODE_CTX_SZ]; /**< Node Context. */ - uint16_t size; /**< Total number of objects available. */ - uint16_t idx; /**< Number of objects used. */ - rte_graph_off_t off; /**< Offset of node in the graph reel. */ - uint64_t total_cycles; /**< Cycles spent in this node. */ - uint64_t total_calls; /**< Calls done to this node. */ - uint64_t total_objs; /**< Objects processed by this node. */ + union { + uint8_t ctx[RTE_NODE_CTX_SZ]; + __extension__ struct { + void *ctx_ptr; + void *ctx_ptr2; + }; + }; /**< Node Context. */ + uint16_t size; /**< Total number of objects available. */ + uint16_t idx; /**< Number of objects used. */ + rte_graph_off_t off; /**< Offset of node in the graph reel. */ + uint64_t total_cycles; /**< Cycles spent in this node. */ + uint64_t total_calls; /**< Calls done to this node. */ + uint64_t total_objs; /**< Objects processed by this node. */ union { void **objs; /**< Array of object pointers. */ uint64_t objs_u64; @@ -127,9 +136,13 @@ struct __rte_cache_aligned rte_node { rte_node_process_t process; /**< Process function. */ uint64_t process_u64; }; + }; alignas(RTE_CACHE_LINE_MIN_SIZE) struct rte_node *nodes[]; /**< Next nodes. */ }; +static_assert(offsetof(struct rte_node, size) - offsetof(struct rte_node, ctx) == RTE_NODE_CTX_SZ, + "rte_node context must be RTE_NODE_CTX_SZ bytes exactly"); + /** * @internal *