diff options
author | Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> | 2016-09-21 17:02:03 +0530 |
---|---|---|
committer | Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> | 2016-09-26 13:53:39 +0530 |
commit | ce869c40f7d76ac73120bb98763aef4edae0f0bd (patch) | |
tree | 37909295c3c0e6c85d7e5fd23d840b1f3ce1d51c /debian | |
parent | 55c3008a78a5913dff6dc25c69abdd8f345c5b5b (diff) |
dpdk-dev: enable lpm, acl, sched, table, port and pipeline libs in ppc64le
This patchset enables lpm, acl, sched, table, port and pileline libs in ppc64le
and also address few patches in related examples (ip_pipeline and l3fwd).
Upstream patches pulled into deb_dpdk.
Change-Id: I73bf0a2a20da227476601b748448f16e2b471eaf
Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com>
Diffstat (limited to 'debian')
8 files changed, 1131 insertions, 0 deletions
diff --git a/debian/patches/dpdk-dev-ppc-enable-1-7-lpm-add-AltiVec-for-ppc64.patch b/debian/patches/dpdk-dev-ppc-enable-1-7-lpm-add-AltiVec-for-ppc64.patch new file mode 100644 index 00000000..1a261f33 --- /dev/null +++ b/debian/patches/dpdk-dev-ppc-enable-1-7-lpm-add-AltiVec-for-ppc64.patch @@ -0,0 +1,317 @@ +From: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> +Date: Thu, 8 Sep 2016 22:18:03 +0530 +Subject: [PATCH 1/7] lpm: add AltiVec for ppc64 + +This patch adds ppc64le port for LPM library in DPDK. + +Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> +Acked-by: Chao Zhu <chaozhu@linux.vnet.ibm.com> + +Origin: Upstream, commit:d2cc7959342b5183ab88aed44ea011d660a91021 +Author: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> +Last-Update: 2016-09-21 +--- + app/test/test_xmmt_ops.h | 16 +++ + config/defconfig_ppc_64-power8-linuxapp-gcc | 1 - + .../common/include/arch/ppc_64/rte_vect.h | 60 ++++++++ + lib/librte_lpm/Makefile | 2 + + lib/librte_lpm/rte_lpm.h | 2 + + lib/librte_lpm/rte_lpm_altivec.h | 154 +++++++++++++++++++++ + 6 files changed, 234 insertions(+), 1 deletion(-) + create mode 100644 lib/librte_eal/common/include/arch/ppc_64/rte_vect.h + create mode 100644 lib/librte_lpm/rte_lpm_altivec.h + +diff --git a/app/test/test_xmmt_ops.h b/app/test/test_xmmt_ops.h +index de9c16f..42174d2 100644 +--- a/app/test/test_xmmt_ops.h ++++ b/app/test/test_xmmt_ops.h +@@ -62,6 +62,22 @@ vect_set_epi32(int i3, int i2, int i1, int i0) + /* sets the 4 signed 32-bit integer values and returns the xmm_t variable */ + #define vect_set_epi32(i3, i2, i1, i0) _mm_set_epi32(i3, i2, i1, i0) + ++#elif defined(RTE_ARCH_PPC_64) ++ ++/* vect_* abstraction implementation using ALTIVEC */ ++ ++/* loads the xmm_t value from address p(does not need to be 16-byte aligned)*/ ++#define vect_loadu_sil128(p) vec_ld(0, p) ++ ++/* sets the 4 signed 32-bit integer values and returns the xmm_t variable */ ++static inline xmm_t __attribute__((always_inline)) ++vect_set_epi32(int i3, int i2, int i1, int i0) ++{ ++ xmm_t data = (xmm_t){i0, i1, i2, i3}; ++ ++ return data; ++} ++ + #endif + + #endif /* _TEST_XMMT_OPS_H_ */ +diff --git a/config/defconfig_ppc_64-power8-linuxapp-gcc b/config/defconfig_ppc_64-power8-linuxapp-gcc +index bef8f49..9ddf3c5 100644 +--- a/config/defconfig_ppc_64-power8-linuxapp-gcc ++++ b/config/defconfig_ppc_64-power8-linuxapp-gcc +@@ -57,7 +57,6 @@ CONFIG_RTE_LIBRTE_ENIC_PMD=n + CONFIG_RTE_LIBRTE_FM10K_PMD=n + + # This following libraries are not available on Power. So they're turned off. +-CONFIG_RTE_LIBRTE_LPM=n + CONFIG_RTE_LIBRTE_ACL=n + CONFIG_RTE_LIBRTE_SCHED=n + CONFIG_RTE_LIBRTE_PORT=n +diff --git a/lib/librte_eal/common/include/arch/ppc_64/rte_vect.h b/lib/librte_eal/common/include/arch/ppc_64/rte_vect.h +new file mode 100644 +index 0000000..05209e5 +--- /dev/null ++++ b/lib/librte_eal/common/include/arch/ppc_64/rte_vect.h +@@ -0,0 +1,60 @@ ++/* ++ * BSD LICENSE ++ * ++ * Copyright (C) IBM Corporation 2016. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * * Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * * Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in ++ * the documentation and/or other materials provided with the ++ * distribution. ++ * * Neither the name of IBM Corporation nor the names of its ++ * contributors may be used to endorse or promote products derived ++ * from this software without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ++ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ++ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++*/ ++ ++#ifndef _RTE_VECT_PPC_64_H_ ++#define _RTE_VECT_PPC_64_H_ ++ ++#include <altivec.h> ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++typedef vector signed int xmm_t; ++ ++#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)]; ++} __attribute__((aligned(16))) rte_xmm_t; ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif /* _RTE_VECT_PPC_64_H_ */ +diff --git a/lib/librte_lpm/Makefile b/lib/librte_lpm/Makefile +index 656ade2..3dc549d 100644 +--- a/lib/librte_lpm/Makefile ++++ b/lib/librte_lpm/Makefile +@@ -51,6 +51,8 @@ ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) + SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_neon.h + else ifeq ($(CONFIG_RTE_ARCH_X86),y) + SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_sse.h ++else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y) ++SYMLINK-$(CONFIG_RTE_LIBRTE_LPM)-include += rte_lpm_altivec.h + endif + + # this lib needs eal +diff --git a/lib/librte_lpm/rte_lpm.h b/lib/librte_lpm/rte_lpm.h +index 2df1d67..dbe5483 100644 +--- a/lib/librte_lpm/rte_lpm.h ++++ b/lib/librte_lpm/rte_lpm.h +@@ -480,6 +480,8 @@ rte_lpm_lookupx4(const struct rte_lpm *lpm, xmm_t ip, uint32_t hop[4], + + #if defined(RTE_ARCH_ARM) || defined(RTE_ARCH_ARM64) + #include "rte_lpm_neon.h" ++#elif defined(RTE_ARCH_PPC_64) ++#include "rte_lpm_altivec.h" + #else + #include "rte_lpm_sse.h" + #endif +diff --git a/lib/librte_lpm/rte_lpm_altivec.h b/lib/librte_lpm/rte_lpm_altivec.h +new file mode 100644 +index 0000000..e26e087 +--- /dev/null ++++ b/lib/librte_lpm/rte_lpm_altivec.h +@@ -0,0 +1,154 @@ ++/* ++ * BSD LICENSE ++ * ++ * Copyright (C) IBM Corporation 2016. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * * Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * * Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in ++ * the documentation and/or other materials provided with the ++ * distribution. ++ * * Neither the name of IBM Corporation nor the names of its ++ * contributors may be used to endorse or promote products derived ++ * from this software without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ++ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ++ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++*/ ++ ++#ifndef _RTE_LPM_ALTIVEC_H_ ++#define _RTE_LPM_ALTIVEC_H_ ++ ++#include <rte_branch_prediction.h> ++#include <rte_byteorder.h> ++#include <rte_common.h> ++#include <rte_vect.h> ++ ++#ifdef __cplusplus ++extern "C" { ++#endif ++ ++static inline void ++rte_lpm_lookupx4(const struct rte_lpm *lpm, xmm_t ip, uint32_t hop[4], ++ uint32_t defv) ++{ ++ vector signed int i24; ++ rte_xmm_t i8; ++ uint32_t tbl[4]; ++ uint64_t idx, pt, pt2; ++ const uint32_t *ptbl; ++ ++ const uint32_t mask = UINT8_MAX; ++ const vector signed int mask8 = (xmm_t){mask, mask, mask, mask}; ++ ++ /* ++ * RTE_LPM_VALID_EXT_ENTRY_BITMASK for 2 LPM entries ++ * as one 64-bit value (0x0300000003000000). ++ */ ++ const uint64_t mask_xv = ++ ((uint64_t)RTE_LPM_VALID_EXT_ENTRY_BITMASK | ++ (uint64_t)RTE_LPM_VALID_EXT_ENTRY_BITMASK << 32); ++ ++ /* ++ * RTE_LPM_LOOKUP_SUCCESS for 2 LPM entries ++ * as one 64-bit value (0x0100000001000000). ++ */ ++ const uint64_t mask_v = ++ ((uint64_t)RTE_LPM_LOOKUP_SUCCESS | ++ (uint64_t)RTE_LPM_LOOKUP_SUCCESS << 32); ++ ++ /* get 4 indexes for tbl24[]. */ ++ i24 = vec_sr((xmm_t) ip, ++ (vector unsigned int){CHAR_BIT, CHAR_BIT, CHAR_BIT, CHAR_BIT}); ++ ++ /* extract values from tbl24[] */ ++ idx = (uint32_t)i24[0]; ++ idx = idx < (1<<24) ? idx : (1<<24)-1; ++ ptbl = (const uint32_t *)&lpm->tbl24[idx]; ++ tbl[0] = *ptbl; ++ ++ idx = (uint32_t) i24[1]; ++ idx = idx < (1<<24) ? idx : (1<<24)-1; ++ ptbl = (const uint32_t *)&lpm->tbl24[idx]; ++ tbl[1] = *ptbl; ++ ++ idx = (uint32_t) i24[2]; ++ idx = idx < (1<<24) ? idx : (1<<24)-1; ++ ptbl = (const uint32_t *)&lpm->tbl24[idx]; ++ tbl[2] = *ptbl; ++ ++ idx = (uint32_t) i24[3]; ++ idx = idx < (1<<24) ? idx : (1<<24)-1; ++ ptbl = (const uint32_t *)&lpm->tbl24[idx]; ++ tbl[3] = *ptbl; ++ ++ /* get 4 indexes for tbl8[]. */ ++ i8.x = vec_and(ip, mask8); ++ ++ pt = (uint64_t)tbl[0] | ++ (uint64_t)tbl[1] << 32; ++ pt2 = (uint64_t)tbl[2] | ++ (uint64_t)tbl[3] << 32; ++ ++ /* search successfully finished for all 4 IP addresses. */ ++ if (likely((pt & mask_xv) == mask_v) && ++ likely((pt2 & mask_xv) == mask_v)) { ++ *(uint64_t *)hop = pt & RTE_LPM_MASKX4_RES; ++ *(uint64_t *)(hop + 2) = pt2 & RTE_LPM_MASKX4_RES; ++ return; ++ } ++ ++ if (unlikely((pt & RTE_LPM_VALID_EXT_ENTRY_BITMASK) == ++ RTE_LPM_VALID_EXT_ENTRY_BITMASK)) { ++ i8.u32[0] = i8.u32[0] + ++ (uint8_t)tbl[0] * RTE_LPM_TBL8_GROUP_NUM_ENTRIES; ++ ptbl = (const uint32_t *)&lpm->tbl8[i8.u32[0]]; ++ tbl[0] = *ptbl; ++ } ++ if (unlikely((pt >> 32 & RTE_LPM_VALID_EXT_ENTRY_BITMASK) == ++ RTE_LPM_VALID_EXT_ENTRY_BITMASK)) { ++ i8.u32[1] = i8.u32[1] + ++ (uint8_t)tbl[1] * RTE_LPM_TBL8_GROUP_NUM_ENTRIES; ++ ptbl = (const uint32_t *)&lpm->tbl8[i8.u32[1]]; ++ tbl[1] = *ptbl; ++ } ++ if (unlikely((pt2 & RTE_LPM_VALID_EXT_ENTRY_BITMASK) == ++ RTE_LPM_VALID_EXT_ENTRY_BITMASK)) { ++ i8.u32[2] = i8.u32[2] + ++ (uint8_t)tbl[2] * RTE_LPM_TBL8_GROUP_NUM_ENTRIES; ++ ptbl = (const uint32_t *)&lpm->tbl8[i8.u32[2]]; ++ tbl[2] = *ptbl; ++ } ++ if (unlikely((pt2 >> 32 & RTE_LPM_VALID_EXT_ENTRY_BITMASK) == ++ RTE_LPM_VALID_EXT_ENTRY_BITMASK)) { ++ i8.u32[3] = i8.u32[3] + ++ (uint8_t)tbl[3] * RTE_LPM_TBL8_GROUP_NUM_ENTRIES; ++ ptbl = (const uint32_t *)&lpm->tbl8[i8.u32[3]]; ++ tbl[3] = *ptbl; ++ } ++ ++ hop[0] = (tbl[0] & RTE_LPM_LOOKUP_SUCCESS) ? tbl[0] & 0x00FFFFFF : defv; ++ hop[1] = (tbl[1] & RTE_LPM_LOOKUP_SUCCESS) ? tbl[1] & 0x00FFFFFF : defv; ++ hop[2] = (tbl[2] & RTE_LPM_LOOKUP_SUCCESS) ? tbl[2] & 0x00FFFFFF : defv; ++ hop[3] = (tbl[3] & RTE_LPM_LOOKUP_SUCCESS) ? tbl[3] & 0x00FFFFFF : defv; ++} ++ ++#ifdef __cplusplus ++} ++#endif ++ ++#endif /* _RTE_LPM_ALTIVEC_H_ */ +-- +1.9.1 + diff --git a/debian/patches/dpdk-dev-ppc-enable-2-7-acl-add-AltiVec-for-ppc64.patch b/debian/patches/dpdk-dev-ppc-enable-2-7-acl-add-AltiVec-for-ppc64.patch new file mode 100644 index 00000000..fad0a71e --- /dev/null +++ b/debian/patches/dpdk-dev-ppc-enable-2-7-acl-add-AltiVec-for-ppc64.patch @@ -0,0 +1,536 @@ +From: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> +Date: Thu, 8 Sep 2016 22:18:04 +0530 +Subject: [PATCH 2/7] acl: add AltiVec for ppc64 + +This patch adds port for ACL library in ppc64le. + +Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> +Acked-by: Chao Zhu <chaozhu@linux.vnet.ibm.com> +Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com> + +Origin: Upstream, commit:1d73135f9f1c626def280bd9c7e06a9ae157f660 +Author: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> +Last-Update: 2016-09-21 +--- + app/test-acl/main.c | 4 + + config/defconfig_ppc_64-power8-linuxapp-gcc | 1 - + lib/librte_acl/Makefile | 2 + + lib/librte_acl/acl.h | 4 + + lib/librte_acl/acl_run.h | 2 + + lib/librte_acl/acl_run_altivec.c | 47 ++++ + lib/librte_acl/acl_run_altivec.h | 329 ++++++++++++++++++++++++++++ + lib/librte_acl/rte_acl.c | 13 ++ + lib/librte_acl/rte_acl.h | 1 + + 9 files changed, 402 insertions(+), 1 deletion(-) + create mode 100644 lib/librte_acl/acl_run_altivec.c + create mode 100644 lib/librte_acl/acl_run_altivec.h + +diff --git a/app/test-acl/main.c b/app/test-acl/main.c +index d366981..1b2b176 100644 +--- a/app/test-acl/main.c ++++ b/app/test-acl/main.c +@@ -105,6 +105,10 @@ static const struct acl_alg acl_alg[] = { + .name = "neon", + .alg = RTE_ACL_CLASSIFY_NEON, + }, ++ { ++ .name = "altivec", ++ .alg = RTE_ACL_CLASSIFY_ALTIVEC, ++ }, + }; + + static struct { +diff --git a/config/defconfig_ppc_64-power8-linuxapp-gcc b/config/defconfig_ppc_64-power8-linuxapp-gcc +index 9ddf3c5..dede34f 100644 +--- a/config/defconfig_ppc_64-power8-linuxapp-gcc ++++ b/config/defconfig_ppc_64-power8-linuxapp-gcc +@@ -57,7 +57,6 @@ CONFIG_RTE_LIBRTE_ENIC_PMD=n + CONFIG_RTE_LIBRTE_FM10K_PMD=n + + # This following libraries are not available on Power. So they're turned off. +-CONFIG_RTE_LIBRTE_ACL=n + CONFIG_RTE_LIBRTE_SCHED=n + CONFIG_RTE_LIBRTE_PORT=n + CONFIG_RTE_LIBRTE_TABLE=n +diff --git a/lib/librte_acl/Makefile b/lib/librte_acl/Makefile +index 9803e9d..d05be66 100644 +--- a/lib/librte_acl/Makefile ++++ b/lib/librte_acl/Makefile +@@ -52,6 +52,8 @@ SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_scalar.c + ifneq ($(filter y,$(CONFIG_RTE_ARCH_ARM) $(CONFIG_RTE_ARCH_ARM64)),) + SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_neon.c + CFLAGS_acl_run_neon.o += -flax-vector-conversions -Wno-maybe-uninitialized ++else ifeq ($(CONFIG_RTE_ARCH_PPC_64),y) ++SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_altivec.c + else + SRCS-$(CONFIG_RTE_LIBRTE_ACL) += acl_run_sse.c + #check if flag for SSE4.1 is already on, if not set it up manually +diff --git a/lib/librte_acl/acl.h b/lib/librte_acl/acl.h +index 09d6784..6664a55 100644 +--- a/lib/librte_acl/acl.h ++++ b/lib/librte_acl/acl.h +@@ -234,6 +234,10 @@ int + rte_acl_classify_neon(const struct rte_acl_ctx *ctx, const uint8_t **data, + uint32_t *results, uint32_t num, uint32_t categories); + ++int ++rte_acl_classify_altivec(const struct rte_acl_ctx *ctx, const uint8_t **data, ++ uint32_t *results, uint32_t num, uint32_t categories); ++ + #ifdef __cplusplus + } + #endif /* __cplusplus */ +diff --git a/lib/librte_acl/acl_run.h b/lib/librte_acl/acl_run.h +index b2fc42c..024f393 100644 +--- a/lib/librte_acl/acl_run.h ++++ b/lib/librte_acl/acl_run.h +@@ -39,7 +39,9 @@ + + #define MAX_SEARCHES_AVX16 16 + #define MAX_SEARCHES_SSE8 8 ++#define MAX_SEARCHES_ALTIVEC8 8 + #define MAX_SEARCHES_SSE4 4 ++#define MAX_SEARCHES_ALTIVEC4 4 + #define MAX_SEARCHES_SCALAR 2 + + #define GET_NEXT_4BYTES(prm, idx) \ +diff --git a/lib/librte_acl/acl_run_altivec.c b/lib/librte_acl/acl_run_altivec.c +new file mode 100644 +index 0000000..3523526 +--- /dev/null ++++ b/lib/librte_acl/acl_run_altivec.c +@@ -0,0 +1,47 @@ ++/*- ++ * BSD LICENSE ++ * ++ * Copyright (C) IBM Corporation 2016. ++ * All rights reserved. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * * Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * * Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in ++ * the documentation and/or other materials provided with the ++ * distribution. ++ * * Neither the name of Intel Corporation nor the names of its ++ * contributors may be used to endorse or promote products derived ++ * from this software without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ++ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ++ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++ */ ++ ++#include "acl_run_altivec.h" ++ ++int ++rte_acl_classify_altivec(const struct rte_acl_ctx *ctx, const uint8_t **data, ++ uint32_t *results, uint32_t num, uint32_t categories) ++{ ++ if (likely(num >= MAX_SEARCHES_ALTIVEC8)) ++ return search_altivec_8(ctx, data, results, num, categories); ++ else if (num >= MAX_SEARCHES_ALTIVEC4) ++ return search_altivec_4(ctx, data, results, num, categories); ++ else ++ return rte_acl_classify_scalar(ctx, data, results, num, ++ categories); ++} +diff --git a/lib/librte_acl/acl_run_altivec.h b/lib/librte_acl/acl_run_altivec.h +new file mode 100644 +index 0000000..7d329bc +--- /dev/null ++++ b/lib/librte_acl/acl_run_altivec.h +@@ -0,0 +1,329 @@ ++/* ++ * BSD LICENSE ++ * ++ * Copyright (C) IBM Corporation 2016. ++ * ++ * Redistribution and use in source and binary forms, with or without ++ * modification, are permitted provided that the following conditions ++ * are met: ++ * ++ * * Redistributions of source code must retain the above copyright ++ * notice, this list of conditions and the following disclaimer. ++ * * Redistributions in binary form must reproduce the above copyright ++ * notice, this list of conditions and the following disclaimer in ++ * the documentation and/or other materials provided with the ++ * distribution. ++ * * Neither the name of IBM Corporation nor the names of its ++ * contributors may be used to endorse or promote products derived ++ * from this software without specific prior written permission. ++ * ++ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ++ * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT ++ * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR ++ * A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT ++ * OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, ++ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT ++ * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, ++ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ++ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT ++ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE ++ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. ++*/ ++ ++#include "acl_run.h" ++#include "acl_vect.h" ++ ++struct _altivec_acl_const { ++ rte_xmm_t xmm_shuffle_input; ++ rte_xmm_t xmm_index_mask; ++ rte_xmm_t xmm_ones_16; ++ rte_xmm_t range_base; ++} altivec_acl_const __attribute__((aligned(RTE_CACHE_LINE_SIZE))) = { ++ { ++ .u32 = {0x00000000, 0x04040404, 0x08080808, 0x0c0c0c0c} ++ }, ++ { ++ .u32 = {RTE_ACL_NODE_INDEX, RTE_ACL_NODE_INDEX, ++ RTE_ACL_NODE_INDEX, RTE_ACL_NODE_INDEX} ++ }, ++ { ++ .u16 = {1, 1, 1, 1, 1, 1, 1, 1} ++ }, ++ { ++ .u32 = {0xffffff00, 0xffffff04, 0xffffff08, 0xffffff0c} ++ }, ++}; ++ ++/* ++ * Resolve priority for multiple results (altivec version). ++ * This consists comparing the priority of the current traversal with the ++ * running set of results for the packet. ++ * For each result, keep a running array of the result (rule number) and ++ * its priority for each category. ++ */ ++static inline void ++resolve_priority_altivec(uint64_t transition, int n, ++ const struct rte_acl_ctx *ctx, struct parms *parms, ++ const struct rte_acl_match_results *p, uint32_t categories) ++{ ++ uint32_t x; ++ xmm_t results, priority, results1, priority1; ++ vector bool int selector; ++ xmm_t *saved_results, *saved_priority; ++ ++ for (x = 0; x < categories; x += RTE_ACL_RESULTS_MULTIPLIER) { ++ ++ saved_results = (xmm_t *)(&parms[n].cmplt->results[x]); ++ saved_priority = ++ (xmm_t *)(&parms[n].cmplt->priority[x]); ++ ++ /* get results and priorities for completed trie */ ++ results = *(const xmm_t *)&p[transition].results[x]; ++ priority = *(const xmm_t *)&p[transition].priority[x]; ++ ++ /* if this is not the first completed trie */ ++ if (parms[n].cmplt->count != ctx->num_tries) { ++ ++ /* get running best results and their priorities */ ++ results1 = *saved_results; ++ priority1 = *saved_priority; ++ ++ /* select results that are highest priority */ ++ selector = vec_cmpgt(priority1, priority); ++ results = vec_sel(results, results1, selector); ++ priority = vec_sel(priority, priority1, ++ selector); ++ } ++ ++ /* save running best results and their priorities */ ++ *saved_results = results; ++ *saved_priority = priority; ++ } ++} ++ ++/* ++ * Check for any match in 4 transitions ++ */ ++static inline __attribute__((always_inline)) uint32_t ++check_any_match_x4(uint64_t val[]) ++{ ++ return (val[0] | val[1] | val[2] | val[3]) & RTE_ACL_NODE_MATCH; ++} ++ ++static inline __attribute__((always_inline)) void ++acl_match_check_x4(int slot, const struct rte_acl_ctx *ctx, struct parms *parms, ++ struct acl_flow_data *flows, uint64_t transitions[]) ++{ ++ while (check_any_match_x4(transitions)) { ++ transitions[0] = acl_match_check(transitions[0], slot, ctx, ++ parms, flows, resolve_priority_altivec); ++ transitions[1] = acl_match_check(transitions[1], slot + 1, ctx, ++ parms, flows, resolve_priority_altivec); ++ transitions[2] = acl_match_check(transitions[2], slot + 2, ctx, ++ parms, flows, resolve_priority_altivec); ++ transitions[3] = acl_match_check(transitions[3], slot + 3, ctx, ++ parms, flows, resolve_priority_altivec); ++ } ++} ++ ++/* ++ * Process 4 transitions (in 2 XMM registers) in parallel ++ */ ++static inline __attribute__((optimize("O2"))) xmm_t ++transition4(xmm_t next_input, const uint64_t *trans, ++ xmm_t *indices1, xmm_t *indices2) ++{ ++ xmm_t addr, tr_lo, tr_hi; ++ xmm_t in, node_type, r, t; ++ xmm_t dfa_ofs, quad_ofs; ++ xmm_t *index_mask, *tp; ++ vector bool int dfa_msk; ++ vector signed char zeroes = {}; ++ union { ++ uint64_t d64[2]; ++ uint32_t d32[4]; ++ } v; ++ ++ /* Move low 32 into tr_lo and high 32 into tr_hi */ ++ tr_lo = (xmm_t){(*indices1)[0], (*indices1)[2], ++ (*indices2)[0], (*indices2)[2]}; ++ tr_hi = (xmm_t){(*indices1)[1], (*indices1)[3], ++ (*indices2)[1], (*indices2)[3]}; ++ ++ /* Calculate the address (array index) for all 4 transitions. */ ++ index_mask = (xmm_t *)&altivec_acl_const.xmm_index_mask.u32; ++ t = vec_xor(*index_mask, *index_mask); ++ in = vec_perm(next_input, (xmm_t){}, ++ *(vector unsigned char *)&altivec_acl_const.xmm_shuffle_input); ++ ++ /* Calc node type and node addr */ ++ node_type = vec_and(vec_nor(*index_mask, *index_mask), tr_lo); ++ addr = vec_and(tr_lo, *index_mask); ++ ++ /* mask for DFA type(0) nodes */ ++ dfa_msk = vec_cmpeq(node_type, t); ++ ++ /* DFA calculations. */ ++ r = vec_sr(in, (vector unsigned int){30, 30, 30, 30}); ++ tp = (xmm_t *)&altivec_acl_const.range_base.u32; ++ r = vec_add(r, *tp); ++ t = vec_sr(in, (vector unsigned int){24, 24, 24, 24}); ++ r = vec_perm(tr_hi, (xmm_t){(uint16_t)0 << 16}, ++ (vector unsigned char)r); ++ ++ dfa_ofs = vec_sub(t, r); ++ ++ /* QUAD/SINGLE caluclations. */ ++ t = (xmm_t)vec_cmpgt((vector signed char)in, (vector signed char)tr_hi); ++ t = (xmm_t)vec_sel( ++ vec_sel( ++ (vector signed char)vec_sub( ++ zeroes, (vector signed char)t), ++ (vector signed char)t, ++ vec_cmpgt((vector signed char)t, zeroes)), ++ zeroes, ++ vec_cmpeq((vector signed char)t, zeroes)); ++ ++ t = (xmm_t)vec_msum((vector signed char)t, ++ (vector unsigned char)t, (xmm_t){}); ++ quad_ofs = (xmm_t)vec_msum((vector signed short)t, ++ *(vector signed short *)&altivec_acl_const.xmm_ones_16.u16, ++ (xmm_t){}); ++ ++ /* blend DFA and QUAD/SINGLE. */ ++ t = vec_sel(quad_ofs, dfa_ofs, dfa_msk); ++ ++ /* calculate address for next transitions. */ ++ addr = vec_add(addr, t); ++ ++ v.d64[0] = (uint64_t)trans[addr[0]]; ++ v.d64[1] = (uint64_t)trans[addr[1]]; ++ *indices1 = (xmm_t){v.d32[0], v.d32[1], v.d32[2], v.d32[3]}; ++ v.d64[0] = (uint64_t)trans[addr[2]]; ++ v.d64[1] = (uint64_t)trans[addr[3]]; ++ *indices2 = (xmm_t){v.d32[0], v.d32[1], v.d32[2], v.d32[3]}; ++ ++ return vec_sr(next_input, ++ (vector unsigned int){CHAR_BIT, CHAR_BIT, CHAR_BIT, CHAR_BIT}); ++} ++ ++/* ++ * Execute trie traversal with 8 traversals in parallel ++ */ ++static inline int ++search_altivec_8(const struct rte_acl_ctx *ctx, const uint8_t **data, ++ uint32_t *results, uint32_t total_packets, uint32_t categories) ++{ ++ int n; ++ struct acl_flow_data flows; ++ uint64_t index_array[MAX_SEARCHES_ALTIVEC8]; ++ struct completion cmplt[MAX_SEARCHES_ALTIVEC8]; ++ struct parms parms[MAX_SEARCHES_ALTIVEC8]; ++ xmm_t input0, input1; ++ ++ acl_set_flow(&flows, cmplt, RTE_DIM(cmplt), data, results, ++ total_packets, categories, ctx->trans_table); ++ ++ for (n = 0; n < MAX_SEARCHES_ALTIVEC8; n++) { ++ cmplt[n].count = 0; ++ index_array[n] = acl_start_next_trie(&flows, parms, n, ctx); ++ } ++ ++ /* Check for any matches. */ ++ acl_match_check_x4(0, ctx, parms, &flows, (uint64_t *)&index_array[0]); ++ acl_match_check_x4(4, ctx, parms, &flows, (uint64_t *)&index_array[4]); ++ ++ while (flows.started > 0) { ++ ++ /* Gather 4 bytes of input data for each stream. */ ++ input0 = (xmm_t){GET_NEXT_4BYTES(parms, 0), ++ GET_NEXT_4BYTES(parms, 1), ++ GET_NEXT_4BYTES(parms, 2), ++ GET_NEXT_4BYTES(parms, 3)}; ++ ++ input1 = (xmm_t){GET_NEXT_4BYTES(parms, 4), ++ GET_NEXT_4BYTES(parms, 5), ++ GET_NEXT_4BYTES(parms, 6), ++ GET_NEXT_4BYTES(parms, 7)}; ++ ++ /* Process the 4 bytes of input on each stream. */ ++ ++ input0 = transition4(input0, flows.trans, ++ (xmm_t *)&index_array[0], (xmm_t *)&index_array[2]); ++ input1 = transition4(input1, flows.trans, ++ (xmm_t *)&index_array[4], (xmm_t *)&index_array[6]); ++ ++ input0 = transition4(input0, flows.trans, ++ (xmm_t *)&index_array[0], (xmm_t *)&index_array[2]); ++ input1 = transition4(input1, flows.trans, ++ (xmm_t *)&index_array[4], (xmm_t *)&index_array[6]); ++ ++ input0 = transition4(input0, flows.trans, ++ (xmm_t *)&index_array[0], (xmm_t *)&index_array[2]); ++ input1 = transition4(input1, flows.trans, ++ (xmm_t *)&index_array[4], (xmm_t *)&index_array[6]); ++ ++ input0 = transition4(input0, flows.trans, ++ (xmm_t *)&index_array[0], (xmm_t *)&index_array[2]); ++ input1 = transition4(input1, flows.trans, ++ (xmm_t *)&index_array[4], (xmm_t *)&index_array[6]); ++ ++ /* Check for any matches. */ ++ acl_match_check_x4(0, ctx, parms, &flows, ++ (uint64_t *)&index_array[0]); ++ acl_match_check_x4(4, ctx, parms, &flows, ++ (uint64_t *)&index_array[4]); ++ } ++ ++ return 0; ++} ++ ++/* ++ * Execute trie traversal with 4 traversals in parallel ++ */ ++static inline int ++search_altivec_4(const struct rte_acl_ctx *ctx, const uint8_t **data, ++ uint32_t *results, int total_packets, uint32_t categories) ++{ ++ int n; ++ struct acl_flow_data flows; ++ uint64_t index_array[MAX_SEARCHES_ALTIVEC4]; ++ struct completion cmplt[MAX_SEARCHES_ALTIVEC4]; ++ struct parms parms[MAX_SEARCHES_ALTIVEC4]; ++ xmm_t input; ++ ++ acl_set_flow(&flows, cmplt, RTE_DIM(cmplt), data, results, ++ total_packets, categories, ctx->trans_table); ++ ++ for (n = 0; n < MAX_SEARCHES_ALTIVEC4; n++) { ++ cmplt[n].count = 0; ++ index_array[n] = acl_start_next_trie(&flows, parms, n, ctx); ++ } ++ ++ /* Check for any matches. */ ++ acl_match_check_x4(0, ctx, parms, &flows, index_array); ++ ++ while (flows.started > 0) { ++ ++ /* Gather 4 bytes of input data for each stream. */ ++ input = (xmm_t){GET_NEXT_4BYTES(parms, 0), ++ GET_NEXT_4BYTES(parms, 1), ++ GET_NEXT_4BYTES(parms, 2), ++ GET_NEXT_4BYTES(parms, 3)}; ++ ++ /* Process the 4 bytes of input on each stream. */ ++ input = transition4(input, flows.trans, ++ (xmm_t *)&index_array[0], (xmm_t *)&index_array[2]); ++ input = transition4(input, flows.trans, ++ (xmm_t *)&index_array[0], (xmm_t *)&index_array[2]); ++ input = transition4(input, flows.trans, ++ (xmm_t *)&index_array[0], (xmm_t *)&index_array[2]); ++ input = transition4(input, flows.trans, ++ (xmm_t *)&index_array[0], (xmm_t *)&index_array[2]); ++ ++ /* Check for any matches. */ ++ acl_match_check_x4(0, ctx, parms, &flows, index_array); ++ } ++ ++ return 0; ++} +diff --git a/lib/librte_acl/rte_acl.c b/lib/librte_acl/rte_acl.c +index 4ba9786..8b7e92c 100644 +--- a/lib/librte_acl/rte_acl.c ++++ b/lib/librte_acl/rte_acl.c +@@ -75,12 +75,23 @@ rte_acl_classify_neon(__rte_unused const struct rte_acl_ctx *ctx, + return -ENOTSUP; + } + ++int __attribute__ ((weak)) ++rte_acl_classify_altivec(__rte_unused const struct rte_acl_ctx *ctx, ++ __rte_unused const uint8_t **data, ++ __rte_unused uint32_t *results, ++ __rte_unused uint32_t num, ++ __rte_unused uint32_t categories) ++{ ++ return -ENOTSUP; ++} ++ + static const rte_acl_classify_t classify_fns[] = { + [RTE_ACL_CLASSIFY_DEFAULT] = rte_acl_classify_scalar, + [RTE_ACL_CLASSIFY_SCALAR] = rte_acl_classify_scalar, + [RTE_ACL_CLASSIFY_SSE] = rte_acl_classify_sse, + [RTE_ACL_CLASSIFY_AVX2] = rte_acl_classify_avx2, + [RTE_ACL_CLASSIFY_NEON] = rte_acl_classify_neon, ++ [RTE_ACL_CLASSIFY_ALTIVEC] = rte_acl_classify_altivec, + }; + + /* by default, use always available scalar code path. */ +@@ -119,6 +130,8 @@ rte_acl_init(void) + #elif defined(RTE_ARCH_ARM) + if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_NEON)) + alg = RTE_ACL_CLASSIFY_NEON; ++#elif defined(RTE_ARCH_PPC_64) ++ alg = RTE_ACL_CLASSIFY_ALTIVEC; + #else + #ifdef CC_AVX2_SUPPORT + if (rte_cpu_get_flag_enabled(RTE_CPUFLAG_AVX2)) +diff --git a/lib/librte_acl/rte_acl.h b/lib/librte_acl/rte_acl.h +index 0979a09..8d4e2a6 100644 +--- a/lib/librte_acl/rte_acl.h ++++ b/lib/librte_acl/rte_acl.h +@@ -271,6 +271,7 @@ enum rte_acl_classify_alg { + RTE_ACL_CLASSIFY_SSE = 2, /**< requires SSE4.1 support. */ + 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_NUM /* should always be the last one. */ + }; + +-- +1.9.1 + diff --git a/debian/patches/dpdk-dev-ppc-enable-3-7-examples-l3fwd-add-AltiVec-for-ppc64.patch b/debian/patches/dpdk-dev-ppc-enable-3-7-examples-l3fwd-add-AltiVec-for-ppc64.patch new file mode 100644 index 00000000..a0eb79ce --- /dev/null +++ b/debian/patches/dpdk-dev-ppc-enable-3-7-examples-l3fwd-add-AltiVec-for-ppc64.patch @@ -0,0 +1,41 @@ +From: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> +Date: Thu, 8 Sep 2016 22:18:05 +0530 +Subject: [PATCH 3/7] examples/l3fwd: add AltiVec for ppc64 + +This patch adds ppc64le port for em_mask_key function. + +Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> +Acked-by: Chao Zhu <chaozhu@linux.vnet.ibm.com> + +Origin: Upstream, commit:f2379ca1f679c1ded6ed2239fc3b7f58844d903b +Author: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> +Last-Update: 2016-09-21 +--- + examples/l3fwd/l3fwd_em.c | 10 +++++++++- + 1 file changed, 9 insertions(+), 1 deletion(-) + +diff --git a/examples/l3fwd/l3fwd_em.c b/examples/l3fwd/l3fwd_em.c +index def5a02..6053a62 100644 +--- a/examples/l3fwd/l3fwd_em.c ++++ b/examples/l3fwd/l3fwd_em.c +@@ -259,8 +259,16 @@ em_mask_key(void *key, xmm_t mask) + + return vandq_s32(data, mask); + } ++#elif defined(RTE_MACHINE_CPUFLAG_ALTIVEC) ++static inline xmm_t ++em_mask_key(void *key, xmm_t mask) ++{ ++ xmm_t data = vec_ld(0, (xmm_t *)(key)); ++ ++ return vec_and(data, mask); ++} + #else +-#error No vector engine (SSE, NEON) available, check your toolchain ++#error No vector engine (SSE, NEON, ALTIVEC) available, check your toolchain + #endif + + static inline uint8_t +-- +1.9.1 + diff --git a/debian/patches/dpdk-dev-ppc-enable-4-7-sched-enable-on-ppc64le.patch b/debian/patches/dpdk-dev-ppc-enable-4-7-sched-enable-on-ppc64le.patch new file mode 100644 index 00000000..f1349fbf --- /dev/null +++ b/debian/patches/dpdk-dev-ppc-enable-4-7-sched-enable-on-ppc64le.patch @@ -0,0 +1,32 @@ +From: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> +Date: Thu, 8 Sep 2016 22:18:07 +0530 +Subject: [PATCH 4/7] sched: enable on ppc64le + +This patch enables librte_sched in ppc64le. + +Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> +Acked-by: Chao Zhu <chaozhu@linux.vnet.ibm.com> +Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com> + +Origin: Upstream, commit:46fbbf34b3b3bceac7beef338fc46c4c5a7d88c1 +Author: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> +Last-Update: 2016-09-21 +--- + config/defconfig_ppc_64-power8-linuxapp-gcc | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/config/defconfig_ppc_64-power8-linuxapp-gcc b/config/defconfig_ppc_64-power8-linuxapp-gcc +index dede34f..45b6077 100644 +--- a/config/defconfig_ppc_64-power8-linuxapp-gcc ++++ b/config/defconfig_ppc_64-power8-linuxapp-gcc +@@ -57,7 +57,6 @@ CONFIG_RTE_LIBRTE_ENIC_PMD=n + CONFIG_RTE_LIBRTE_FM10K_PMD=n + + # This following libraries are not available on Power. So they're turned off. +-CONFIG_RTE_LIBRTE_SCHED=n + CONFIG_RTE_LIBRTE_PORT=n + CONFIG_RTE_LIBRTE_TABLE=n + CONFIG_RTE_LIBRTE_PIPELINE=n +-- +1.9.1 + diff --git a/debian/patches/dpdk-dev-ppc-enable-5-7-table-fix-verification-on-hash-bucket-header-alignme.patch b/debian/patches/dpdk-dev-ppc-enable-5-7-table-fix-verification-on-hash-bucket-header-alignme.patch new file mode 100644 index 00000000..1c24ce29 --- /dev/null +++ b/debian/patches/dpdk-dev-ppc-enable-5-7-table-fix-verification-on-hash-bucket-header-alignme.patch @@ -0,0 +1,90 @@ +From: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> +Date: Thu, 8 Sep 2016 22:18:11 +0530 +Subject: [PATCH 5/7] table: fix verification on hash bucket header alignment + +In powerpc systems, rte table hash structs rte_bucket_4_8, rte_bucket_4_16 and +rte_bucket_4_32 are not cache aligned and hence verification on same would fail. +Instead of checking alignment on cpu cacheline, it could equally be tested as +multiple of 64 bytes. + +Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> +Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com> + +Origin: Upstream, commit:43f15e28377f8cc2f8622b458a249efa006c637a +Author: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> +Last-Update: 2016-09-21 +--- + lib/librte_table/rte_table_hash_key16.c | 4 ++-- + lib/librte_table/rte_table_hash_key32.c | 4 ++-- + lib/librte_table/rte_table_hash_key8.c | 4 ++-- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/lib/librte_table/rte_table_hash_key16.c b/lib/librte_table/rte_table_hash_key16.c +index b7e000f..08d4d77 100644 +--- a/lib/librte_table/rte_table_hash_key16.c ++++ b/lib/librte_table/rte_table_hash_key16.c +@@ -130,7 +130,7 @@ rte_table_hash_create_key16_lru(void *params, + /* Check input parameters */ + if ((check_params_create_lru(p) != 0) || + ((sizeof(struct rte_table_hash) % RTE_CACHE_LINE_SIZE) != 0) || +- ((sizeof(struct rte_bucket_4_16) % RTE_CACHE_LINE_SIZE) != 0)) ++ ((sizeof(struct rte_bucket_4_16) % 64) != 0)) + return NULL; + n_entries_per_bucket = 4; + key_size = 16; +@@ -344,7 +344,7 @@ rte_table_hash_create_key16_ext(void *params, + /* Check input parameters */ + if ((check_params_create_ext(p) != 0) || + ((sizeof(struct rte_table_hash) % RTE_CACHE_LINE_SIZE) != 0) || +- ((sizeof(struct rte_bucket_4_16) % RTE_CACHE_LINE_SIZE) != 0)) ++ ((sizeof(struct rte_bucket_4_16) % 64) != 0)) + return NULL; + + n_entries_per_bucket = 4; +diff --git a/lib/librte_table/rte_table_hash_key32.c b/lib/librte_table/rte_table_hash_key32.c +index a7aba49..161f6b7 100644 +--- a/lib/librte_table/rte_table_hash_key32.c ++++ b/lib/librte_table/rte_table_hash_key32.c +@@ -129,7 +129,7 @@ rte_table_hash_create_key32_lru(void *params, + /* Check input parameters */ + if ((check_params_create_lru(p) != 0) || + ((sizeof(struct rte_table_hash) % RTE_CACHE_LINE_SIZE) != 0) || +- ((sizeof(struct rte_bucket_4_32) % RTE_CACHE_LINE_SIZE) != 0)) { ++ ((sizeof(struct rte_bucket_4_32) % 64) != 0)) { + return NULL; + } + n_entries_per_bucket = 4; +@@ -337,7 +337,7 @@ rte_table_hash_create_key32_ext(void *params, + /* Check input parameters */ + if ((check_params_create_ext(p) != 0) || + ((sizeof(struct rte_table_hash) % RTE_CACHE_LINE_SIZE) != 0) || +- ((sizeof(struct rte_bucket_4_32) % RTE_CACHE_LINE_SIZE) != 0)) ++ ((sizeof(struct rte_bucket_4_32) % 64) != 0)) + return NULL; + + n_entries_per_bucket = 4; +diff --git a/lib/librte_table/rte_table_hash_key8.c b/lib/librte_table/rte_table_hash_key8.c +index e2e2bdc..b04f60d 100644 +--- a/lib/librte_table/rte_table_hash_key8.c ++++ b/lib/librte_table/rte_table_hash_key8.c +@@ -125,7 +125,7 @@ rte_table_hash_create_key8_lru(void *params, int socket_id, uint32_t entry_size) + /* Check input parameters */ + if ((check_params_create_lru(p) != 0) || + ((sizeof(struct rte_table_hash) % RTE_CACHE_LINE_SIZE) != 0) || +- ((sizeof(struct rte_bucket_4_8) % RTE_CACHE_LINE_SIZE) != 0)) { ++ ((sizeof(struct rte_bucket_4_8) % 64) != 0)) { + return NULL; + } + n_entries_per_bucket = 4; +@@ -332,7 +332,7 @@ rte_table_hash_create_key8_ext(void *params, int socket_id, uint32_t entry_size) + /* Check input parameters */ + if ((check_params_create_ext(p) != 0) || + ((sizeof(struct rte_table_hash) % RTE_CACHE_LINE_SIZE) != 0) || +- ((sizeof(struct rte_bucket_4_8) % RTE_CACHE_LINE_SIZE) != 0)) ++ ((sizeof(struct rte_bucket_4_8) % 64) != 0)) + return NULL; + + n_entries_per_bucket = 4; +-- +1.9.1 + diff --git a/debian/patches/dpdk-dev-ppc-enable-6-7-config-enable-packet-framework-on-ppc64le.patch b/debian/patches/dpdk-dev-ppc-enable-6-7-config-enable-packet-framework-on-ppc64le.patch new file mode 100644 index 00000000..a4bb1940 --- /dev/null +++ b/debian/patches/dpdk-dev-ppc-enable-6-7-config-enable-packet-framework-on-ppc64le.patch @@ -0,0 +1,33 @@ +From: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> +Date: Thu, 8 Sep 2016 22:18:06 +0530 +Subject: [PATCH 6/7] config: enable packet framework on ppc64le + +This patch enables librte_port, librte_table, and librte_pipeline +in ppc64le. + +Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> +Acked-by: Chao Zhu <chaozhu@linux.vnet.ibm.com> +Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com> + +Origin: Upstream, commit:81f713ee7bac66221a11f07c8a437e40c1891f70 +Author: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> +Last-Update: 2016-09-21 +--- + config/defconfig_ppc_64-power8-linuxapp-gcc | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/config/defconfig_ppc_64-power8-linuxapp-gcc b/config/defconfig_ppc_64-power8-linuxapp-gcc +index 45b6077..f953e61 100644 +--- a/config/defconfig_ppc_64-power8-linuxapp-gcc ++++ b/config/defconfig_ppc_64-power8-linuxapp-gcc +@@ -56,7 +56,3 @@ CONFIG_RTE_LIBRTE_PMD_BOND=n + CONFIG_RTE_LIBRTE_ENIC_PMD=n + CONFIG_RTE_LIBRTE_FM10K_PMD=n + +-# This following libraries are not available on Power. So they're turned off. +-CONFIG_RTE_LIBRTE_PORT=n +-CONFIG_RTE_LIBRTE_TABLE=n +-CONFIG_RTE_LIBRTE_PIPELINE=n +-- +1.9.1 + diff --git a/debian/patches/dpdk-dev-ppc-enable-7-7-examples-ip_pipeline-fix-lcore-mapping-for-ppc64.patch b/debian/patches/dpdk-dev-ppc-enable-7-7-examples-ip_pipeline-fix-lcore-mapping-for-ppc64.patch new file mode 100644 index 00000000..e98d33f1 --- /dev/null +++ b/debian/patches/dpdk-dev-ppc-enable-7-7-examples-ip_pipeline-fix-lcore-mapping-for-ppc64.patch @@ -0,0 +1,74 @@ +From: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> +Date: Thu, 8 Sep 2016 22:18:10 +0530 +Subject: [PATCH 7/7] examples/ip_pipeline: fix lcore mapping for ppc64 + +This patch fixes ip_pipeline panic in app_init_core_map while preparing cpu +core map in powerpc with SMT off. cpu_core_map_compute_linux currently prepares +core mapping based on file existence in sysfs ie. + +/sys/devices/system/cpu/cpu<LCORE_NUM>/topology/physical_package_id + /sys/devices/system/cpu/cpu<LCORE_NUM>/topology/core_id + +These files do not exist for lcores which are offline for any reason (as in +powerpc, while SMT is off). In this situation, this function should further +continue preparing map for other online lcores instead of returning with -1 +for a first unavailable lcore. + +Also, in SMT=off scenario for powerpc, lcore ids can not be always indexed from +0 upto 'number of cores present' (/sys/devices/system/cpu/present). For eg, for +an online lcore 32, core_id returned in sysfs is 112 where online lcores are +10 (as in one configuration), hence sysfs lcore id can not be checked with +indexing lcore number before positioning lcore map array. + +Signed-off-by: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> +Acked-by: Chao Zhu <chaozhu@linux.vnet.ibm.com> +Acked-by: Cristian Dumitrescu <cristian.dumitrescu@intel.com> + +Origin: Upstream, commit:58d55fd279dc6f8f8d92fcab3362e24e19c9fbea +Author: Gowrishankar Muthukrishnan <gowrishankar.m@linux.vnet.ibm.com> +Last-Update: 2016-09-21 +--- + examples/ip_pipeline/cpu_core_map.c | 8 ++++++++ + 1 file changed, 8 insertions(+) + +diff --git a/examples/ip_pipeline/cpu_core_map.c b/examples/ip_pipeline/cpu_core_map.c +index cb088b1..dd8f678 100644 +--- a/examples/ip_pipeline/cpu_core_map.c ++++ b/examples/ip_pipeline/cpu_core_map.c +@@ -351,8 +351,10 @@ cpu_core_map_compute_linux(struct cpu_core_map *map) + int lcore_socket_id = + cpu_core_map_get_socket_id_linux(lcore_id); + ++#if !defined(RTE_ARCH_PPC_64) + if (lcore_socket_id < 0) + return -1; ++#endif + + if (((uint32_t) lcore_socket_id) == socket_id) + n_detected++; +@@ -368,6 +370,7 @@ cpu_core_map_compute_linux(struct cpu_core_map *map) + cpu_core_map_get_socket_id_linux( + lcore_id); + ++#if !defined(RTE_ARCH_PPC_64) + if (lcore_socket_id < 0) + return -1; + +@@ -377,9 +380,14 @@ cpu_core_map_compute_linux(struct cpu_core_map *map) + + if (lcore_core_id < 0) + return -1; ++#endif + ++#if !defined(RTE_ARCH_PPC_64) + if (((uint32_t) lcore_socket_id == socket_id) && + ((uint32_t) lcore_core_id == core_id)) { ++#else ++ if (((uint32_t) lcore_socket_id == socket_id)) { ++#endif + uint32_t pos = cpu_core_map_pos(map, + socket_id, + core_id_contig, +-- +1.9.1 + diff --git a/debian/patches/series b/debian/patches/series index a1e65826..5c0a2991 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -11,3 +11,11 @@ dpdk-dev-v2-2-4-doc-rendering-and-installation-of-man-pages.patch dpdk-dev-v2-3-4-doc-add-basic-invocation-info-for-dpdk-pmdinfo.patch dpdk-dev-v2-4-4-doc-add-basic-invocation-info-for-dpdk-devbind.patch dpdk-dev-v2-kni-fix-build-with-kernel-4.8.patch +dpdk-dev-ppc-enable-1-7-lpm-add-AltiVec-for-ppc64.patch +dpdk-dev-ppc-enable-2-7-acl-add-AltiVec-for-ppc64.patch +dpdk-dev-ppc-enable-3-7-examples-l3fwd-add-AltiVec-for-ppc64.patch +dpdk-dev-ppc-enable-4-7-sched-enable-on-ppc64le.patch +dpdk-dev-ppc-enable-5-7-table-fix-verification-on-hash-bucket-header-alignme.patch +dpdk-dev-ppc-enable-6-7-config-enable-packet-framework-on-ppc64le.patch +dpdk-dev-ppc-enable-7-7-examples-ip_pipeline-fix-lcore-mapping-for-ppc64.patch + |