linux

mirror of https://github.com/torvalds/linux.git synced 2024-11-15 00:21:59 +00:00

History

Martin Andersson 013d386814 [PATCH] sched: fix task interactivity calculation Is a truncation error in kernel/sched.c triggered when the nice value is negative. The affected code is used in the TASK_INTERACTIVE macro. The code is: #define SCALE(v1,v1_max,v2_max) \ (v1) * (v2_max) / (v1_max) which is used in this way: SCALE(TASK_NICE(p), 40, MAX_BONUS) Comments in the code says: * This part scales the interactivity limit depending on niceness. * * We scale it linearly, offset by the INTERACTIVE_DELTA delta. * Here are a few examples of different nice levels: * * TASK_INTERACTIVE(-20): [1,1,1,1,1,1,1,1,1,0,0] * TASK_INTERACTIVE(-10): [1,1,1,1,1,1,1,0,0,0,0] * TASK_INTERACTIVE( 0): [1,1,1,1,0,0,0,0,0,0,0] * TASK_INTERACTIVE( 10): [1,1,0,0,0,0,0,0,0,0,0] * TASK_INTERACTIVE( 19): [0,0,0,0,0,0,0,0,0,0,0] * * (the X axis represents the possible -5 ... 0 ... +5 dynamic * priority range a task can explore, a value of '1' means the * task is rated interactive.) However, the current code does not scale it linearly and the result differs from the given examples. If the mathematical function "floor" is used when the nice value is negative instead of the truncation one gets when using integer division, the result conforms to the documentation. Output of TASK_INTERACTIVE when using the kernel code: nice dynamic priorities -20 1 1 1 1 1 1 1 1 1 0 0 -19 1 1 1 1 1 1 1 1 0 0 0 -18 1 1 1 1 1 1 1 1 0 0 0 -17 1 1 1 1 1 1 1 1 0 0 0 -16 1 1 1 1 1 1 1 1 0 0 0 -15 1 1 1 1 1 1 1 0 0 0 0 -14 1 1 1 1 1 1 1 0 0 0 0 -13 1 1 1 1 1 1 1 0 0 0 0 -12 1 1 1 1 1 1 1 0 0 0 0 -11 1 1 1 1 1 1 0 0 0 0 0 -10 1 1 1 1 1 1 0 0 0 0 0 -9 1 1 1 1 1 1 0 0 0 0 0 -8 1 1 1 1 1 1 0 0 0 0 0 -7 1 1 1 1 1 0 0 0 0 0 0 -6 1 1 1 1 1 0 0 0 0 0 0 -5 1 1 1 1 1 0 0 0 0 0 0 -4 1 1 1 1 1 0 0 0 0 0 0 -3 1 1 1 1 0 0 0 0 0 0 0 -2 1 1 1 1 0 0 0 0 0 0 0 -1 1 1 1 1 0 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 2 1 1 1 1 0 0 0 0 0 0 0 3 1 1 1 1 0 0 0 0 0 0 0 4 1 1 1 0 0 0 0 0 0 0 0 5 1 1 1 0 0 0 0 0 0 0 0 6 1 1 1 0 0 0 0 0 0 0 0 7 1 1 1 0 0 0 0 0 0 0 0 8 1 1 0 0 0 0 0 0 0 0 0 9 1 1 0 0 0 0 0 0 0 0 0 10 1 1 0 0 0 0 0 0 0 0 0 11 1 1 0 0 0 0 0 0 0 0 0 12 1 0 0 0 0 0 0 0 0 0 0 13 1 0 0 0 0 0 0 0 0 0 0 14 1 0 0 0 0 0 0 0 0 0 0 15 1 0 0 0 0 0 0 0 0 0 0 16 0 0 0 0 0 0 0 0 0 0 0 17 0 0 0 0 0 0 0 0 0 0 0 18 0 0 0 0 0 0 0 0 0 0 0 19 0 0 0 0 0 0 0 0 0 0 0 Output of TASK_INTERACTIVE when using "floor" nice dynamic priorities -20 1 1 1 1 1 1 1 1 1 0 0 -19 1 1 1 1 1 1 1 1 1 0 0 -18 1 1 1 1 1 1 1 1 1 0 0 -17 1 1 1 1 1 1 1 1 1 0 0 -16 1 1 1 1 1 1 1 1 0 0 0 -15 1 1 1 1 1 1 1 1 0 0 0 -14 1 1 1 1 1 1 1 1 0 0 0 -13 1 1 1 1 1 1 1 1 0 0 0 -12 1 1 1 1 1 1 1 0 0 0 0 -11 1 1 1 1 1 1 1 0 0 0 0 -10 1 1 1 1 1 1 1 0 0 0 0 -9 1 1 1 1 1 1 1 0 0 0 0 -8 1 1 1 1 1 1 0 0 0 0 0 -7 1 1 1 1 1 1 0 0 0 0 0 -6 1 1 1 1 1 1 0 0 0 0 0 -5 1 1 1 1 1 1 0 0 0 0 0 -4 1 1 1 1 1 0 0 0 0 0 0 -3 1 1 1 1 1 0 0 0 0 0 0 -2 1 1 1 1 1 0 0 0 0 0 0 -1 1 1 1 1 1 0 0 0 0 0 0 0 1 1 1 1 0 0 0 0 0 0 0 1 1 1 1 1 0 0 0 0 0 0 0 2 1 1 1 1 0 0 0 0 0 0 0 3 1 1 1 1 0 0 0 0 0 0 0 4 1 1 1 0 0 0 0 0 0 0 0 5 1 1 1 0 0 0 0 0 0 0 0 6 1 1 1 0 0 0 0 0 0 0 0 7 1 1 1 0 0 0 0 0 0 0 0 8 1 1 0 0 0 0 0 0 0 0 0 9 1 1 0 0 0 0 0 0 0 0 0 10 1 1 0 0 0 0 0 0 0 0 0 11 1 1 0 0 0 0 0 0 0 0 0 12 1 0 0 0 0 0 0 0 0 0 0 13 1 0 0 0 0 0 0 0 0 0 0 14 1 0 0 0 0 0 0 0 0 0 0 15 1 0 0 0 0 0 0 0 0 0 0 16 0 0 0 0 0 0 0 0 0 0 0 17 0 0 0 0 0 0 0 0 0 0 0 18 0 0 0 0 0 0 0 0 0 0 0 19 0 0 0 0 0 0 0 0 0 0 0 Signed-off-by: Martin Andersson <martin.andersson@control.lth.se> Acked-by: Ingo Molnar <mingo@elte.hu> Cc: Nick Piggin <nickpiggin@yahoo.com.au> Cc: Mike Galbraith <efault@gmx.de> Cc: Peter Williams <pwil3058@bigpond.net.au> Cc: Con Kolivas <kernel@kolivas.org> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>		2006-03-27 08:44:43 -08:00
..
irq	[PATCH] warn if free_irq() is called from IRQ context	2006-03-26 08:56:53 -08:00
power	[PATCH] swswsup: return correct load_image error	2006-03-26 08:56:55 -08:00
.gitignore	gitignore: ignore more generated files	2006-01-03 11:35:26 +01:00
acct.c	[PATCH] move capable() to capability.h	2006-01-11 18:42:13 -08:00
audit.c	[PATCH] fix audit_init failure path	2006-03-20 14:08:55 -05:00
audit.h	[PATCH] sem2mutex: audit_netlink_sem	2006-03-20 14:08:55 -05:00
auditfilter.c	[PATCH] sem2mutex: audit_netlink_sem	2006-03-20 14:08:55 -05:00
auditsc.c	Merge branch 'audit.b3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current	2006-03-25 09:24:53 -08:00
capability.c	[PATCH] refactor capable() to one implementation, add __capable() helper	2006-03-25 08:22:56 -08:00
compat.c	[PATCH] consolidate sys32/compat_adjtimex	2006-03-26 08:56:57 -08:00
configs.c	update the email address of Randy Dunlap	2006-01-03 13:37:51 +01:00
cpu.c	BUG_ON() Conversion in kernel/cpu.c	2006-03-24 18:45:21 +01:00
cpuset.c	[PATCH] cpuset: remove useless local variable initialization	2006-03-24 07:33:24 -08:00
dma.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
exec_domain.c	[PATCH] Fix module refcount leak in __set_personality()	2006-03-24 07:33:30 -08:00
exit.c	[PATCH] sem2mutex: tty	2006-03-23 07:38:11 -08:00
extable.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
fork.c	Merge git://git.kernel.org/pub/scm/linux/kernel/git/bunk/trivial	2006-03-26 09:41:18 -08:00
futex.c	[PATCH] FRV: Make futex code compilable on nommu [try #2 ]	2006-01-06 08:33:33 -08:00
hrtimer.c	[PATCH] hrtimers: remove data field	2006-03-26 08:57:03 -08:00
intermodule.c	[PATCH] missing license tag in intermodule	2006-02-05 11:06:52 -08:00
itimer.c	[PATCH] hrtimers: remove data field	2006-03-26 08:57:03 -08:00
kallsyms.c	[PATCH] fix missing includes	2005-10-30 17:37:32 -08:00
Kconfig.hz	[PATCH] i386: Selectable Frequency of the Timer Interrupt	2005-06-23 09:45:10 -07:00
Kconfig.preempt	[PATCH] sched: voluntary kernel preemption	2005-06-25 16:24:45 -07:00
kexec.c	[PATCH] move capable() to capability.h	2006-01-11 18:42:13 -08:00
kfifo.c	[PATCH] gfp flags annotations - part 1	2005-10-08 15:00:57 -07:00
kmod.c	[PATCH] Keys: Get rid of warning in kmod.c if keys disabled	2005-10-30 17:37:23 -08:00
kprobes.c	[PATCH] kretprobe instance recycled by parent process	2006-03-26 08:57:04 -08:00
ksysfs.c	[PATCH] fix build error if CONFIG_SYSFS=n	2006-03-24 07:33:31 -08:00
kthread.c	[PATCH] find_task_by_pid() needs tasklist_lock	2006-03-25 08:22:57 -08:00
Makefile	Merge branch 'audit.b3' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current	2006-03-25 09:24:53 -08:00
module.c	[PATCH] Remove MODULE_PARM	2006-03-25 08:22:52 -08:00
mutex-debug.c	[PATCH] fix/simplify mutex debugging code	2006-01-11 08:14:16 -08:00
mutex-debug.h	[PATCH] mutex subsystem, debugging code	2006-01-09 15:59:20 -08:00
mutex.c	[PATCH] mutex: trivial whitespace cleanups	2006-01-10 14:27:59 -08:00
mutex.h	[PATCH] mutex subsystem, core	2006-01-09 15:59:19 -08:00
panic.c	[PATCH] pause_on_oops command line option	2006-03-23 07:38:16 -08:00
params.c	[PATCH] kernel/params.c: make param_array() static	2006-03-25 08:22:52 -08:00
pid.c	[PATCH] RCU signal handling	2006-01-08 20:13:40 -08:00
posix-cpu-timers.c	[PATCH] hrtimer: switch clock_nanosleep to hrtimer nanosleep API	2006-01-10 08:01:38 -08:00
posix-timers.c	[PATCH] hrtimers: remove data field	2006-03-26 08:57:03 -08:00
printk.c	[PATCH] console_setup() depends (wrongly?) on CONFIG_PRINTK	2006-03-24 07:33:27 -08:00
profile.c	[PATCH] sem2mutex: kernel/	2006-03-23 07:38:10 -08:00
ptrace.c	[PATCH] fix zap_thread's ptrace related problems	2006-02-15 11:05:43 -08:00
rcupdate.c	[PATCH] rcu_process_callbacks: don't cli() while testing ->nxtlist	2006-03-24 07:33:20 -08:00
rcutorture.c	[PATCH] Remove MODULE_PARM	2006-03-25 08:22:52 -08:00
relay.c	[PATCH] relay: consolidate sendfile() and read() code	2006-03-23 19:58:45 +01:00
resource.c	[PATCH] kernel/resource.c: __check_region(): remove pointless __deprecated	2006-01-10 08:02:02 -08:00
sched.c	[PATCH] sched: fix task interactivity calculation	2006-03-27 08:44:43 -08:00
seccomp.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
signal.c	[PATCH] sigprocmask: kill unneeded temp var	2006-03-23 07:38:15 -08:00
softirq.c	[PATCH] on_each_cpu(): disable local interrupts	2006-03-22 07:53:59 -08:00
softlockup.c	[PATCH] timer irq driven soft watchdog fix	2006-03-25 08:22:48 -08:00
spinlock.c	[PATCH] BUILD_LOCK_OPS: cleanup preempt_disable() usage	2006-03-23 07:38:16 -08:00
stop_machine.c	[PATCH] Remove set_fs() in stop_machine()	2006-01-10 08:01:25 -08:00
sys_ni.c	[PATCH] Fix compile for CONFIG_SYSVIPC=n or CONFIG_SYSCTL=n	2006-02-20 20:00:11 -08:00
sys.c	[PATCH] Use unsigned int types for a faster bsearch	2006-03-25 08:23:01 -08:00
sysctl.c	[PATCH] Range checking in do_proc_dointvec_(userhz_)jiffies_conv	2006-03-24 07:33:20 -08:00
time.c	[PATCH] hrtimers: remove nsec_t typedef	2006-03-26 08:57:03 -08:00
timer.c	[PATCH] remove pps support	2006-03-25 08:23:02 -08:00
uid16.c	[PATCH] move capable() to capability.h	2006-01-11 18:42:13 -08:00
user.c	[PATCH] free_uid() locking improvement	2006-03-24 07:33:20 -08:00
wait.c	Linux-2.6.12-rc2	2005-04-16 15:20:36 -07:00
workqueue.c	[SCSI] add execute_in_process_context() API	2006-02-27 23:34:40 -06:00