bpf: Sync uapi bpf.h header to tools directory

There is a delta between kernel UAPI bpf.h and tools UAPI bpf.h,
thus sync them again.

Signed-off-by: Daniel Borkmann <daniel@iogearbox.net>

diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index 1fb3cb2636e62e56e615a3a0a113072aadabac34..e8241b320c6d9ab3647ad7855c6949130866b97e 100644 (file)
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -5519,11 +5519,12 @@ union bpf_attr {
  *             **-EOPNOTSUPP** if the hash calculation failed or **-EINVAL** if
  *             invalid arguments are passed.
  *
- * void *bpf_kptr_xchg(void *map_value, void *ptr)
+ * void *bpf_kptr_xchg(void *dst, void *ptr)
  *     Description
- *             Exchange kptr at pointer *map_value* with *ptr*, and return the
- *             old value. *ptr* can be NULL, otherwise it must be a referenced
- *             pointer which will be released when this helper is called.
+ *             Exchange kptr at pointer *dst* with *ptr*, and return the old value.
+ *             *dst* can be map value or local kptr. *ptr* can be NULL, otherwise
+ *             it must be a referenced pointer which will be released when this helper
+ *             is called.
  *     Return
  *             The old value of kptr (which can be NULL). The returned pointer
  *             if not NULL, is a reference which must be released using its
@@ -6046,11 +6047,6 @@ enum {
        BPF_F_MARK_ENFORCE              = (1ULL << 6),
 };
 
-/* BPF_FUNC_clone_redirect and BPF_FUNC_redirect flags. */
-enum {
-       BPF_F_INGRESS                   = (1ULL << 0),
-};
-
 /* BPF_FUNC_skb_set_tunnel_key and BPF_FUNC_skb_get_tunnel_key flags. */
 enum {
        BPF_F_TUNINFO_IPV6              = (1ULL << 0),
@@ -6197,10 +6193,12 @@ enum {
        BPF_F_BPRM_SECUREEXEC   = (1ULL << 0),
 };
 
-/* Flags for bpf_redirect_map helper */
+/* Flags for bpf_redirect and bpf_redirect_map helpers */
 enum {
-       BPF_F_BROADCAST         = (1ULL << 3),
-       BPF_F_EXCLUDE_INGRESS   = (1ULL << 4),
+       BPF_F_INGRESS           = (1ULL << 0), /* used for skb path */
+       BPF_F_BROADCAST         = (1ULL << 3), /* used for XDP path */
+       BPF_F_EXCLUDE_INGRESS   = (1ULL << 4), /* used for XDP path */
+#define BPF_F_REDIRECT_FLAGS (BPF_F_INGRESS | BPF_F_BROADCAST | BPF_F_EXCLUDE_INGRESS)
 };
 
 #define __bpf_md_ptr(type, name)       \