From patchwork Thu Jan 17 01:01:14 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maciej Fijalkowski X-Patchwork-Id: 1026364 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="nPlQoRk9"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 43g5QG5G8Vz9sCh for ; Thu, 17 Jan 2019 12:02:14 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727527AbfAQBCN (ORCPT ); Wed, 16 Jan 2019 20:02:13 -0500 Received: from mail-lf1-f66.google.com ([209.85.167.66]:46476 "EHLO mail-lf1-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727375AbfAQBCL (ORCPT ); Wed, 16 Jan 2019 20:02:11 -0500 Received: by mail-lf1-f66.google.com with SMTP id y14so6413929lfg.13 for ; Wed, 16 Jan 2019 17:02:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=074N5JSYyVWI+zHkL6kIXIqWw10G7MECM9QmOHG8zzQ=; b=nPlQoRk9r2CauWvo+IjyPYaG+kctJvh7p0owXW0Aq00NURDvIOw6f2JYIwJ4XNetf6 Z2LpWBMfVCEJUyUW6TNWP+0oZ4d/Ccb5NIzybKCnYnVT/YwfmgknCnsMwnDhK3my1v3f N65ZZl38j1XXnKRhLi9LwHgSrmbqrO/HDvUHg4GLkEluyxT7lT8VnwyV027VseuW89z1 W3lLZg42IKpSTHflifXuLSBh2bqgJE8NcvPp7YOa0d4LuPuCSbb/Oo579d81efW+998m GRNHwETea5nACA/V7T+1uHZZvw8PCcSJJDNUnXLIRAx9oAUc8cEJ2uHsFhb7xnWVCQHi QyTw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=074N5JSYyVWI+zHkL6kIXIqWw10G7MECM9QmOHG8zzQ=; b=m6UziyWwb64psLD5PdXvo1+eRBJ2ILrAfWQIKNBa1Q/guqyd/B5dtqGu/HnenK88T/ ubOXVEeJ7E18KLgNWT7UOWnkrO5EFRWh0IovwZGFBz7ECzlVij2o9yKpcEIRHvv+rvSm 5ZrHb/6kUcBCRtEFX+e+f0TCcQyeWGOKJ1wApPCQJ83HfFEOye8ZgBGH00Apikm+n/5O 020ThDAwWcwQvrPPnQN9cdnANjRt++x8/KRfQCmO+juqcLP0AsSeUqm4YizvZ9tFJCl6 yOGJhgGeIiIvobnD9BNleFuxDz+u4v5207DBg6QDUWIBjq8SWeXAeL4bP2Yi01OZpk4O KIuQ== X-Gm-Message-State: AJcUukeXAk9jHA2NpFBw28uAP68SFk6urT+JvS7YKSTGO05gvalhrdH5 IzqffICe7naHER4VvHX1IcWNhEkX X-Google-Smtp-Source: ALg8bN4r4Y+SMKwQnxfpZVL2Ab45vh6Z9DORx3SRiTX61C25UOteQiP0gCrnpQq++3RR+SzQNpZv6A== X-Received: by 2002:a19:920a:: with SMTP id u10mr4188743lfd.122.1547686928339; Wed, 16 Jan 2019 17:02:08 -0800 (PST) Received: from localhost.localdomain (host-185-93-94-63.ip-point.pl. [185.93.94.63]) by smtp.gmail.com with ESMTPSA id l17sm4341lfk.40.2019.01.16.17.02.07 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Wed, 16 Jan 2019 17:02:07 -0800 (PST) From: Maciej Fijalkowski To: daniel@iogearbox.net, ast@kernel.org Cc: netdev@vger.kernel.org, jakub.kicinski@netronome.com, brouer@redhat.com Subject: [PATCH bpf-next 5/6] libbpf: Add a support for getting xdp prog id on ifindex Date: Thu, 17 Jan 2019 02:01:14 +0100 Message-Id: <20190117010115.18234-6-maciejromanfijalkowski@gmail.com> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20190117010115.18234-1-maciejromanfijalkowski@gmail.com> References: <20190117010115.18234-1-maciejromanfijalkowski@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Since we have a dedicated netlink attributes for xdp setup on a particular interface, it is now possible to retrieve the program id that is currently attached to the interface. The use case is targeted for sample xdp programs, which will store the program id just after loading bpf program onto iface. On shutdown, the sample will make sure that it can unload the program by querying again the iface and verifying that both program id's matches. Signed-off-by: Maciej Fijalkowski Reviewed-by: Jakub Kicinski --- tools/lib/bpf/libbpf.h | 1 + tools/lib/bpf/libbpf.map | 1 + tools/lib/bpf/netlink.c | 84 ++++++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 86 insertions(+) diff --git a/tools/lib/bpf/libbpf.h b/tools/lib/bpf/libbpf.h index 7f10d36abdde..8e55705e9a41 100644 --- a/tools/lib/bpf/libbpf.h +++ b/tools/lib/bpf/libbpf.h @@ -317,6 +317,7 @@ LIBBPF_API int bpf_prog_load(const char *file, enum bpf_prog_type type, struct bpf_object **pobj, int *prog_fd); LIBBPF_API int bpf_set_link_xdp_fd(int ifindex, int fd, __u32 flags); +LIBBPF_API int bpf_get_link_xdp_id(int ifindex, __u32 *prog_id, __u32 flags); enum bpf_perf_event_ret { LIBBPF_PERF_EVENT_DONE = 0, diff --git a/tools/lib/bpf/libbpf.map b/tools/lib/bpf/libbpf.map index 7c59e4f64082..5b73bf886d05 100644 --- a/tools/lib/bpf/libbpf.map +++ b/tools/lib/bpf/libbpf.map @@ -127,4 +127,5 @@ LIBBPF_0.0.1 { LIBBPF_0.0.2 { global: bpf_object__find_map_fd_by_name; + bpf_get_link_xdp_id; } LIBBPF_0.0.1; diff --git a/tools/lib/bpf/netlink.c b/tools/lib/bpf/netlink.c index 0ce67aea8f3b..e44a6ef25678 100644 --- a/tools/lib/bpf/netlink.c +++ b/tools/lib/bpf/netlink.c @@ -21,6 +21,12 @@ typedef int (*__dump_nlmsg_t)(struct nlmsghdr *nlmsg, libbpf_dump_nlmsg_t, void *cookie); +struct xdp_id_md { + int ifindex; + __u32 flags; + __u32 id; +}; + int libbpf_netlink_open(__u32 *nl_pid) { struct sockaddr_nl sa; @@ -196,6 +202,84 @@ static int __dump_link_nlmsg(struct nlmsghdr *nlh, return dump_link_nlmsg(cookie, ifi, tb); } +static unsigned char get_xdp_id_attr(unsigned char mode, __u32 flags) +{ + if (mode != XDP_ATTACHED_MULTI) + return IFLA_XDP_PROG_ID; + if (flags & XDP_FLAGS_DRV_MODE) + return IFLA_XDP_DRV_PROG_ID; + if (flags & XDP_FLAGS_HW_MODE) + return IFLA_XDP_HW_PROG_ID; + if (flags & XDP_FLAGS_SKB_MODE) + return IFLA_XDP_SKB_PROG_ID; + + return IFLA_XDP_UNSPEC; +} + +static int get_xdp_id(void *cookie, void *msg, struct nlattr **tb) +{ + struct nlattr *xdp_tb[IFLA_XDP_MAX + 1]; + struct xdp_id_md *xdp_id = cookie; + struct ifinfomsg *ifinfo = msg; + unsigned char mode, xdp_attr; + int ret; + + if (xdp_id->ifindex && xdp_id->ifindex != ifinfo->ifi_index) + return 0; + + if (!tb[IFLA_XDP]) + return 0; + + ret = libbpf_nla_parse_nested(xdp_tb, IFLA_XDP_MAX, tb[IFLA_XDP], NULL); + if (ret) + return ret; + + if (!xdp_tb[IFLA_XDP_ATTACHED]) + return 0; + + mode = libbpf_nla_getattr_u8(xdp_tb[IFLA_XDP_ATTACHED]); + if (mode == XDP_ATTACHED_NONE) + return 0; + + xdp_attr = get_xdp_id_attr(mode, xdp_id->flags); + if (!xdp_attr || !xdp_tb[xdp_attr]) + return -ENOENT; + + xdp_id->id = libbpf_nla_getattr_u32(xdp_tb[xdp_attr]); + + return 0; +} + +int bpf_get_link_xdp_id(int ifindex, __u32 *prog_id, __u32 flags) +{ + struct xdp_id_md xdp_id = {}; + int sock, ret; + __u32 nl_pid; + __u32 mask; + + if (flags & ~XDP_FLAGS_MASK) + return -EINVAL; + + /* Check whether the single {HW,DRV,SKB} mode is set */ + flags &= XDP_FLAGS_MODES; + mask = flags - 1; + if (flags && flags & mask) + return -EINVAL; + + sock = libbpf_netlink_open(&nl_pid); + if (sock < 0) + return sock; + + xdp_id.ifindex = ifindex; + xdp_id.flags = flags; + + ret = libbpf_nl_get_link(sock, nl_pid, get_xdp_id, &xdp_id); + *prog_id = xdp_id.id; + + close(sock); + return ret; +} + int libbpf_nl_get_link(int sock, unsigned int nl_pid, libbpf_dump_nlmsg_t dump_link_nlmsg, void *cookie) {