diff mbox series

[1/3] eal: move CACHE and IOVA related definitions

Message ID 20190816125304.29719-2-konstantin.ananyev@intel.com (mailing list archive)
State Superseded, archived
Delegated to: Thomas Monjalon
Headers
Series move mbuf definition into a separate file |

Checks

Context Check Description
ci/checkpatch success coding style OK
ci/iol-Compile-Testing success Compile Testing PASS
ci/Intel-compilation success Compilation OK
ci/intel-Performance-Testing success Performance Testing PASS
ci/mellanox-Performance-Testing success Performance Testing PASS

Commit Message

Ananyev, Konstantin Aug. 16, 2019, 12:53 p.m. UTC 
  Right now RTE_CACHE_ and IOVA definitions are located inside rte_memory.h
That might cause an unwanted inclusions of arch/os specific header files.
See [1] for particular problem example.
Probably the simplest way to deal with such problems -
move these definitions into rte_commmon.h

Note that this move doesn't introduce any change in functionality.

[1] https://bugs.dpdk.org/show_bug.cgi?id=321

Suggested-by: Vipin Varghese <vipin.varghese@intel.com>
Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
---
 lib/librte_eal/common/include/rte_common.h | 44 ++++++++++++++++++++++
 lib/librte_eal/common/include/rte_memory.h | 38 -------------------
 2 files changed, 44 insertions(+), 38 deletions(-)

Comments

Michel Machado Aug. 16, 2019, 6:50 p.m. UTC | #1 
Acked-by: Michel Machado <michel@digirati.com.br>

[ ]'s
Michel Machado

