112fc39b82
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 endianness 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.
Fixes: 98b0fdb0ffc6 ("pmdinfogen: add buildtools and pmdinfogen utility")
Signed-off-by: Neil Horman <nhorman@tuxdriver.com>
Tested-by: Bruce Richardson <bruce.richardson@intel.com>
125 lines
3.0 KiB
C
125 lines
3.0 KiB
C
|
|
/* Postprocess pmd object files to export hw support
|
|
*
|
|
* Copyright 2016 Neil Horman <nhorman@tuxdriver.com>
|
|
* Based in part on modpost.c from the linux kernel
|
|
*
|
|
* This software may be used and distributed according to the terms
|
|
* of the GNU General Public License V2, incorporated herein by reference.
|
|
*
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
#include <stdlib.h>
|
|
#include <stdarg.h>
|
|
#include <string.h>
|
|
#include <sys/types.h>
|
|
#include <sys/stat.h>
|
|
#include <sys/mman.h>
|
|
#ifdef __linux__
|
|
#include <endian.h>
|
|
#else
|
|
#include <sys/endian.h>
|
|
#endif
|
|
#include <fcntl.h>
|
|
#include <unistd.h>
|
|
#include <elf.h>
|
|
#include <rte_config.h>
|
|
#include <rte_pci.h>
|
|
|
|
/* On BSD-alike OSes elf.h defines these according to host's word size */
|
|
#undef ELF_ST_BIND
|
|
#undef ELF_ST_TYPE
|
|
#undef ELF_R_SYM
|
|
#undef ELF_R_TYPE
|
|
|
|
/*
|
|
* Define ELF64_* to ELF_*, the latter being defined in both 32 and 64 bit
|
|
* flavors in elf.h. This makes our code a bit more generic between arches
|
|
* and allows us to support 32 bit code in the future should we ever want to
|
|
*/
|
|
#ifdef RTE_ARCH_64
|
|
#define Elf_Ehdr Elf64_Ehdr
|
|
#define Elf_Shdr Elf64_Shdr
|
|
#define Elf_Sym Elf64_Sym
|
|
#define Elf_Addr Elf64_Addr
|
|
#define Elf_Sword Elf64_Sxword
|
|
#define Elf_Section Elf64_Half
|
|
#define ELF_ST_BIND ELF64_ST_BIND
|
|
#define ELF_ST_TYPE ELF64_ST_TYPE
|
|
|
|
#define Elf_Rel Elf64_Rel
|
|
#define Elf_Rela Elf64_Rela
|
|
#define ELF_R_SYM ELF64_R_SYM
|
|
#define ELF_R_TYPE ELF64_R_TYPE
|
|
#else
|
|
#define Elf_Ehdr Elf32_Ehdr
|
|
#define Elf_Shdr Elf32_Shdr
|
|
#define Elf_Sym Elf32_Sym
|
|
#define Elf_Addr Elf32_Addr
|
|
#define Elf_Sword Elf32_Sxword
|
|
#define Elf_Section Elf32_Half
|
|
#define ELF_ST_BIND ELF32_ST_BIND
|
|
#define ELF_ST_TYPE ELF32_ST_TYPE
|
|
|
|
#define Elf_Rel Elf32_Rel
|
|
#define Elf_Rela Elf32_Rela
|
|
#define ELF_R_SYM ELF32_R_SYM
|
|
#define ELF_R_TYPE ELF32_R_TYPE
|
|
#endif
|
|
|
|
|
|
/*
|
|
* Note, it seems odd that we have both a CONVERT_NATIVE and a TO_NATIVE macro
|
|
* below. We do this because the values passed to TO_NATIVE may themselves be
|
|
* macros and need both macros here to get expanded. Specifically its the width
|
|
* variable we are concerned with, because it needs to get expanded prior to
|
|
* string concatenation
|
|
*/
|
|
#define CONVERT_NATIVE(fend, width, x) ({ \
|
|
typeof(x) ___x; \
|
|
if ((fend) == ELFDATA2LSB) \
|
|
___x = le##width##toh(x); \
|
|
else \
|
|
___x = be##width##toh(x); \
|
|
___x; \
|
|
})
|
|
|
|
#define TO_NATIVE(fend, width, x) CONVERT_NATIVE(fend, width, x)
|
|
|
|
enum opt_params {
|
|
PMD_PARAM_STRING = 0,
|
|
PMD_OPT_MAX
|
|
};
|
|
|
|
struct pmd_driver {
|
|
Elf_Sym *name_sym;
|
|
const char *name;
|
|
struct rte_pci_id *pci_tbl;
|
|
struct pmd_driver *next;
|
|
|
|
const char *opt_vals[PMD_OPT_MAX];
|
|
};
|
|
|
|
struct elf_info {
|
|
unsigned long size;
|
|
Elf_Ehdr *hdr;
|
|
Elf_Shdr *sechdrs;
|
|
Elf_Sym *symtab_start;
|
|
Elf_Sym *symtab_stop;
|
|
char *strtab;
|
|
|
|
/* support for 32bit section numbers */
|
|
|
|
unsigned int num_sections; /* max_secindex + 1 */
|
|
unsigned int secindex_strings;
|
|
/* if Nth symbol table entry has .st_shndx = SHN_XINDEX,
|
|
* take shndx from symtab_shndx_start[N] instead
|
|
*/
|
|
Elf32_Word *symtab_shndx_start;
|
|
Elf32_Word *symtab_shndx_stop;
|
|
|
|
struct pmd_driver *drivers;
|
|
};
|
|
|