bpf/arm: add build infrastructure

Add build infrastructure and documentation
update for arm64 JIT support.

Signed-off-by: Jerin Jacob <jerinj@marvell.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>

diff --git a/MAINTAINERS b/MAINTAINERS
index b020662701e4211bb79b2d6ea59d2f24ccedde92..f8a56e2e2615feb9d573bf4b7814bb0615b7257f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -251,6 +251,7 @@ M: Gavin Hu <gavin.hu@arm.com>
 F: lib/librte_eal/common/include/arch/arm/*_64.h
 F: lib/librte_net/net_crc_neon.h
 F: lib/librte_acl/acl_run_neon.*
 F: lib/librte_eal/common/include/arch/arm/*_64.h
 F: lib/librte_net/net_crc_neon.h
 F: lib/librte_acl/acl_run_neon.*

+F: lib/librte_bpf/bpf_jit_arm64.c

 F: lib/librte_lpm/rte_lpm_neon.h
 F: lib/librte_hash/rte*_arm64.h
 F: lib/librte_efd/rte*_arm64.h
 F: lib/librte_lpm/rte_lpm_neon.h
 F: lib/librte_hash/rte*_arm64.h
 F: lib/librte_efd/rte*_arm64.h

diff --git a/doc/guides/prog_guide/bpf_lib.rst b/doc/guides/prog_guide/bpf_lib.rst
index 7c08e6b2d392b421e5cc2fede3e9c86183302809..9c728da7bdc66557f9ced4c1e5422e8b942cdf0b 100644 (file)
--- a/doc/guides/prog_guide/bpf_lib.rst
+++ b/doc/guides/prog_guide/bpf_lib.rst
@@ -30,7 +30,7 @@ The library API provides the following basic operations:
 Not currently supported eBPF features
 -------------------------------------
 
 Not currently supported eBPF features
 -------------------------------------
 

- - JIT for non X86_64 platforms
+ - JIT support only available for X86_64 and arm64 platforms

  - cBPF
  - tail-pointer call
  - eBPF MAP
  - cBPF
  - tail-pointer call
  - eBPF MAP

diff --git a/doc/guides/rel_notes/release_19_11.rst b/doc/guides/rel_notes/release_19_11.rst
index 23ceb8f6702e8954a1109892255d5fc63044d744..85953b962d04b3b1841467f2b2406eb17ff52291 100644 (file)
--- a/doc/guides/rel_notes/release_19_11.rst
+++ b/doc/guides/rel_notes/release_19_11.rst
@@ -110,6 +110,11 @@ New Features
   Added stateful decompression support in the Intel QuickAssist Technology PMD.
   Please note that stateful compression is not supported.
 
   Added stateful decompression support in the Intel QuickAssist Technology PMD.
   Please note that stateful compression is not supported.
 

+* **Added eBPF JIT support for arm64.**
+
+  Added eBPF JIT support for arm64 architecture to improve the eBPF program
+  performance.
+

 
 Removed Items
 -------------
 
 Removed Items
 -------------

diff --git a/lib/librte_bpf/Makefile b/lib/librte_bpf/Makefile
index c0e8aaa68c812645f646241227a5d6751318d3f8..419a5162e01338d78a36ecda0ffe6d8c8368b657 100644 (file)
--- a/lib/librte_bpf/Makefile
+++ b/lib/librte_bpf/Makefile
@@ -31,6 +31,8 @@ SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_load_elf.c
 endif
 ifeq ($(CONFIG_RTE_ARCH_X86_64),y)
 SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_jit_x86.c
 endif
 ifeq ($(CONFIG_RTE_ARCH_X86_64),y)
 SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_jit_x86.c

+else ifeq ($(CONFIG_RTE_ARCH_ARM64),y)
+SRCS-$(CONFIG_RTE_LIBRTE_BPF) += bpf_jit_arm64.c

 endif
 
 # install header files
 endif
 
 # install header files

diff --git a/lib/librte_bpf/bpf.c b/lib/librte_bpf/bpf.c
index cc963d52e78378bc568450a3d379c9a2deb9f310..7e1879ffa5b5ef7c532d0693fe03875cac83560c 100644 (file)
--- a/lib/librte_bpf/bpf.c
+++ b/lib/librte_bpf/bpf.c
@@ -41,8 +41,10 @@ bpf_jit(struct rte_bpf *bpf)
 {
        int32_t rc;
 
 {
        int32_t rc;
 

-#ifdef RTE_ARCH_X86_64
+#if defined(RTE_ARCH_X86_64)

        rc = bpf_jit_x86(bpf);
        rc = bpf_jit_x86(bpf);

+#elif defined(RTE_ARCH_ARM64)
+       rc = bpf_jit_arm64(bpf);

 #else
        rc = -ENOTSUP;
 #endif
 #else
        rc = -ENOTSUP;
 #endif

diff --git a/lib/librte_bpf/bpf_impl.h b/lib/librte_bpf/bpf_impl.h
index b577e2cbe9b2d540910cf782da40cb8f92590c53..03ba0ae1128d17821049bbfad1322cb163dd099f 100644 (file)
--- a/lib/librte_bpf/bpf_impl.h
+++ b/lib/librte_bpf/bpf_impl.h
@@ -25,9 +25,8 @@ extern int bpf_validate(struct rte_bpf *bpf);
 
 extern int bpf_jit(struct rte_bpf *bpf);
 
 
 extern int bpf_jit(struct rte_bpf *bpf);
 

-#ifdef RTE_ARCH_X86_64

 extern int bpf_jit_x86(struct rte_bpf *);
 extern int bpf_jit_x86(struct rte_bpf *);

-#endif
+extern int bpf_jit_arm64(struct rte_bpf *);

 
 extern int rte_bpf_logtype;
 
 
 extern int rte_bpf_logtype;
 

diff --git a/lib/librte_bpf/bpf_jit_arm64.c b/lib/librte_bpf/bpf_jit_arm64.c
new file mode 100644 (file)
index 0000000..621bb7f
--- /dev/null
+++ b/lib/librte_bpf/bpf_jit_arm64.c
@@ -0,0 +1,19 @@
+/* SPDX-License-Identifier: BSD-3-Clause
+ * Copyright(C) 2019 Marvell International Ltd.
+ */
+
+#include <errno.h>
+
+#include <rte_common.h>
+
+#include "bpf_impl.h"
+/*
+ * Produce a native ISA version of the given BPF code.
+ */
+int
+bpf_jit_arm64(struct rte_bpf *bpf)
+{
+       RTE_SET_USED(bpf);
+
+       return -ENOTSUP;
+}

diff --git a/lib/librte_bpf/meson.build b/lib/librte_bpf/meson.build
index 11c1fb5586630c1fa65cbe61ac84758159e23eec..13fc02db38ed92ec0df1307ae2c41042ec9f70b7 100644 (file)
--- a/lib/librte_bpf/meson.build
+++ b/lib/librte_bpf/meson.build
@@ -10,6 +10,8 @@ sources = files('bpf.c',
 
 if arch_subdir == 'x86' and dpdk_conf.get('RTE_ARCH_64')
        sources += files('bpf_jit_x86.c')
 
 if arch_subdir == 'x86' and dpdk_conf.get('RTE_ARCH_64')
        sources += files('bpf_jit_x86.c')

+elif dpdk_conf.has('RTE_ARCH_ARM64')
+       sources += files('bpf_jit_arm64.c')

 endif
 
 install_headers = files('bpf_def.h',
 endif
 
 install_headers = files('bpf_def.h',