tools: bpftool: improve architecture detection by using ifindex

The current architecture detection method in bpftool is designed for host
case.

For offload case, we can't use the architecture of "bpftool" itself.
Instead, we could call the existing "ifindex_to_name_ns" to get DEVNAME,
then read pci id from /sys/class/dev/DEVNAME/device/vendor, finally we map
vendor id to bfd arch name which will finally be used to select bfd backend
for the disassembler.

Reviewed-by: Jakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: Jiong Wang <jiong.wang@netronome.com>
Acked-by: Alexei Starovoitov <ast@kernel.org>
Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

1 files changed, 11 insertions, 1 deletions

diff --git a/tools/bpf/bpftool/prog.c b/tools/bpf/bpftool/prog.c
index 099e21cf1b5c..e8e2baaf93c2 100644
--- a/tools/bpf/bpftool/prog.c
+++ b/tools/bpf/bpftool/prog.c
@@ -776,7 +776,17 @@ static int do_dump(int argc, char **argv)
                 }
         } else {
                 if (member_len == &info.jited_prog_len) {
-                        disasm_print_insn(buf, *member_len, opcodes);
+                        const char *name = NULL;
+
+                        if (info.ifindex) {
+                                name = ifindex_to_bfd_name_ns(info.ifindex,
+                                                              info.netns_dev,
+                                                              info.netns_ino);
+                                if (!name)
+                                        goto err_free;
+                        }
+
+                        disasm_print_insn(buf, *member_len, opcodes, name);
                 } else {
                         kernel_syms_load(&dd);
                         if (json_output)