Merge branch 'bpf-offload-fixes'

Jakub Kicinski says:

====================
This series addresses some late comments and moves checking if program
has been loaded for the correct device to the drivers.  There are also
some problems with net namespaces which I didn't take into consideration.
On the kernel side we will now simply ignore namespace moves.  Since the
user space API is not reporting any namespace identification we have to
remove the ifindex until a correct way of reporting is agreed upon.

v2:
 - fix ext ack reporting for XDP (David A);
 - add Jiri's Ack.
====================

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

2 files changed, 1 insertions, 38 deletions

diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
index f45c44ef9bec..ad619b96c276 100644
--- a/tools/bpf/bpftool/prog.c
+++ b/tools/bpf/bpftool/prog.c
@@ -41,7 +41,6 @@
 #include <string.h>
 #include <time.h>
 #include <unistd.h>
-#include <net/if.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
@@ -230,21 +229,6 @@ 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];
 
@@ -302,21 +286,6 @@ 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 e880ae6434ee..4c223ab30293 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -262,7 +262,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 */
+                __u32           prog_ifindex;   /* ifindex of netdev to prep for */
         };
 
         struct { /* anonymous struct used by BPF_OBJ_* commands */
@@ -897,10 +897,6 @@ 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;
@@ -914,8 +910,6 @@ 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 {