diff mbox series

net: bpf: make bpf_ktime_get_ns() available to non GPL programs

Message ID 20200420184750.218489-1-zenczykowski@gmail.com
State Accepted
Delegated to: BPF Maintainers
Headers show
Series net: bpf: make bpf_ktime_get_ns() available to non GPL programs | expand

Commit Message

Maciej Żenczykowski April 20, 2020, 6:47 p.m. UTC 
From: Maciej Żenczykowski <maze@google.com>

The entire implementation is in kernel/bpf/helpers.c:

BPF_CALL_0(bpf_ktime_get_ns) {
       /* NMI safe access to clock monotonic */
       return ktime_get_mono_fast_ns();
}

const struct bpf_func_proto bpf_ktime_get_ns_proto = {
       .func           = bpf_ktime_get_ns,
       .gpl_only       = false,
       .ret_type       = RET_INTEGER,
};

and this was presumably marked GPL due to kernel/time/timekeeping.c:
  EXPORT_SYMBOL_GPL(ktime_get_mono_fast_ns);

and while that may make sense for kernel modules (although even that
is doubtful), there is currently AFAICT no other source of time
available to ebpf.

Furthermore this is really just equivalent to clock_gettime(CLOCK_MONOTONIC)
which is exposed to userspace (via vdso even to make it performant)...

As such, I see no reason to keep the GPL restriction.
(In the future I'd like to have access to time from Apache licensed ebpf code)

Signed-off-by: Maciej Żenczykowski <maze@google.com>
---
 kernel/bpf/helpers.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Alexei Starovoitov April 26, 2020, 4:08 p.m. UTC | #1 
On Mon, Apr 20, 2020 at 11:47 AM Maciej Żenczykowski
<zenczykowski@gmail.com> wrote:
>
> From: Maciej Żenczykowski <maze@google.com>
>
> The entire implementation is in kernel/bpf/helpers.c:
>
> BPF_CALL_0(bpf_ktime_get_ns) {
>        /* NMI safe access to clock monotonic */
>        return ktime_get_mono_fast_ns();
> }
>
> const struct bpf_func_proto bpf_ktime_get_ns_proto = {
>        .func           = bpf_ktime_get_ns,
>        .gpl_only       = false,
>        .ret_type       = RET_INTEGER,
> };
>
> and this was presumably marked GPL due to kernel/time/timekeeping.c:
>   EXPORT_SYMBOL_GPL(ktime_get_mono_fast_ns);
>
> and while that may make sense for kernel modules (although even that
> is doubtful), there is currently AFAICT no other source of time
> available to ebpf.
>
> Furthermore this is really just equivalent to clock_gettime(CLOCK_MONOTONIC)
> which is exposed to userspace (via vdso even to make it performant)...
>
> As such, I see no reason to keep the GPL restriction.
> (In the future I'd like to have access to time from Apache licensed ebpf code)
>
> Signed-off-by: Maciej Żenczykowski <maze@google.com>

The issue of compatibility with apache licensed bpf progs was
brought up few times in the past.
The patch indeed will clear this hurdle.
Applied.
diff mbox series

Patch

diff --git a/kernel/bpf/helpers.c b/kernel/bpf/helpers.c
index bafc53ddd350..a5158a179e81 100644
--- a/kernel/bpf/helpers.c
+++ b/kernel/bpf/helpers.c
@@ -151,7 +151,7 @@  BPF_CALL_0(bpf_ktime_get_ns)
 
 const struct bpf_func_proto bpf_ktime_get_ns_proto = {
 	.func		= bpf_ktime_get_ns,
-	.gpl_only	= true,
+	.gpl_only	= false,
 	.ret_type	= RET_INTEGER,
 };