From patchwork Wed Oct 9 15:26:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Antonio Neira Bustos X-Patchwork-Id: 1173808 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="JQUFbOOr"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46pJ3X0TVwz9sN1 for ; Thu, 10 Oct 2019 02:26:48 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731669AbfJIP0r (ORCPT ); Wed, 9 Oct 2019 11:26:47 -0400 Received: from mail-qt1-f194.google.com ([209.85.160.194]:37961 "EHLO mail-qt1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729644AbfJIP0q (ORCPT ); Wed, 9 Oct 2019 11:26:46 -0400 Received: by mail-qt1-f194.google.com with SMTP id j31so3995968qta.5; Wed, 09 Oct 2019 08:26:45 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=p5dmhqgXzU0PAo+f6c2oMinYRJIOzYqFfyKVcX2FFw4=; b=JQUFbOOr0m2S/6J7hF2a2oUAuXvKLCHe0lUxqbfqt+Lj9OurgMvglKCH/Xf28yA559 h2uD5C4Jtom4azADB4I3xcuDaSsuMa2w5phBRq5BXnn9s+Bwo34m2pEzZGLkMGfHaQPk fhJytCBvuTeIqr4WB907sZX6jNpUUpSqCzpDMrfoEF68bzraO0uCGUjhm1q1Ri7QAkHD W2KjA5GDtSD3I3XrivH3SdcbvJGKJ9X50z+8gdKqXp1joVyyZmFPhjm57Kj+ep3h/Iz/ RhYB//ji6wY2QyoqmzrQHw7JUMIynY2vQ7QZP56xQ4k5OoxsIl6OQT6Q5fB2Rd3s7mLf 36FA== 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:mime-version:content-transfer-encoding; bh=p5dmhqgXzU0PAo+f6c2oMinYRJIOzYqFfyKVcX2FFw4=; b=MTPE9JbJb+MVE3FM+gEsSL7xqw+FT26pyUGh8VV9kzo+UFfXCm5mripVHBDRP6E70E NJKbkhiRzR+5fBVSZQqsJAcAWelGkJSn2qvo2IxAvDkR0Qf7s7H+lXBNJ2kBRnbo08YR ca2K3WuYvv98AgbJUhxtqItxq9pbgoSoEwPcLiNhCmgzbeGzkYthln1rspF80Jw9JQaq L2jtJLZHj/5fHMR/vOKzGYio6cKPx1KbQ4JLKhv8FQc5uNcqdb5OnOtVRDSPlcdv08aN 8Z7TGoeehJxoZtEujVvMbBhsOuNMD2EsBwHO8ROdBGJviihYJ7E4jqUsmChbkS1cXsPk mCjw== X-Gm-Message-State: APjAAAVBtHYo5soZvlBF4qhWYtHtXbgF5xaWAp79QCQbL40GvViVk+tf ddYn0jBKp7nw+UftLT1G9yYZ1z67of0= X-Google-Smtp-Source: APXvYqyUk6o30HfmfZPYSqRb/QMCORCLqqUcdLCq96cJIugL8cxFGwuq8Z65RgAmiRIXtQ8i3/qM6Q== X-Received: by 2002:a0c:fe02:: with SMTP id x2mr4111814qvr.117.1570634805071; Wed, 09 Oct 2019 08:26:45 -0700 (PDT) Received: from ebpf00.byteswizards.com ([190.162.109.190]) by smtp.googlemail.com with ESMTPSA id l189sm1049895qke.69.2019.10.09.08.26.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2019 08:26:44 -0700 (PDT) From: Carlos Neira To: netdev@vger.kernel.org Cc: yhs@fb.com, ebiederm@xmission.com, brouer@redhat.com, bpf@vger.kernel.org, cneirabustos@gmail.com Subject: [PATCH v13 1/4] fs/nsfs.c: added ns_match Date: Wed, 9 Oct 2019 12:26:29 -0300 Message-Id: <20191009152632.14218-2-cneirabustos@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191009152632.14218-1-cneirabustos@gmail.com> References: <20191009152632.14218-1-cneirabustos@gmail.com> MIME-Version: 1.0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org ns_match returns true if the namespace inode and dev_t matches the ones provided by the caller. Signed-off-by: Carlos Neira --- fs/nsfs.c | 8 ++++++++ include/linux/proc_ns.h | 2 ++ 2 files changed, 10 insertions(+) diff --git a/fs/nsfs.c b/fs/nsfs.c index a0431642c6b5..256f6295d33d 100644 --- a/fs/nsfs.c +++ b/fs/nsfs.c @@ -245,6 +245,14 @@ struct file *proc_ns_fget(int fd) return ERR_PTR(-EINVAL); } +/* Returns true if current namespace matches dev/ino. + */ +bool ns_match(const struct ns_common *ns, dev_t dev, ino_t ino) +{ + return ((ns->inum == ino) && (nsfs_mnt->mnt_sb->s_dev == dev)); +} + + static int nsfs_show_path(struct seq_file *seq, struct dentry *dentry) { struct inode *inode = d_inode(dentry); diff --git a/include/linux/proc_ns.h b/include/linux/proc_ns.h index d31cb6215905..1da9f33489f3 100644 --- a/include/linux/proc_ns.h +++ b/include/linux/proc_ns.h @@ -82,6 +82,8 @@ typedef struct ns_common *ns_get_path_helper_t(void *); extern void *ns_get_path_cb(struct path *path, ns_get_path_helper_t ns_get_cb, void *private_data); +extern bool ns_match(const struct ns_common *ns, dev_t dev, ino_t ino); + extern int ns_get_name(char *buf, size_t size, struct task_struct *task, const struct proc_ns_operations *ns_ops); extern void nsfs_init(void); From patchwork Wed Oct 9 15:26:30 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Antonio Neira Bustos X-Patchwork-Id: 1173810 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=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="UuQPXmfc"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46pJ3Z2PBhz9sDQ for ; Thu, 10 Oct 2019 02:26:50 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731671AbfJIP0t (ORCPT ); Wed, 9 Oct 2019 11:26:49 -0400 Received: from mail-qt1-f193.google.com ([209.85.160.193]:39242 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729644AbfJIP0t (ORCPT ); Wed, 9 Oct 2019 11:26:49 -0400 Received: by mail-qt1-f193.google.com with SMTP id n7so3982796qtb.6; Wed, 09 Oct 2019 08:26:48 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=gLrccfQSPN88or4knKZ/oRltVurvWLGNIQNyDLr0FI8=; b=UuQPXmfcvH+zzw+BI1BGgQg5eQ4kugkIN4ete++I1hWLzUur6jRwweIgwDk9COApju q3Rny+Kt8rwTyL/oVBjnN3zbhvu2vZelJF+MpLJdXSMltJllg6y2I0YACw4K2z4fiRqu W9ZvyjdmW8HnYyYH3xgaDxrg9DpWk+0yYcKgG3XKAzhvVr48yeu37ziN1kVyV4dCXp4d ETknAwq7CeSpRZPbgwBd+3nGhoSM0CLj60A+C7kZwhnoBcJjzMaoYZ9iYBVw0DQvD80R f0aDYKko0CNzj9LgagmrQJiCg+hPplUn8tIZmYzRybf2I2HVpwTfuli91E8/l69nCLq1 jkWA== 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:mime-version:content-transfer-encoding; bh=gLrccfQSPN88or4knKZ/oRltVurvWLGNIQNyDLr0FI8=; b=fViTs1sQ8CbDsKypBX+vdvhH8I4LH7GeS12RSWQV7bHC1El4g77Mg5FVE1bTM4cw+S GX4rpaT1/zuj7f+hVNvseF1NzOGE5J1K7ysvgDAtYefRF7M+ArAJBiOL8m7PHFGPdIGn 82pGjXVc4dvIwOdKXU0rTjkBOU5hlWb4wumDidLPoIzsEQeqXra/KPZ24C+nNJunSA1N 2lVU4MZCato9IYI/1/F4d5qtOrls1oQXxw7L9T1AJIWi1mlrzPCdtIe4MangZ49Yx14A WsEF70oLtmby8ZfuAGZFBG6fjd5r5BvyLCFubCGGzkBVUR9AOm58XQDq48+uOyS9aDPC sZEA== X-Gm-Message-State: APjAAAVe53xreeiHXc4i9OoQc9qd2X/bQjmUZCfHyUOUn2GuPwM1r8mj 5KlbX71SWkpey6H6ehNh9+bjGUExIJE= X-Google-Smtp-Source: APXvYqyW/c0Jf6ELYYvxJ6woASryeA3+IxoX0qqDSRG7VcW2IKpMy8vgGmmT6FRnjZoEeO1ti/4RnQ== X-Received: by 2002:a05:6214:3ce:: with SMTP id ce14mr4108090qvb.174.1570634807277; Wed, 09 Oct 2019 08:26:47 -0700 (PDT) Received: from ebpf00.byteswizards.com ([190.162.109.190]) by smtp.googlemail.com with ESMTPSA id l189sm1049895qke.69.2019.10.09.08.26.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2019 08:26:46 -0700 (PDT) From: Carlos Neira To: netdev@vger.kernel.org Cc: yhs@fb.com, ebiederm@xmission.com, brouer@redhat.com, bpf@vger.kernel.org, cneirabustos@gmail.com Subject: [PATCH v13 2/4] bpf: added new helper bpf_get_ns_current_pid_tgid Date: Wed, 9 Oct 2019 12:26:30 -0300 Message-Id: <20191009152632.14218-3-cneirabustos@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191009152632.14218-1-cneirabustos@gmail.com> References: <20191009152632.14218-1-cneirabustos@gmail.com> MIME-Version: 1.0 Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org New bpf helper bpf_get_ns_current_pid_tgid, This helper will return pid and tgid from current task which namespace matches dev_t and inode number provided, this will allows us to instrument a process inside a container. Signed-off-by: Carlos Neira --- include/linux/bpf.h | 1 + include/uapi/linux/bpf.h | 22 +++++++++++++++++++- kernel/bpf/core.c | 1 + kernel/bpf/helpers.c | 43 ++++++++++++++++++++++++++++++++++++++++ kernel/trace/bpf_trace.c | 2 ++ 5 files changed, 68 insertions(+), 1 deletion(-) diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 5b9d22338606..231001475504 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -1055,6 +1055,7 @@ extern const struct bpf_func_proto bpf_get_local_storage_proto; extern const struct bpf_func_proto bpf_strtol_proto; extern const struct bpf_func_proto bpf_strtoul_proto; extern const struct bpf_func_proto bpf_tcp_sock_proto; +extern const struct bpf_func_proto bpf_get_ns_current_pid_tgid_proto; /* Shared helpers among cBPF and eBPF. */ void bpf_user_rnd_init_once(void); diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h index 77c6be96d676..6ad3f2abf00d 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -2750,6 +2750,19 @@ union bpf_attr { * **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 + * + * u64 bpf_get_ns_current_pid_tgid(struct *bpf_pidns_info, u32 size) + * Return + * 0 on success, values for pid and tgid from nsinfo will be as seen + * from the namespace that matches dev and inum from nsinfo. + * + * On failure, the returned value is one of the following: + * + * **-EINVAL** if dev and inum supplied don't match dev_t and inode number + * with nsfs of current task, or if dev conversion to dev_t lost high bits. + * + * **-ENOENT** if /proc/self/ns does not exists. + * */ #define __BPF_FUNC_MAPPER(FN) \ FN(unspec), \ @@ -2862,7 +2875,8 @@ union bpf_attr { FN(sk_storage_get), \ FN(sk_storage_delete), \ FN(send_signal), \ - FN(tcp_gen_syncookie), + FN(tcp_gen_syncookie), \ + FN(get_ns_current_pid_tgid), /* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call @@ -3613,4 +3627,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { + __u64 dev; + __u64 inum; + __u32 pid; + __u32 tgid; +}; #endif /* _UAPI__LINUX_BPF_H__ */ diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 66088a9e9b9e..b2fd5358f472 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -2042,6 +2042,7 @@ const struct bpf_func_proto bpf_get_current_uid_gid_proto __weak; const struct bpf_func_proto bpf_get_current_comm_proto __weak; const struct bpf_func_proto bpf_get_current_cgroup_id_proto __weak; const struct bpf_func_proto bpf_get_local_storage_proto __weak; +const struct bpf_func_proto bpf_get_ns_current_pid_tgid_proto __weak; const struct bpf_func_proto * __weak bpf_get_trace_printk_proto(void) { diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c index 5e28718928ca..78a1ce7726aa 100644 --- a/kernel/bpf/helpers.c +++ b/kernel/bpf/helpers.c @@ -11,6 +11,8 @@ #include #include #include +#include +#include #include "../../lib/kstrtox.h" @@ -487,3 +489,44 @@ const struct bpf_func_proto bpf_strtoul_proto = { .arg4_type = ARG_PTR_TO_LONG, }; #endif + +BPF_CALL_2(bpf_get_ns_current_pid_tgid, struct bpf_pidns_info *, nsdata, u32, + size) +{ + struct task_struct *task = current; + struct pid_namespace *pidns; + int err = -EINVAL; + + if (unlikely(size != sizeof(struct bpf_pidns_info))) + goto clear; + + if ((u64)(dev_t)nsdata->dev != nsdata->dev) + goto clear; + + if (unlikely(!task)) + goto clear; + + pidns = task_active_pid_ns(task); + if (unlikely(!pidns)) { + err = -ENOENT; + goto clear; + } + + if (!ns_match(&pidns->ns, (dev_t)nsdata->dev, nsdata->inum)) + goto clear; + + nsdata->pid = task_pid_nr_ns(task, pidns); + nsdata->tgid = task_tgid_nr_ns(task, pidns); + return 0; +clear: + memset((void *)nsdata, 0, (size_t) size); + return err; +} + +const struct bpf_func_proto bpf_get_ns_current_pid_tgid_proto = { + .func = bpf_get_ns_current_pid_tgid, + .gpl_only = false, + .ret_type = RET_INTEGER, + .arg1_type = ARG_PTR_TO_UNINIT_MEM, + .arg2_type = ARG_CONST_SIZE, +}; diff --git a/kernel/trace/bpf_trace.c b/kernel/trace/bpf_trace.c index 44bd08f2443b..32331a1dcb6d 100644 --- a/kernel/trace/bpf_trace.c +++ b/kernel/trace/bpf_trace.c @@ -735,6 +735,8 @@ tracing_func_proto(enum bpf_func_id func_id, const struct bpf_prog *prog) #endif case BPF_FUNC_send_signal: return &bpf_send_signal_proto; + case BPF_FUNC_get_ns_current_pid_tgid: + return &bpf_get_ns_current_pid_tgid_proto; default: return NULL; } From patchwork Wed Oct 9 15:26:31 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Antonio Neira Bustos X-Patchwork-Id: 1173812 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=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="GymUyy+u"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46pJ3d0m1Zz9sDB for ; Thu, 10 Oct 2019 02:26:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731675AbfJIP0w (ORCPT ); Wed, 9 Oct 2019 11:26:52 -0400 Received: from mail-qt1-f195.google.com ([209.85.160.195]:40661 "EHLO mail-qt1-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729644AbfJIP0w (ORCPT ); Wed, 9 Oct 2019 11:26:52 -0400 Received: by mail-qt1-f195.google.com with SMTP id m61so3975158qte.7; Wed, 09 Oct 2019 08:26:50 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=CLlmsJf3ShLtGT0uefsGsqKyq1wDjDG1ATRu3k+5ehM=; b=GymUyy+uyrs6IokUbSZ9lSqhiUT6NLjqevsaEoHoACjj0NAjmJT/5oPHhbUAMIGazS 8BQ7c02FRNwp5k+PUvWlRLmsQt5yd9+89s7if5X2WNUyCL21ugw8lOPQZDffXB6EXUhj JmFjsJyBppCgAQv4p6TsJQu/RbJZMJy/3gnGgs8nyHdZqon58odCNjJxg9ZIlfiYCnK/ m0hzQLufv4JzcEUEoVL7IZARxjpMbYF8lZnJjIFFXpbIV47tOF72ZBJq8Q75XG5ldHfO UY6pT+Uj1IfZCvN5H7I1CGaDcfuVXnniiG//ZA4OR8jrY4ommLMD7GBEdkHwrGKaEQKo gUiA== 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:mime-version:content-transfer-encoding; bh=CLlmsJf3ShLtGT0uefsGsqKyq1wDjDG1ATRu3k+5ehM=; b=YcsvReI78ToTu18DaS4rTtUdqmNrEYR6YXjD3jteuEGfpEfOjjyQAdgMqk8UCrp7xa DmQz/wRPwpN4pQrmyWf9oCar8LkmJixCZMdwKL6c/Kf9ZJbdnAAyV3v1WbdTn3sUeUi9 zu6YIToDuLa2NGgH0fPjfcTkO2C2oeWt5nMk5ey5um1XxeiMfj9wBnaQF2sQS6I/zBrW 5pM9wbL+UnHtKGmOIQWMK6CFhmzwNFAqzJ5UVHrI0qQtDxRzAfFN70OY+i10QNxjsKTt v6J57dt18DH+k9V/pLMEZ2b1MesSLfuR2MS+c3l+kyJD5pyEt9sHBOkeMzehp2ZYredp WpIw== X-Gm-Message-State: APjAAAX8R9+fMdI2JDwH9gvNtwET8MXKHLnLlVqQDNoYDzlr4IJbr9C2 AQtTBxOxhiN5y0p6bOzF5DV8E9LZ740= X-Google-Smtp-Source: APXvYqyv6+LY6ht60gQh7/CmqS05Q2eW8+mc1z1lfGIJNMoYbqsKilZb1ji255d9Bhioysb7Uj421g== X-Received: by 2002:ac8:750d:: with SMTP id u13mr4286544qtq.129.1570634809338; Wed, 09 Oct 2019 08:26:49 -0700 (PDT) Received: from ebpf00.byteswizards.com ([190.162.109.190]) by smtp.googlemail.com with ESMTPSA id l189sm1049895qke.69.2019.10.09.08.26.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2019 08:26:48 -0700 (PDT) From: Carlos Neira To: netdev@vger.kernel.org Cc: yhs@fb.com, ebiederm@xmission.com, brouer@redhat.com, bpf@vger.kernel.org, cneirabustos@gmail.com Subject: [PATCH v13 3/4] tools: Added bpf_get_ns_current_pid_tgid helper Date: Wed, 9 Oct 2019 12:26:31 -0300 Message-Id: <20191009152632.14218-4-cneirabustos@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191009152632.14218-1-cneirabustos@gmail.com> References: <20191009152632.14218-1-cneirabustos@gmail.com> MIME-Version: 1.0 Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org sync tools/include/uapi/linux/bpf.h to include new helper. Signed-off-by: Carlos Neira --- tools/include/uapi/linux/bpf.h | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 77c6be96d676..6ad3f2abf00d 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -2750,6 +2750,19 @@ union bpf_attr { * **-EOPNOTSUPP** kernel configuration does not enable SYN cookies * * **-EPROTONOSUPPORT** IP packet version is not 4 or 6 + * + * u64 bpf_get_ns_current_pid_tgid(struct *bpf_pidns_info, u32 size) + * Return + * 0 on success, values for pid and tgid from nsinfo will be as seen + * from the namespace that matches dev and inum from nsinfo. + * + * On failure, the returned value is one of the following: + * + * **-EINVAL** if dev and inum supplied don't match dev_t and inode number + * with nsfs of current task, or if dev conversion to dev_t lost high bits. + * + * **-ENOENT** if /proc/self/ns does not exists. + * */ #define __BPF_FUNC_MAPPER(FN) \ FN(unspec), \ @@ -2862,7 +2875,8 @@ union bpf_attr { FN(sk_storage_get), \ FN(sk_storage_delete), \ FN(send_signal), \ - FN(tcp_gen_syncookie), + FN(tcp_gen_syncookie), \ + FN(get_ns_current_pid_tgid), /* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call @@ -3613,4 +3627,10 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { + __u64 dev; + __u64 inum; + __u32 pid; + __u32 tgid; +}; #endif /* _UAPI__LINUX_BPF_H__ */ From patchwork Wed Oct 9 15:26:32 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Antonio Neira Bustos X-Patchwork-Id: 1173814 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=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="s/Mu1NbQ"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46pJ3g6tGQz9sDQ for ; Thu, 10 Oct 2019 02:26:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731682AbfJIP0z (ORCPT ); Wed, 9 Oct 2019 11:26:55 -0400 Received: from mail-qt1-f179.google.com ([209.85.160.179]:33356 "EHLO mail-qt1-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729644AbfJIP0y (ORCPT ); Wed, 9 Oct 2019 11:26:54 -0400 Received: by mail-qt1-f179.google.com with SMTP id r5so4036705qtd.0; Wed, 09 Oct 2019 08:26:52 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=vV8z+kyEhV7bZFxf5/wDgbHy4ySE7RP8RD7gYio5VZ4=; b=s/Mu1NbQKtr8r0/EFI72ij/HltRJezBNZN09sKYTK/WgE1rs1R6F6fnyIPpe9t/dVb HTOnDlEoMXWr9/Lzrd3YPA4+PAvM11PtZEq78J8C4lKKoczqXueQxLFz9zUvStA2t9nx MNah1xWy59iVOk2D1J2rRzDqC1+tV208AM8oSI2dc780AhqVbNDBtN/DJFhQ8QzN2Zmu erGGX/KAIz/E7Z06C+xi6xDC5NR+TCIrULcV8DUj1ZrpagNgCB6l4C2FajPqv1yOLspk OWRK4sacKrun4yqPgZw13gyq+TX2Dh/TYKHyKiPEv+SCBa8RlnpkIYJHGzo6T3zln6oK xjXA== 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:mime-version:content-transfer-encoding; bh=vV8z+kyEhV7bZFxf5/wDgbHy4ySE7RP8RD7gYio5VZ4=; b=Nyo/XMbDYVGOiCR8LG7qxVwCc7DHSGUMDw+RJCQt9oLYwmV9yv8cxoz/sh9UborMMP BoDAh5g5SgoxiTlzqZXyQlX1v6X/onSPeRMFK/h3JpaeVTpYdr9BoWp1To4N+05YQ1hC EXm6aj3B7b/O1gHIV6KyRj7RBRDQ/+s+opNclGB4bTWanAYFJ8bk8KXEXv4cpsZUtJSG 8ahs4ykQWEtxtxf4ALuTAZWkYA1AaPcDnQM1/I1LmY8f9WDW6adCD9A63OpFXj4C4Sjn 2Y2z+8EhhcBjWv3Ypfj7rab2gpgZNQvJUEW98MTtJG/2dcCbGiwi8LuitPtEXqgiumm8 PBpQ== X-Gm-Message-State: APjAAAUbrIG06cEO3HVTJhPfPknRxcnIvd6KtFwoP6p80N3SnyhThSQj V0cUJhlgpaFYGCZAjM4D6RtR8AgQzPo= X-Google-Smtp-Source: APXvYqz0ziUxgBi0wOQqVP/tHfoeVRmK+MV3fDrBUH7LuNdiy282Apbvsl3e8w5UT6y8P5QKxeopjg== X-Received: by 2002:ac8:664b:: with SMTP id j11mr4318355qtp.137.1570634811396; Wed, 09 Oct 2019 08:26:51 -0700 (PDT) Received: from ebpf00.byteswizards.com ([190.162.109.190]) by smtp.googlemail.com with ESMTPSA id l189sm1049895qke.69.2019.10.09.08.26.49 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2019 08:26:50 -0700 (PDT) From: Carlos Neira To: netdev@vger.kernel.org Cc: yhs@fb.com, ebiederm@xmission.com, brouer@redhat.com, bpf@vger.kernel.org, cneirabustos@gmail.com Subject: [PATCH v13 4/4] tools/testing/selftests/bpf: Add self-tests for new helper. Date: Wed, 9 Oct 2019 12:26:32 -0300 Message-Id: <20191009152632.14218-5-cneirabustos@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191009152632.14218-1-cneirabustos@gmail.com> References: <20191009152632.14218-1-cneirabustos@gmail.com> MIME-Version: 1.0 Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Self tests added for new helper Signed-off-by: Carlos Neira --- tools/testing/selftests/bpf/bpf_helpers.h | 4 + .../bpf/prog_tests/get_ns_current_pid_tgid.c | 85 +++++++++++++++++++ .../bpf/progs/get_ns_current_pid_tgid_kern.c | 53 ++++++++++++ 3 files changed, 142 insertions(+) create mode 100644 tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c create mode 100644 tools/testing/selftests/bpf/progs/get_ns_current_pid_tgid_kern.c diff --git a/tools/testing/selftests/bpf/bpf_helpers.h b/tools/testing/selftests/bpf/bpf_helpers.h index 54a50699bbfd..16261b23e011 100644 --- a/tools/testing/selftests/bpf/bpf_helpers.h +++ b/tools/testing/selftests/bpf/bpf_helpers.h @@ -233,6 +233,10 @@ static int (*bpf_send_signal)(unsigned sig) = (void *)BPF_FUNC_send_signal; static long long (*bpf_tcp_gen_syncookie)(struct bpf_sock *sk, void *ip, int ip_len, void *tcp, int tcp_len) = (void *) BPF_FUNC_tcp_gen_syncookie; +static unsigned long long (*bpf_get_ns_current_pid_tgid)(struct bpf_pidns_info *nsinfo, + unsigned int buf_size) = + (void *) BPF_FUNC_get_ns_current_pid_tgid; + /* llvm builtin functions that eBPF C program may use to * emit BPF_LD_ABS and BPF_LD_IND instructions diff --git a/tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c b/tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c new file mode 100644 index 000000000000..a7bff0ef6677 --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c @@ -0,0 +1,85 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2019 Carlos Neira cneirabustos@gmail.com */ +#include +#include +#include +#include +#include +#include + +void test_get_ns_current_pid_tgid(void) +{ + const char *probe_name = "syscalls/sys_enter_nanosleep"; + const char *file = "get_ns_current_pid_tgid_kern.o"; + int ns_data_map_fd, duration = 0; + struct perf_event_attr attr = {}; + int err, efd, prog_fd, pmu_fd; + __u64 ino, dev, id, nspid; + struct bpf_object *obj; + struct stat st; + __u32 key = 0; + char buf[256]; + + err = bpf_prog_load(file, BPF_PROG_TYPE_TRACEPOINT, &obj, &prog_fd); + if (CHECK(err, "prog_load", "err %d errno %d\n", err, errno)) + return; + + ns_data_map_fd = bpf_find_map(__func__, obj, "ns_data_map"); + if (CHECK_FAIL(ns_data_map_fd < 0)) + goto close_prog; + + pid_t tid = syscall(SYS_gettid); + pid_t pid = getpid(); + + id = (__u64) tid << 32 | pid; + bpf_map_update_elem(ns_data_map_fd, &key, &id, 0); + + if (stat("/proc/self/ns/pid", &st)) + goto close_prog; + + dev = st.st_dev; + ino = st.st_ino; + key = 1; + bpf_map_update_elem(ns_data_map_fd, &key, &dev, 0); + key = 2; + bpf_map_update_elem(ns_data_map_fd, &key, &ino, 0); + + snprintf(buf, sizeof(buf), + "/sys/kernel/debug/tracing/events/%s/id", probe_name); + efd = open(buf, O_RDONLY, 0); + read(efd, buf, sizeof(buf)); + close(efd); + attr.config = strtol(buf, NULL, 0); + attr.type = PERF_TYPE_TRACEPOINT; + attr.sample_type = PERF_SAMPLE_RAW; + attr.sample_period = 1; + attr.wakeup_events = 1; + + pmu_fd = syscall(__NR_perf_event_open, &attr, getpid(), -1, -1, 0); + if (CHECK_FAIL(pmu_fd < 0)) + goto cleanup; + + err = ioctl(pmu_fd, PERF_EVENT_IOC_ENABLE, 0); + if (CHECK_FAIL(err)) + goto cleanup; + + err = ioctl(pmu_fd, PERF_EVENT_IOC_SET_BPF, prog_fd); + if (CHECK_FAIL(err)) + goto cleanup; + + /* trigger some syscalls */ + sleep(1); + key = 3; + err = bpf_map_lookup_elem(ns_data_map_fd, &key, &nspid); + if (CHECK_FAIL(err)) + goto cleanup; + + if (CHECK(id != nspid, "Compare user pid/tgid vs. bpf pid/tgid", + "Userspace pid/tgid %llu EBPF pid/tgid %llu\n", id, nspid)) + goto cleanup; + +cleanup: + close(pmu_fd); +close_prog: + bpf_object__close(obj); +} diff --git a/tools/testing/selftests/bpf/progs/get_ns_current_pid_tgid_kern.c b/tools/testing/selftests/bpf/progs/get_ns_current_pid_tgid_kern.c new file mode 100644 index 000000000000..3659aaa7c71f --- /dev/null +++ b/tools/testing/selftests/bpf/progs/get_ns_current_pid_tgid_kern.c @@ -0,0 +1,53 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2019 Carlos Neira cneirabustos@gmail.com */ + +#include +#include "bpf_helpers.h" + +struct { + __uint(type, BPF_MAP_TYPE_ARRAY); + __uint(max_entries, 4); + __type(key, __u32); + __type(value, __u64); +} ns_data_map SEC(".maps"); + + +SEC("tracepoint/syscalls/sys_enter_nanosleep") +int trace(void *ctx) +{ + __u64 *val, *inum, *dev, nspidtgid, *expected_pid; + struct bpf_pidns_info nsdata; + __u32 key = 1; + + dev = bpf_map_lookup_elem(&ns_data_map, &key); + if (!dev) + return 0; + key = 2; + inum = bpf_map_lookup_elem(&ns_data_map, &key); + if (!inum) + return 0; + + nsdata.dev = *dev; + nsdata.inum = *inum; + + if (bpf_get_ns_current_pid_tgid(&nsdata, sizeof(struct bpf_pidns_info))) + return 0; + + nspidtgid = (__u64)nsdata.tgid << 32 | nsdata.pid; + key = 0; + expected_pid = bpf_map_lookup_elem(&ns_data_map, &key); + + if (!expected_pid || *expected_pid != nspidtgid) + return 0; + + key = 3; + val = bpf_map_lookup_elem(&ns_data_map, &key); + + if (val) + *val = nspidtgid; + + return 0; +} + +char _license[] SEC("license") = "GPL"; +__u32 _version SEC("version") = 1;