[dpdk-dev] [PATCH v2] librte_lpm: define tbl entry reversely for big endian

Bruce Richardson bruce.richardson at intel.com
Tue May 19 12:05:59 CEST 2015


On Tue, Mar 24, 2015 at 01:58:20PM +0800, xuelin.shi at freescale.com wrote:
> From: Xuelin Shi <xuelin.shi at freescale.com>
> 
> This module uses type conversion between struct and int.
> Also truncation and comparison is used with this int.
> It is not safe for different endian arch.
> 
> Add ifdef for big endian struct to fix this issue.
> 
> Signed-off-by: Xuelin Shi <xuelin.shi at freescale.com>

Since nobody objects to this patch, and it looks ok to me:

Acked-by: Bruce Richardson <bruce.richardson at intel.com>

> ---
> changes for v2:
>   add <rte_byteorder.h>
> 
>  lib/librte_lpm/rte_lpm.h | 20 ++++++++++++++++++++
>  1 file changed, 20 insertions(+)
> 
> diff --git a/lib/librte_lpm/rte_lpm.h b/lib/librte_lpm/rte_lpm.h
> index 1af150c..6cbcd4c 100644
> --- a/lib/librte_lpm/rte_lpm.h
> +++ b/lib/librte_lpm/rte_lpm.h
> @@ -44,6 +44,7 @@
>  #include <stdint.h>
>  #include <stdlib.h>
>  #include <rte_branch_prediction.h>
> +#include <rte_byteorder.h>
>  #include <rte_memory.h>
>  #include <rte_common.h>
>  #include <rte_common_vect.h>
> @@ -96,6 +97,7 @@ extern "C" {
>  /** Bitmask used to indicate successful lookup */
>  #define RTE_LPM_LOOKUP_SUCCESS          0x0100
>  
> +#if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN
>  /** @internal Tbl24 entry structure. */
>  struct rte_lpm_tbl24_entry {
>  	/* Stores Next hop or group index (i.e. gindex)into tbl8. */
> @@ -117,6 +119,24 @@ struct rte_lpm_tbl8_entry {
>  	uint8_t valid_group :1; /**< Group validation flag. */
>  	uint8_t depth       :6; /**< Rule depth. */
>  };
> +#else
> +struct rte_lpm_tbl24_entry {
> +	uint8_t depth 	    :6;
> +	uint8_t ext_entry   :1;
> +	uint8_t valid	    :1;
> +	union {
> +		uint8_t tbl8_gindex;
> +		uint8_t next_hop;
> +	};
> +};
> +
> +struct rte_lpm_tbl8_entry {
> +	uint8_t depth 	    :6;
> +	uint8_t valid_group :1;
> +	uint8_t valid	    :1;
> +	uint8_t next_hop;
> +};
> +#endif
>  
>  /** @internal Rule structure. */
>  struct rte_lpm_rule {
> -- 
> 1.9.1
> 


More information about the dev mailing list