Merge tag 'v4.4-rc2' into drm-intel-next-queued

Linux 4.4-rc2

Backmerge to get at

commit 1b0e3a049efe471c399674fd954500ce97438d30
Author: Imre Deak <imre.deak@intel.com>
Date:   Thu Nov 5 23:04:11 2015 +0200

    drm/i915/skl: disable display side power well support for now

so that we can proplery re-eanble skl power wells in -next.

Conflicts are just adjacent lines changed, except for intel_fbdev.c
where we need to interleave the changs. Nothing nefarious.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>

1 files changed, 35 insertions, 37 deletions

diff --git a/include/uapi/linux/bpf.h b/include/uapi/linux/bpf.h
index 92a48e2d5461..9ea2d22fa2cb 100644
--- a/include/uapi/linux/bpf.h
+++ b/include/uapi/linux/bpf.h
@@ -63,50 +63,16 @@ struct bpf_insn {
         __s32   imm;            /* signed immediate constant */
 };
 
-/* BPF syscall commands */
+/* BPF syscall commands, see bpf(2) man-page for details. */
 enum bpf_cmd {
-        /* create a map with given type and attributes
-         * fd = bpf(BPF_MAP_CREATE, union bpf_attr *, u32 size)
-         * returns fd or negative error
-         * map is deleted when fd is closed
-         */
         BPF_MAP_CREATE,
-
-        /* lookup key in a given map
-         * err = bpf(BPF_MAP_LOOKUP_ELEM, union bpf_attr *attr, u32 size)
-         * Using attr->map_fd, attr->key, attr->value
-         * returns zero and stores found elem into value
-         * or negative error
-         */
         BPF_MAP_LOOKUP_ELEM,
-
-        /* create or update key/value pair in a given map
-         * err = bpf(BPF_MAP_UPDATE_ELEM, union bpf_attr *attr, u32 size)
-         * Using attr->map_fd, attr->key, attr->value, attr->flags
-         * returns zero or negative error
-         */
         BPF_MAP_UPDATE_ELEM,
-
-        /* find and delete elem by key in a given map
-         * err = bpf(BPF_MAP_DELETE_ELEM, union bpf_attr *attr, u32 size)
-         * Using attr->map_fd, attr->key
-         * returns zero or negative error
-         */
         BPF_MAP_DELETE_ELEM,
-
-        /* lookup key in a given map and return next key
-         * err = bpf(BPF_MAP_GET_NEXT_KEY, union bpf_attr *attr, u32 size)
-         * Using attr->map_fd, attr->key, attr->next_key
-         * returns zero and stores next key or negative error
-         */
         BPF_MAP_GET_NEXT_KEY,
-
-        /* verify and load eBPF program
-         * prog_fd = bpf(BPF_PROG_LOAD, union bpf_attr *attr, u32 size)
-         * Using attr->prog_type, attr->insns, attr->license
-         * returns fd or negative error
-         */
         BPF_PROG_LOAD,
+        BPF_OBJ_PIN,
+        BPF_OBJ_GET,
 };
 
 enum bpf_map_type {
@@ -160,6 +126,11 @@ union bpf_attr {
                 __aligned_u64   log_buf;        /* user supplied buffer */
                 __u32           kern_version;   /* checked when prog_type=kprobe */
         };
+
+        struct { /* anonymous struct used by BPF_OBJ_* commands */
+                __aligned_u64   pathname;
+                __u32           bpf_fd;
+        };
 } __attribute__((aligned(8)));
 
 /* integer value in 'imm' field of BPF_CALL instruction selects which helper
@@ -272,6 +243,32 @@ enum bpf_func_id {
         BPF_FUNC_skb_get_tunnel_key,
         BPF_FUNC_skb_set_tunnel_key,
         BPF_FUNC_perf_event_read,       /* u64 bpf_perf_event_read(&map, index) */
+        /**
+         * bpf_redirect(ifindex, flags) - redirect to another netdev
+         * @ifindex: ifindex of the net device
+         * @flags: bit 0 - if set, redirect to ingress instead of egress
+         *         other bits - reserved
+         * Return: TC_ACT_REDIRECT
+         */
+        BPF_FUNC_redirect,
+
+        /**
+         * bpf_get_route_realm(skb) - retrieve a dst's tclassid
+         * @skb: pointer to skb
+         * Return: realm if != 0
+         */
+        BPF_FUNC_get_route_realm,
+
+        /**
+         * bpf_perf_event_output(ctx, map, index, data, size) - output perf raw sample
+         * @ctx: struct pt_regs*
+         * @map: pointer to perf_event_array map
+         * @index: index of event in the map
+         * @data: data on stack to be output as raw data
+         * @size: size of data
+         * Return: 0 on success
+         */
+        BPF_FUNC_perf_event_output,
         __BPF_FUNC_MAX_ID,
 };
 
@@ -293,6 +290,7 @@ struct __sk_buff {
         __u32 tc_index;
         __u32 cb[5];
         __u32 hash;
+        __u32 tc_classid;
 };
 
 struct bpf_tunnel_key {