diff options
author | Ingo Molnar <mingo@kernel.org> | 2019-08-26 11:59:57 +0200 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2019-08-26 11:59:57 +0200 |
commit | 8db5957bc736f0fcbe187ab460e5448d82b41c03 (patch) | |
tree | 070b560282ddc4a9a86018ccc59b888b6347ece0 /tools/include | |
parent | 49c46457caadb8c170fd841bd8051e03062d9b8b (diff) | |
parent | a55aa89aab90fae7c815b0551b07be37db359d76 (diff) | |
download | lwn-8db5957bc736f0fcbe187ab460e5448d82b41c03.tar.gz lwn-8db5957bc736f0fcbe187ab460e5448d82b41c03.zip |
Merge tag 'v5.3-rc6' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'tools/include')
-rw-r--r-- | tools/include/uapi/linux/bpf.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h index 4e455018da65..a5aa7d3ac6a1 100644 --- a/tools/include/uapi/linux/bpf.h +++ b/tools/include/uapi/linux/bpf.h @@ -1466,8 +1466,8 @@ union bpf_attr { * If no cookie has been set yet, generate a new cookie. Once * generated, the socket cookie remains stable for the life of the * socket. This helper can be useful for monitoring per socket - * networking traffic statistics as it provides a unique socket - * identifier per namespace. + * networking traffic statistics as it provides a global socket + * identifier that can be assumed unique. * Return * A 8-byte long non-decreasing number on success, or 0 if the * socket field is missing inside *skb*. @@ -1571,8 +1571,11 @@ union bpf_attr { * but this is only implemented for native XDP (with driver * support) as of this writing). * - * All values for *flags* are reserved for future usage, and must - * be left at zero. + * The lower two bits of *flags* are used as the return code if + * the map lookup fails. This is so that the return value can be + * one of the XDP program return codes up to XDP_TX, as chosen by + * the caller. Any higher bits in the *flags* argument must be + * unset. * * When used to redirect packets to net devices, this helper * provides a high performance increase over **bpf_redirect**\ (). |