[bpf-next,09/13] bpf: Add BPF_FUNC_jiffies

Message ID	20191214004758.1653342-1-kafai@fb.com
State	Changes Requested
Delegated to:	BPF Maintainers
Headers	show Return-Path: <bpf-owner@vger.kernel.org> Smtp-Origin-Hostprefix: devbig From: Martin KaFai Lau <kafai@fb.com> Smtp-Origin-Hostname: devbig005.ftw2.facebook.com To: <bpf@vger.kernel.org> CC: Alexei Starovoitov <ast@kernel.org>, Daniel Borkmann <daniel@iogearbox.net>, David Miller <davem@davemloft.net>, <kernel-team@fb.com>, <netdev@vger.kernel.org> Smtp-Origin-Cluster: ftw2c04 Subject: [PATCH bpf-next 09/13] bpf: Add BPF_FUNC_jiffies Date: Fri, 13 Dec 2019 16:47:58 -0800 Message-ID: <20191214004758.1653342-1-kafai@fb.com> In-Reply-To: <20191214004737.1652076-1-kafai@fb.com> References: <20191214004737.1652076-1-kafai@fb.com> MIME-Version: 1.0 Content-Type: text/plain Sender: bpf-owner@vger.kernel.org Precedence: bulk
Series	Introduce BPF STRUCT_OPS \| expand [bpf-next,00/13] Introduce BPF STRUCT_OPS [bpf-next,01/13] bpf: Save PTR_TO_BTF_ID register state when spilling to stack [bpf-next,02/13] bpf: Avoid storing modifier to info->btf_id [bpf-next,03/13] bpf: Add enum support to btf_ctx_access() [bpf-next,04/13] bpf: Support bitfield read access in btf_struct_access [bpf-next,05/13] bpf: Introduce BPF_PROG_TYPE_STRUCT_OPS [bpf-next,06/13] bpf: Introduce BPF_MAP_TYPE_STRUCT_OPS [bpf-next,07/13] bpf: tcp: Support tcp_congestion_ops in bpf [bpf-next,08/13] bpf: Add BPF_FUNC_tcp_send_ack helper [bpf-next,09/13] bpf: Add BPF_FUNC_jiffies [bpf-next,10/13] bpf: Synch uapi bpf.h to tools/ [bpf-next,11/13] bpf: libbpf: Add STRUCT_OPS support [bpf-next,12/13] bpf: Add bpf_dctcp example [bpf-next,13/13] bpf: Add bpf_cubic example

diff --git a/include/linux/bpf.h b/include/linux/bpf.h index 349cedd7b97b..00491961421e 100644 --- a/include/linux/bpf.h +++ b/include/linux/bpf.h @@ -1371,6 +1371,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_jiffies_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 602449a56dde..cf864a5f7d61 100644 --- a/include/uapi/linux/bpf.h +++ b/include/uapi/linux/bpf.h @@ -2835,6 +2835,16 @@ union bpf_attr { * Return * 0 on success, or a negative error in case of failure. * + * u64 bpf_jiffies(u64 in, u64 flags) + * Description + * jiffies helper. + * Return + * *flags*: 0, return the current jiffies. + * BPF_F_NS_TO_JIFFIES, convert *in* from ns to jiffies. + * BPF_F_JIFFIES_TO_NS, convert *in* from jiffies to + * ns. If *in* is zero, it returns the current + * jiffies as ns. + * */ #define __BPF_FUNC_MAPPER(FN) \ FN(unspec), \ @@ -2953,7 +2963,8 @@ union bpf_attr { FN(probe_read_kernel), \ FN(probe_read_user_str), \ FN(probe_read_kernel_str), \ - FN(tcp_send_ack), + FN(tcp_send_ack), \ + FN(jiffies), /* integer value in 'imm' field of BPF_CALL instruction selects which helper * function eBPF program intends to call @@ -3032,6 +3043,9 @@ enum bpf_func_id { /* BPF_FUNC_sk_storage_get flags */ #define BPF_SK_STORAGE_GET_F_CREATE (1ULL << 0) +#define BPF_F_NS_TO_JIFFIES (1ULL << 0) +#define BPF_F_JIFFIES_TO_NS (1ULL << 1) + /* Mode for BPF_FUNC_skb_adjust_room helper. */ enum bpf_adj_room_mode { BPF_ADJ_ROOM_NET, diff --git a/kernel/bpf/core.c b/kernel/bpf/core.c index 2ff01a716128..0ffbda9a13e9 100644 --- a/kernel/bpf/core.c +++ b/kernel/bpf/core.c @@ -2134,6 +2134,7 @@ const struct bpf_func_proto bpf_map_pop_elem_proto __weak; const struct bpf_func_proto bpf_map_peek_elem_proto __weak; const struct bpf_func_proto bpf_spin_lock_proto __weak; const struct bpf_func_proto bpf_spin_unlock_proto __weak; +const struct bpf_func_proto bpf_jiffies_proto __weak; const struct bpf_func_proto bpf_get_prandom_u32_proto __weak; const struct bpf_func_proto bpf_get_smp_processor_id_proto __weak; diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c index cada974c9f4e..e87c332d1b61 100644 --- a/kernel/bpf/helpers.c +++ b/kernel/bpf/helpers.c @@ -11,6 +11,7 @@ #include <linux/uidgid.h> #include <linux/filter.h> #include <linux/ctype.h> +#include <linux/jiffies.h> #include "../../lib/kstrtox.h" @@ -486,4 +487,28 @@ const struct bpf_func_proto bpf_strtoul_proto = { .arg3_type = ARG_ANYTHING, .arg4_type = ARG_PTR_TO_LONG, }; + +BPF_CALL_2(bpf_jiffies, u64, in, u64, flags) +{ + if (!flags) + return get_jiffies_64(); + + if (flags & BPF_F_NS_TO_JIFFIES) { + return nsecs_to_jiffies(in); + } else if (flags & BPF_F_JIFFIES_TO_NS) { + if (!in) + in = get_jiffies_64(); + return jiffies_to_nsecs(in); + } + + return 0; +} + +const struct bpf_func_proto bpf_jiffies_proto = { + .func = bpf_jiffies, + .gpl_only = false, + .ret_type = RET_INTEGER, + .arg1_type = ARG_ANYTHING, + .arg2_type = ARG_ANYTHING, +}; #endif diff --git a/net/core/filter.c b/net/core/filter.c index fbb3698026bd..355746715901 100644 --- a/net/core/filter.c +++ b/net/core/filter.c @@ -6015,6 +6015,8 @@ bpf_base_func_proto(enum bpf_func_id func_id) return &bpf_spin_unlock_proto; case BPF_FUNC_trace_printk: return bpf_get_trace_printk_proto(); + case BPF_FUNC_jiffies: + return &bpf_jiffies_proto; default: return NULL; }

[bpf-next,09/13] bpf: Add BPF_FUNC_jiffies

Commit Message

Comments

Patch