From patchwork Thu Oct 17 15:00:28 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: 1178715 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 (no SPF record) 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="k51BRc1u"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46vC5w1yNjz9sPV for ; Fri, 18 Oct 2019 02:00:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406593AbfJQPAq (ORCPT ); Thu, 17 Oct 2019 11:00:46 -0400 Received: from mail-qk1-f193.google.com ([209.85.222.193]:42452 "EHLO mail-qk1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731768AbfJQPAp (ORCPT ); Thu, 17 Oct 2019 11:00:45 -0400 Received: by mail-qk1-f193.google.com with SMTP id f16so2131220qkl.9; Thu, 17 Oct 2019 08:00:44 -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=k51BRc1uXGSeUt3GuXgKvxxmHEPuVIepTatdB1k/6uxcC17yc0gfVyoAUyqN2F2Vix 6P1OEAXWw6VdSFYmywA6JhR1jZiP7vvFUpO//Re5ahA2eFSSUsz44w6ke5+91hpTUJt1 06AFNe6uKYvCeVk15wE5EvK1AYM5eu9WSfW2qkjuRCf/av93X7A2zW7HyVVzqNOXlXN0 WJCeLeZhJoM1zr80t7YpUqbPK6kkoR1e3SNpLPgDKfh0sU/eUwRUkd4yB4lnpxg75ynI 2iCTru9sdZBacH2SnmTfiNek1SdB3g93JIA8+SwLY23wHN2ZKD248fujOpfO6yKiXl5u EnMQ== 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=Rb8RZ1rxUowzZoCkVrc08zLzU9+aglg668JnskR5Y7mGqaUST1LAQl7V+CUZ23Dtkf XP1+5hZVi6bviu8pLeYBkgT1kte+wXzmtuLASSMOl9iIK6YTVzN0voI16agpI01li+7B kG/YGAd55QL9mVcn1/6cquUeYH6t45/oRAtiePS/CKsRxwdf8m3jpYx9qnEd/JoaQtmU ctWdnbzX/XJ0ZQyvaqD+y/1IM7pK447L2s/A3wJWPfTgUiw5ZKQmt10tm0JKeuinWxiD CFYoOIzTnK3yuCgr2/Xgc0CKc8aCMtWhN1ylbcnL8QPNAZpKfqLPynES3Y7VWrliE8Qh 7Feg== X-Gm-Message-State: APjAAAWV4/KOMhQQNiKSIAd/toWYbHuIwIYM7UP+JihT20BDdXN+uD2g gTzk1NOXZ1fpQeLGA2RTu2AMvzxUrdk= X-Google-Smtp-Source: APXvYqxkmdMbFO9hxXAN2IWOVudz+DdzpYmQeZRgxUX/nhwtlE94hdDOQmo3PSVEvdZ1RouD7WDdYg== X-Received: by 2002:a37:4701:: with SMTP id u1mr3786419qka.44.1571324444058; Thu, 17 Oct 2019 08:00:44 -0700 (PDT) Received: from ebpf00.byteswizards.com ([190.162.109.190]) by smtp.googlemail.com with ESMTPSA id z20sm1550859qtu.91.2019.10.17.08.00.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 08:00:43 -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 v14 1/5] fs/nsfs.c: added ns_match Date: Thu, 17 Oct 2019 12:00:28 -0300 Message-Id: <20191017150032.14359-2-cneirabustos@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191017150032.14359-1-cneirabustos@gmail.com> References: <20191017150032.14359-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 Thu Oct 17 15:00: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: 1178717 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 (no SPF record) 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="pwiGsGl7"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46vC5w5FQqz9sPc for ; Fri, 18 Oct 2019 02:00:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2406637AbfJQPAs (ORCPT ); Thu, 17 Oct 2019 11:00:48 -0400 Received: from mail-qk1-f194.google.com ([209.85.222.194]:39352 "EHLO mail-qk1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731768AbfJQPAs (ORCPT ); Thu, 17 Oct 2019 11:00:48 -0400 Received: by mail-qk1-f194.google.com with SMTP id 4so2147032qki.6; Thu, 17 Oct 2019 08:00:47 -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=ibxCrQjjLmKEnH9cIzGG1Bmbb2ACnvCT12kEmqAt8LQ=; b=pwiGsGl7rIUv0+b/wMlbeIx7nGZqr9y+KNFDNvnNl8gN9uKPegFMd94qBF/8qxDjSj 5L87rUzEKh0Eoecb7Mw4POA1LZpVkiQzGYJ9+I/oDUaZeaw5sZpWRfISs2+91BEINibk jMNPuGSzW3rSexTWSeb/Vza7chrclc38Gjs62cmnvSYTXKZhq1Dl7evy40+rJ8W8qTHH ZHsfO3FAdfJE705IWXI4UI5gyOhVf8WlzxGS7+GPWGfriQwfegb+T+v2fboVDUhpNcft V4ZPBF70O2PtXOB0cPGShA+PRiINRWsvU0nwfJInj8FzO7URF+Wrt3zSzcF9jupphJZU 3mPQ== 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=ibxCrQjjLmKEnH9cIzGG1Bmbb2ACnvCT12kEmqAt8LQ=; b=fqTVu3QJNUitkS2g8I5bWTh/ScY+/hlgW2VyUp5YDmx00wzC8GL+tYGtOTc59cmQd4 wg8ZW/UYB5PXR8C/3s2+Lx27ZxHi342KQBnqcrtb84sFUJSO7S3rof705PnVV3IOMniY DPN1omfM5DdIMSUKEibfRdmQWMOPHAwreqL1qRBJWxtAyqdN183bXjflM7NYc2zQJnF4 MZ1i6JxPSbkkHvcf/2GnqfeiOjaTH+R3E4+qUuNM5NEK9G8xwDHU9PfOmhE4FxoxocCy FnQZp602RbxJvGpK/QVHqZvUYTX9XnF29lnWnorFzoFTJcItvTeVVQyyg7A6UXgRqhAl apmA== X-Gm-Message-State: APjAAAWLGsrpvKEgujgooPfN0hes6Vx1PfLS07J1617YMshrWH49tYMu qszbKl9vXoeHI9ZIrduIPo4AQv9Qk9s= X-Google-Smtp-Source: APXvYqwzm90/7C8i0s2JD/pE/RYoPHXCf8Stn+ZQd663SOYVMcOPfdPQRt2gMAEPnMJI+Gz7q7ycUQ== X-Received: by 2002:a37:ac1a:: with SMTP id e26mr3705701qkm.20.1571324446373; Thu, 17 Oct 2019 08:00:46 -0700 (PDT) Received: from ebpf00.byteswizards.com ([190.162.109.190]) by smtp.googlemail.com with ESMTPSA id z20sm1550859qtu.91.2019.10.17.08.00.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 08:00:45 -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 v14 2/5] bpf: added new helper bpf_get_ns_current_pid_tgid Date: Thu, 17 Oct 2019 12:00:29 -0300 Message-Id: <20191017150032.14359-3-cneirabustos@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191017150032.14359-1-cneirabustos@gmail.com> References: <20191017150032.14359-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 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 | 20 +++++++++++++++++- kernel/bpf/core.c | 1 + kernel/bpf/helpers.c | 45 ++++++++++++++++++++++++++++++++++++++++ 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 a65c3b0c6935..a17583ae9aa3 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(u64 dev, u64 ino, struct bpf_pidns_info *nsdata, u32 size) + * Description + * Returns 0 on success, values for *pid* and *tgid* as seen from the current + * *namespace* will be returned in *nsdata*. + * + * 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,8 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { + __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..5477ad984d7c 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,46 @@ const struct bpf_func_proto bpf_strtoul_proto = { .arg4_type = ARG_PTR_TO_LONG, }; #endif + +BPF_CALL_4(bpf_get_ns_current_pid_tgid, u64, dev, u64, ino, + 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 (unlikely((u64)(dev_t)dev != 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)dev, ino)) + 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_ANYTHING, + .arg2_type = ARG_ANYTHING, + .arg3_type = ARG_PTR_TO_UNINIT_MEM, + .arg4_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 Thu Oct 17 15:00: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: 1178719 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 (no SPF record) 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="jjqw7qVp"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46vC5x29M5z9sCJ for ; Fri, 18 Oct 2019 02:00:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2407885AbfJQPAu (ORCPT ); Thu, 17 Oct 2019 11:00:50 -0400 Received: from mail-qk1-f196.google.com ([209.85.222.196]:33614 "EHLO mail-qk1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731768AbfJQPAt (ORCPT ); Thu, 17 Oct 2019 11:00:49 -0400 Received: by mail-qk1-f196.google.com with SMTP id x134so2178019qkb.0; Thu, 17 Oct 2019 08:00:49 -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=A4q7JdM3gpKjaJbj8ZRzzKEDY6bhXVBkntTNN2SMjG4=; b=jjqw7qVpwvnacqUddjsg9B+TzWdsLV03kLRuUraIRkMykIV1PPDkgVuY53dlpjK8bI xXaoJY/LOTStZwN5fsn6QOnptda+ehdPWy16Wg6cxSwTxvuJhO70zkDHgHzAI21QzySM C1CImgzplzIMfDTWyLa6KqAEIocgPw8vUJxDMb8Nbi4/LmzQlh1ZqNJyc/9njmaptRjx bIrzuc/1MyLbVG/6iSEr/hX45b11n/dGCMV35d4oeq4SnusSY9JrvslUIBuJoEGukXtu f+8EG5DuW7jE7mv1vuHD/BoABi6ntk2PaWSMyLX2LlnI8p4IF22B9QTov/cyvD6iYd7M nlKQ== 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=A4q7JdM3gpKjaJbj8ZRzzKEDY6bhXVBkntTNN2SMjG4=; b=TBm3C3xidrmzgkLjU+dHhVrB41TBvrnVTeko7LpGXrC65rZhH4SardwhK4SziIG/ld NNiMlAJW4i4HaYxpeCgF6nfK5r/g1i8SFlBLFIMidITQczHKJ29OrVN2x5vt9yF+O6Ka bMzKpvk9ZScBPL0W+IAj/ZzYfhMI8QZXcrnxzmZ43z6ESqD03bf5E/jRdc94q1m6hHAM I/44bfW1hfxwuWIQfNhLAABO521vHJSkabmwFE/vsSOuuf1HpryVz2rpNjvIv06XhVhc m2A1idwcZxbuVzqKn8AytD5d9d+/3lxnFhEiDDxOq3bdwNj1AdAW1GFExEPf70TV2put Zd1A== X-Gm-Message-State: APjAAAVUK0OgAOmiWVsogdpHqigFS1iDsG+eooY+HgfgkIqpEHhWXYvW JYNyfg24rHVDNwAxJRJWP0N9w1LQKr4= X-Google-Smtp-Source: APXvYqwrIK5gVIr6rabkwnmooPnhfXtiiI/qiJXx19IMpXZwXyKss6er7XK22zMBvNOsuJLyEpQ8eA== X-Received: by 2002:ae9:ea05:: with SMTP id f5mr2452265qkg.370.1571324448405; Thu, 17 Oct 2019 08:00:48 -0700 (PDT) Received: from ebpf00.byteswizards.com ([190.162.109.190]) by smtp.googlemail.com with ESMTPSA id z20sm1550859qtu.91.2019.10.17.08.00.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 08:00:47 -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 v14 3/5] tools: Added bpf_get_ns_current_pid_tgid helper Date: Thu, 17 Oct 2019 12:00:30 -0300 Message-Id: <20191017150032.14359-4-cneirabustos@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191017150032.14359-1-cneirabustos@gmail.com> References: <20191017150032.14359-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 sync tools/include/uapi/linux/bpf.h to include new helper. Signed-off-by: Carlos Neira --- tools/include/uapi/linux/bpf.h | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index a65c3b0c6935..a17583ae9aa3 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(u64 dev, u64 ino, struct bpf_pidns_info *nsdata, u32 size) + * Description + * Returns 0 on success, values for *pid* and *tgid* as seen from the current + * *namespace* will be returned in *nsdata*. + * + * 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,8 @@ struct bpf_sockopt { __s32 retval; }; +struct bpf_pidns_info { + __u32 pid; + __u32 tgid; +}; #endif /* _UAPI__LINUX_BPF_H__ */ From patchwork Thu Oct 17 15:00: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: 1178721 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 (no SPF record) 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="Lbnd3PGq"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46vC5x5fDrz9sPF for ; Fri, 18 Oct 2019 02:00:53 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2409402AbfJQPAx (ORCPT ); Thu, 17 Oct 2019 11:00:53 -0400 Received: from mail-qt1-f170.google.com ([209.85.160.170]:43370 "EHLO mail-qt1-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731768AbfJQPAw (ORCPT ); Thu, 17 Oct 2019 11:00:52 -0400 Received: by mail-qt1-f170.google.com with SMTP id t20so3981655qtr.10; Thu, 17 Oct 2019 08:00:51 -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=q37tUh9xqxmgGI/s8GNG5ls9HK4DNX5e/Lei/51fEg4=; b=Lbnd3PGqhgjLTaRiIgymehYNrW2iTh545LykuEay+Huctvv4JNbsj1j9uM/yb4B2pA /X2cF31piI0Qq2z0ehWr2f8hA26ZQY1CF4yF7TpuFpnjQivMiUBsxRJJitUiISld7tWg igZ9YrnvJ19P/uPz1551pYKEdP5hWQyFwz+scR5PCdHBTK7SMol4xIxkZ6HSwR+wColt d6Xxpl0RuZKZ/UdwiDdLXwM0daN5vZe5TlYENm1hjQ1FUv1vsMbJl6BmMx43OM/gwNmQ KZDaybG9Id8xGQj8HeqMMlNnivhz2qetZWAJdTpqI6thvzEIaOkISjTnrj85gWNxQDd7 ejrg== 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=q37tUh9xqxmgGI/s8GNG5ls9HK4DNX5e/Lei/51fEg4=; b=NFGf6PxSrLs0hvlcUB04+cJNt86OxzJlaZ0ehWjQU+MoTDG3/IyttjPgqe2nAlR+MP I/FVVFVH4djAnPQpX9/l9pfbOUqr8sP+2rZ8n9f3JAG7KZXOYrQxfdUbKewbsW0dQUV7 zXyWudUkFQUn0g/PSOO1S7/xhbaxJ+K0JtrhOOTx7UF9JkCYZhzFXQpF+m6fvOsiIYLg PdLwNokq5n7geHj60Lnefe1zPWWKs+zVXnA3yjHlrsGIDlDAJ70psH8aOSx3zpDbo1RU hVsDqlskkK5Hcj7vIpkJqZa88PsJ9ctsf8nZiO7nwcR855iyE8QbvynigyAwzbIHIUZt RWag== X-Gm-Message-State: APjAAAXjBZaij1SUKJDJ7UU/ff24Vr/Bp/3gwmgC6JBASr4HfW9cupaO HLKNq0nStcyAzODIfuMWU89Z/hZ8xwk= X-Google-Smtp-Source: APXvYqy/48aSjpBMzOfcVu621D9xK2jv8wz0k6ifVskJIrAVrkqHd5wNCX2Sc52SG6B6jFzwLwyzEg== X-Received: by 2002:ac8:714e:: with SMTP id h14mr4256830qtp.147.1571324450492; Thu, 17 Oct 2019 08:00:50 -0700 (PDT) Received: from ebpf00.byteswizards.com ([190.162.109.190]) by smtp.googlemail.com with ESMTPSA id z20sm1550859qtu.91.2019.10.17.08.00.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 08:00:49 -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 v14 4/5] tools/testing/selftests/bpf: Add self-tests for new helper. Date: Thu, 17 Oct 2019 12:00:31 -0300 Message-Id: <20191017150032.14359-5-cneirabustos@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191017150032.14359-1-cneirabustos@gmail.com> References: <20191017150032.14359-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 --- .../bpf/prog_tests/get_ns_current_pid_tgid.c | 96 +++++++++++++++++++ .../bpf/progs/get_ns_current_pid_tgid_kern.c | 53 ++++++++++ 2 files changed, 149 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/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..48d9785f89d0 --- /dev/null +++ b/tools/testing/selftests/bpf/prog_tests/get_ns_current_pid_tgid.c @@ -0,0 +1,96 @@ +// SPDX-License-Identifier: GPL-2.0 +/* Copyright (c) 2019 Carlos Neira cneirabustos@gmail.com */ +#include +#include +#include +#include +#include +#include + +struct bss { + __u64 dev; + __u64 ino; + __u64 pidtgid; + __u64 userpidtgid; +} data; + +void test_get_ns_current_pid_tgid(void) +{ + const char *probe_name = "raw_tracepoint/sys_enter"; + const char *file = "get_ns_current_pid_tgid_kern.o"; + struct bpf_object_load_attr load_attr = {}; + struct bpf_link *link = NULL; + struct bpf_program *prog; + struct bpf_map *bss_map; + struct bpf_object *obj; + int err, duration = 0; + const __u32 key = 0; + struct stat st; + __u64 id; + + obj = bpf_object__open(file); + if (CHECK(IS_ERR_OR_NULL(obj), "obj_open", + "failed to open '%s': %ld\n", + file, PTR_ERR(obj))) + goto cleanup; + + prog = bpf_object__find_program_by_title(obj, probe_name); + if (CHECK(!prog, "find_probe", + "prog '%s' not found\n", probe_name)) + goto cleanup; + + bpf_program__set_type(prog, BPF_PROG_TYPE_RAW_TRACEPOINT); + + load_attr.obj = obj; + load_attr.log_level = 0; + load_attr.target_btf_path = NULL; + err = bpf_object__load_xattr(&load_attr); + if (CHECK(err, "obj_load", + "failed to load prog '%s': %d\n", + probe_name, err)) + goto cleanup; + + link = bpf_program__attach_raw_tracepoint(prog, "sys_enter"); + if (CHECK(IS_ERR(link), "attach_raw_tp", "err %ld\n", + PTR_ERR(link))) + goto cleanup; + + bss_map = bpf_object__find_map_by_name(obj, "ns_data_map"); + if (CHECK(!bss_map, "find_bss_map", "failed\n")) + goto cleanup; + + memset(&data, 0, sizeof(data)); + pid_t tid = syscall(SYS_gettid); + pid_t pid = getpid(); + + id = (__u64) tid << 32 | pid; + data.userpidtgid = id; + + if (CHECK(stat("/proc/self/ns/pid", &st), "stat","failed\n")) + goto cleanup; + + data.dev = st.st_dev; + data.ino = st.st_ino; + + err = bpf_map_update_elem(bpf_map__fd(bss_map), &key, &data, 0); + if (CHECK(err, "setting_bss", "failed to set bss data: %d\n", err)) + goto cleanup; + + /* trigger some syscalls */ + usleep(1); + + err = bpf_map_lookup_elem(bpf_map__fd(bss_map), &key, &data); + if (CHECK(err, "set_bss", "failed to get bss data: %d\n", err)) + goto cleanup; + + if (CHECK(id != data.pidtgid, "Compare user pid/tgid vs. bpf pid/tgid", + "User pid/tgid %llu EBPF pid/tgid %llu\n", id, data.pidtgid)) + goto cleanup; +cleanup: + + if (!IS_ERR_OR_NULL(link)) { + bpf_link__destroy(link); + link = NULL; + } + 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..1fd847b63105 --- /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 +#include "bpf_helpers.h" +#include "bpf_core_read.h" + +struct res { + __u64 dev; + __u64 ino; + __u64 pidtgid; + __u64 userpidtgid; +}; + +struct { + __uint(type, BPF_MAP_TYPE_ARRAY); + __uint(max_entries, 1); + __type(key, __u32); + __type(value, struct res); +} ns_data_map SEC(".maps"); + +static struct res data; + +SEC("raw_tracepoint/sys_enter") +int trace(void *ctx) +{ + __u64 nspidtgid, expected_pid; + struct bpf_pidns_info nsdata; + const __u32 key = 0; + struct res *pres; + + pres = bpf_map_lookup_elem(&ns_data_map, &key); + if (!pres) + return 0; + + if (bpf_get_ns_current_pid_tgid(pres->dev, pres->ino, &nsdata, + sizeof(struct bpf_pidns_info))) + return 0; + + nspidtgid = (__u64)nsdata.tgid << 32 | nsdata.pid; + expected_pid = pres->userpidtgid; + + if (expected_pid != nspidtgid) + return 0; + + data.pidtgid = nspidtgid; + bpf_map_update_elem(&ns_data_map, &key, &data, 0); + + return 0; +} + +char _license[] SEC("license") = "GPL"; From patchwork Thu Oct 17 15:00: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: 1178722 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 (no SPF record) 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="T2XyWna3"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46vC5z55mrz9sCJ for ; Fri, 18 Oct 2019 02:00:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2409408AbfJQPAy (ORCPT ); Thu, 17 Oct 2019 11:00:54 -0400 Received: from mail-qt1-f169.google.com ([209.85.160.169]:35331 "EHLO mail-qt1-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731768AbfJQPAy (ORCPT ); Thu, 17 Oct 2019 11:00:54 -0400 Received: by mail-qt1-f169.google.com with SMTP id m15so4062816qtq.2; Thu, 17 Oct 2019 08:00:53 -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=F1lqeUF4eYaIZsid524XxMao/krSOB40UF5+S1hEV9I=; b=T2XyWna3C2o25XSGB9L29eUhNW8pkBLNz3dhptkVgkZKzMfLjR6vDXIfkE+nuKb4dY /4ySHoxkTSvdxpoOZhULnpRv3NUmCVYdhIFKWff6zsbDO0inTapQZlAZMUnU/+72Bxl7 qGEL5cAiI4XFV0MlA3WiVFVPZsDOECFwj21X6agb19YBR73GSSdbvnf9hfCOrOFLgB0s Poq1DhSLKS61bn2hz5weu/KmfVFUMxHK1GgpvBkQvV8gft6r1mqanVqRfTL+hxpKoaFh vbZWb8p4eosfwCSjK710ITOP5wz/BKphoa9qfcYnU6TLSbsUfBU0Q0UjthgcafFMYTkT jUcA== 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=F1lqeUF4eYaIZsid524XxMao/krSOB40UF5+S1hEV9I=; b=uBs87DsJ+DfujPNpWkPqS33cXpMLs8PlbeQ4VJNSv5OWQW3Vu0GAsQUPySTB9tAV9x NY0N36MYU4O2dWQHK21q0xLvISZdk/n/biV7SplAQSf1HqmY0xp1kbD3RKokfnSKFSD6 jvjQULjLVX9khm9IgMUxkkjgVO8P2emw6UbnLlSpbIJoKNm84W9zKorQWV8nTV5s/UyD fE+wFaTQJELXDyDJ+2hX4+/tAEiYymV9LQpz1N3RIjgixKUnSu+zY3NnRZO5z0RaciZd bIzEPyh+zUSnqZ26dDWcwvORaYCDHlgeZv45AfngWXxW38mX68PLO4Vo5KMG0IyHhxn+ 4PiA== X-Gm-Message-State: APjAAAVRkIw1iWruGllgOW/8ob9Qi+1odTuEF2eLNz+b50W4bQE9kTXb MjfCMSDzBfJfkLHbjxUX09ublP/qY4M= X-Google-Smtp-Source: APXvYqzcUekTMXuZ/QYAM0Ae5m7rYcwVEZFWf0xHfrOLO+YbmA0uHLb8QIsIDS1MFlJ7w+5jdsAwYg== X-Received: by 2002:a0c:e6a6:: with SMTP id j6mr4294073qvn.74.1571324452900; Thu, 17 Oct 2019 08:00:52 -0700 (PDT) Received: from ebpf00.byteswizards.com ([190.162.109.190]) by smtp.googlemail.com with ESMTPSA id z20sm1550859qtu.91.2019.10.17.08.00.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Oct 2019 08:00:52 -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 v14 5/5] bpf_helpers_doc.py: Add struct bpf_pidns_info to known types Date: Thu, 17 Oct 2019 12:00:32 -0300 Message-Id: <20191017150032.14359-6-cneirabustos@gmail.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191017150032.14359-1-cneirabustos@gmail.com> References: <20191017150032.14359-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 Add struct bpf_pidns_info to known types Signed-off-by: Carlos Neira --- scripts/bpf_helpers_doc.py | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/bpf_helpers_doc.py b/scripts/bpf_helpers_doc.py index 7df9ce598ff9..d42eb185810f 100755 --- a/scripts/bpf_helpers_doc.py +++ b/scripts/bpf_helpers_doc.py @@ -450,6 +450,7 @@ class PrinterHelpers(Printer): 'struct sk_reuseport_md', 'struct sockaddr', 'struct tcphdr', + 'struct bpf_pidns_info', } mapped_types = { 'u8': '__u8',