When using BPF in cases like port mirroring, need to be
able to put BPF code into a buffer shared between primary
and secondary process. Separate the allocation of the
buffer from the export step.
Minor code refactoring to breakup the steps for how load
happens.
Add test for the new function.
Signed-off-by: Stephen Hemminger <step...@networkplumber.org>
---
app/test/test_bpf.c | 28 +++++++++++
lib/bpf/bpf_load.c | 111 ++++++++++++++++++++++++++++++++++++++------
lib/bpf/rte_bpf.h | 38 +++++++++++++++
3 files changed, 163 insertions(+), 14 deletions(-)
diff --git a/app/test/test_bpf.c b/app/test/test_bpf.c
index 90e10d7d2c..3aefc684eb 100644
--- a/app/test/test_bpf.c
+++ b/app/test/test_bpf.c
@@ -3235,6 +3235,7 @@ run_test(const struct bpf_test *tst)
if (ret != 0) {
printf("%s@%d: check_result(%s) failed, error: %d(%s);\n",
__func__, __LINE__, tst->name, ret, strerror(ret));
+ return -1;
}
/* repeat the same test with jit, when possible */
@@ -3250,10 +3251,37 @@ run_test(const struct bpf_test *tst)
"error: %d(%s);\n",
__func__, __LINE__, tst->name,
rv, strerror(rv));
+ return -1;
}
}
rte_bpf_destroy(bpf);
+
+ /* repeat the same test with bpf in hugepages */
+ size_t len = rte_bpf_buf_size(&tst->prm);
+ void *buf = malloc(len);
+ if (buf == NULL) {
+ printf("%s@%d: allocation of %zu failed\n",
+ __func__, __LINE__, len);
+ return -1;
+ }
+
+ bpf = rte_bpf_buf_load(&tst->prm, buf, len);
+ if (bpf == NULL) {
+ printf("%s@%d: failed to load bpf into buf, error=%d(%s);\n",
+ __func__, __LINE__, rte_errno, strerror(rte_errno));
+ return -1;
+ }
+
+ tst->prepare(tbuf);
+ rc = rte_bpf_exec(bpf, tbuf);
+ ret = tst->check_result(rc, tbuf);
+ if (ret != 0) {
+ printf("%s@%d: check_result(%s) failed, error: %d(%s);\n",
+ __func__, __LINE__, tst->name, ret, strerror(ret));
+ }
+ free(bpf);
+
return ret;
}
diff --git a/lib/bpf/bpf_load.c b/lib/bpf/bpf_load.c
index 556e613762..7b526346ea 100644
--- a/lib/bpf/bpf_load.c
+++ b/lib/bpf/bpf_load.c
@@ -14,25 +14,16 @@
#include "bpf_impl.h"
static struct rte_bpf *
-bpf_load(const struct rte_bpf_prm *prm)
+bpf_copy(const struct rte_bpf_prm *prm, uint8_t *buf)
{
- uint8_t *buf;
struct rte_bpf *bpf;
- size_t sz, bsz, insz, xsz;
-
- xsz = prm->nb_xsym * sizeof(prm->xsym[0]);
- insz = prm->nb_ins * sizeof(prm->ins[0]);
- bsz = sizeof(bpf[0]);
- sz = insz + xsz + bsz;
-
- buf = mmap(NULL, sz, PROT_READ | PROT_WRITE,
- MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
- if (buf == MAP_FAILED)
- return NULL;
+ size_t xsz = prm->nb_xsym * sizeof(prm->xsym[0]);
+ size_t insz = prm->nb_ins * sizeof(prm->ins[0]);
+ size_t bsz = sizeof(bpf[0]);
+ size_t sz = insz + xsz + bsz;
bpf = (void *)buf;
bpf->sz = sz;
-
memcpy(&bpf->prm, prm, sizeof(bpf->prm));
if (xsz > 0)
@@ -45,6 +36,30 @@ bpf_load(const struct rte_bpf_prm *prm)
return bpf;
}
+static size_t
+bpf_buf_size(const struct rte_bpf_prm *prm)
+{
+ size_t xsz = prm->nb_xsym * sizeof(prm->xsym[0]);
+ size_t insz = prm->nb_ins * sizeof(prm->ins[0]);
+ size_t bsz = sizeof(struct rte_bpf);
+
+ return insz + xsz + bsz;
+}
+
+static struct rte_bpf *
+bpf_load(const struct rte_bpf_prm *prm)
+{
+ void *buf;
+ size_t len = bpf_buf_size(prm);
+
+ buf = mmap(NULL, len, PROT_READ | PROT_WRITE,
+ MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
+ if (buf == MAP_FAILED)
+ return NULL;
+
+ return bpf_copy(prm, buf);
+}
+
/*
* Check that user provided external symbol.
*/
@@ -125,3 +140,71 @@ rte_bpf_load(const struct rte_bpf_prm *prm)
return bpf;
}
+
+RTE_EXPORT_EXPERIMENTAL_SYMBOL(rte_bpf_buf_size, 25.11)
+ssize_t
+rte_bpf_buf_size(const struct rte_bpf_prm *prm)
+{
+ int rc = 0;
+ uint32_t i;
+
+ if (prm == NULL || prm->ins == NULL ||
+ (prm->nb_xsym != 0 && prm->xsym == NULL)) {
+ rte_errno = EINVAL;
+ return -1;
+ }
+
+ for (i = 0; i != prm->nb_xsym && rc == 0; i++)
+ rc = bpf_check_xsym(prm->xsym + i);
+
+ if (rc != 0) {
+ rte_errno = -rc;
+ RTE_BPF_LOG_LINE(ERR, "%s: %d-th xsym is invalid", __func__, i);
+ return -1;
+ }
+
+ return bpf_buf_size(prm);
+}
+
+RTE_EXPORT_EXPERIMENTAL_SYMBOL(rte_bpf_buf_load, 25.11)
+struct rte_bpf *
+rte_bpf_buf_load(const struct rte_bpf_prm *prm, void *buf, size_t len)
+{
+ struct rte_bpf *bpf;
+ int32_t rc;
+ uint32_t i;
+
+ if (prm == NULL || prm->ins == NULL ||
+ (prm->nb_xsym != 0 && prm->xsym == NULL)) {
+ rte_errno = EINVAL;
+ return NULL;
+ }
+
+ rc = 0;
+ for (i = 0; i != prm->nb_xsym && rc == 0; i++)
+ rc = bpf_check_xsym(prm->xsym + i);
+
+ if (rc != 0) {
+ rte_errno = -rc;
+ RTE_BPF_LOG_LINE(ERR, "%s: %d-th xsym is invalid", __func__, i);
+ return NULL;
+ }
+
+ size_t sz = bpf_buf_size(prm);
+ if (len < sz) {
+ rte_errno = -EINVAL;
+ RTE_BPF_LOG_LINE(ERR, "%s: len %zu < required %zu",
+ __func__, len, sz);
+ return NULL;
+ }
+
+ bpf = bpf_copy(prm, buf);
+ rc = __rte_bpf_validate(bpf);
+ if (rc != 0) {
+ rte_errno = -rc;
+ return NULL;
+ }
+
+ /* This bpf code is in non protected memory it can not use JIT */
+ return bpf;
+}
diff --git a/lib/bpf/rte_bpf.h b/lib/bpf/rte_bpf.h
index 80ebb0210f..0972422a30 100644
--- a/lib/bpf/rte_bpf.h
+++ b/lib/bpf/rte_bpf.h
@@ -153,6 +153,44 @@ rte_bpf_load(const struct rte_bpf_prm *prm);
struct rte_bpf *
rte_bpf_elf_load(const struct rte_bpf_prm *prm, const char *fname,
const char *sname);
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Determine size of required memory area.
+ *
+ * @param prm
+ * Parameters used to create and initialise the BPF execution context.
+ * @return
+ * Number of bytes required or negative on error,
+ * with error code set in rte_errno.
+ */
+__rte_experimental
+ssize_t
+rte_bpf_buf_size(const struct rte_bpf_prm *prm);
+
+/**
+ * @warning
+ * @b EXPERIMENTAL: this API may change without prior notice.
+ *
+ * Create a new eBPF execution context into provided memory area
+ * and load given BPF code into it.
+ *
+ * @param prm
+ * Parameters used to create and initialise the BPF execution context.
+ * @param buf
+ * Memory area to place BPF code into.
+ * @param len
+ * Size of the buf area.
+ * @return
+ * BPF handle that is used in future BPF operations,
+ * or NULL on error, with error code set in rte_errno.
+ */
+__rte_experimental
+struct rte_bpf *
+rte_bpf_buf_load(const struct rte_bpf_prm *prm, void *buf, size_t len);
+
/**
* Execute given BPF bytecode.
*
--
2.47.2
