d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

bpf: hide internal program argument type

Browse Source 
RTE_BPF_ARG_PTR_STACK is used as internal program
arg type. Rename to RTE_BPF_ARG_RESERVED to
avoid exposing internal program type.

Signed-off-by: Jerin Jacob <jerinj@marvell.com>
Acked-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
Tested-by: Konstantin Ananyev <konstantin.ananyev@intel.com>
This commit is contained in:
Jerin Jacob 2019-08-14 18:39:53 +05:30 committed by Thomas Monjalon
parent 082482cef4
commit 7fa2537226
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/librte_bpf/bpf_validate.c
View File

@ -15,6 +15,8 @@
#include "bpf_impl.h" #include "bpf_impl.h"
#define BPF_ARG_PTR_STACK RTE_BPF_ARG_RESERVED
struct bpf_reg_val { struct bpf_reg_val {
struct rte_bpf_arg v; struct rte_bpf_arg v;
uint64_t mask; uint64_t mask;
@ -710,7 +712,7 @@ eval_ptr(struct bpf_verifier *bvf, struct bpf_reg_val *rm, uint32_t opsz,
if (rm->u.max % align != 0) if (rm->u.max % align != 0)
return "unaligned memory access"; return "unaligned memory access";
if (rm->v.type == RTE_BPF_ARG_PTR_STACK) { if (rm->v.type == BPF_ARG_PTR_STACK) {
if (rm->u.max != rm->u.min || rm->s.max != rm->s.min || if (rm->u.max != rm->u.min || rm->s.max != rm->s.min ||
rm->u.max != (uint64_t)rm->s.max) rm->u.max != (uint64_t)rm->s.max)
@ -764,7 +766,7 @@ eval_load(struct bpf_verifier *bvf, const struct ebpf_insn *ins)
if (err != NULL) if (err != NULL)
return err; return err;
if (rs.v.type == RTE_BPF_ARG_PTR_STACK) { if (rs.v.type == BPF_ARG_PTR_STACK) {
sv = st->sv + rs.u.max / sizeof(uint64_t); sv = st->sv + rs.u.max / sizeof(uint64_t);
if (sv->v.type == RTE_BPF_ARG_UNDEF || sv->mask < msk) if (sv->v.type == RTE_BPF_ARG_UNDEF || sv->mask < msk)
@ -859,7 +861,7 @@ eval_store(struct bpf_verifier *bvf, const struct ebpf_insn *ins)
if (err != NULL) if (err != NULL)
return err; return err;
if (rd.v.type == RTE_BPF_ARG_PTR_STACK) { if (rd.v.type == BPF_ARG_PTR_STACK) {
sv = st->sv + rd.u.max / sizeof(uint64_t); sv = st->sv + rd.u.max / sizeof(uint64_t);
if (BPF_CLASS(ins->code) == BPF_STX && if (BPF_CLASS(ins->code) == BPF_STX &&
@ -908,7 +910,7 @@ eval_func_arg(struct bpf_verifier *bvf, const struct rte_bpf_arg *arg,
* pointer to the variable on the stack is passed * pointer to the variable on the stack is passed
* as an argument, mark stack space it occupies as initialized. * as an argument, mark stack space it occupies as initialized.
*/ */
if (err == NULL && rv->v.type == RTE_BPF_ARG_PTR_STACK) { if (err == NULL && rv->v.type == BPF_ARG_PTR_STACK) {
i = rv->u.max / sizeof(uint64_t); i = rv->u.max / sizeof(uint64_t);
n = i + arg->size / sizeof(uint64_t); n = i + arg->size / sizeof(uint64_t);
@ -2131,7 +2133,7 @@ evaluate(struct bpf_verifier *bvf)
/* initial state of frame pointer */ /* initial state of frame pointer */
static const struct bpf_reg_val rvfp = { static const struct bpf_reg_val rvfp = {
.v = { .v = {
.type = RTE_BPF_ARG_PTR_STACK, .type = BPF_ARG_PTR_STACK,
.size = MAX_BPF_STACK_SIZE, .size = MAX_BPF_STACK_SIZE,
}, },
.mask = UINT64_MAX, .mask = UINT64_MAX,

2
lib/librte_bpf/rte_bpf.h
View File

@ -32,7 +32,7 @@ enum rte_bpf_arg_type {
RTE_BPF_ARG_RAW, /**< scalar value */ RTE_BPF_ARG_RAW, /**< scalar value */
RTE_BPF_ARG_PTR = 0x10, /**< pointer to data buffer */ RTE_BPF_ARG_PTR = 0x10, /**< pointer to data buffer */
RTE_BPF_ARG_PTR_MBUF, /**< pointer to rte_mbuf */ RTE_BPF_ARG_PTR_MBUF, /**< pointer to rte_mbuf */
RTE_BPF_ARG_PTR_STACK, RTE_BPF_ARG_RESERVED, /**< reserved for internal use */
}; };
/** /**