On 8/16/19 8:53 AM, Konstantin Ananyev wrote:
> Right now RTE_CACHE_ and IOVA definitions are located inside rte_memory.h
> That might cause an unwanted inclusions of arch/os specific header files.
> See [1] for particular problem example.
> Probably the simplest way to deal with such problems -
> move these definitions into rte_commmon.h
> 
> Note that this move doesn't introduce any change in functionality.
> 
> [1] https://bugs.dpdk.org/show_bug.cgi?id=321
> 
> Suggested-by: Vipin Varghese <vipin.varghese@intel.com>
> Signed-off-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
> ---
>   lib/librte_eal/common/include/rte_common.h | 44 ++++++++++++++++++++++
>   lib/librte_eal/common/include/rte_memory.h | 38 -------------------
>   2 files changed, 44 insertions(+), 38 deletions(-)
> 
> diff --git a/lib/librte_eal/common/include/rte_common.h b/lib/librte_eal/common/include/rte_common.h
> index 05a3a6401..c275093d7 100644
> --- a/lib/librte_eal/common/include/rte_common.h
> +++ b/lib/librte_eal/common/include/rte_common.h
> @@ -291,6 +291,50 @@ rte_is_aligned(void *ptr, unsigned align)
>    */
>   #define RTE_BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
>   
> +/*********** RTE_CACHE related macros ********/
> +
> +#define RTE_CACHE_LINE_MASK (RTE_CACHE_LINE_SIZE-1) /**< Cache line mask. */
> +
> +#define RTE_CACHE_LINE_ROUNDUP(size) \
> +	(RTE_CACHE_LINE_SIZE * ((size + RTE_CACHE_LINE_SIZE - 1) / \
> +	RTE_CACHE_LINE_SIZE))
> +/**< Return the first cache-aligned value greater or equal to size. */
> +
> +/**< Cache line size in terms of log2 */
> +#if RTE_CACHE_LINE_SIZE == 64
> +#define RTE_CACHE_LINE_SIZE_LOG2 6
> +#elif RTE_CACHE_LINE_SIZE == 128
> +#define RTE_CACHE_LINE_SIZE_LOG2 7
> +#else
> +#error "Unsupported cache line size"
> +#endif
> +
> +#define RTE_CACHE_LINE_MIN_SIZE 64	/**< Minimum Cache line size. */
> +
> +/**
> + * Force alignment to cache line.
> + */
> +#define __rte_cache_aligned __rte_aligned(RTE_CACHE_LINE_SIZE)
> +
> +/**
> + * Force minimum cache line alignment.
> + */
> +#define __rte_cache_min_aligned __rte_aligned(RTE_CACHE_LINE_MIN_SIZE)
> +
> +/*********** PA/IOVA type definitions ********/
> +
> +typedef uint64_t phys_addr_t; /**< Physical address. */
> +#define RTE_BAD_PHYS_ADDR ((phys_addr_t)-1)
> +/**
> + * IO virtual address type.
> + * When the physical addressing mode (IOVA as PA) is in use,
> + * the translation from an IO virtual address (IOVA) to a physical address
> + * is a direct mapping, i.e. the same value.
> + * Otherwise, in virtual mode (IOVA as VA), an IOMMU may do the translation.
> + */
> +typedef uint64_t rte_iova_t;
> +#define RTE_BAD_IOVA ((rte_iova_t)-1)
> +
>   /**
>    * Combines 32b inputs most significant set bits into the least
>    * significant bits to construct a value with the same MSBs as x
> diff --git a/lib/librte_eal/common/include/rte_memory.h b/lib/librte_eal/common/include/rte_memory.h
> index 4717dcb43..38e00e382 100644
> --- a/lib/librte_eal/common/include/rte_memory.h
> +++ b/lib/librte_eal/common/include/rte_memory.h
> @@ -39,44 +39,6 @@ enum rte_page_sizes {
>   };
>   
>   #define SOCKET_ID_ANY -1                    /**< Any NUMA socket. */
> -#define RTE_CACHE_LINE_MASK (RTE_CACHE_LINE_SIZE-1) /**< Cache line mask. */
> -
> -#define RTE_CACHE_LINE_ROUNDUP(size) \
> -	(RTE_CACHE_LINE_SIZE * ((size + RTE_CACHE_LINE_SIZE - 1) / RTE_CACHE_LINE_SIZE))
> -/**< Return the first cache-aligned value greater or equal to size. */
> -
> -/**< Cache line size in terms of log2 */
> -#if RTE_CACHE_LINE_SIZE == 64
> -#define RTE_CACHE_LINE_SIZE_LOG2 6
> -#elif RTE_CACHE_LINE_SIZE == 128
> -#define RTE_CACHE_LINE_SIZE_LOG2 7
> -#else
> -#error "Unsupported cache line size"
> -#endif
> -
> -#define RTE_CACHE_LINE_MIN_SIZE 64	/**< Minimum Cache line size. */
> -
> -/**
> - * Force alignment to cache line.
> - */
> -#define __rte_cache_aligned __rte_aligned(RTE_CACHE_LINE_SIZE)
> -
> -/**
> - * Force minimum cache line alignment.
> - */
> -#define __rte_cache_min_aligned __rte_aligned(RTE_CACHE_LINE_MIN_SIZE)
> -
> -typedef uint64_t phys_addr_t; /**< Physical address. */
> -#define RTE_BAD_PHYS_ADDR ((phys_addr_t)-1)
> -/**
> - * IO virtual address type.
> - * When the physical addressing mode (IOVA as PA) is in use,
> - * the translation from an IO virtual address (IOVA) to a physical address
> - * is a direct mapping, i.e. the same value.
> - * Otherwise, in virtual mode (IOVA as VA), an IOMMU may do the translation.
> - */
> -typedef uint64_t rte_iova_t;
> -#define RTE_BAD_IOVA ((rte_iova_t)-1)
>   
>   /**
>    * Physical memory segment descriptor.
>
diff mbox series

Patch

diff --git a/lib/librte_eal/common/include/rte_common.h b/lib/librte_eal/common/include/rte_common.h
index 05a3a6401..c275093d7 100644
--- a/lib/librte_eal/common/include/rte_common.h
+++ b/lib/librte_eal/common/include/rte_common.h
@@ -291,6 +291,50 @@  rte_is_aligned(void *ptr, unsigned align)
  */
 #define RTE_BUILD_BUG_ON(condition) ((void)sizeof(char[1 - 2*!!(condition)]))
 
