Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp751561yba; Thu, 18 Apr 2019 08:59:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqyq8NFmGda03mFzdvhonb9VYF9hp+UDiJ7HG+dPvU6E3URVRne3zKWdD6PMUC3J71Ll6S4a X-Received: by 2002:a17:902:f084:: with SMTP id go4mr93448302plb.235.1555603194429; Thu, 18 Apr 2019 08:59:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1555603194; cv=none; d=google.com; s=arc-20160816; b=YPGrdqJrkg772BRp9LTI5xDG69ZUHf28hgXltJMKISWEh+afVJ2mdYNOsDRYGWVI1/ rAsHWo7FzjOvRJ8pH74u9azNKGw7qezZ/A1y8jMugClR4w6KpxZ5OghpQXMwfaPsc+U5 OKAneRCpZnXxaa8WPV8orWOfD+FX+6oobzU7wYwCEO93BOUoyeV/qyDWO7eVjW3mqs02 3/lwwlmw2JiIK+NZgORM3Qv+S40CTvIbWgRuew2G+8Fy5e3vjuVbGiNG0EIR58+hmeak Czh/Vmx/s4jG4f68jQxM52lUkPHcME9gmytY+aiqJu+Spp2YlKzwegOD1NG3GhuyE43O m3MQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :message-id:date:subject:cc:to:from:dkim-signature; bh=mRIa7YtbcBQn0bTD/QeYRSxAmMEbW6gakCQU+eJmUrM=; b=B9VC7L/ags7b+aeTzZh2izOe1sZGWYhjcv3BT6nveD7GBAvXv/+4bu91Jt37Ru5Zki vPIcQP4bbG5tDqsapWcO1jalxv0HnE3GFz3Y0J+UbLN8ZmI2BeAQOXG+0kbxFpyOxEFK Q+iTrg9PMiN6yPaJCumE4E0tFxPFAHAyBEFCLGv2qUaRLmxjwb5AjxpKHzbMbTioxJpP D223g8m5aCrU0ZinomwVgP/7LtIMDV6fwbaThxLLR0Yv5987vaon1NZkxNodqPUZb4/e k5jBVTPN2+y7576OFyFgK3atPoxjgyZu4GXp71pd+hwlHOK3brEdJgqFYOI0B4szo2ni hNSA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=QipZTpMb; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 36si2083898pgn.272.2019.04.18.08.59.39; Thu, 18 Apr 2019 08:59:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@gmail.com header.s=20161025 header.b=QipZTpMb; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389594AbfDRP5R (ORCPT + 99 others); Thu, 18 Apr 2019 11:57:17 -0400 Received: from mail-ed1-f67.google.com ([209.85.208.67]:36581 "EHLO mail-ed1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731317AbfDRP5Q (ORCPT ); Thu, 18 Apr 2019 11:57:16 -0400 Received: by mail-ed1-f67.google.com with SMTP id u57so2234272edm.3; Thu, 18 Apr 2019 08:57:14 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=sender:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=mRIa7YtbcBQn0bTD/QeYRSxAmMEbW6gakCQU+eJmUrM=; b=QipZTpMbL3qfg5Cvba0enefPaLwhFSwiZLz9v42+AD9CDIZl9C/78gdXAVlrqxyAfF HW1MrLIVK6sGaqb1TjmElO4hijQlOBtuVePA2WuP4RYinOE3E1p7HrVMYPoj9viQkrnt a4HWNsfWNzpiGF3qXx6KDeo9BMObMCaEVN+wT9QLm2kzvXp9qIcmao5GwHxbsj3QD4pk w2DNkxwud99SEzF9or8FUdMn0uiWkf1HSUKY1yO9GmvihkFyhke9wTQ3R5Vmxyh8GoZe RTna5jKuMkTgnGNGUO987xIUF8U32NXCheBHymyeaFIjY8KrFBypdGVcXfam2iMqyWqn 60tg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:sender:from:to:cc:subject:date:message-id :mime-version:content-transfer-encoding; bh=mRIa7YtbcBQn0bTD/QeYRSxAmMEbW6gakCQU+eJmUrM=; b=jbjLQdIGzmowxNjNJl9D7GuEhQ6l5nNhoAr9QcrqtRyXiuc3GY4Os/7tctvgmReEHY ot76EXm6XtdgOVVmwWW597DJiqRvTo0Nee8eRH4wmW2wMEgeQUSqcaTJb6D0ReK7TVrD CtuL9qFYM/6GbPH0s/954cwytFXF0dh4xaXCZtaWuklTAx7+ujOTUC155vb6Ixn5mSa4 boYfgXeUu56HHwQA0StdYfif7KBJYOcY6JKX7NnNMviSBcPAw+DGAcx7212HH/3GIGz1 eAG682rNbcVtmWf89roSAvbIFaQt8jTVfP10RHxcv+SyDLWq9jbCXw+ZuA50p99cbYYH dH+Q== X-Gm-Message-State: APjAAAXg+9nkYjt3k6tngfWtuDxL/GLajo3/j/PKi4XgxlKenYcwsT8j T7Ch1s5vr/zEvPDa5XA159c= X-Received: by 2002:a50:e61a:: with SMTP id y26mr46513128edm.157.1555603033989; Thu, 18 Apr 2019 08:57:13 -0700 (PDT) Received: from neptune.fritz.box ([178.19.216.175]) by smtp.gmail.com with ESMTPSA id 31sm591274edf.18.2019.04.18.08.57.12 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Apr 2019 08:57:13 -0700 (PDT) From: Alban Crequy X-Google-Original-From: Alban Crequy To: john.fastabend@gmail.com, ast@kernel.org, daniel@iogearbox.net Cc: bpf@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, alban@kinvolk.io, iago@kinvolk.io Subject: [PATCH bpf-next v2 1/3] bpf: sock ops: add netns ino and dev in bpf context Date: Thu, 18 Apr 2019 17:56:50 +0200 Message-Id: <20190418155652.22181-1-alban@kinvolk.io> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Alban Crequy sockops programs can now access the network namespace inode and device via (struct bpf_sock_ops)->netns_ino and ->netns_dev. This can be useful to apply different policies on different network namespaces. In the unlikely case where network namespaces are not compiled in (CONFIG_NET_NS=n), the verifier will not allow access to ->netns_*. The generated BPF bytecode for netns_ino is loading the correct inode number at the time of execution. However, the generated BPF bytecode for netns_dev is loading an immediate value determined at BPF-load-time by looking at the initial network namespace. In practice, this works because all netns currently use the same virtual device. If this was to change, this code would need to be updated too. Signed-off-by: Alban Crequy --- Changes since v1: - add netns_dev (review from Alexei) --- include/uapi/linux/bpf.h | 2 ++ net/core/filter.c | 70 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 72 insertions(+) diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index eaf2d3284248..f4f841dde42c 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -3213,6 +3213,8 @@ struct bpf_sock_ops { __u32 sk_txhash; __u64 bytes_received; __u64 bytes_acked; + __u64 netns_dev; + __u64 netns_ino; }; /* Definitions for bpf_sock_ops_cb_flags */ diff --git a/net/core/filter.c b/net/core/filter.c index 1833926a63fc..93e3429603d7 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -75,6 +75,8 @@ #include #include #include +#include +#include /** * sk_filter_trim_cap - run a packet through a socket filter @@ -6774,6 +6776,15 @@ static bool sock_ops_is_valid_access(int off, int size, } } else { switch (off) { + case offsetof(struct bpf_sock_ops, netns_dev): + case offsetof(struct bpf_sock_ops, netns_ino): +#ifdef CONFIG_NET_NS + if (size != sizeof(__u64)) + return false; +#else + return false; +#endif + break; case bpf_ctx_range_till(struct bpf_sock_ops, bytes_received, bytes_acked): if (size != sizeof(__u64)) @@ -7660,6 +7671,11 @@ static u32 sock_addr_convert_ctx_access(enum bpf_access_type type, return insn - insn_buf; } +static struct ns_common *sockops_netns_cb(void *private_data) +{ + return &init_net.ns; +} + static u32 sock_ops_convert_ctx_access(enum bpf_access_type type, const struct bpf_insn *si, struct bpf_insn *insn_buf, @@ -7668,6 +7684,10 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type, { struct bpf_insn *insn = insn_buf; int off; + struct inode *ns_inode; + struct path ns_path; + __u64 netns_dev; + void *res; /* Helper macro for adding read access to tcp_sock or sock fields. */ #define SOCK_OPS_GET_FIELD(BPF_FIELD, OBJ_FIELD, OBJ) \ @@ -7914,6 +7934,56 @@ static u32 sock_ops_convert_ctx_access(enum bpf_access_type type, SOCK_OPS_GET_OR_SET_FIELD(sk_txhash, sk_txhash, struct sock, type); break; + + case offsetof(struct bpf_sock_ops, netns_dev): +#ifdef CONFIG_NET_NS + /* We get the netns_dev at BPF-load-time and not at + * BPF-exec-time. We assume that netns_dev is a constant. + */ + res = ns_get_path_cb(&ns_path, sockops_netns_cb, NULL); + if (IS_ERR(res)) { + netns_dev = 0; + } else { + ns_inode = ns_path.dentry->d_inode; + netns_dev = new_encode_dev(ns_inode->i_sb->s_dev); + } +#else + netns_dev = 0; +#endif + *insn++ = BPF_MOV64_IMM(si->dst_reg, netns_dev); + break; + + case offsetof(struct bpf_sock_ops, netns_ino): +#ifdef CONFIG_NET_NS + /* Loading: sk_ops->sk->__sk_common.skc_net.net->ns.inum + * Type: (struct bpf_sock_ops_kern *) + * ->(struct sock *) + * ->(struct sock_common) + * .possible_net_t + * .(struct net *) + * ->(struct ns_common) + * .(unsigned int) + */ + BUILD_BUG_ON(offsetof(struct sock, __sk_common) != 0); + BUILD_BUG_ON(offsetof(possible_net_t, net) != 0); + *insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF( + struct bpf_sock_ops_kern, sk), + si->dst_reg, si->src_reg, + offsetof(struct bpf_sock_ops_kern, sk)); + *insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF( + possible_net_t, net), + si->dst_reg, si->dst_reg, + offsetof(struct sock_common, skc_net)); + *insn++ = BPF_LDX_MEM(BPF_FIELD_SIZEOF( + struct ns_common, inum), + si->dst_reg, si->dst_reg, + offsetof(struct net, ns) + + offsetof(struct ns_common, inum)); +#else + *insn++ = BPF_MOV64_IMM(si->dst_reg, 0); +#endif + break; + } return insn - insn_buf; } -- 2.20.1