> From: Tyler Retzlaff [mailto:roret...@linux.microsoft.com] > Sent: Wednesday, 20 March 2024 23.02 > > RTE_MARKER typedefs are a GCC extension unsupported by MSVC. Remove > RTE_MARKER fields from rte_mbuf struct. > > Maintain alignment of fields after removed cacheline1 marker by placing > C11 alignas(RTE_CACHE_LINE_MIN_SIZE). > > Signed-off-by: Tyler Retzlaff <roret...@linux.microsoft.com> > --- > doc/guides/rel_notes/release_24_03.rst | 3 +++ > lib/cryptodev/cryptodev_pmd.h | 5 +++-- > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/doc/guides/rel_notes/release_24_03.rst > b/doc/guides/rel_notes/release_24_03.rst > index 75d40d4..d3e5abe 100644 > --- a/doc/guides/rel_notes/release_24_03.rst > +++ b/doc/guides/rel_notes/release_24_03.rst > @@ -222,6 +222,9 @@ Removed Items > * security: ``RTE_MARKER`` fields ``cacheline0`` and ``cacheline1`` > have been removed from ``struct rte_security_session``. > > +* cryptodev: ``RTE_MARKER`` fields ``cacheline0`` and ``cacheline1`` > + have been removed from ``struct cryptodev_driver``. > + > API Changes > ----------- > > diff --git a/lib/cryptodev/cryptodev_pmd.h > b/lib/cryptodev/cryptodev_pmd.h > index d195b81..9daf129 100644 > --- a/lib/cryptodev/cryptodev_pmd.h > +++ b/lib/cryptodev/cryptodev_pmd.h > @@ -5,6 +5,8 @@ > #ifndef _CRYPTODEV_PMD_H_ > #define _CRYPTODEV_PMD_H_ > > +#include <stdalign.h> > + > #ifdef __cplusplus > extern "C" { > #endif > @@ -139,7 +141,6 @@ struct cryptodev_driver { > * has a fixed algo, key, op-type, digest_len etc. > */ > struct rte_cryptodev_sym_session { > - RTE_MARKER cacheline0; > uint64_t opaque_data; > /**< Can be used for external metadata */ > uint32_t sess_data_sz; > @@ -151,7 +152,7 @@ struct rte_cryptodev_sym_session { > rte_iova_t driver_priv_data_iova; > /**< Session driver data IOVA address */ > > - alignas(RTE_CACHE_LINE_MIN_SIZE) RTE_MARKER cacheline1; > + alignas(RTE_CACHE_LINE_MIN_SIZE) > /**< Second cache line - start of the driver session data */ > uint8_t driver_priv_data[]; > /**< Driver specific session data, variable size */ > -- > 1.8.3.1
Reviewed-by: Morten Brørup <m...@smartsharesystems.com>
