[dpdk-dev] [PATCH] pmdinfogen: Fix pmdinfogen to select proper endianess on cross-compile
2016-11-21 10:11, Bruce Richardson: > On Fri, Nov 18, 2016 at 01:47:52PM -0500, Neil Horman wrote: > > pmdinfogen has a bug in which, during build, it pulls in rte_byteorder.h to > > obtain the rte macros for byteswapping between the cpu byte order and big or > > little endian. Unfortunately, pmdinfogen is a tool that is only meant to > > be run > > during the build of dpdk components, and so, it runs on the host. In cross > > compile environments however, the rte_byteorder.h is configured using a > > target > > cpu, who's endianess may differ from that of the host, leading to improper > > swapping. > > > > The fix is to use host system defined byte swapping routines rather than the > > dpdk provided routines. Note that we are using non posix compliant > > routines, as > > the posix compliant api only addresses 16 and 32 bit swaps, and we also > > need 64 > > bit swaps. Those macros exist (via endian.h), but BSD and Linux put that > > header > > in different locations so some ifdeffery is required. > > > > Tested successfully by myself on Linux and BSD systems. > > > > Signed-off-by: Neil Horman > > CC: Hemant Agrawal > > CC: Jerin Jacob > > CC: Bruce Richardson > > CC: Thomas Monjalon > > --- > > buildtools/pmdinfogen/pmdinfogen.h | 10 +++--- > > 1 file changed, 7 insertions(+), 3 deletions(-) > > Compiles fine on FreeBSD with clang. > > Tested-by: Bruce Richardson Fixed "endianness" typo, headline, added Fixes:, CC: stable at dpdk.org and removed a trailing whitespace, then applied, thanks
[dpdk-dev] [PATCH] pmdinfogen: Fix pmdinfogen to select proper endianess on cross-compile
On Fri, Nov 18, 2016 at 01:47:52PM -0500, Neil Horman wrote: > pmdinfogen has a bug in which, during build, it pulls in rte_byteorder.h to > obtain the rte macros for byteswapping between the cpu byte order and big or > little endian. Unfortunately, pmdinfogen is a tool that is only meant to be > run > during the build of dpdk components, and so, it runs on the host. In cross > compile environments however, the rte_byteorder.h is configured using a target > cpu, who's endianess may differ from that of the host, leading to improper > swapping. > > The fix is to use host system defined byte swapping routines rather than the > dpdk provided routines. Note that we are using non posix compliant routines, > as > the posix compliant api only addresses 16 and 32 bit swaps, and we also need > 64 > bit swaps. Those macros exist (via endian.h), but BSD and Linux put that > header > in different locations so some ifdeffery is required. > > Tested successfully by myself on Linux and BSD systems. > > Signed-off-by: Neil Horman > CC: Hemant Agrawal > CC: Jerin Jacob > CC: Bruce Richardson > CC: Thomas Monjalon > --- > buildtools/pmdinfogen/pmdinfogen.h | 10 +++--- > 1 file changed, 7 insertions(+), 3 deletions(-) Compiles fine on FreeBSD with clang. Tested-by: Bruce Richardson
[dpdk-dev] [PATCH] pmdinfogen: Fix pmdinfogen to select proper endianess on cross-compile
pmdinfogen has a bug in which, during build, it pulls in rte_byteorder.h to obtain the rte macros for byteswapping between the cpu byte order and big or little endian. Unfortunately, pmdinfogen is a tool that is only meant to be run during the build of dpdk components, and so, it runs on the host. In cross compile environments however, the rte_byteorder.h is configured using a target cpu, who's endianess may differ from that of the host, leading to improper swapping. The fix is to use host system defined byte swapping routines rather than the dpdk provided routines. Note that we are using non posix compliant routines, as the posix compliant api only addresses 16 and 32 bit swaps, and we also need 64 bit swaps. Those macros exist (via endian.h), but BSD and Linux put that header in different locations so some ifdeffery is required. Tested successfully by myself on Linux and BSD systems. Signed-off-by: Neil Horman CC: Hemant Agrawal CC: Jerin Jacob CC: Bruce Richardson CC: Thomas Monjalon --- buildtools/pmdinfogen/pmdinfogen.h | 10 +++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/buildtools/pmdinfogen/pmdinfogen.h b/buildtools/pmdinfogen/pmdinfogen.h index 1da2966..7c787c1 100644 --- a/buildtools/pmdinfogen/pmdinfogen.h +++ b/buildtools/pmdinfogen/pmdinfogen.h @@ -16,12 +16,16 @@ #include #include #include +#ifdef __linux__ +#include +#else +#include +#endif #include #include #include #include #include -#include /* On BSD-alike OSes elf.h defines these according to host's word size */ #undef ELF_ST_BIND @@ -75,9 +79,9 @@ #define CONVERT_NATIVE(fend, width, x) ({ \ typeof(x) ___x; \ if ((fend) == ELFDATA2LSB) \ - ___x = rte_le_to_cpu_##width(x); \ + ___x = le##width##toh(x); \ else \ - ___x = rte_be_to_cpu_##width(x); \ + ___x = be##width##toh(x); \ ___x; \ }) -- 2.7.4