port: fix unaligned access to metadata

Fix RTE_MBUF_METADATA macros to allow for unaligned accesses to
meta-data fields.
Forcing aligned accesses is not really required, so this is removing an
unneeded constraint.
This issue was met during testing of the new version of the ip_pipeline
application. There is no performance impact.
This change has no ABI impact, as the previous code that uses aligned
accesses continues to run without any issues.

Signed-off-by: Daniel Mrzyglod <danielx.t.mrzyglod@intel.com>
Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com>

diff --git a/lib/librte_pipeline/rte_pipeline.c b/lib/librte_pipeline/rte_pipeline.c
index 36d92c9f5f8ce25d4439d130151215fc12f69477..b777cf1c2093622384c00414cae6ebe90fe8f59f 100644 (file)
--- a/lib/librte_pipeline/rte_pipeline.c
+++ b/lib/librte_pipeline/rte_pipeline.c
@@ -175,14 +175,6 @@ rte_pipeline_check_params(struct rte_pipeline_params *params)
                return -EINVAL;
        }
 
-       /* offset_port_id */
-       if (params->offset_port_id & 0x3) {
-               RTE_LOG(ERR, PIPELINE,
-                       "%s: Incorrect value for parameter offset_port_id\n",
-                       __func__);
-               return -EINVAL;
-       }
-
        return 0;
 }
 

diff --git a/lib/librte_port/rte_port.h b/lib/librte_port/rte_port.h
index d84e5a12850ce30fabf8955148abc18d951adb93..1b99b0a913407dcbc22539666f943df3f478200b 100644 (file)
--- a/lib/librte_port/rte_port.h
+++ b/lib/librte_port/rte_port.h
@@ -54,23 +54,23 @@ extern "C" {
  * Macros to allow accessing metadata stored in the mbuf headroom
  * just beyond the end of the mbuf data structure returned by a port
  */
-#define RTE_MBUF_METADATA_UINT8(mbuf, offset)              \
-       (((uint8_t *)&(mbuf)[1])[offset])
-#define RTE_MBUF_METADATA_UINT16(mbuf, offset)             \
-       (((uint16_t *)&(mbuf)[1])[offset/sizeof(uint16_t)])
-#define RTE_MBUF_METADATA_UINT32(mbuf, offset)             \
-       (((uint32_t *)&(mbuf)[1])[offset/sizeof(uint32_t)])
-#define RTE_MBUF_METADATA_UINT64(mbuf, offset)             \
-       (((uint64_t *)&(mbuf)[1])[offset/sizeof(uint64_t)])
-
 #define RTE_MBUF_METADATA_UINT8_PTR(mbuf, offset)          \
-       (&RTE_MBUF_METADATA_UINT8(mbuf, offset))
+       (&((uint8_t *) &(mbuf)[1])[offset])
 #define RTE_MBUF_METADATA_UINT16_PTR(mbuf, offset)         \
-       (&RTE_MBUF_METADATA_UINT16(mbuf, offset))
+       ((uint16_t *) RTE_MBUF_METADATA_UINT8_PTR(mbuf, offset))
 #define RTE_MBUF_METADATA_UINT32_PTR(mbuf, offset)         \
-       (&RTE_MBUF_METADATA_UINT32(mbuf, offset))
+       ((uint32_t *) RTE_MBUF_METADATA_UINT8_PTR(mbuf, offset))
 #define RTE_MBUF_METADATA_UINT64_PTR(mbuf, offset)         \
-       (&RTE_MBUF_METADATA_UINT64(mbuf, offset))
+       ((uint64_t *) RTE_MBUF_METADATA_UINT8_PTR(mbuf, offset))
+
+#define RTE_MBUF_METADATA_UINT8(mbuf, offset)              \
+       (*RTE_MBUF_METADATA_UINT8_PTR(mbuf, offset))
+#define RTE_MBUF_METADATA_UINT16(mbuf, offset)             \
+       (*RTE_MBUF_METADATA_UINT16_PTR(mbuf, offset))
+#define RTE_MBUF_METADATA_UINT32(mbuf, offset)             \
+       (*RTE_MBUF_METADATA_UINT32_PTR(mbuf, offset))
+#define RTE_MBUF_METADATA_UINT64(mbuf, offset)             \
+       (*RTE_MBUF_METADATA_UINT64_PTR(mbuf, offset))
 /**@}*/
 
 /*

diff --git a/lib/librte_table/rte_table_array.c b/lib/librte_table/rte_table_array.c
index c0310700f9fb185035e8658cb3f3d3e4b41ea36a..b00ca67e938cd08f96e886c68de1bce69334ed4a 100644 (file)
--- a/lib/librte_table/rte_table_array.c
+++ b/lib/librte_table/rte_table_array.c
@@ -66,10 +66,8 @@ rte_table_array_create(void *params, int socket_id, uint32_t entry_size)
        /* Check input parameters */
        if ((p == NULL) ||
            (p->n_entries == 0) ||
-               (!rte_is_power_of_2(p->n_entries)) ||
-               ((p->offset & 0x3) != 0)) {
+               (!rte_is_power_of_2(p->n_entries)))
                return NULL;
-       }
 
        /* Memory allocation */
        total_cl_size = (sizeof(struct rte_table_array) +

diff --git a/lib/librte_table/rte_table_hash_ext.c b/lib/librte_table/rte_table_hash_ext.c
index 66e416bb310946a9e7c41f10b98f462d3ba0ff81..73beeaf384ed61beb85be16dcf210d0aaf746122 100644 (file)
--- a/lib/librte_table/rte_table_hash_ext.c
+++ b/lib/librte_table/rte_table_hash_ext.c
@@ -149,19 +149,6 @@ check_params_create(struct rte_table_hash_ext_params *params)
                return -EINVAL;
        }
 
