[RFC bpf-next 4/7] bpf: Sync linux/bpf.h to tools/

[Jakub Sitnicki]

Newly added program and context type is needed for tests in subsequent
patches.

Signed-off-by: Jakub Sitnicki <ja...@cloudflare.com>
---
 tools/include/uapi/linux/bpf.h | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/tools/include/uapi/linux/bpf.h b/tools/include/uapi/linux/bpf.h
index d0a23476f887..7776f36a43d1 100644
--- a/tools/include/uapi/linux/bpf.h
+++ b/tools/include/uapi/linux/bpf.h
@@ -170,6 +170,7 @@ enum bpf_prog_type {
        BPF_PROG_TYPE_FLOW_DISSECTOR,
        BPF_PROG_TYPE_CGROUP_SYSCTL,
        BPF_PROG_TYPE_RAW_TRACEPOINT_WRITABLE,
+       BPF_PROG_TYPE_INET_LOOKUP,
 };
 
 enum bpf_attach_type {
@@ -192,6 +193,7 @@ enum bpf_attach_type {
        BPF_LIRC_MODE2,
        BPF_FLOW_DISSECTOR,
        BPF_CGROUP_SYSCTL,
+       BPF_INET_LOOKUP,
        __MAX_BPF_ATTACH_TYPE
 };
 
@@ -3066,6 +3068,31 @@ struct bpf_tcp_sock {
                                 */
 };
 
+/* User accessible data for inet_lookup programs.
+ * New fields must be added at the end.
+ */
+struct bpf_inet_lookup {
+       __u32 family;
+       __u32 remote_ip4;       /* Allows 1,2,4-byte read but no write.
+                                * Stored in network byte order.
+                                */
+       __u32 local_ip4;        /* Allows 1,2,4-byte read and 4-byte write.
+                                * Stored in network byte order.
+                                */
+       __u32 remote_ip6[4];    /* Allows 1,2,4-byte read but no write.
+                                * Stored in network byte order.
+                                */
+       __u32 local_ip6[4];     /* Allows 1,2,4-byte read and 4-byte write.
+                                * Stored in network byte order.
+                                */
+       __u32 remote_port;      /* Allows 4-byte read but no write.
+                                * Stored in network byte order.
+                                */
+       __u32 local_port;       /* Allows 4-byte read and write.
+                                * Stored in host byte order.
+                                */
+};
+
 struct bpf_sock_tuple {
        union {
                struct {
-- 
2.20.1