Contrary to the pkt_metadata structure for which the cacheline markers are checked at build time and are used at runtime to prefetch the data, there is no need for marking some locations in the cmap and netdev_dpdk structures.
Remove them to avoid giving the impression there was some intent behind them. Signed-off-by: David Marchand <[email protected]> --- lib/cmap.c | 4 ++-- lib/netdev-dpdk.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/cmap.c b/lib/cmap.c index 8ca893b0b2..2b3a6a8b12 100644 --- a/lib/cmap.c +++ b/lib/cmap.c @@ -160,7 +160,7 @@ BUILD_ASSERT_DECL(sizeof(struct cmap_bucket) == CACHE_LINE_SIZE); /* The implementation of a concurrent hash map. */ struct cmap_impl { - PADDED_MEMBERS_CACHELINE_MARKER(CACHE_LINE_SIZE, cacheline0, + PADDED_MEMBERS(CACHE_LINE_SIZE, unsigned int n; /* Number of in-use elements. */ unsigned int max_n; /* Max elements before enlarging. */ unsigned int min_n; /* Min elements before shrinking. */ @@ -169,7 +169,7 @@ struct cmap_impl { hash values. */ ); - PADDED_MEMBERS_CACHELINE_MARKER(CACHE_LINE_SIZE, cacheline1, + PADDED_MEMBERS(CACHE_LINE_SIZE, struct cmap_bucket buckets[1]; ); }; diff --git a/lib/netdev-dpdk.c b/lib/netdev-dpdk.c index 89a9556d5b..c7642fe741 100644 --- a/lib/netdev-dpdk.c +++ b/lib/netdev-dpdk.c @@ -452,7 +452,7 @@ enum dpdk_rx_steer_flags { */ struct netdev_dpdk { - PADDED_MEMBERS_CACHELINE_MARKER(CACHE_LINE_SIZE, cacheline0, + PADDED_MEMBERS(CACHE_LINE_SIZE, dpdk_port_t port_id; /* If true, device was attached by rte_eth_dev_attach(). */ @@ -480,7 +480,7 @@ struct netdev_dpdk { struct rte_eth_link link; ); - PADDED_MEMBERS_CACHELINE_MARKER(CACHE_LINE_SIZE, cacheline1, + PADDED_MEMBERS(CACHE_LINE_SIZE, struct ovs_mutex mutex OVS_ACQ_AFTER(dpdk_mutex); struct dpdk_mp *dpdk_mp; -- 2.54.0 _______________________________________________ dev mailing list [email protected] https://mail.openvswitch.org/mailman/listinfo/ovs-dev