+/*********** RTE_CACHE related macros ********/
+
+#define RTE_CACHE_LINE_MASK (RTE_CACHE_LINE_SIZE-1) /**< Cache line mask. */
+
+#define RTE_CACHE_LINE_ROUNDUP(size) \
+	(RTE_CACHE_LINE_SIZE * ((size + RTE_CACHE_LINE_SIZE - 1) / \
+	RTE_CACHE_LINE_SIZE))
+/**< Return the first cache-aligned value greater or equal to size. */
+
+/**< Cache line size in terms of log2 */
+#if RTE_CACHE_LINE_SIZE == 64
+#define RTE_CACHE_LINE_SIZE_LOG2 6
+#elif RTE_CACHE_LINE_SIZE == 128
+#define RTE_CACHE_LINE_SIZE_LOG2 7
+#else
+#error "Unsupported cache line size"
+#endif
+
+#define RTE_CACHE_LINE_MIN_SIZE 64	/**< Minimum Cache line size. */
+
+/**
+ * Force alignment to cache line.
+ */
+#define __rte_cache_aligned __rte_aligned(RTE_CACHE_LINE_SIZE)
+
+/**
+ * Force minimum cache line alignment.
+ */
+#define __rte_cache_min_aligned __rte_aligned(RTE_CACHE_LINE_MIN_SIZE)
+
+/*********** PA/IOVA type definitions ********/
+
+typedef uint64_t phys_addr_t; /**< Physical address. */
+#define RTE_BAD_PHYS_ADDR ((phys_addr_t)-1)
+/**
+ * IO virtual address type.
+ * When the physical addressing mode (IOVA as PA) is in use,
+ * the translation from an IO virtual address (IOVA) to a physical address
+ * is a direct mapping, i.e. the same value.
+ * Otherwise, in virtual mode (IOVA as VA), an IOMMU may do the translation.
+ */
+typedef uint64_t rte_iova_t;
+#define RTE_BAD_IOVA ((rte_iova_t)-1)
+
 /**
  * Combines 32b inputs most significant set bits into the least
  * significant bits to construct a value with the same MSBs as x
diff --git a/lib/librte_eal/common/include/rte_memory.h b/lib/librte_eal/common/include/rte_memory.h
index 4717dcb43..38e00e382 100644
--- a/lib/librte_eal/common/include/rte_memory.h
+++ b/lib/librte_eal/common/include/rte_memory.h
@@ -39,44 +39,6 @@  enum rte_page_sizes {
 };
 
 #define SOCKET_ID_ANY -1                    /**< Any NUMA socket. */
-#define RTE_CACHE_LINE_MASK (RTE_CACHE_LINE_SIZE-1) /**< Cache line mask. */
-
-#define RTE_CACHE_LINE_ROUNDUP(size) \
-	(RTE_CACHE_LINE_SIZE * ((size + RTE_CACHE_LINE_SIZE - 1) / RTE_CACHE_LINE_SIZE))
-/**< Return the first cache-aligned value greater or equal to size. */
-
-/**< Cache line size in terms of log2 */
-#if RTE_CACHE_LINE_SIZE == 64
-#define RTE_CACHE_LINE_SIZE_LOG2 6
-#elif RTE_CACHE_LINE_SIZE == 128
-#define RTE_CACHE_LINE_SIZE_LOG2 7
-#else
-#error "Unsupported cache line size"
-#endif
-
-#define RTE_CACHE_LINE_MIN_SIZE 64	/**< Minimum Cache line size. */
-
-/**
- * Force alignment to cache line.
- */
-#define __rte_cache_aligned __rte_aligned(RTE_CACHE_LINE_SIZE)
-
-/**
- * Force minimum cache line alignment.
- */
-#define __rte_cache_min_aligned __rte_aligned(RTE_CACHE_LINE_MIN_SIZE)
-
-typedef uint64_t phys_addr_t; /**< Physical address. */
-#define RTE_BAD_PHYS_ADDR ((phys_addr_t)-1)
-/**
- * IO virtual address type.
- * When the physical addressing mode (IOVA as PA) is in use,
- * the translation from an IO virtual address (IOVA) to a physical address
- * is a direct mapping, i.e. the same value.
- * Otherwise, in virtual mode (IOVA as VA), an IOMMU may do the translation.
- */
-typedef uint64_t rte_iova_t;
-#define RTE_BAD_IOVA ((rte_iova_t)-1)
 
 /**
  * Physical memory segment descriptor.