From a0e2c9198314e086c5315237a8459e1b1f9060b7 Mon Sep 17 00:00:00 2001 From: Jesper Dangaard Brouer Date: Tue, 5 Apr 2022 10:35:34 +0200 Subject: [PATCH] AF_XDP-interaction: lib user don't need to check for btf_id Now that lib side of xsk_btf__init_xdp_hint check for a valid btf_id variable, then users of the call doesn't need to check for the existance of a btf_id member. Signed-off-by: Jesper Dangaard Brouer --- AF_XDP-interaction/af_xdp_user.c | 9 +-------- AF_XDP-interaction/btf_unit_test.c | 9 +-------- 2 files changed, 2 insertions(+), 16 deletions(-) diff --git a/AF_XDP-interaction/af_xdp_user.c b/AF_XDP-interaction/af_xdp_user.c index b69b608..492e82d 100644 --- a/AF_XDP-interaction/af_xdp_user.c +++ b/AF_XDP-interaction/af_xdp_user.c @@ -143,18 +143,11 @@ struct xsk_btf_info *setup_btf_info(struct btf *btf, err = xsk_btf__init_xdp_hint(btf, struct_name, &xbi); if (err) { - fprintf(stderr, "WARN(%d): Cannot BTF find struct:%s\n", + fprintf(stderr, "WARN(%d): Cannot BTF locate valid struct:%s\n", err, struct_name); return NULL; } - if (!xsk_btf__has_field("btf_id", xbi)) { - fprintf(stderr, "ERR: %s doesn't contain member btf_id\n", - struct_name); - xsk_btf__free_xdp_hint(xbi); - return NULL; - } - if (debug_meta) printf("Setup BTF based XDP hints for struct: %s\n", struct_name); diff --git a/AF_XDP-interaction/btf_unit_test.c b/AF_XDP-interaction/btf_unit_test.c index 5878188..c5445e2 100644 --- a/AF_XDP-interaction/btf_unit_test.c +++ b/AF_XDP-interaction/btf_unit_test.c @@ -69,18 +69,11 @@ struct xsk_btf_info *setup_btf_info(struct btf *btf, err = xsk_btf__init_xdp_hint(btf, struct_name, &xbi); if (err) { - fprintf(stderr, "WARN(%d): Cannot BTF find struct:%s\n", + fprintf(stderr, "WARN(%d): Cannot BTF locate valid struct:%s\n", err, struct_name); return NULL; } - if (!xsk_btf__has_field("btf_id", xbi)) { - fprintf(stderr, "ERR: %s doesn't contain member btf_id\n", - struct_name); - xsk_btf__free_xdp_hint(xbi); - return NULL; - } - if (verbose) printf("Setup BTF based XDP hints for struct: %s\n", struct_name);