-       /* signature offset */
-       if ((params->signature_offset & 0x3) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: signature_offset invalid value\n",
-                       __func__);
-               return -EINVAL;
-       }
-
-       /* key offset */
-       if ((params->key_offset & 0x7) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: key_offset invalid value\n", __func__);
-               return -EINVAL;
-       }
-
        return 0;
 }
 

diff --git a/lib/librte_table/rte_table_hash_key16.c b/lib/librte_table/rte_table_hash_key16.c
index f87ea0e5b3401baf13fda08b601dbe29084f5e20..67a4249d9d543d80e41ff68cfdf77892ba1490dc 100644 (file)
--- a/lib/librte_table/rte_table_hash_key16.c
+++ b/lib/librte_table/rte_table_hash_key16.c
@@ -89,18 +89,6 @@ check_params_create_lru(struct rte_table_hash_key16_lru_params *params) {
                return -EINVAL;
        }
 
-       /* signature offset */
-       if ((params->signature_offset & 0x3) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: invalid signature_offset\n", __func__);
-               return -EINVAL;
-       }
-
-       /* key offset */
-       if ((params->key_offset & 0x7) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: invalid key_offset\n", __func__);
-               return -EINVAL;
-       }
-
        /* f_hash */
        if (params->f_hash == NULL) {
                RTE_LOG(ERR, TABLE,
@@ -307,18 +295,6 @@ check_params_create_ext(struct rte_table_hash_key16_ext_params *params) {
                return -EINVAL;
        }
 
-       /* signature offset */
-       if ((params->signature_offset & 0x3) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: invalid signature offset\n", __func__);
-               return -EINVAL;
-       }
-
-       /* key offset */
-       if ((params->key_offset & 0x7) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: invalid key offset\n", __func__);
-               return -EINVAL;
-       }
-
        /* f_hash */
        if (params->f_hash == NULL) {
                RTE_LOG(ERR, TABLE,

diff --git a/lib/librte_table/rte_table_hash_key32.c b/lib/librte_table/rte_table_hash_key32.c
index 6790594944b548e998f8a9c64b9269525c1c26c7..1fdb75d0d429b4d15631365dcb9df058f2212230 100644 (file)
--- a/lib/librte_table/rte_table_hash_key32.c
+++ b/lib/librte_table/rte_table_hash_key32.c
@@ -89,18 +89,6 @@ check_params_create_lru(struct rte_table_hash_key32_lru_params *params) {
                return -EINVAL;
        }
 
-       /* signature offset */
-       if ((params->signature_offset & 0x3) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: invalid signature offset\n", __func__);
-               return -EINVAL;
-       }
-
-       /* key offset */
-       if ((params->key_offset & 0x7) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: invalid key offset\n", __func__);
-               return -EINVAL;
-       }
-
        /* f_hash */
        if (params->f_hash == NULL) {
                RTE_LOG(ERR, TABLE, "%s: f_hash function pointer is NULL\n",
@@ -309,18 +297,6 @@ check_params_create_ext(struct rte_table_hash_key32_ext_params *params) {
                return -EINVAL;
        }
 
-       /* signature offset */
-       if ((params->signature_offset & 0x3) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: invalid signature offset\n", __func__);
-               return -EINVAL;
-       }
-
-       /* key offset */
-       if ((params->key_offset & 0x7) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: invalid key offset\n", __func__);
-               return -EINVAL;
-       }
-
        /* f_hash */
        if (params->f_hash == NULL) {
                RTE_LOG(ERR, TABLE, "%s: f_hash function pointer is NULL\n",

diff --git a/lib/librte_table/rte_table_hash_key8.c b/lib/librte_table/rte_table_hash_key8.c
index 6803eb2ef70ad42f04fb4dc552df7706e56ca47e..4dfa3c835e6c766f3b393e96a785082d5ab8a69c 100644 (file)
--- a/lib/librte_table/rte_table_hash_key8.c
+++ b/lib/librte_table/rte_table_hash_key8.c
@@ -86,18 +86,6 @@ check_params_create_lru(struct rte_table_hash_key8_lru_params *params) {
                return -EINVAL;
        }
 
-       /* signature offset */
-       if ((params->signature_offset & 0x3) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: invalid signature_offset\n", __func__);
-               return -EINVAL;
-       }
-
-       /* key offset */
-       if ((params->key_offset & 0x7) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: invalid key_offset\n", __func__);
-               return -EINVAL;
-       }
-
        /* f_hash */
        if (params->f_hash == NULL) {
                RTE_LOG(ERR, TABLE, "%s: f_hash function pointer is NULL\n",
@@ -300,18 +288,6 @@ check_params_create_ext(struct rte_table_hash_key8_ext_params *params) {
                return -EINVAL;
        }
 
-       /* signature offset */
-       if ((params->signature_offset & 0x3) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: invalid signature_offset\n", __func__);
-               return -EINVAL;
-       }
-
-       /* key offset */
-       if ((params->key_offset & 0x7) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: invalid key_offset\n", __func__);
-               return -EINVAL;
-       }
-
        /* f_hash */
        if (params->f_hash == NULL) {
                RTE_LOG(ERR, TABLE, "%s: f_hash function pointer is NULL\n",

diff --git a/lib/librte_table/rte_table_hash_lru.c b/lib/librte_table/rte_table_hash_lru.c
index c9a8afd7d413fb6a2058f5e58c75478b19780850..b5393f0735a5c4ce0516787f82e0268a1640bd8c 100644 (file)
--- a/lib/librte_table/rte_table_hash_lru.c
+++ b/lib/librte_table/rte_table_hash_lru.c
@@ -126,19 +126,6 @@ check_params_create(struct rte_table_hash_lru_params *params)
                return -EINVAL;
        }
 
-       /* signature offset */
-       if ((params->signature_offset & 0x3) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: signature_offset invalid value\n",
-                       __func__);
-               return -EINVAL;
-       }
-
-       /* key offset */
-       if ((params->key_offset & 0x7) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: key_offset invalid value\n", __func__);
-               return -EINVAL;
-       }
-
        return 0;
 }
 

diff --git a/lib/librte_table/rte_table_lpm.c b/lib/librte_table/rte_table_lpm.c
index 64c684d03f26d154b7b073cc04c437fd24df8afb..3f60672ec42caec0880aa58ffb30dd80ba895e18 100644 (file)
--- a/lib/librte_table/rte_table_lpm.c
+++ b/lib/librte_table/rte_table_lpm.c
@@ -87,10 +87,6 @@ rte_table_lpm_create(void *params, int socket_id, uint32_t entry_size)
                        __func__);
                return NULL;
        }
-       if ((p->offset & 0x3) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: Invalid offset\n", __func__);
-               return NULL;
-       }
 
        entry_size = RTE_ALIGN(entry_size, sizeof(uint64_t));
 

diff --git a/lib/librte_table/rte_table_lpm_ipv6.c b/lib/librte_table/rte_table_lpm_ipv6.c
index ce4ddc0b04e71f459ce284b3e4b163301c01bf2f..df83ecf9392a46f49a378f5574c091ecbe8c9e1c 100644 (file)
--- a/lib/librte_table/rte_table_lpm_ipv6.c
+++ b/lib/librte_table/rte_table_lpm_ipv6.c
@@ -93,10 +93,6 @@ rte_table_lpm_ipv6_create(void *params, int socket_id, uint32_t entry_size)
                        __func__);
                return NULL;
        }
-       if ((p->offset & 0x3) != 0) {
-               RTE_LOG(ERR, TABLE, "%s: Invalid offset\n", __func__);
-               return NULL;
-       }
 
        entry_size = RTE_ALIGN(entry_size, sizeof(uint64_t));