bpftool: print program device bound info

If program is bound to a device, print the name of the relevant
interface or unknown if the netdev has since been removed.

Signed-off-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Reviewed-by: Simon Horman <simon.horman@netronome.com>
Reviewed-by: Quentin Monnet <quentin.monnet@netronome.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
index 250f80f..d3ab808 100644 (file)
--- a/tools/bpf/bpftool/prog.c
+++ b/tools/bpf/bpftool/prog.c
@@ -41,6 +41,7 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
+#include <net/if.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -229,6 +230,21 @@ static void print_prog_json(struct bpf_prog_info *info, int fd)
                     info->tag[0], info->tag[1], info->tag[2], info->tag[3],
                     info->tag[4], info->tag[5], info->tag[6], info->tag[7]);
 
+       if (info->status & BPF_PROG_STATUS_DEV_BOUND) {
+               jsonw_name(json_wtr, "dev");
+               if (info->ifindex) {
+                       char name[IF_NAMESIZE];
+
+                       if (!if_indextoname(info->ifindex, name))
+                               jsonw_printf(json_wtr, "\"ifindex:%d\"",
+                                            info->ifindex);
+                       else
+                               jsonw_printf(json_wtr, "\"%s\"", name);
+               } else {
+                       jsonw_printf(json_wtr, "\"unknown\"");
+               }
+       }
+
        if (info->load_time) {
                char buf[32];
 
@@ -274,6 +290,21 @@ static void print_prog_plain(struct bpf_prog_info *info, int fd)
 
        printf("tag ");
        fprint_hex(stdout, info->tag, BPF_TAG_SIZE, "");
+       printf(" ");
+
+       if (info->status & BPF_PROG_STATUS_DEV_BOUND) {
+               printf("dev ");
+               if (info->ifindex) {
+                       char name[IF_NAMESIZE];
+
+                       if (!if_indextoname(info->ifindex, name))
+                               printf("ifindex:%d ", info->ifindex);
+                       else
+                               printf("%s ", name);
+               } else {
+                       printf("unknown ");
+               }
+       }
        printf("\n");
 
        if (info->load_time) {

diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index 7cebba4..e92f62c 100644 (file)
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -259,6 +259,7 @@ union bpf_attr {
                __u32           kern_version;   /* checked when prog_type=kprobe */
                __u32           prog_flags;
                char            prog_name[BPF_OBJ_NAME_LEN];
+               __u32           prog_target_ifindex;    /* ifindex of netdev to prep for */
        };
 
        struct { /* anonymous struct used by BPF_OBJ_* commands */
@@ -893,6 +894,10 @@ enum sk_action {
 
 #define BPF_TAG_SIZE   8
 
+enum bpf_prog_status {
+       BPF_PROG_STATUS_DEV_BOUND       = (1 << 0),
+};
+
 struct bpf_prog_info {
        __u32 type;
        __u32 id;
@@ -906,6 +911,8 @@ struct bpf_prog_info {
        __u32 nr_map_ids;
        __aligned_u64 map_ids;
        char name[BPF_OBJ_NAME_LEN];
+       __u32 ifindex;
+       __u32 status;
 } __attribute__((aligned(8)));
 
 struct bpf_map_info {