From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.3 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_SANE_1 autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 70DBBECE58C for ; Wed, 9 Oct 2019 17:45:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4384120B7C for ; Wed, 9 Oct 2019 17:45:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Fbtqe6B3" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731947AbfJIRpp (ORCPT ); Wed, 9 Oct 2019 13:45:45 -0400 Received: from mail-qt1-f193.google.com ([209.85.160.193]:33578 "EHLO mail-qt1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731832AbfJIRpp (ORCPT ); Wed, 9 Oct 2019 13:45:45 -0400 Received: by mail-qt1-f193.google.com with SMTP id r5so4665026qtd.0; Wed, 09 Oct 2019 10:45:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=zwnNTaQIaUTddUko874FzJjuDJo3zgtFneSvZk5Fx5A=; b=Fbtqe6B3QNe0PRAZEQ4Vbn/vRPPmtp9A3FwuhAqXcPkvvoI1qSLefw8gBxaJkrS8Cs f8I519PGR6Sy5GcQXVx1+laTXVCdAMD0K+BjIZZSccTrbE77C6hRa/J8bTPLR/RuFm0a 8adCh32GXm7aV/vNWtF6+llGaP0KxKSHW1hhj4YOLFcQEJuEbS862ZDnzHORroPffRDQ 7JY/Sq3fdngcXEwiP1j3FN834/PTkj+MmubYBAAr6qi3w6VLr75B3oU2NzFqJC/NXwyR ShNBv/zEYVaMmsL4l0Skp6aU9jWA4TxS/FaIhMz0V3Mk+dCWd3V1eYjPiDV5QtfL4yJD NZ+A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=zwnNTaQIaUTddUko874FzJjuDJo3zgtFneSvZk5Fx5A=; b=KsJs/StjAIz0CZ68nEnsArj5hN1uN2ULTYrZxHts+OOcClRN8yOwM9QcMf8kE61cwf 9mzJESDOZFmEQcGh2GrKKgpBAEn5Fl3X6SGcWXxfj8AbkBouAdrE2HiLcK3M6PJgfrnh co+biN/EHrWwv9bfU4dwL/9/Z0XdjtG5Nkp/FeZH66KDFo0gL62iDOJSMcAa7z65DcFC 1lM/o8hG8XjPBS1s3KYm15ckXlmXWEfbXs5E/eoz9pZIgcVGjP0Xr6UjVgn6opqsKFgD 8fi4SBql1OF+Si/FeflueuYTgAVXCPdXErwj2O7otPzhpY9RCFWZaqW4Z4tRn/DBqYTJ bZlQ== X-Gm-Message-State: APjAAAV9Ixyp5eTqsby022DhpZ0e5ZRhmdbGj3HEBuFojXmjOQW108Sf wnSkg0kGrZ0beQS3VUMoxY0= X-Google-Smtp-Source: APXvYqzqZpGtqvkKPrFxQ3rXpMHb0EIby5ciwFpjy61yQqMdiGHpqB4KCCkmJFDkbGRk+wdloiYfpA== X-Received: by 2002:ac8:259a:: with SMTP id e26mr5081401qte.134.1570643143629; Wed, 09 Oct 2019 10:45:43 -0700 (PDT) Received: from frodo.byteswizards.com ([190.162.109.190]) by smtp.gmail.com with ESMTPSA id n21sm1380882qka.83.2019.10.09.10.45.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Oct 2019 10:45:42 -0700 (PDT) Date: Wed, 9 Oct 2019 14:45:38 -0300 From: Carlos Antonio Neira Bustos To: Andrii Nakryiko Cc: Networking , Yonghong Song , ebiederm@xmission.com, Jesper Dangaard Brouer , bpf Subject: Re: [PATCH v13 2/4] bpf: added new helper bpf_get_ns_current_pid_tgid Message-ID: <20191009174538.GB12351@frodo.byteswizards.com> References: <20191009152632.14218-1-cneirabustos@gmail.com> <20191009152632.14218-3-cneirabustos@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.12.1 (2019-06-15) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On Wed, Oct 09, 2019 at 09:14:42AM -0700, Andrii Nakryiko wrote: > On Wed, Oct 9, 2019 at 8:27 AM Carlos Neira wrote: > > > > 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) > > Should be: > > struct bpf_pidns_info *nsdata > > > + * 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. > > I think its cleaner to have a Description section, explaining that it > will return pid/tgid in bpf_pidns_info, and then describe exit codes > in Return section. > > > + * > > + * 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; > > seems like conventionally this should be named "ino", this is what > ns_match calls it, so let's stay consistent. > > > + __u32 pid; > > + __u32 tgid; > > +}; > > So it seems like dev and inum are treated as input parameters, while > pid/tgid is output parameter, right? Wouldn't it be cleaner to have > dev and inum as explicit arguments into bpf_get_ns_current_pid_tgid()? > What's also not great, is that on failure you'll memset this entire > struct to zero, and user will lose its dev/inum. So in practice you'll > be keeping dev/inum somewhere else, then constructing and filling in > this bpf_pidns_info struct every time you need to invoke > bpf_get_ns_current_pid_tgid. > > Maybe it was discussed already, but IMO feels cleaner to have only > pid/tgid in bpf_pidns_info and pass dev/inum as direct arguments. > > > #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) > > this seems unlikely() as well :) > > > + 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, > > So this is a lie, you do expect part of that struct to be initialized. > One more reason to just split off dev/inum(ino?). > > > > + .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; > > } > > -- > > 2.20.1 > > Thanks for reviewing this, I'll make the changes you suggest. I'm not sure about removing dev and ino from struct bpf_pidns_info, I think is useful to know to which ns pid/tgid belong to using dev and ino to figure it out. Maybe in the future we could filter bpf_pidns_info structs by dev/ino, just an idea. Bests