From patchwork Wed Apr 24 21:31:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 1090480 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="vI82nSIX"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44qD696MzNz9s3l for ; Thu, 25 Apr 2019 07:31:45 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730845AbfDXVbo (ORCPT ); Wed, 24 Apr 2019 17:31:44 -0400 Received: from mail-oi1-f202.google.com ([209.85.167.202]:47409 "EHLO mail-oi1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730761AbfDXVbo (ORCPT ); Wed, 24 Apr 2019 17:31:44 -0400 Received: by mail-oi1-f202.google.com with SMTP id j5so8182516oif.14 for ; Wed, 24 Apr 2019 14:31:44 -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=uMtp7LKm5ZrgglhLvgXAGqa2KgxyCfqfcKKjsIpeGmg=; b=vI82nSIXuRNuhn2igYNrN9XN3hw2wZyexMs1EdZHEbFsJiqDXrXU8VDBQlGF/Ps7ny HxiEZM7t5SPeRIpHo1UxjKLLt3ae/JKrmrkO5Ohs/hSSXX8CUtHIwTxoBHzBPUgowbfT JjjPiEheNPb0g57g/7wHzig7bBxuvui5xiZj/yq41iACGvDTZV+Okg7alQ9J7p9TFMfm ZnQ7QUSS5dFzQKmC/lcYA2DW1QLsP6ItoVwucy4tzOdyffFqDbQLQBCyFAdOJryrUajG DWgf1WyR4q7vGrC+acQKoO2WUGlR9drWhQj3HSEsJjuK5DdW291JUiHVq/dxP50h9vca qypQ== 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=uMtp7LKm5ZrgglhLvgXAGqa2KgxyCfqfcKKjsIpeGmg=; b=KWdlxlxuhAVxjOO74GuWVayS1eFl/0icyCMrbqNeW5NTihdpujAK38dDHIYN+w8rZL wyxmKt3oxcLI8IjSFE8C8vWRPOAqAK/ETvU1O52GzCqYioylyx5uTNK8D7jWPl+v1rq8 Q5GvfsEdmbmQT/5PKvN3wBZkV5JhJVOUWzvuTKQKtLRSd+6iu3POpGg/5EGVgz8Frc+8 sSjqNpnHhm8BiJBKuCIGmjXv49ygs3CxmX/ZsaRzp8qpTs71T7UmQ8wWmd/CI3392bJd jdFRPid7oKgZ8SFbJ+SJT5Z8rYXxr883kegdr+pz/CXdD+QiwrLjRPT4cRhrbJ34t5mC vCkA== X-Gm-Message-State: APjAAAW+wQyhrgXfqCCsnqqnVC7K9i4NAcDd8aFQMTnNDOS1kxJ0QT0c bZsqCbWYUQsGAKtQmDjVE2skNVQ= X-Google-Smtp-Source: APXvYqzuqk0wBOzX6D1g5XWILjixOFVjNYwKxBs5DMgirsNTZfLOOVKocNA0O8WcWq1sO/ehNLIfeOk= X-Received: by 2002:aca:d595:: with SMTP id m143mr862555oig.31.1556141503531; Wed, 24 Apr 2019 14:31:43 -0700 (PDT) Date: Wed, 24 Apr 2019 14:31:40 -0700 Message-Id: <20190424213141.201134-1-sdf@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog Subject: [PATCH bpf-next v4 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, jakub.kicinski@netronome.com, quentin.monnet@netronome.com, 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. 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 | 46 +++++++++++++++++++++++++++++++++++++++ 3 files changed, 56 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..27466e54ad3a 100644 --- a/net/core/flow_dissector.c +++ b/net/core/flow_dissector.c @@ -65,6 +65,52 @@ 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; + int ret = 0; + + 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(); + + if (copy_to_user(&uattr->query.attach_flags, &flags, sizeof(flags))) { + ret = -EFAULT; + goto out; + } + if (copy_to_user(&uattr->query.prog_cnt, &prog_cnt, sizeof(prog_cnt))) { + ret = -EFAULT; + goto out; + } + + if (!attr->query.prog_cnt || !prog_ids || !prog_cnt) + goto out; + + if (copy_to_user(prog_ids, &prog_id, sizeof(u32))) { + ret = -EFAULT; + goto out; + } + +out: + put_net(net); + return ret; +} + int skb_flow_dissector_bpf_prog_attach(const union bpf_attr *attr, struct bpf_prog *prog) { From patchwork Wed Apr 24 21:31:41 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 1090482 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="LXXnN4OM"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 44qD6D0CRlz9s3l for ; Thu, 25 Apr 2019 07:31:48 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731033AbfDXVbr (ORCPT ); Wed, 24 Apr 2019 17:31:47 -0400 Received: from mail-pl1-f201.google.com ([209.85.214.201]:56546 "EHLO mail-pl1-f201.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726474AbfDXVbr (ORCPT ); Wed, 24 Apr 2019 17:31:47 -0400 Received: by mail-pl1-f201.google.com with SMTP id gn10so13155354plb.23 for ; Wed, 24 Apr 2019 14:31:46 -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=1EjWmQcKxn9x5KSLal9ZUpeWIYKWWx06r7Cg/o3+fR8=; b=LXXnN4OMmV9e+mG7FePNk6u6Iln7RB1APjSVO0yWgr4bk5wCgBpUCI9sB2TJfB3zGS YdDgATqrgOs4TVqRZOh+9RedXgmKMIqFLLnhZf8MiWDliuvX5OvOGX78Z9JpeIzjObEn T7+WTbwrnqBeD9UK9OA7z4c92ZjCJwJpyzjOTdW9CtS/kimZUFKQRks14Dm+RnnqFe7P 0Vz38wlbzvx/tE6u36k9AjiYf1KeH/mbnjtHZ+vrvUIX2wMoizLtAWwsqpKiQZRIgo0X 8YkzE3ADlqcRi8LqFvcYklhA1nSYlB2O3W10e9rnF3qNB1SX9L+aPn0IsHX9K2qDU17Y V5mQ== 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=1EjWmQcKxn9x5KSLal9ZUpeWIYKWWx06r7Cg/o3+fR8=; b=RWFwnBL+IE3lIl2fPZmZBSUk7dUgbRIStruE6TRqaHYuwplUzJQ0nj8TjmNWGy191Q jHvcjKA2f6Fr9VDyFpTtOypcFeaJAe0p51dXyT3QGHCVBR1XWQNF8goqr+7EeRJT1Y6h vJqzQZUkWIgk2xGrouqPVw5lh7BmOnYuoaSFdv9Rjsfn4hAQJzG+evTiCkZK0VCkgUhN 0XDRdhUK5Ozjni4cSLaAWD+DIC+feM6m3MRrjTMoFhGoNJEgfw9PtumoJzB2xA2Twihi g9WMu5iUDDlFMyWvqXY7llWfbYb+dKFiJ1LBX4qMmaLKbWh3etrb45ABepk/Yzru2ZUH Z1cQ== X-Gm-Message-State: APjAAAXLdDhtkzAQtv3mI5ULYAuwC7CACxyUHoJQQy0JpogG9d3Sc+vH 3Abq0BL6fkL43p2C4g5pnFHVWtY= X-Google-Smtp-Source: APXvYqx3q9tKd+XZIofazqF6ITdF5rGA7V0mFcXKWLURdS5xiZAnbh15rjVzEzA8aDKoO0vVVSb1q/s= X-Received: by 2002:a65:480c:: with SMTP id h12mr32478341pgs.266.1556141505949; Wed, 24 Apr 2019 14:31:45 -0700 (PDT) Date: Wed, 24 Apr 2019 14:31:41 -0700 In-Reply-To: <20190424213141.201134-1-sdf@google.com> Message-Id: <20190424213141.201134-2-sdf@google.com> Mime-Version: 1.0 References: <20190424213141.201134-1-sdf@google.com> X-Mailer: git-send-email 2.21.0.593.g511ec345e18-goog Subject: [PATCH bpf-next v4 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, jakub.kicinski@netronome.com, quentin.monnet@netronome.com, Stanislav Fomichev 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);