From patchwork Thu Apr 25 21:37:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 1091092 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.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=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="eqv1h9xY"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44qrBR4c0Nz9s6w for ; Fri, 26 Apr 2019 07:37:35 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731280AbfDYVh2 (ORCPT ); Thu, 25 Apr 2019 17:37:28 -0400 Received: from mail-pg1-f202.google.com ([209.85.215.202]:56019 "EHLO mail-pg1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731255AbfDYVh1 (ORCPT ); Thu, 25 Apr 2019 17:37:27 -0400 Received: by mail-pg1-f202.google.com with SMTP id a8so538788pgq.22 for ; Thu, 25 Apr 2019 14:37:27 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=UAjPdvqWg5Vcpy6WjhUujOLut6fOmfM18+jDIqTl8yU=; b=eqv1h9xYKqx2Mt2qm6D6gIVR9ld1O0wDmWr4VM1uIynlztZbuPt+8YaPYkp8m5887e nMexZyQLyNgPgCkalsCjTwDdccazQsozzRA/Doc8jgsaIqQmbU41gWwb02MaE95QfEWN T5iuXbOFMn0eQ6Z0xcRcjP2DSZx3v7Ag+gfoOuLGHM2bZ4Bp1f6m6GX785ak3/NYWQt+ qLDqM20oqfeVmyoKyJprc12P59YMCh8jMRekTCneLPmeWpe/smw6u6XUJX2Vg7KeZD/+ UFtyULlkotN7FcKvv+xVRXdHwF5pRFfIwfQtg7lwdtTqrdv7AUhQYVNEQBdZOUzAZC0z V0mw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=UAjPdvqWg5Vcpy6WjhUujOLut6fOmfM18+jDIqTl8yU=; b=m+/yPCaiA/K2Kd4vDeLHguK61hua6ASZaIeC2wm1Y9rjqhHcReZRXibG5tMh4Ooir/ MlUWSoQt/PfxdDMY75y9/VjQq/nS60S/hnA1A3HQO7fSadx7Jvjj7L5cf7//x8zylwaL wBOpPOJZwYMlBSa1pVIkg5u/eN+zRZOejmZjD494D/43ILqOfowBJXK+7dnPp5jbGzpR F3efHbHGNCdU0t1R4X4OmXSc23ezUyAG0566C3fpX6KkmgVQyhojthe4Nc3oPiH0k4n5 FtPVHgJyGMPxog3+xvz7jv7hpRlL0is7bpRSU/HbsJ3vVqBiFHbVNkvs8wwgDJDV/lhw 2NhA== X-Gm-Message-State: APjAAAVfO6etgew4xXmE7RV20D9L94nVPXhZEnEmX9MIYlhNjaKra2gX +3lhErS6Q4gFzBpgSxdTXz2N75o= X-Google-Smtp-Source: APXvYqxP6GJBeiLkNqCfAvmX5JUUDmol9S8qtksSnCsECoAI8fFcavhIa9IwVvU7cWcY1u4FKTH2nBg= X-Received: by 2002:a63:f26:: with SMTP id e38mr40563801pgl.290.1556228247069; Thu, 25 Apr 2019 14:37:27 -0700 (PDT) Date: Thu, 25 Apr 2019 14:37:23 -0700 Message-Id: <20190425213724.25056-1-sdf@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog Subject: [PATCH bpf-next v5 1/2] bpf: support BPF_PROG_QUERY for BPF_FLOW_DISSECTOR attach_type From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev , Jann Horn Sender: bpf-owner@vger.kernel.org Precedence: bulk List-Id: netdev.vger.kernel.org target_fd is target namespace. If there is a flow dissector BPF program attached to that namespace, its (single) id is returned. v5: * drop net ref right after rcu unlock (Daniel Borkmann) v4: * add missing put_net (Jann Horn) v3: * add missing inline to skb_flow_dissector_prog_query static def (kbuild test robot ) v2: * don't sleep in rcu critical section (Jakub Kicinski) * check input prog_cnt (exit early) Cc: Jann Horn Signed-off-by: Stanislav Fomichev --- include/linux/skbuff.h | 8 ++++++++ kernel/bpf/syscall.c | 2 ++ net/core/flow_dissector.c | 39 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 49 insertions(+) diff --git a/include/linux/skbuff.h b/include/linux/skbuff.h index 998256c2820b..6d58fa8a65fd 100644 --- a/include/linux/skbuff.h +++ b/include/linux/skbuff.h @@ -1258,11 +1258,19 @@ void skb_flow_dissector_init(struct flow_dissector *flow_dissector, unsigned int key_count); #ifdef CONFIG_NET +int skb_flow_dissector_prog_query(const union bpf_attr *attr, + union bpf_attr __user *uattr); int skb_flow_dissector_bpf_prog_attach(const union bpf_attr *attr, struct bpf_prog *prog); int skb_flow_dissector_bpf_prog_detach(const union bpf_attr *attr); #else +static inline int skb_flow_dissector_prog_query(const union bpf_attr *attr, + union bpf_attr __user *uattr) +{ + return -EOPNOTSUPP; +} + static inline int skb_flow_dissector_bpf_prog_attach(const union bpf_attr *attr, struct bpf_prog *prog) { diff --git a/kernel/bpf/syscall.c b/kernel/bpf/syscall.c index 92c9b8a32b50..b0de49598341 100644 --- a/kernel/bpf/syscall.c +++ b/kernel/bpf/syscall.c @@ -2009,6 +2009,8 @@ static int bpf_prog_query(const union bpf_attr *attr, break; case BPF_LIRC_MODE2: return lirc_prog_query(attr, uattr); + case BPF_FLOW_DISSECTOR: + return skb_flow_dissector_prog_query(attr, uattr); default: return -EINVAL; } diff --git a/net/core/flow_dissector.c b/net/core/flow_dissector.c index fac712cee9d5..9ca784c592ac 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -65,6 +65,45 @@ void skb_flow_dissector_init(struct flow_dissector *flow_dissector, } EXPORT_SYMBOL(skb_flow_dissector_init); +int skb_flow_dissector_prog_query(const union bpf_attr *attr, + union bpf_attr __user *uattr) +{ + __u32 __user *prog_ids = u64_to_user_ptr(attr->query.prog_ids); + u32 prog_id, prog_cnt = 0, flags = 0; + struct bpf_prog *attached; + struct net *net; + + if (attr->query.query_flags) + return -EINVAL; + + net = get_net_ns_by_fd(attr->query.target_fd); + if (IS_ERR(net)) + return PTR_ERR(net); + + rcu_read_lock(); + attached = rcu_dereference(net->flow_dissector_prog); + if (attached) { + prog_cnt = 1; + prog_id = attached->aux->id; + } + rcu_read_unlock(); + + put_net(net); + + if (copy_to_user(&uattr->query.attach_flags, &flags, sizeof(flags))) + return -EFAULT; + if (copy_to_user(&uattr->query.prog_cnt, &prog_cnt, sizeof(prog_cnt))) + return -EFAULT; + + if (!attr->query.prog_cnt || !prog_ids || !prog_cnt) + return 0; + + if (copy_to_user(prog_ids, &prog_id, sizeof(u32))) + return -EFAULT; + + return 0; +} + int skb_flow_dissector_bpf_prog_attach(const union bpf_attr *attr, struct bpf_prog *prog) { From patchwork Thu Apr 25 21:37:24 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 1091090 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: incoming-bpf@patchwork.ozlabs.org Delivered-To: patchwork-incoming-bpf@bilbo.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=bpf-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=google.com header.i=@google.com header.b="Ua9Gexce"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44qrBP0tK2z9s47 for ; Fri, 26 Apr 2019 07:37:33 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726020AbfDYVhb (ORCPT ); Thu, 25 Apr 2019 17:37:31 -0400 Received: from mail-ot1-f74.google.com ([209.85.210.74]:43403 "EHLO mail-ot1-f74.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728909AbfDYVha (ORCPT ); Thu, 25 Apr 2019 17:37:30 -0400 Received: by mail-ot1-f74.google.com with SMTP id q23so661155otk.10 for ; Thu, 25 Apr 2019 14:37:30 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=I2JTfqrC8u8PvvtvlU3SwuCWT5zC0tVBoJ8XxBMMeTM=; b=Ua9GexceU0NU1w3TH7N6Hk0+DAb5EWteOGztE9Sba6FLw5JYgL/WfMPV+Gul7u4eLQ 1oyW3p5lGMmlQi7jqxY27pbkoTp1zIi2yftalCq4jYxGEMqDetF9z8n8ByKMbPq8gwzj 5VzqcbeyVxaK+E3KU2yZGBJCkIQ5PEoVZ5Sd9yEVef2Lece+wPjab0KmbGqThnWRFQp2 QbxN5tUVCmh0yhXtFpJwISCAQBTVEOM+6qMcKOqjP6Y68BZ5yEvgeL387Dx9pn4Dzmkd 6NfJeL9SrLeSxIKr/JhSl+9LgqMirecForrkccBbyo/DNcH19mWJJtg3lvQ0WFAZfjKo IbZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=I2JTfqrC8u8PvvtvlU3SwuCWT5zC0tVBoJ8XxBMMeTM=; b=HQElJ/1Ys6qYxCClMd83oVz68TOzQP+0k3tdo5B02wLG5Kn0H8fnlZsiSnDq6LwVKl Fg8lpifwdwNEFuqZqdbMtPRhHAtREkDa4Nk1xqnbGLRW79NL/X0JSDZKGN7oPrz3yuT8 caCAZTeg2DvIczpbjAoCUvmdi+O4HCDjKmI60XyGocbtmThjHRZupHHmCiL3A+k6iCuh FGOzQtklRvXmaK1FqKXaxs73Rwj8yNvsYYAXs8L6nTlV1tbqVqlyciJTNNAYRwBJDS5R +9YjQlxkOU1vSJLTQ8lEyNhMCqFlyINJaOkClkIV2Xk6I052qMp/ZldH4lRsFdWw6Bxd IUJw== X-Gm-Message-State: APjAAAW19TG3cY6OJQenxLZefAnhyCF5joNe/d2D9sDh6ek8a8zaJRgA KBXNGa8CcGzX/ct23C6CnezazqU= X-Google-Smtp-Source: APXvYqxT9/FliOL4MJ72uBvutaw4oZyJMBVzmtmHF7JpNWEde9fLj9IKHUvqGrcJRk11iD+QQ8eSzXg= X-Received: by 2002:aca:564e:: with SMTP id k75mr5009183oib.54.1556228249534; Thu, 25 Apr 2019 14:37:29 -0700 (PDT) Date: Thu, 25 Apr 2019 14:37:24 -0700 In-Reply-To: <20190425213724.25056-1-sdf@google.com> Message-Id: <20190425213724.25056-2-sdf@google.com> Mime-Version: 1.0 References: <20190425213724.25056-1-sdf@google.com> X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog Subject: [PATCH bpf-next v5 2/2] bpftool: show flow_dissector attachment status From: Stanislav Fomichev To: netdev@vger.kernel.org, bpf@vger.kernel.org Cc: davem@davemloft.net, ast@kernel.org, daniel@iogearbox.net, Stanislav Fomichev , Quentin Monnet , Jakub Kicinski Sender: bpf-owner@vger.kernel.org Precedence: bulk List-Id: netdev.vger.kernel.org Right now there is no way to query whether BPF flow_dissector program is attached to a network namespace or not. In previous commit, I added support for querying that info, show it when doing `bpftool net`: $ bpftool prog loadall ./bpf_flow.o \ /sys/fs/bpf/flow type flow_dissector \ pinmaps /sys/fs/bpf/flow $ bpftool prog 3: flow_dissector name _dissect tag 8c9e917b513dd5cc gpl loaded_at 2019-04-23T16:14:48-0700 uid 0 xlated 656B jited 461B memlock 4096B map_ids 1,2 btf_id 1 ... $ bpftool net -j [{"xdp":[],"tc":[],"flow_dissector":[]}] $ bpftool prog attach pinned \ /sys/fs/bpf/flow/flow_dissector flow_dissector $ bpftool net -j [{"xdp":[],"tc":[],"flow_dissector":["id":3]}] Doesn't show up in a different net namespace: $ ip netns add test $ ip netns exec test bpftool net -j [{"xdp":[],"tc":[],"flow_dissector":[]}] Non-json output: $ bpftool net xdp: tc: flow_dissector: id 3 v2: * initialization order (Jakub Kicinski) * clear errno for batch mode (Quentin Monnet) Signed-off-by: Stanislav Fomichev Reviewed-by: Quentin Monnet Reviewed-by: Jakub Kicinski --- tools/bpf/bpftool/net.c | 54 +++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/tools/bpf/bpftool/net.c b/tools/bpf/bpftool/net.c index db0e7de49d49..67e99c56bc88 100644 --- a/tools/bpf/bpftool/net.c +++ b/tools/bpf/bpftool/net.c @@ -3,6 +3,7 @@ #define _GNU_SOURCE #include +#include #include #include #include @@ -12,6 +13,8 @@ #include #include #include +#include +#include #include #include @@ -48,6 +51,10 @@ struct bpf_filter_t { int ifindex; }; +struct bpf_attach_info { + __u32 flow_dissector_id; +}; + static int dump_link_nlmsg(void *cookie, void *msg, struct nlattr **tb) { struct bpf_netdev_t *netinfo = cookie; @@ -180,8 +187,45 @@ static int show_dev_tc_bpf(int sock, unsigned int nl_pid, return 0; } +static int query_flow_dissector(struct bpf_attach_info *attach_info) +{ + __u32 attach_flags; + __u32 prog_ids[1]; + __u32 prog_cnt; + int err; + int fd; + + fd = open("/proc/self/ns/net", O_RDONLY); + if (fd < 0) { + p_err("can't open /proc/self/ns/net: %d", + strerror(errno)); + return -1; + } + prog_cnt = ARRAY_SIZE(prog_ids); + err = bpf_prog_query(fd, BPF_FLOW_DISSECTOR, 0, + &attach_flags, prog_ids, &prog_cnt); + close(fd); + if (err) { + if (errno == EINVAL) { + /* Older kernel's don't support querying + * flow dissector programs. + */ + errno = 0; + return 0; + } + p_err("can't query prog: %s", strerror(errno)); + return -1; + } + + if (prog_cnt == 1) + attach_info->flow_dissector_id = prog_ids[0]; + + return 0; +} + static int do_show(int argc, char **argv) { + struct bpf_attach_info attach_info = {}; int i, sock, ret, filter_idx = -1; struct bpf_netdev_t dev_array; unsigned int nl_pid; @@ -199,6 +243,10 @@ static int do_show(int argc, char **argv) usage(); } + ret = query_flow_dissector(&attach_info); + if (ret) + return -1; + sock = libbpf_netlink_open(&nl_pid); if (sock < 0) { fprintf(stderr, "failed to open netlink sock\n"); @@ -227,6 +275,12 @@ static int do_show(int argc, char **argv) } NET_END_ARRAY("\n"); } + + NET_START_ARRAY("flow_dissector", "%s:\n"); + if (attach_info.flow_dissector_id > 0) + NET_DUMP_UINT("id", "id %u", attach_info.flow_dissector_id); + NET_END_ARRAY("\n"); + NET_END_OBJECT; if (json_output) jsonw_end_array(json_wtr);