LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Jiri Olsa <jolsa@kernel.org>
To: Alexei Starovoitov <ast@kernel.org>,
Daniel Borkmann <daniel@iogearbox.net>
Cc: lkml <linux-kernel@vger.kernel.org>,
netdev@vger.kernel.org,
Quentin Monnet <quentin.monnet@netronome.com>
Subject: [PATCH 3/3] tools bpftool: Display license in prog show/list
Date: Mon, 23 Apr 2018 08:59:27 +0200 [thread overview]
Message-ID: <20180423065927.23127-4-jolsa@kernel.org> (raw)
In-Reply-To: <20180423065927.23127-1-jolsa@kernel.org>
Display the license string in bpftool prog command, like:
# bpftool prog list
1: kprobe name func_begin tag 59bef35a42fda602 license GPL
loaded_at Apr 22/15:46 uid 0
xlated 272B not jited memlock 4096B map_ids 1
# bpftool prog show --json
[{"id":1,"type":"kprobe","name":"fun ... ,"license":"GPL", ... ]
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
---
tools/bpf/bpftool/prog.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
index 548adb9b7317..ea5ede899cf7 100644
--- a/tools/bpf/bpftool/prog.c
+++ b/tools/bpf/bpftool/prog.c
@@ -235,6 +235,8 @@ 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]);
+ jsonw_string_field(json_wtr, "license", info->license);
+
print_dev_json(info->ifindex, info->netns_dev, info->netns_ino);
if (info->load_time) {
@@ -295,8 +297,10 @@ static void print_prog_plain(struct bpf_prog_info *info, int fd)
printf("tag ");
fprint_hex(stdout, info->tag, BPF_TAG_SIZE, "");
print_dev_plain(info->ifindex, info->netns_dev, info->netns_ino);
+ printf(" license %s", info->license);
printf("\n");
+
if (info->load_time) {
char buf[32];
--
2.13.6
next prev parent reply other threads:[~2018-04-23 6:59 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-04-23 6:59 [PATCH 0/3] bpf: Store/dump license string for loaded program Jiri Olsa
2018-04-23 6:59 ` [PATCH 1/3] bpf: Store " Jiri Olsa
2018-04-23 6:59 ` [PATCH 2/3] tools bpf: Sync bpf.h uapi header Jiri Olsa
2018-04-23 6:59 ` Jiri Olsa [this message]
2018-04-23 20:11 ` [PATCH 0/3] bpf: Store/dump license string for loaded program Alexei Starovoitov
2018-04-25 10:17 ` Jiri Olsa
2018-04-25 16:15 ` Alexei Starovoitov
2018-04-25 16:20 ` Jiri Olsa
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180423065927.23127-4-jolsa@kernel.org \
--to=jolsa@kernel.org \
--cc=ast@kernel.org \
--cc=daniel@iogearbox.net \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=quentin.monnet@netronome.com \
--subject='Re: [PATCH 3/3] tools bpftool: Display license in prog show/list' \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).