Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 51aa4239 authored by Jakub Kicinski's avatar Jakub Kicinski Committed by Daniel Borkmann
Browse files

bpftool: revert printing program device bound info 



This reverts commit 928631e0 ("bpftool: print program device bound
info").  We will remove this API and redo it right in -next.

Signed-off-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 62c71b45

tools/bpf/bpftool/prog.c

+0 −31
Original line number Diff line number Diff line
@@ -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) {

tools/include/uapi/linux/bpf.h

+0 −6
Original line number Diff line number Diff line
@@ -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 {