--- /dev/null
+From 35cf4e50b16331def6cfcbee11e49270b6db07f5 Mon Sep 17 00:00:00 2001
+From: Mike Galbraith <efault@gmx.de>
+Date: Tue, 7 Aug 2012 05:00:13 +0200
+Subject: sched,cgroup: Fix up task_groups list
+
+From: Mike Galbraith <efault@gmx.de>
+
+commit 35cf4e50b16331def6cfcbee11e49270b6db07f5 upstream.
+
+With multiple instances of task_groups, for_each_rt_rq() is a noop,
+no task groups having been added to the rt.c list instance. This
+renders __enable/disable_runtime() and print_rt_stats() noop, the
+user (non) visible effect being that rt task groups are missing in
+/proc/sched_debug.
+
+Signed-off-by: Mike Galbraith <efault@gmx.de>
+Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
+Link: http://lkml.kernel.org/r/1344308413.6846.7.camel@marge.simpson.net
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ kernel/sched/core.c | 1 +
+ kernel/sched/sched.h | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -7011,6 +7011,7 @@ int in_sched_functions(unsigned long add
+
+ #ifdef CONFIG_CGROUP_SCHED
+ struct task_group root_task_group;
++LIST_HEAD(task_groups);
+ #endif
+
+ DECLARE_PER_CPU(cpumask_var_t, load_balance_tmpmask);
+--- a/kernel/sched/sched.h
++++ b/kernel/sched/sched.h
+@@ -80,7 +80,7 @@ extern struct mutex sched_domains_mutex;
+ struct cfs_rq;
+ struct rt_rq;
+
+-static LIST_HEAD(task_groups);
++extern struct list_head task_groups;
+
+ struct cfs_bandwidth {
+ #ifdef CONFIG_CFS_BANDWIDTH
--- /dev/null
+From bea6832cc8c4a0a9a65dd17da6aaa657fe27bc3e Mon Sep 17 00:00:00 2001
+From: Stanislaw Gruszka <sgruszka@redhat.com>
+Date: Wed, 8 Aug 2012 11:27:15 +0200
+Subject: sched: fix divide by zero at {thread_group,task}_times
+
+From: Stanislaw Gruszka <sgruszka@redhat.com>
+
+commit bea6832cc8c4a0a9a65dd17da6aaa657fe27bc3e upstream.
+
+On architectures where cputime_t is 64 bit type, is possible to trigger
+divide by zero on do_div(temp, (__force u32) total) line, if total is a
+non zero number but has lower 32 bit's zeroed. Removing casting is not
+a good solution since some do_div() implementations do cast to u32
+internally.
+
+This problem can be triggered in practice on very long lived processes:
+
+ PID: 2331 TASK: ffff880472814b00 CPU: 2 COMMAND: "oraagent.bin"
+ #0 [ffff880472a51b70] machine_kexec at ffffffff8103214b
+ #1 [ffff880472a51bd0] crash_kexec at ffffffff810b91c2
+ #2 [ffff880472a51ca0] oops_end at ffffffff814f0b00
+ #3 [ffff880472a51cd0] die at ffffffff8100f26b
+ #4 [ffff880472a51d00] do_trap at ffffffff814f03f4
+ #5 [ffff880472a51d60] do_divide_error at ffffffff8100cfff
+ #6 [ffff880472a51e00] divide_error at ffffffff8100be7b
+ [exception RIP: thread_group_times+0x56]
+ RIP: ffffffff81056a16 RSP: ffff880472a51eb8 RFLAGS: 00010046
+ RAX: bc3572c9fe12d194 RBX: ffff880874150800 RCX: 0000000110266fad
+ RDX: 0000000000000000 RSI: ffff880472a51eb8 RDI: 001038ae7d9633dc
+ RBP: ffff880472a51ef8 R8: 00000000b10a3a64 R9: ffff880874150800
+ R10: 00007fcba27ab680 R11: 0000000000000202 R12: ffff880472a51f08
+ R13: ffff880472a51f10 R14: 0000000000000000 R15: 0000000000000007
+ ORIG_RAX: ffffffffffffffff CS: 0010 SS: 0018
+ #7 [ffff880472a51f00] do_sys_times at ffffffff8108845d
+ #8 [ffff880472a51f40] sys_times at ffffffff81088524
+ #9 [ffff880472a51f80] system_call_fastpath at ffffffff8100b0f2
+ RIP: 0000003808caac3a RSP: 00007fcba27ab6d8 RFLAGS: 00000202
+ RAX: 0000000000000064 RBX: ffffffff8100b0f2 RCX: 0000000000000000
+ RDX: 00007fcba27ab6e0 RSI: 000000000076d58e RDI: 00007fcba27ab6e0
+ RBP: 00007fcba27ab700 R8: 0000000000000020 R9: 000000000000091b
+ R10: 00007fcba27ab680 R11: 0000000000000202 R12: 00007fff9ca41940
+ R13: 0000000000000000 R14: 00007fcba27ac9c0 R15: 00007fff9ca41940
+ ORIG_RAX: 0000000000000064 CS: 0033 SS: 002b
+
+Signed-off-by: Stanislaw Gruszka <sgruszka@redhat.com>
+Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
+Link: http://lkml.kernel.org/r/20120808092714.GA3580@redhat.com
+Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ kernel/sched/core.c | 34 ++++++++++++++++++++--------------
+ 1 file changed, 20 insertions(+), 14 deletions(-)
+
+--- a/kernel/sched/core.c
++++ b/kernel/sched/core.c
+@@ -3084,6 +3084,20 @@ void thread_group_times(struct task_stru
+ # define nsecs_to_cputime(__nsecs) nsecs_to_jiffies(__nsecs)
+ #endif
+
++static cputime_t scale_utime(cputime_t utime, cputime_t rtime, cputime_t total)
++{
++ u64 temp = (__force u64) rtime;
++
++ temp *= (__force u64) utime;
++
++ if (sizeof(cputime_t) == 4)
++ temp = div_u64(temp, (__force u32) total);
++ else
++ temp = div64_u64(temp, (__force u64) total);
++
++ return (__force cputime_t) temp;
++}
++
+ void task_times(struct task_struct *p, cputime_t *ut, cputime_t *st)
+ {
+ cputime_t rtime, utime = p->utime, total = utime + p->stime;
+@@ -3093,13 +3107,9 @@ void task_times(struct task_struct *p, c
+ */
+ rtime = nsecs_to_cputime(p->se.sum_exec_runtime);
+
+- if (total) {
+- u64 temp = (__force u64) rtime;
+-
+- temp *= (__force u64) utime;
+- do_div(temp, (__force u32) total);
+- utime = (__force cputime_t) temp;
+- } else
++ if (total)
++ utime = scale_utime(utime, rtime, total);
++ else
+ utime = rtime;
+
+ /*
+@@ -3126,13 +3136,9 @@ void thread_group_times(struct task_stru
+ total = cputime.utime + cputime.stime;
+ rtime = nsecs_to_cputime(cputime.sum_exec_runtime);
+
+- if (total) {
+- u64 temp = (__force u64) rtime;
+-
+- temp *= (__force u64) cputime.utime;
+- do_div(temp, (__force u32) total);
+- utime = (__force cputime_t) temp;
+- } else
++ if (total)
++ utime = scale_utime(cputime.utime, rtime, total);
++ else
+ utime = rtime;
+
+ sig->prev_utime = max(sig->prev_utime, utime);
--- /dev/null
+From 8a3f0ede2b3f5477122060af1a816c6bbf09fcd2 Mon Sep 17 00:00:00 2001
+From: Jayakrishnan Memana <jayakrishnan.memana@maxim-ic.com>
+Date: Sun, 15 Jul 2012 10:54:03 -0300
+Subject: [media] uvcvideo: Reset the bytesused field when recycling an erroneous buffer
+
+From: Jayakrishnan Memana <jayakrishnan.memana@maxim-ic.com>
+
+commit 8a3f0ede2b3f5477122060af1a816c6bbf09fcd2 upstream.
+
+Buffers marked as erroneous are recycled immediately by the driver if
+the nodrop module parameter isn't set. The buffer payload size is reset
+to 0, but the buffer bytesused field isn't. This results in the buffer
+being immediately considered as complete, leading to an infinite loop in
+interrupt context.
+
+Fix the problem by resetting the bytesused field when recycling the
+buffer.
+
+Signed-off-by: Jayakrishnan Memana <jayakrishnan.memana@maxim-ic.com>
+Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
+Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+---
+ drivers/media/video/uvc/uvc_queue.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/drivers/media/video/uvc/uvc_queue.c
++++ b/drivers/media/video/uvc/uvc_queue.c
+@@ -355,6 +355,7 @@ struct uvc_buffer *uvc_queue_next_buffer
+ if ((queue->flags & UVC_QUEUE_DROP_CORRUPTED) && buf->error) {
+ buf->error = 0;
+ buf->state = UVC_BUF_STATE_QUEUED;
++ buf->bytesused = 0;
+ vb2_set_plane_payload(&buf->buf, 0, 0);
+ return buf;
+ }
projects / thirdparty / kernel / stable-queue.git / commitdiff
