Add support for IBM Z s390x
Subsystems (2)
PATCH v2 1/1 Add support for IBM Z s390x
Minimal changes to drivers and app to support the IBM s390x.
--- app/test-acl/main.c | 4 + app/test/test_acl.c | 1 + app/test/test_atomic.c | 7 +- app/test/test_cmdline_ipaddr.c | 12 +- app/test/test_cmdline_num.c | 110 ++++ app/test/test_hash_functions.c | 29 + app/test/test_xmmt_ops.h | 14 + buildtools/pmdinfogen.py | 11 +- config/meson.build | 2 + config/s390x/meson.build | 51 ++ config/s390x/s390x_linux_clang_ubuntu | 19 + doc/guides/nics/features/i40e.ini | 1 + drivers/common/mlx5/mlx5_common.h | 9 + drivers/net/i40e/i40e_rxtx_vec_s390x.c | 630 +++++++++++++++++++ drivers/net/i40e/meson.build | 2 + drivers/net/ixgbe/ixgbe_rxtx.c | 8 +- drivers/net/memif/rte_eth_memif.h | 2 + drivers/net/mlx5/mlx5_rx.c | 24 +- drivers/net/octeontx/base/octeontx_pki_var.h | 6 + examples/l3fwd/l3fwd_em.c | 8 + examples/l3fwd/l3fwd_lpm_s390x.h | 137 ++++ examples/l3fwd/l3fwd_s390x.h | 261 ++++++++ lib/acl/acl_bld.c | 3 + lib/acl/acl_gen.c | 9 + lib/acl/acl_run_scalar.c | 8 + lib/acl/rte_acl.c | 27 + lib/acl/rte_acl.h | 5 +- lib/eal/s390x/include/meson.build | 16 + lib/eal/s390x/include/rte_atomic.h | 44 ++ lib/eal/s390x/include/rte_byteorder.h | 43 ++ lib/eal/s390x/include/rte_cpuflags.h | 41 ++ lib/eal/s390x/include/rte_cycles.h | 44 ++ lib/eal/s390x/include/rte_io.h | 184 ++++++ lib/eal/s390x/include/rte_mcslock.h | 18 + lib/eal/s390x/include/rte_memcpy.h | 55 ++ lib/eal/s390x/include/rte_pause.h | 22 + lib/eal/s390x/include/rte_power_intrinsics.h | 20 + lib/eal/s390x/include/rte_prefetch.h | 46 ++ lib/eal/s390x/include/rte_rwlock.h | 42 ++ lib/eal/s390x/include/rte_spinlock.h | 85 +++ lib/eal/s390x/include/rte_ticketlock.h | 18 + lib/eal/s390x/include/rte_vect.h | 35 ++ lib/eal/s390x/meson.build | 16 + lib/eal/s390x/rte_cpuflags.c | 91 +++ lib/eal/s390x/rte_cycles.c | 11 + lib/eal/s390x/rte_hypervisor.c | 11 + lib/eal/s390x/rte_power_intrinsics.c | 51 ++ lib/hash/rte_fbk_hash.h | 7 + lib/lpm/meson.build | 1 + lib/lpm/rte_lpm.h | 2 + lib/lpm/rte_lpm6.c | 18 + lib/lpm/rte_lpm_s390x.h | 130 ++++ meson.build | 2 + 53 files changed, 2439 insertions(+), 14 deletions(-) create mode 100644 config/s390x/meson.build create mode 100644 config/s390x/s390x_linux_clang_ubuntu create mode 100644 drivers/net/i40e/i40e_rxtx_vec_s390x.c create mode 100644 examples/l3fwd/l3fwd_lpm_s390x.h create mode 100644 examples/l3fwd/l3fwd_s390x.h create mode 100644 lib/eal/s390x/include/meson.build create mode 100644 lib/eal/s390x/include/rte_atomic.h create mode 100644 lib/eal/s390x/include/rte_byteorder.h create mode 100644 lib/eal/s390x/include/rte_cpuflags.h create mode 100644 lib/eal/s390x/include/rte_cycles.h create mode 100644 lib/eal/s390x/include/rte_io.h create mode 100644 lib/eal/s390x/include/rte_mcslock.h create mode 100644 lib/eal/s390x/include/rte_memcpy.h create mode 100644 lib/eal/s390x/include/rte_pause.h create mode 100644 lib/eal/s390x/include/rte_power_intrinsics.h create mode 100644 lib/eal/s390x/include/rte_prefetch.h create mode 100644 lib/eal/s390x/include/rte_rwlock.h create mode 100644 lib/eal/s390x/include/rte_spinlock.h create mode 100644 lib/eal/s390x/include/rte_ticketlock.h create mode 100644 lib/eal/s390x/include/rte_vect.h create mode 100644 lib/eal/s390x/meson.build create mode 100644 lib/eal/s390x/rte_cpuflags.c create mode 100644 lib/eal/s390x/rte_cycles.c create mode 100644 lib/eal/s390x/rte_hypervisor.c create mode 100644 lib/eal/s390x/rte_power_intrinsics.c create mode 100644 lib/lpm/rte_lpm_s390x.h
app/test-acl/main.c +4 -0
@@ -89,6 +89,10 @@ static const struct acl_alg acl_alg[] = { .name = "altivec", .alg = RTE_ACL_CLASSIFY_ALTIVEC, }, + { + .name = "s390x", + .alg = RTE_ACL_CLASSIFY_S390X, + }, { .name = "avx512x16", .alg = RTE_ACL_CLASSIFY_AVX512X16,
app/test/test_acl.c +1 -0
@@ -351,6 +351,7 @@ test_classify_run(struct rte_acl_ctx *acx, struct ipv4_7tuple test_data[],RTE_ACL_CLASSIFY_AVX2 ,RTE_ACL_CLASSIFY_NEON ,RTE_ACL_CLASSIFY_ALTIVEC , +RTE_ACL_CLASSIFY_S390X ,RTE_ACL_CLASSIFY_AVX512X16 , RTE_ACL_CLASSIFY_AVX512X32, };
app/test/test_atomic.c +6 -1
@@ -17,6 +17,7 @@#include <rte_lcore.h> #include <rte_random.h> #include <rte_hash_crc.h> +#include <rte_byteorder.h> #include "test.h"
@@ -351,6 +352,7 @@ volatile uint16_t token16;volatile uint32_t token32;volatile uint64_t token64; +#ifndef RTE_ARCH_S390X static void build_crc8_table (void ) {
@@ -441,6 +443,8 @@ test_atomic_exchange(__rte_unused void *arg) return 0; } +#endif +static int test_atomic (void ) {
@@ -597,6 +601,7 @@ test_atomic(void) }#endif +#if RTE_BYTE_ORDER ==RTE_LITTLE_ENDIAN /* * Test 16/32/64bit atomic exchange. */
@@ -628,7 +633,7 @@ test_atomic(void)printf ("Atomic exchange test failed\n" ); return -1; } - +#endif return 0 ; }REGISTER_TEST_COMMAND (atomic_autotest, test_atomic);
app/test/test_cmdline_ipaddr.c +11 -1
@@ -6,19 +6,29 @@#include <inttypes.h> #include <rte_string_fns.h> +#include <rte_byteorder.h> #include <cmdline_parse.h> #include <cmdline_parse_ipaddr.h> #include "test_cmdline.h" -#define IP4 (a,b,c,d) {.s_addr = (uint32_t)(((a) & 0xff) | \ +#if RTE_BYTE_ORDER ==RTE_LITTLE_ENDIAN +#define IP4 (a, b, c, d) {.s_addr = (uint32_t)(((a) & 0xff) | \ (((b) & 0xff) << 8) | \ (((c) & 0xff) << 16) | \ ((d) & 0xff) << 24)}#define U16_SWAP (x) \ (((x & 0xFF) << 8) | ((x & 0xFF00) >> 8)) +#else +#define IP4 (a, b, c, d) {((uint32_t)(((a) & 0xff) << 24) | \ + (((b) & 0xff) << 16) | \ + (((c) & 0xff) << 8) | \ + ((d) & 0xff))} + +#define U16_SWAP (x) x +#endif /* create IPv6 address, swapping bytes where needed */ #ifndef s6_addr16
app/test/test_cmdline_num.c +110 -0
140 lines not on this page · raw message
app/test/test_hash_functions.c +29 -0
@@ -25,6 +25,7 @@* e.g.: key size = 4, key = 0x03020100 * key size = 8, key = 0x0706050403020100 */ +#if !defined(RTE_ARCH_S390X) static uint32_t hash_values_jhash[2][12] = {{ 0x8ba9414b, 0xdf0d39c9, 0xe4cf1d42, 0xd4ccb93c, 0x5e84eafc, 0x21362cfe,
@@ -51,6 +52,34 @@ static uint32_t hash_values_crc[2][12] = {{0x789c104f ,0x53028d3e } }; +#else +static uint32_t hash_values_jhash[2 ][12 ] = {{ +0x8ba9414b ,0x8a2f8eb , +0x55dcd60b ,0xf0b95bfe ,0x1a28d94c ,0x003d8f00 , +0x84c90b2c ,0x24b83acf ,0x5e16af2f ,0x751c9f59 , +0x665b8254 ,0x6e347c81 +}, +{ +0x5c62c303 ,0xb21d4b7b , +0xa33cdfcf ,0x47cf3d14 ,0x1cae829f ,0x1253a9ea , +0x7171efd1 ,0xcef21db0 ,0x3df3f5fe ,0x35fd67d2 , +0x2922cbc4 ,0xeaee5c5c +} +}; +static uint32_t hash_values_crc[2 ][12 ] = {{ +0x00000000 ,0x13a29877 , +0x3eef4343 ,0xb6719589 ,0x938d3d79 ,0xed93196b , +0xe710a46c ,0x81f7ab71 ,0x702bc9ee ,0x26c72488 , +0x2e7092a9 ,0xf2fbc80b +}, +{ +0xbdfd3980 ,0x91e95e36 , +0x37765e57 ,0x6559eb17 ,0x49c8a164 ,0x18daa0d3 , +0x67065980 ,0x62f966d0 ,0x4e28a2a0 ,0xe342d18f , +0x1518c680 ,0xebe8026b +} +}; +#endif /******************************************************************************* * Hash function performance test configuration section. Each performance test
app/test/test_xmmt_ops.h +14 -0
@@ -52,6 +52,20 @@ vect_set_epi32(int i3, int i2, int i1, int i0)return data; } +#elif defined(RTE_ARCH_S390X ) + +/* loads the xmm_t value from address p(does not need to be 16-byte aligned)*/ +#define vect_loadu_sil128 (p) vec_xld2(0, (signed int *)p) + +/* sets the 4 signed 32-bit integer values and returns the xmm_t variable */ +static __rte_always_inline xmm_t +vect_set_epi32 (int i3,int i2,int i1,int i0) +{ +xmm_t data = (xmm_t ){.u32 = {i0, i1, i2, i3}}; + +return data; +} +#elif defined(RTE_ARCH_RISCV )#define vect_loadu_sil128 (p) vect_load_128(p)
buildtools/pmdinfogen.py +9 -2
@@ -16,8 +16,15 @@ except ImportError: pass -import coff +try: + import coff +except TypeError: + pass +def decode_asciiz(data): + index = data.find(b'\x00') + end = index if index >= 0 else len(data) + return data[:end].decode() class ELFSymbol: def __init__(self, image, symbol):
@@ -28,7 +35,7 @@ def __init__(self, image, symbol): def string_value(self): size = self._symbol["st_size"] value = self.get_value(0, size) - return coff.decode_asciiz(value) # not COFF-specific + return decode_asciiz(value) # not COFF-specific def get_value(self, offset, size): section = self._symbol["st_shndx"]
config/meson.build +2 -0
@@ -121,6 +121,8 @@ if cpu_instruction_set == 'generic' cpu_instruction_set = 'generic' elif host_machine.cpu_family().startswith('ppc') cpu_instruction_set = 'power8' + elif host_machine.cpu_family().startswith('s390x') + machine = 'z13' elif host_machine.cpu_family().startswith('riscv') cpu_instruction_set = 'riscv' endif
config/s390x/meson.build new file +51 -0
51 lines not on this page · raw message
config/s390x/s390x_linux_clang_ubuntu new file +19 -0
@@ -0,0 +1,19 @@ +[binaries] +c = 'clang' +cpp = 'clang++' +ar = 'llvm-ar' +strip = 'llvm-strip' +llvm-config = 'llvm-config' +pcap-config = 'llvm-config' +pkgconfig = 'pkg-config' + +[host_machine] +system = 'linux' +cpu_family = 's390x' +cpu = 'z13' +endian = 'big' + +[properties] +platform = 'generic' +c_args = ['-target', 'aarch64-linux-gnu', '--sysroot', '/usr/aarch64-linux-gnu'] +c_link_args = ['-target', 'aarch64-linux-gnu', '-fuse-ld=lld', '--gcc-toolchain=/usr']
doc/guides/nics/features/i40e.ini +1 -0
@@ -50,6 +50,7 @@ x86-32 = Y x86-64 = Y ARMv8 = Y Power8 = Y +s390x = Y [rte_flow items] ah = Y
drivers/common/mlx5/mlx5_common.h +9 -0
@@ -21,6 +21,11 @@#include <rte_spinlock.h> #include <rte_os_shim.h> +/* s390x pci implemenation. */ +#ifdef RTE_MACHINE_CPUFLAG_ZARCH +#include <rte_io.h> +#endif +#include "mlx5_prm.h" #include "mlx5_devx_cmds.h" #include "mlx5_common_os.h"
@@ -407,7 +412,11 @@ mlx5_doorbell_ring(struct mlx5_uar_data *uar, uint64_t val, uint32_t index,/* Ensure ordering between DB record actual update and UAR access. */ rte_wmb ();#ifdef RTE_ARCH_64 +# ifndef RTE_MACHINE_CPUFLAG_ZARCH *uar->db = val; +# else +rte_write64_relaxed (val, uar->db); +# endif #else /* !RTE_ARCH_64 */ rte_spinlock_lock (uar->sl_p); *(volatile uint32_t *)uar->db = val;
drivers/net/i40e/i40e_rxtx_vec_s390x.c new file +630 -0
630 lines not on this page · raw message
drivers/net/i40e/meson.build +2 -0
@@ -91,6 +91,8 @@ if arch_subdir == 'x86' endif elif arch_subdir == 'ppc' sources += files('i40e_rxtx_vec_altivec.c') +elif arch_subdir == 's390x' + sources += files('i40e_rxtx_vec_s390x.c') elif arch_subdir == 'arm' sources += files('i40e_rxtx_vec_neon.c') endif
drivers/net/ixgbe/ixgbe_rxtx.c +4 -4
@@ -6029,11 +6029,11 @@ ixgbe_config_rss_filter(struct rte_eth_dev *dev,return 0 ; } -/* Stubs needed for linkage when RTE_ARCH_PPC_64, RTE_ARCH_RISCV or -* RTE_ARCH_LOONGARCH is set. +/* Stubs needed for linkage when RTE_ARCH_PPC_64, RTE_ARCH_RISCV, +* RTE_ARCH_LOONGARCH or RTE_ARCH_S390X is set. */ -#if defined(RTE_ARCH_PPC_64 ) || defined(RTE_ARCH_RISCV ) || \ - defined(RTE_ARCH_LOONGARCH ) +#if defined(RTE_ARCH_PPC_64) || defined(RTE_ARCH_S390X) \ + defined(RTE_ARCH_LOONGARCH ) || defined(RTE_ARCH_RISCV )int ixgbe_rx_vec_dev_conf_condition_check(struct rte_eth_dev __rte_unused *dev) {
drivers/net/memif/rte_eth_memif.h +2 -0
@@ -182,6 +182,8 @@ const char *memif_version(void);#define __NR_memfd_create 279#elif defined __powerpc__#define __NR_memfd_create 360 +#elif defined __s390x__ +#define __NR_memfd_create 350#elif defined __i386__#define __NR_memfd_create 356#elif defined __riscv
drivers/net/mlx5/mlx5_rx.c +20 -4
@@ -229,6 +229,8 @@ mlx5_rx_burst_mode_get(struct rte_eth_dev *dev,snprintf (mode->info,sizeof (mode->info),"%s" ,"Vector Neon" );#elif definedRTE_ARCH_PPC_64 snprintf (mode->info,sizeof (mode->info),"%s" ,"Vector AltiVec" ); +#elif definedRTE_ARCH_S390X +snprintf (mode->info,sizeof (mode->info),"%s" ,"Vector S390X" );#else return -EINVAL ;#endif
@@ -239,6 +241,8 @@ mlx5_rx_burst_mode_get(struct rte_eth_dev *dev,snprintf (mode->info,sizeof (mode->info),"%s" ,"MPRQ Vector Neon" );#elif definedRTE_ARCH_PPC_64 snprintf (mode->info,sizeof (mode->info),"%s" ,"MPRQ Vector AltiVec" ); +#elif definedRTE_ARCH_S390X +snprintf (mode->info,sizeof (mode->info),"%s" ,"MPRQ Vector S390X" );#else return -EINVAL ;#endif
@@ -340,12 +344,24 @@ rxq_cq_to_pkt_type(struct mlx5_rxq_data *rxq, volatile struct mlx5_cqe *cqe,uint8_t ptype;uint8_t pinfo = (cqe->pkt_info &0x3 ) <<6 ; +/* +* hdr_type_etc is from the cqe thus it is BE +* the logic below did not convert BE -> LE prior +* to using the value of it. So the logic below +* is written for LE thus the value of hdr_type_etc has +* to be converted from LE to BE for the logic to work +*/ +uint16_t cqe_t_le =rte_le_to_cpu_16 (cqe->hdr_type_etc); +uint16_t mcqe_t_le; +/* Get l3/l4 header from mini-CQE in case L3/L4 format*/ if (mcqe ==NULL || - rxq->mcqe_format !=MLX5_CQE_RESP_FORMAT_L34H_STRIDX ) - ptype = (cqe->hdr_type_etc &0xfc00 ) >>10 ; -else - ptype = mcqe->hdr_type >>2 ; + rxq->mcqe_format !=MLX5_CQE_RESP_FORMAT_L34H_STRIDX ) { + ptype = (cqe_t_le &0xfc00 ) >>10 ; + }else { + mcqe_t_le =rte_le_to_cpu_16 (mcqe->hdr_type); + ptype = mcqe_t_le >>2 ; + }/* * The index to the array should have: * bit[1:0] = l3_hdr_type
drivers/net/octeontx/base/octeontx_pki_var.h +6 -0
@@ -157,6 +157,12 @@ typedef union octtx_wqe_s { uint64_t lbptr : 8; uint64_t laptr : 8; } w4; + +struct { +uint64_t size :16 ; +uint64_t dwd :1 ; +uint64_t rsvd0 :47 ; + } w5;#endif } s;
examples/l3fwd/l3fwd_em.c +8 -0
@@ -239,6 +239,14 @@ em_mask_key(void *key, xmm_t mask) return vec_and(data, mask); } +#elif defined(__s390x__) +static inline xmm_t +em_mask_key (void *key,xmm_t mask) +{ +xmm_t data = (xmm_t )vec_xld2 (0 , (unsigned int *)(key)); + +return data + mask; +}#elif defined(RTE_ARCH_RISCV)static inline xmm_t em_mask_key (void *key,xmm_t mask)
examples/l3fwd/l3fwd_lpm_s390x.h new file +137 -0
137 lines not on this page · raw message
examples/l3fwd/l3fwd_s390x.h new file +261 -0
261 lines not on this page · raw message
lib/acl/acl_bld.c +3 -0
@@ -780,6 +780,9 @@ acl_build_reset(struct rte_acl_ctx *ctx) sizeof(*ctx) - offsetof(struct rte_acl_ctx, num_categories)); } + + +static void acl_gen_full_range (struct acl_build_context *context,struct rte_acl_node *root,struct rte_acl_node *end,int size,int level)
lib/acl/acl_gen.c +9 -0
@@ -360,7 +360,16 @@ acl_gen_node(struct rte_acl_node *node, uint64_t *node_array, array_ptr = &node_array[index->quad_index];acl_add_ptrs (node, array_ptr, no_match,0 ); qtrp = (uint32_t *)node->transitions; + +/* Swap qtrp on big endian that transitions[0] +* is at least signifcant byte. +*/ +#if __BYTE_ORDER == __ORDER_BIG_ENDIAN__ + node->node_index =__bswap_32 (qtrp[0 ]); +#else node->node_index = qtrp[0 ]; +#endif + node->node_index <<=sizeof (index->quad_index) *CHAR_BIT ; node->node_index |= index->quad_index | node->node_type; index->quad_index += node->fanout;
lib/acl/acl_run_scalar.c +8 -0
@@ -141,6 +141,14 @@ rte_acl_classify_scalar(const struct rte_acl_ctx *ctx, const uint8_t **data, input0 =GET_NEXT_4BYTES (parms,0 ); input1 =GET_NEXT_4BYTES (parms,1 ); +/* input needs to be swapped because the rules get +* swapped while building the trie. +*/ +#if __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__ + input0 =__bswap_32 (input0); + input1 =__bswap_32 (input1); +#endif +for (n =0 ; n <4 ; n++) { transition0 = scalar_transition(flows.trans,
lib/acl/rte_acl.c +27 -0
@@ -101,6 +101,8 @@ static const rte_acl_classify_t classify_fns[] = { [RTE_ACL_CLASSIFY_AVX2] = rte_acl_classify_avx2, [RTE_ACL_CLASSIFY_NEON] = rte_acl_classify_neon, [RTE_ACL_CLASSIFY_ALTIVEC] = rte_acl_classify_altivec, +/* use scalar for s390x for now */ + [RTE_ACL_CLASSIFY_S390X] = rte_acl_classify_scalar, [RTE_ACL_CLASSIFY_AVX512X16] = rte_acl_classify_avx512x16, [RTE_ACL_CLASSIFY_AVX512X32] = rte_acl_classify_avx512x32, };
@@ -145,6 +147,27 @@ acl_check_alg_ppc(enum rte_acl_classify_alg alg)return -EINVAL ; } + + +/* +* Helper function for acl_check_alg. +* Check support for PPC specific classify methods. +*/ +static int +acl_check_alg_s390x (enum rte_acl_classify_alg alg) +{ +if (alg ==RTE_ACL_CLASSIFY_S390X ) { +#if defined(RTE_ARCH_S390X ) +if (rte_vect_get_max_simd_bitwidth () >=RTE_VECT_SIMD_128 ) +return 0 ; +#endif +return -ENOTSUP ; + } + +return -EINVAL ; +} + +#ifdef CC_AVX512_SUPPORT static int acl_check_avx512_cpu_flags (void )
@@ -216,6 +239,8 @@ acl_check_alg(enum rte_acl_classify_alg alg)return acl_check_alg_arm (alg);case RTE_ACL_CLASSIFY_ALTIVEC :return acl_check_alg_ppc (alg); +case RTE_ACL_CLASSIFY_S390X : +return acl_check_alg_s390x (alg);case RTE_ACL_CLASSIFY_AVX512X32 :case RTE_ACL_CLASSIFY_AVX512X16 :case RTE_ACL_CLASSIFY_AVX2 :
@@ -244,6 +269,8 @@ acl_get_best_alg(void) RTE_ACL_CLASSIFY_NEON,#elif defined(RTE_ARCH_PPC_64 ) RTE_ACL_CLASSIFY_ALTIVEC, +#elif defined(RTE_ARCH_S390X ) + RTE_ACL_CLASSIFY_S390X,#elif defined(RTE_ARCH_X86 )RTE_ACL_CLASSIFY_AVX512X32 , RTE_ACL_CLASSIFY_AVX512X16,
lib/acl/rte_acl.h +3 -2
@@ -242,8 +242,9 @@ enum rte_acl_classify_alg {RTE_ACL_CLASSIFY_AVX2 =3 ,/**< requires AVX2 support. */ RTE_ACL_CLASSIFY_NEON =4 ,/**< requires NEON support. */ RTE_ACL_CLASSIFY_ALTIVEC =5 ,/**< requires ALTIVEC support. */ -RTE_ACL_CLASSIFY_AVX512X16 =6 ,/**< requires AVX512 support. */ - RTE_ACL_CLASSIFY_AVX512X32 = 7, /**< requires AVX512 support. */ +RTE_ACL_CLASSIFY_S390X =6 ,/**< requires s390x z13 support. */ +RTE_ACL_CLASSIFY_AVX512X16 =7 ,/**< requires AVX512 support. */ + RTE_ACL_CLASSIFY_AVX512X32 = 8, /**< requires AVX512 support. */ };/**
lib/eal/s390x/include/meson.build new file +16 -0
@@ -0,0 +1,16 @@ +# SPDX-License-Identifier: BSD-3-Clause +# (c) Copyright IBM Corp. 2018, 2019 + +install_headers( + 'rte_atomic.h', + 'rte_byteorder.h', + 'rte_cpuflags.h', + 'rte_cycles.h', + 'rte_io.h', + 'rte_memcpy.h', + 'rte_pause.h', + 'rte_prefetch.h', + 'rte_rwlock.h', + 'rte_spinlock.h', + 'rte_vect.h', + subdir: get_option('include_subdir_arch'))
lib/eal/s390x/include/rte_atomic.h new file +44 -0
44 lines not on this page · raw message
lib/eal/s390x/include/rte_byteorder.h new file +43 -0
43 lines not on this page · raw message
lib/eal/s390x/include/rte_cpuflags.h new file +41 -0
41 lines not on this page · raw message
lib/eal/s390x/include/rte_cycles.h new file +44 -0
44 lines not on this page · raw message
lib/eal/s390x/include/rte_io.h new file +184 -0
184 lines not on this page · raw message
lib/eal/s390x/include/rte_mcslock.h new file +18 -0
@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(c) 2019 Arm Limited +*/ + +#ifndef _RTE_MCSLOCK_S390X_H_ +#define _RTE_MCSLOCK_S390X_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include "generic/rte_mcslock.h" + +#ifdef __cplusplus +} +#endif + +#endif /* _RTE_MCSLOCK_S390X_H_ */
lib/eal/s390x/include/rte_memcpy.h new file +55 -0
55 lines not on this page · raw message
lib/eal/s390x/include/rte_pause.h new file +22 -0
@@ -0,0 +1,22 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* (c) Copyright IBM Corp. 2018, 2019 +*/ + +#ifndef _RTE_PAUSE_S390X_H_ +#define _RTE_PAUSE_S390X_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include "generic/rte_pause.h" + +static inline void rte_pause (void ) +{ +} + +#ifdef __cplusplus +} +#endif + +#endif /* _RTE_PAUSE_S390X_H_ */
lib/eal/s390x/include/rte_power_intrinsics.h new file +20 -0
@@ -0,0 +1,20 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* Copyright(c) 2020 Intel Corporation +*/ + +#ifndef _RTE_POWER_INTRINSIC_PPC_H_ +#define _RTE_POWER_INTRINSIC_PPC_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include <rte_common.h> + +#include "generic/rte_power_intrinsics.h" + +#ifdef __cplusplus +} +#endif + +#endif /* _RTE_POWER_INTRINSIC_PPC_H_ */
lib/eal/s390x/include/rte_prefetch.h new file +46 -0
46 lines not on this page · raw message
lib/eal/s390x/include/rte_rwlock.h new file +42 -0
42 lines not on this page · raw message
lib/eal/s390x/include/rte_spinlock.h new file +85 -0
85 lines not on this page · raw message
lib/eal/s390x/include/rte_ticketlock.h new file +18 -0
@@ -0,0 +1,18 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* (c) Copyright IBM Corp. 2019 +*/ + +#ifndef _RTE_TICKETLOCK_S390X_H_ +#define _RTE_TICKETLOCK_S390X_H_ + +#ifdef __cplusplus +extern "C" { +#endif + +#include "generic/rte_ticketlock.h" + +#ifdef __cplusplus +} +#endif + +#endif /* _RTE_TICKETLOCK_S390X_H_ */
lib/eal/s390x/include/rte_vect.h new file +35 -0
@@ -0,0 +1,35 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* (c) Copyright IBM Corp. 2018, 2019 +*/ + +#ifndef _RTE_VECT_S390X_H_ +#define _RTE_VECT_S390X_H_ + +#include <vecintrin.h> +#include "generic/rte_vect.h" + +#ifdef __cplusplus +extern "C" { +#endif + +#define RTE_VECT_DEFAULT_SIMD_BITWIDTH RTE_VECT_SIMD_256 + +typedef int xmm_t __attribute__((vector_size (4 *sizeof (int )))); + +#define XMM_SIZE (sizeof(xmm_t)) +#define XMM_MASK (XMM_SIZE - 1) + +typedef union rte_xmm { +xmm_t x; +uint8_t u8[XMM_SIZE /sizeof (uint8_t )]; +uint16_t u16[XMM_SIZE /sizeof (uint16_t )]; +uint32_t u32[XMM_SIZE /sizeof (uint32_t )]; +uint64_t u64[XMM_SIZE /sizeof (uint64_t )]; +double pd[XMM_SIZE /sizeof (double )]; +}__aligned(16) rte_xmm_t ; + +#ifdef __cplusplus +} +#endif + +#endif /* _RTE_VECT_S390X_H_ */
lib/eal/s390x/meson.build new file +16 -0
@@ -0,0 +1,16 @@ +# SPDX-License-Identifier: BSD-3-Clause +# (c) Copyright IBM Corp. 2018, 2019 + +subdir('include') + +# 19.xx zarch patches lib/librte_eal/common/arch/s390x/meson.build: +# var was: eal_common_arch_sources +# +sources += files( + 'rte_cpuflags.c', + 'rte_cycles.c', + 'rte_hypervisor.c', + 'rte_power_intrinsics.c', +) + +
lib/eal/s390x/rte_cpuflags.c new file +91 -0
91 lines not on this page · raw message
lib/eal/s390x/rte_cycles.c new file +11 -0
@@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* (c) Copyright IBM Corp. 2018, 2019 +*/ + +#include "eal_private.h" + +uint64_t +get_tsc_freq_arch (void ) +{ +return 0 ; +}
lib/eal/s390x/rte_hypervisor.c new file +11 -0
@@ -0,0 +1,11 @@ +/* SPDX-License-Identifier: BSD-3-Clause +* (c) Copyright IBM Corp. 2018, 2019 +*/ + +#include "rte_hypervisor.h" + +enum rte_hypervisor +rte_hypervisor_get (void ) +{ +return RTE_HYPERVISOR_UNKNOWN ; +}
lib/eal/s390x/rte_power_intrinsics.c new file +51 -0
51 lines not on this page · raw message
lib/hash/rte_fbk_hash.h +7 -0
@@ -123,9 +123,16 @@ rte_fbk_hash_add_key_with_bucket(struct rte_fbk_hash_table *ht,* corrupted due to race conditions, but it's still possible to * overwrite entries that have just been made valid. */ +#if RTE_BYTE_ORDER ==RTE_LITTLE_ENDIAN const uint64_t new_entry = ((uint64_t )(key) <<32 ) | ((uint64_t )(value) <<16 ) |1 ;/* 1 = is_entry bit. */ +#else +const uint64_t new_entry = + ((uint64_t )(1 ) <<48 ) |/* 1 = is_entry bit. */ + ((uint64_t )(value) <<32 ) | + (uint64_t )(key); +#endif uint32_t i;for (i =0 ; i < ht->entries_per_bucket; i++) {
lib/lpm/meson.build +1 -0
@@ -7,6 +7,7 @@ headers = files('rte_lpm.h', 'rte_lpm6.h') # without worrying about which architecture we actually need indirect_headers += files( 'rte_lpm_altivec.h', + 'rte_lpm_s390x.h', 'rte_lpm_neon.h', 'rte_lpm_scalar.h', 'rte_lpm_sse.h',
lib/lpm/rte_lpm.h +2 -0
@@ -407,6 +407,8 @@ rte_lpm_lookupx4(const struct rte_lpm *lpm, xmm_t ip, uint32_t hop[4],#include "rte_lpm_neon.h" #elif defined(RTE_ARCH_PPC_64 )#include "rte_lpm_altivec.h" +#elif defined(RTE_ARCH_S390X ) +#include "rte_lpm_s390x.h" #elif defined(RTE_ARCH_X86 )#include "rte_lpm_sse.h" #else
lib/lpm/rte_lpm6.c +18 -0
@@ -18,6 +18,7 @@#include <assert.h> #include <rte_jhash.h> #include <rte_tailq.h> +#include <rte_byteorder.h> #include "rte_lpm6.h"
@@ -52,6 +53,8 @@ static struct rte_tailq_elem rte_lpm6_tailq = { }; EAL_REGISTER_TAILQ(rte_lpm6_tailq) +#if RTE_BYTE_ORDER == RTE_LITTLE_ENDIAN + /** Tbl entry structure. It is the same for both tbl24 and tbl8 */ struct rte_lpm6_tbl_entry { uint32_t next_hop: 21; /**< Next hop / next table to be checked. */
@@ -63,6 +66,21 @@ struct rte_lpm6_tbl_entry { uint32_t ext_entry :1; /**< External entry. */ }; +#else + +struct rte_lpm6_tbl_entry { + +/* Flags. */ +uint32_t ext_entry :1 ;/**< External entry. */ +uint32_t valid_group :1 ;/**< Group validation flag. */ +uint32_t valid :1 ;/**< Validation flag. */ + +uint32_t depth :8 ;/**< Rule depth. */ +uint32_t next_hop:21 ;/**< Next hop / next table to be checked. */ +}; + +#endif +/** Rules tbl entry structure. */ struct rte_lpm6_rule {uint8_t ip[RTE_LPM6_IPV6_ADDR_SIZE ];/**< Rule IP address. */
lib/lpm/rte_lpm_s390x.h new file +130 -0
130 lines not on this page · raw message
meson.build +2 -0
@@ -58,6 +58,8 @@ elif host_machine.cpu_family().startswith('loongarch') arch_subdir = 'loongarch' elif host_machine.cpu_family().startswith('ppc') arch_subdir = 'ppc' +elif host_machine.cpu_family().startswith('s390x') + arch_subdir = 's390x' elif host_machine.cpu_family().startswith('riscv') arch_subdir = 'riscv' endif
Signature · 1 line
2.37.2