static void explain(void)
{
- fprintf(stderr, "Usage: ... bpf ... [ index INDEX ]\n");
- fprintf(stderr, "\n");
- fprintf(stderr, "BPF use case:\n");
- fprintf(stderr, " bytecode BPF_BYTECODE\n");
- fprintf(stderr, " bytecode-file FILE\n");
- fprintf(stderr, "\n");
- fprintf(stderr, "eBPF use case:\n");
- fprintf(stderr, " object-file FILE [ section ACT_NAME ] [ export UDS_FILE ]");
- fprintf(stderr, " [ verbose ]\n");
- fprintf(stderr, " object-pinned FILE\n");
- fprintf(stderr, "\n");
- fprintf(stderr, "Where BPF_BYTECODE := \'s,c t f k,c t f k,c t f k,...\'\n");
- fprintf(stderr, "c,t,f,k and s are decimals; s denotes number of 4-tuples\n");
- fprintf(stderr, "\n");
- fprintf(stderr, "Where FILE points to a file containing the BPF_BYTECODE string,\n");
- fprintf(stderr, "an ELF file containing eBPF map definitions and bytecode, or a\n");
- fprintf(stderr, "pinned eBPF program.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, "Where ACT_NAME refers to the section name containing the\n");
- fprintf(stderr, "action (default \'%s\').\n", bpf_prog_to_default_section(bpf_type));
- fprintf(stderr, "\n");
- fprintf(stderr, "Where UDS_FILE points to a unix domain socket file in order\n");
- fprintf(stderr, "to hand off control of all created eBPF maps to an agent.\n");
- fprintf(stderr, "\n");
- fprintf(stderr, "Where optionally INDEX points to an existing action, or\n");
- fprintf(stderr, "explicitly specifies an action index upon creation.\n");
+ fprintf(stderr,
+ "Usage: ... bpf ... [ index INDEX ]\n"
+ "\n"
+ "BPF use case:\n"
+ " bytecode BPF_BYTECODE\n"
+ " bytecode-file FILE\n"
+ "\n"
+ "eBPF use case:\n"
+ " object-file FILE [ section ACT_NAME ] [ export UDS_FILE ]"
+ " [ verbose ]\n"
+ " object-pinned FILE\n"
+ "\n"
+ "Where BPF_BYTECODE := \'s,c t f k,c t f k,c t f k,...\'\n"
+ "c,t,f,k and s are decimals; s denotes number of 4-tuples\n"
+ "\n"
+ "Where FILE points to a file containing the BPF_BYTECODE string,\n"
+ "an ELF file containing eBPF map definitions and bytecode, or a\n"
+ "pinned eBPF program.\n"
+ "\n"
+ "Where ACT_NAME refers to the section name containing the\n"
+ "action (default \'%s\').\n"
+ "\n"
+ "Where UDS_FILE points to a unix domain socket file in order\n"
+ "to hand off control of all created eBPF maps to an agent.\n"
+ "\n"
+ "Where optionally INDEX points to an existing action, or\n"
+ "explicitly specifies an action index upon creation.\n",
+ bpf_prog_to_default_section(bpf_type));
}
static void bpf_cbpf_cb(void *nl, const struct sock_filter *ops, int ops_len)
int tca_id, struct nlmsghdr *n)
{
const char *bpf_obj = NULL, *bpf_uds_name = NULL;
- struct tc_act_bpf parm = { .action = TC_ACT_PIPE };
+ struct tc_act_bpf parm = {};
struct bpf_cfg_in cfg = {};
bool seen_run = false;
struct rtattr *tail;
NEXT_ARG();
- tail = NLMSG_TAIL(n);
- addattr_l(n, MAX_MSG, tca_id, NULL, 0);
+ tail = addattr_nest(n, MAX_MSG, tca_id);
while (argc > 0) {
if (matches(*argv, "run") == 0) {
NEXT_ARG();
+
+ if (seen_run)
+ duparg("run", *argv);
opt_bpf:
seen_run = true;
+ cfg.type = bpf_type;
cfg.argc = argc;
cfg.argv = argv;
- if (bpf_parse_common(bpf_type, &cfg, &bpf_cb_ops, n))
+ if (bpf_parse_and_load_common(&cfg, &bpf_cb_ops, n))
return -1;
argc = cfg.argc;
NEXT_ARG_FWD();
}
- if (argc && !action_a2n(*argv, &parm.action, false))
- NEXT_ARG_FWD();
+ parse_action_control_dflt(&argc, &argv, &parm.action,
+ false, TC_ACT_PIPE);
if (argc) {
if (matches(*argv, "index") == 0) {
}
addattr_l(n, MAX_MSG, TCA_ACT_BPF_PARMS, &parm, sizeof(parm));
- tail->rta_len = (char *)NLMSG_TAIL(n) - (char *)tail;
+ addattr_nest_end(n, tail);
if (bpf_uds_name)
ret = bpf_send_map_fds(bpf_uds_name, bpf_obj);
{
struct rtattr *tb[TCA_ACT_BPF_MAX + 1];
struct tc_act_bpf *parm;
+ int d_ok = 0;
+ print_string(PRINT_ANY, "kind", "%s ", "bpf");
if (arg == NULL)
- return -1;
+ return 0;
parse_rtattr_nested(tb, TCA_ACT_BPF_MAX, arg);
if (!tb[TCA_ACT_BPF_PARMS]) {
- fprintf(f, "[NULL bpf parameters]");
+ fprintf(stderr, "Missing bpf parameters\n");
return -1;
}
parm = RTA_DATA(tb[TCA_ACT_BPF_PARMS]);
- fprintf(f, "bpf ");
if (tb[TCA_ACT_BPF_NAME])
- fprintf(f, "%s ", rta_getattr_str(tb[TCA_ACT_BPF_NAME]));
-
+ print_string(PRINT_ANY, "bpf_name", "%s ",
+ rta_getattr_str(tb[TCA_ACT_BPF_NAME]));
if (tb[TCA_ACT_BPF_OPS] && tb[TCA_ACT_BPF_OPS_LEN]) {
- bpf_print_ops(f, tb[TCA_ACT_BPF_OPS],
+ bpf_print_ops(tb[TCA_ACT_BPF_OPS],
rta_getattr_u16(tb[TCA_ACT_BPF_OPS_LEN]));
- fprintf(f, " ");
+ print_string(PRINT_FP, NULL, "%s", " ");
+ }
+
+ if (tb[TCA_ACT_BPF_ID])
+ d_ok = bpf_dump_prog_info(f,
+ rta_getattr_u32(tb[TCA_ACT_BPF_ID]));
+ if (!d_ok && tb[TCA_ACT_BPF_TAG]) {
+ SPRINT_BUF(b);
+
+ print_string(PRINT_ANY, "tag", "tag %s ",
+ hexstring_n2a(RTA_DATA(tb[TCA_ACT_BPF_TAG]),
+ RTA_PAYLOAD(tb[TCA_ACT_BPF_TAG]),
+ b, sizeof(b)));
}
- fprintf(f, "default-action %s\n", action_n2a(parm->action));
- fprintf(f, "\tindex %d ref %d bind %d", parm->index, parm->refcnt,
- parm->bindcnt);
+ print_action_control(f, "default-action ", parm->action, _SL_);
+ print_uint(PRINT_ANY, "index", "\t index %u", parm->index);
+ print_int(PRINT_ANY, "ref", " ref %d", parm->refcnt);
+ print_int(PRINT_ANY, "bind", " bind %d", parm->bindcnt);
if (show_stats) {
if (tb[TCA_ACT_BPF_TM]) {
projects / mirror_iproute2.git / blobdiff