From mboxrd@z Thu Jan 1 00:00:00 1970 From: Matteo Croce Subject: [PATCH bpf-next 2/2] samples: bpf: get ifindex from ifname Date: Thu, 18 Oct 2018 22:47:09 +0200 Message-ID: <20181018204709.29547-3-mcroce@redhat.com> References: <20181018204709.29547-1-mcroce@redhat.com> <20181018204709.29547-2-mcroce@redhat.com> Mime-Version: 1.0 Content-Transfer-Encoding: 8bit Cc: Alexei Starovoitov , Daniel Borkmann To: netdev@vger.kernel.org Return-path: Received: from mail-wr1-f68.google.com ([209.85.221.68]:43632 "EHLO mail-wr1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727170AbeJSEuC (ORCPT ); Fri, 19 Oct 2018 00:50:02 -0400 Received: by mail-wr1-f68.google.com with SMTP id n1-v6so35139068wrt.10 for ; Thu, 18 Oct 2018 13:47:15 -0700 (PDT) In-Reply-To: <20181018204709.29547-2-mcroce@redhat.com> Sender: netdev-owner@vger.kernel.org List-ID: Find the ifindex via ioctl(SIOCGIFINDEX) instead of requiring the numeric ifindex. Signed-off-by: Matteo Croce --- samples/bpf/xdp1_user.c | 26 ++++++++++++++++++++++++-- 1 file changed, 24 insertions(+), 2 deletions(-) diff --git a/samples/bpf/xdp1_user.c b/samples/bpf/xdp1_user.c index 4f3d824fc044..a1d0c5dcee9c 100644 --- a/samples/bpf/xdp1_user.c +++ b/samples/bpf/xdp1_user.c @@ -15,6 +15,9 @@ #include #include #include +#include +#include +#include #include "bpf_util.h" #include "bpf/bpf.h" @@ -59,7 +62,7 @@ static void poll_stats(int map_fd, int interval) static void usage(const char *prog) { fprintf(stderr, - "usage: %s [OPTS] IFINDEX\n\n" + "usage: %s [OPTS] IFACE\n\n" "OPTS:\n" " -S use skb-mode\n" " -N enforce native mode\n", @@ -74,9 +77,11 @@ int main(int argc, char **argv) }; const char *optstr = "SN"; int prog_fd, map_fd, opt; + struct ifreq ifr = { 0 }; struct bpf_object *obj; struct bpf_map *map; char filename[256]; + int sock; while ((opt = getopt(argc, argv, optstr)) != -1) { switch (opt) { @@ -102,7 +107,24 @@ int main(int argc, char **argv) return 1; } - ifindex = strtoul(argv[optind], NULL, 0); + sock = socket(AF_UNIX, SOCK_DGRAM, 0); + if (sock == -1) { + perror("socket"); + return 1; + } + + if (strlen(argv[optind]) >= IFNAMSIZ) { + printf("invalid ifname '%s'\n", argv[optind]); + return 1; + } + + strcpy(ifr.ifr_name, argv[optind]); + if (ioctl(sock, SIOCGIFINDEX, &ifr) < 0) { + perror("SIOCGIFINDEX"); + return 1; + } + close(sock); + ifindex = ifr.ifr_ifindex; snprintf(filename, sizeof(filename), "%s_kern.o", argv[0]); prog_load_attr.file = filename; -- 2.19.1