git - ziggy471-sgs3-jb.git/commitdiff

file:db43518c328529196dd9aa1d06790e0803e932e3 -> file:12aa24341eb86a17a382908afa610eba392f5c44

--- a/Makefile

+++ b/Makefile

@@ -10,6 +10,10 @@ NAME = Sneaky Weasel

# Comments in this file are targeted only to the developer, do not

# expect to learn how to build the kernel reading this file.

+CKVERSION = -ck1

+CKNAME = BFS Powered

+EXTRAVERSION := $(EXTRAVERSION)$(CKVERSION)

# Do not:

# o use make's built-in rules and variables

# (this increases performance and avoids hard-to-debug behaviour);

file:32cb4e66d2cd032220dd110c5a3a803bb066cf4f -> file:bfa5dc773b94c61cf5bd5b13f2aa72cd25c6055e

--- a/arch/powerpc/platforms/cell/spufs/sched.c

+++ b/arch/powerpc/platforms/cell/spufs/sched.c

@@ -64,11 +64,6 @@ static struct timer_list spusched_timer;

static struct timer_list spuloadavg_timer;

- * Priority of a normal, non-rt, non-niced'd process (aka nice level 0).

- */

-#define NORMAL_PRIO 120

-/*

* Frequency of the spu scheduler tick. By default we do one SPU scheduler

* tick for every 10 CPU scheduler ticks.

file:37357a599dcac02e4407467e844bbac0d9e8d224 -> file:7b821ebbbae259c0db94cea940e1d0d18f6af579

--- a/arch/x86/Kconfig

+++ b/arch/x86/Kconfig

@@ -1072,7 +1072,7 @@ endchoice

choice

depends on EXPERIMENTAL

- prompt "Memory split" if EXPERT

+ prompt "Memory split"

default VMSPLIT_3G

depends on X86_32

---help---

@@ -1092,17 +1092,17 @@ choice

option alone!

config VMSPLIT_3G

- bool "3G/1G user/kernel split"

+ bool "Default 896MB lowmem (3G/1G user/kernel split)"

config VMSPLIT_3G_OPT

depends on !X86_PAE

- bool "3G/1G user/kernel split (for full 1G low memory)"

+ bool "1GB lowmem (3G/1G user/kernel split)"

config VMSPLIT_2G

- bool "2G/2G user/kernel split"

+ bool "2GB lowmem (2G/2G user/kernel split)"

config VMSPLIT_2G_OPT

depends on !X86_PAE

- bool "2G/2G user/kernel split (for full 2G low memory)"

+ bool "2GB lowmem (2G/2G user/kernel split)"

config VMSPLIT_1G

- bool "1G/3G user/kernel split"

+ bool "3GB lowmem (1G/3G user/kernel split)"

endchoice

config PAGE_OFFSET

file:62ac8cb6ba277218eec7cae7c7ef6d474d6406bc -> file:a8bdf23c43df35d9e57e97815854f19bb5b70285

--- a/arch/x86/kernel/cpu/proc.c

+++ b/arch/x86/kernel/cpu/proc.c

@@ -109,7 +109,7 @@ static int show_cpuinfo(struct seq_file

seq_printf(m, "\nbogomips\t: %lu.%02lu\n",

c->loops_per_jiffy/(500000/HZ),

- (c->loops_per_jiffy/(5000/HZ)) % 100);

+ (c->loops_per_jiffy * 10 /(50000/HZ)) % 100);

#ifdef CONFIG_X86_64

if (c->x86_tlbsize > 0)

file:9fd3137230d46af2053cdebb88c3a6ef4867984f -> file:3c696f6b6a9e5e9fcff43f198e270ba78a3290cb

--- a/arch/x86/kernel/smpboot.c

+++ b/arch/x86/kernel/smpboot.c

@@ -430,7 +430,7 @@ static void impress_friends(void)

"Total of %d processors activated (%lu.%02lu BogoMIPS).\n",

num_online_cpus(),

bogosum/(500000/HZ),

- (bogosum/(5000/HZ))%100);

+ (bogosum * 10/(50000/HZ))%100);

pr_debug("Before bogocount - setting activated=1.\n");

}

file:a522683c579457f51eb8452b3eb804d32181f44c -> file:5281c533746f977590e0e35f37aa6d3b5f789204

--- a/drivers/cpufreq/cpufreq.c

+++ b/drivers/cpufreq/cpufreq.c

@@ -28,6 +28,7 @@

#include <linux/cpu.h>

#include <linux/completion.h>

#include <linux/mutex.h>

+#include <linux/sched.h>

#include <linux/syscore_ops.h>

#include <trace/events/power.h>

@@ -1631,6 +1632,12 @@ int __cpufreq_driver_target(struct cpufr

target_freq, relation);

if (cpu_online(policy->cpu) && cpufreq_driver->target)

retval = cpufreq_driver->target(policy, target_freq, relation);

+ if (likely(retval != -EINVAL)) {

+ if (target_freq == policy->max)

+ cpu_nonscaling(policy->cpu);

+ else

+ cpu_scaling(policy->cpu);

+ }

return retval;

}

file:33b56e5c5c14a36fbfc99dd700a8b98164aca707 -> file:96d3ec37e64f79cb544c6b2522282d1e8a6211d4

--- a/drivers/cpufreq/cpufreq_conservative.c

+++ b/drivers/cpufreq/cpufreq_conservative.c

@@ -29,8 +29,8 @@

* It helps to keep variable names smaller, simpler

-#define DEF_FREQUENCY_UP_THRESHOLD (80)

-#define DEF_FREQUENCY_DOWN_THRESHOLD (20)

+#define DEF_FREQUENCY_UP_THRESHOLD (63)

+#define DEF_FREQUENCY_DOWN_THRESHOLD (26)

* The polling frequency of this governor depends on the capability of

file:a27a9c62175646dfc6419cee121db6bb9ec8a9dc -> file:5e7c2f74e3379e424a804a2211c45f74f9dabbed

--- a/drivers/cpufreq/cpufreq_ondemand.c

+++ b/drivers/cpufreq/cpufreq_ondemand.c

@@ -31,8 +31,8 @@

* It helps to keep variable names smaller, simpler

-#define DEF_FREQUENCY_DOWN_DIFFERENTIAL (10)

-#define DEF_FREQUENCY_UP_THRESHOLD (80)

+#define DEF_FREQUENCY_DOWN_DIFFERENTIAL (26)

+#define DEF_FREQUENCY_UP_THRESHOLD (63)

#define DEF_SAMPLING_DOWN_FACTOR (1)

#define MAX_SAMPLING_DOWN_FACTOR (100000)

#define MICRO_FREQUENCY_DOWN_DIFFERENTIAL (3)

@@ -549,10 +549,10 @@ static void dbs_check_cpu(struct cpu_dbs

* Every sampling_rate, we check, if current idle time is less

- * than 20% (default), then we try to increase frequency

+ * than 37% (default), then we try to increase frequency

* Every sampling_rate, we look for a the lowest

* frequency which can sustain the load while keeping idle time over

- * 30%. If such a frequency exist, we try to decrease to this frequency.

+ * 63%. If such a frequency exist, we try to decrease to this frequency.

* Any frequency increase takes it to the maximum frequency.

* Frequency reduction happens at minimum steps of

file:6a938aa9e29429179ccfef84f76ff881a2a80314 -> file:5b67176e574299f3f2c0dc6ac46d8559d2d11847

--- a/fs/proc/base.c

+++ b/fs/proc/base.c

@@ -365,7 +365,7 @@ static int proc_pid_stack(struct seq_fil

static int proc_pid_schedstat(struct task_struct *task, char *buffer)

{

return sprintf(buffer, "%llu %llu %lu\n",

- (unsigned long long)task->se.sum_exec_runtime,

+ (unsigned long long)tsk_seruntime(task),

(unsigned long long)task->sched_info.run_delay,

task->sched_info.pcount);

}

file:76dad48088474462b5f21deeff0414b40aca6b8e -> file:72324720a973a62d542f3df2afbe00fe132a6907

--- a/include/linux/ioprio.h

+++ b/include/linux/ioprio.h

@@ -64,6 +64,8 @@ static inline int task_ioprio_class(stru

static inline int task_nice_ioprio(struct task_struct *task)

{

+ if (iso_task(task))

+ return 0;

return (task_nice(task) + 20) / 5;

}

file:265e2c3cbd1cd74d2b3efd416aa9301c90ae90ad -> file:82d247e361e87f19609ed564ec8895228d04b3e5

--- a/include/linux/jiffies.h

+++ b/include/linux/jiffies.h

@@ -164,7 +164,7 @@ static inline u64 get_jiffies_64(void)

* Have the 32 bit jiffies value wrap 5 minutes after boot

* so jiffies wrap bugs show up earlier.

-#define INITIAL_JIFFIES ((unsigned long)(unsigned int) (-300*HZ))

+#define INITIAL_JIFFIES ((unsigned long)(unsigned int) (-10*HZ))

* Change timeval to jiffies, trying to avoid the

file:8f7d24712dc115790269442be6f8c245d4cf6145 -> file:62e4208ecef473a52dda81e9ebc0b40ab3b6bd13

--- a/include/linux/mm_inline.h

+++ b/include/linux/mm_inline.h

@@ -23,9 +23,12 @@ static inline int page_is_file_cache(str

static inline void

__add_page_to_lru_list(struct zone *zone, struct page *page, enum lru_list l,

- struct list_head *head)

+ struct list_head *head, int tail)

{

- list_add(&page->lru, head);

+ if (tail)

+ list_add_tail(&page->lru, head);

+ else

+ list_add(&page->lru, head);

__mod_zone_page_state(zone, NR_LRU_BASE + l, hpage_nr_pages(page));

mem_cgroup_add_lru_list(page, l);

}

@@ -33,7 +36,13 @@ __add_page_to_lru_list(struct zone *zone

static inline void

add_page_to_lru_list(struct zone *zone, struct page *page, enum lru_list l)

{

- __add_page_to_lru_list(zone, page, l, &zone->lru[l].list);

+ __add_page_to_lru_list(zone, page, l, &zone->lru[l].list, 0);

+static inline void

+add_page_to_lru_list_tail(struct zone *zone, struct page *page, enum lru_list l)

+ __add_page_to_lru_list(zone, page, l, &zone->lru[l].list, 1);

}

static inline void

file:26360cced2cf4fe47cad7f34103e7a737e165f20 -> file:fac6ecae8c3002c94dc636ca7089b19e016e0a24

--- a/include/linux/mmzone.h

+++ b/include/linux/mmzone.h

@@ -15,6 +15,7 @@

#include <linux/seqlock.h>

#include <linux/nodemask.h>

#include <linux/pageblock-flags.h>

+#include <linux/timer.h>

#include <generated/bounds.h>

#include <asm/atomic.h>

#include <asm/page.h>

@@ -162,12 +163,14 @@ enum zone_watermarks {

WMARK_MIN,

WMARK_LOW,

WMARK_HIGH,

+ WMARK_LOTS,

NR_WMARK

};

#define min_wmark_pages(z) (z->watermark[WMARK_MIN])

#define low_wmark_pages(z) (z->watermark[WMARK_LOW])

#define high_wmark_pages(z) (z->watermark[WMARK_HIGH])

+#define lots_wmark_pages(z) (z->watermark[WMARK_LOTS])

struct per_cpu_pages {

int count; /* number of pages in the list */

@@ -339,7 +342,7 @@ struct zone {

ZONE_PADDING(_pad1_)

/* Fields commonly accessed by the page reclaim scanner */

- spinlock_t lru_lock;

+ spinlock_t lru_lock;

struct zone_lru {

struct list_head list;

} lru[NR_LRU_LISTS];

@@ -641,6 +644,7 @@ typedef struct pglist_data {

wait_queue_head_t kswapd_wait;

struct task_struct *kswapd;

int kswapd_max_order;

+ struct timer_list watermark_timer;

enum zone_type classzone_idx;

} pg_data_t;

file:2693ef647df6657ae20ca917f3862921e7e53874 -> file:8930bb8dd1d8a353e6a7275ae7878aed827d9d63

--- a/include/linux/nfsd/stats.h

+++ b/include/linux/nfsd/stats.h

@@ -11,8 +11,8 @@

#include <linux/nfs4.h>

-/* thread usage wraps very million seconds (approx one fortnight) */

-#define NFSD_USAGE_WRAP (HZ*1000000)

+/* thread usage wraps every one hundred thousand seconds (approx one day) */

+#define NFSD_USAGE_WRAP (HZ*100000)

#ifdef __KERNEL__

file:716875e53520ecb4afe8ae7edd1e39a7eb75032a -> file:8b6ba7bb695dfa3ebdfd8a70263f3b835535c0e4

--- a/include/linux/pagemap.h

+++ b/include/linux/pagemap.h

@@ -458,6 +458,8 @@ int add_to_page_cache_locked(struct page

pgoff_t index, gfp_t gfp_mask);

int add_to_page_cache_lru(struct page *page, struct address_space *mapping,

pgoff_t index, gfp_t gfp_mask);

+int __add_to_page_cache_lru(struct page *page, struct address_space *mapping,

+ pgoff_t offset, gfp_t gfp_mask, int tail);

extern void delete_from_page_cache(struct page *page);

extern void __delete_from_page_cache(struct page *page);

int replace_page_cache_page(struct page *old, struct page *new, gfp_t gfp_mask);

file:35895e3ff675ef712898fe63d788dea18d468e6a -> file:fc2c49246d1067cde6af1b66e31668d1b8e9dc41

--- a/include/linux/sched.h

+++ b/include/linux/sched.h

@@ -39,6 +39,8 @@

#define SCHED_BATCH 3

/* SCHED_ISO: reserved but not implemented yet */

#define SCHED_IDLE 5

+#define SCHED_IDLEPRIO SCHED_IDLE

/* Can be ORed in to make sure the process is reverted back to SCHED_NORMAL on fork */

#define SCHED_RESET_ON_FORK 0x40000000

@@ -268,8 +270,6 @@ extern asmlinkage void schedule_tail(str

extern void init_idle(struct task_struct *idle, int cpu);

extern void init_idle_bootup_task(struct task_struct *idle);

-extern int runqueue_is_locked(int cpu);

extern cpumask_var_t nohz_cpu_mask;

#if defined(CONFIG_SMP) && defined(CONFIG_NO_HZ)

extern void select_nohz_load_balancer(int stop_tick);

@@ -1226,9 +1226,12 @@ struct task_struct {

#ifdef CONFIG_SMP

struct task_struct *wake_entry;

- int on_cpu;

#endif

- int on_rq;

+#if defined(CONFIG_SMP)

+ bool on_cpu;

+#endif

+ bool on_rq;

int prio, static_prio, normal_prio;

unsigned int rt_priority;

@@ -1572,6 +1575,42 @@ struct task_struct {

#endif

};

+extern int runqueue_is_locked(int cpu);

+static inline void cpu_scaling(int cpu)

+static inline void cpu_nonscaling(int cpu)

+#define tsk_seruntime(t) ((t)->se.sum_exec_runtime)

+#define tsk_rttimeout(t) ((t)->rt.timeout)

+static inline void tsk_cpus_current(struct task_struct *p)

+ p->rt.nr_cpus_allowed = current->rt.nr_cpus_allowed;

+static inline void print_scheduler_version(void)

+ printk(KERN_INFO"CFS CPU scheduler.\n");

+static inline bool iso_task(struct task_struct *p)

+ return false;

+static inline void remove_cpu(int cpu)

+/* Anyone feel like implementing this? */

+static inline int above_background_load(void)

+ return 1;

/* Future-safe accessor for struct task_struct's cpus_allowed. */

#define tsk_cpus_allowed(tsk) (&(tsk)->cpus_allowed)

@@ -1589,10 +1628,11 @@ struct task_struct {

#define MAX_USER_RT_PRIO 100

-#define MAX_RT_PRIO MAX_USER_RT_PRIO

+#define MAX_RT_PRIO (MAX_USER_RT_PRIO + 1)

+#define DEFAULT_PRIO (MAX_RT_PRIO + 20)

#define MAX_PRIO (MAX_RT_PRIO + 40)

-#define DEFAULT_PRIO (MAX_RT_PRIO + 20)

+#define NORMAL_PRIO DEFAULT_PRIO

static inline int rt_prio(int prio)

{

@@ -1942,7 +1982,7 @@ extern unsigned long long

task_sched_runtime(struct task_struct *task);

/* sched_exec is called by processes performing an exec */

-#ifdef CONFIG_SMP

+#if defined(CONFIG_SMP)

extern void sched_exec(void);

#else

#define sched_exec() {}

@@ -2571,7 +2611,7 @@ extern void signal_wake_up(struct task_s

#ifdef CONFIG_SMP

-static inline unsigned int task_cpu(const struct task_struct *p)

+static inline int task_cpu(const struct task_struct *p)

{

return task_thread_info(p)->cpu;

}

@@ -2580,12 +2620,12 @@ extern void set_task_cpu(struct task_str

#else

-static inline unsigned int task_cpu(const struct task_struct *p)

+static inline int task_cpu(const struct task_struct *p)

{

return 0;

}

-static inline void set_task_cpu(struct task_struct *p, unsigned int cpu)

+static inline void set_task_cpu(struct task_struct *p, int cpu)

{

}

@@ -2699,5 +2739,3 @@ static inline unsigned long rlimit_max(u

}

#endif /* __KERNEL__ */

-#endif

file:a273468f82858d6af3b61aa35b2db536385cbf05 -> file:89cd8dce2c30516aeeca76ee8e1c177762bfc98e

--- a/include/linux/swap.h

+++ b/include/linux/swap.h

@@ -201,7 +201,7 @@ struct swap_list_t {

int next; /* swapfile to be used next */

};

-/* Swap 50% full? Release swapcache more aggressively.. */

+/* Swap 50% full? */

#define vm_swap_full() (nr_swap_pages*2 < total_swap_pages)

/* linux/mm/page_alloc.c */

@@ -215,6 +215,7 @@ extern unsigned int nr_free_pagecache_pa

/* linux/mm/swap.c */

+extern void ____lru_cache_add(struct page *, enum lru_list lru, int tail);

extern void __lru_cache_add(struct page *, enum lru_list lru);

extern void lru_cache_add_lru(struct page *, enum lru_list lru);

extern void lru_add_page_tail(struct zone* zone,

@@ -238,9 +239,14 @@ static inline void lru_cache_add_anon(st

__lru_cache_add(page, LRU_INACTIVE_ANON);

}

+static inline void lru_cache_add_file_tail(struct page *page, int tail)

+ ____lru_cache_add(page, LRU_INACTIVE_FILE, tail);

static inline void lru_cache_add_file(struct page *page)

{

- __lru_cache_add(page, LRU_INACTIVE_FILE);

+ ____lru_cache_add(page, LRU_INACTIVE_FILE, 0);

}

/* LRU Isolation modes. */

@@ -350,9 +356,10 @@ extern void grab_swap_token(struct mm_st

extern void __put_swap_token(struct mm_struct *);

extern void disable_swap_token(struct mem_cgroup *memcg);

+/* Only allow swap token to have effect if swap is full */

static inline int has_swap_token(struct mm_struct *mm)

{

- return (mm == swap_token_mm);

+ return (mm == swap_token_mm && vm_swap_full());

}

static inline void put_swap_token(struct mm_struct *mm)

file:17404b5388a75302c4951d5f469fd96814ad7709 -> file:04f4389c58a18965fa3d2fd80cff34f10b44a4a0

--- a/include/net/inet_timewait_sock.h

+++ b/include/net/inet_timewait_sock.h

@@ -39,8 +39,8 @@ struct inet_hashinfo;

* If time > 4sec, it is "slow" path, no recycling is required,

* so that we select tick to get range about 4 seconds.

-#if HZ <= 16 || HZ > 4096

-# error Unsupported: HZ <= 16 or HZ > 4096

+#if HZ <= 16 || HZ > 16384

+# error Unsupported: HZ <= 16 or HZ > 16384

#elif HZ <= 32

# define INET_TWDR_RECYCLE_TICK (5 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)

#elif HZ <= 64

@@ -55,8 +55,12 @@ struct inet_hashinfo;

# define INET_TWDR_RECYCLE_TICK (10 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)

#elif HZ <= 2048

# define INET_TWDR_RECYCLE_TICK (11 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)

-#else

+#elif HZ <= 4096

# define INET_TWDR_RECYCLE_TICK (12 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)

+#elif HZ <= 8192

+# define INET_TWDR_RECYCLE_TICK (13 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)

+#else

+# define INET_TWDR_RECYCLE_TICK (14 + 2 - INET_TWDR_RECYCLE_SLOTS_LOG)

#endif

/* TIME_WAIT reaping mechanism. */

file:aae2f40fea4cbea200f0658c7f6afddb60f1d934 -> file:6e0ba781a37ca5c29e262a46a43f2d54ec2151e8

--- a/init/calibrate.c

+++ b/init/calibrate.c

@@ -269,7 +269,7 @@ void __cpuinit calibrate_delay(void)

if (!printed)

pr_cont("%lu.%02lu BogoMIPS (lpj=%lu)\n",

lpj/(500000/HZ),

- (lpj/(5000/HZ)) % 100, lpj);

+ (lpj * 10 /(50000 / HZ)) % 100, lpj);

loops_per_jiffy = lpj;

printed = true;

file:4f0cb249bcaca9f3b8d7e88ea9ca60928eb1c9cf -> file:fced0813fcaecc677ea246cbe1c9b6a0ceb78b81

--- a/init/main.c

+++ b/init/main.c

@@ -775,6 +775,7 @@ static noinline int init_post(void)

system_state = SYSTEM_RUNNING;

numa_default_policy();

+ print_scheduler_version();

current->signal->flags |= SIGNAL_UNKILLABLE;

file:94fabd534b03d9347dc117b653204fa838283def -> file:e593aa0bdc2908f62142154e5eafd0b1f26b01ff

--- a/kernel/Kconfig.hz

+++ b/kernel/Kconfig.hz

@@ -4,7 +4,7 @@

choice

prompt "Timer frequency"

- default HZ_250

+ default HZ_1000

help

Allows the configuration of the timer frequency. It is customary

to have the timer interrupt run at 1000 Hz but 100 Hz may be more

@@ -23,13 +23,14 @@ choice

with lots of processors that may show reduced performance if

too many timer interrupts are occurring.

- config HZ_250

+ config HZ_250_NODEFAULT

bool "250 HZ"

help

- 250 Hz is a good compromise choice allowing server performance

- while also showing good interactive responsiveness even

- on SMP and NUMA systems. If you are going to be using NTSC video

- or multimedia, selected 300Hz instead.

+ 250 HZ is a lousy compromise choice allowing server interactivity

+ while also showing desktop throughput and no extra power saving on

+ laptops. No good for anything.

+ Recommend 100 or 1000 instead.

config HZ_300

bool "300 HZ"

@@ -43,16 +44,82 @@ choice

bool "1000 HZ"

help

1000 Hz is the preferred choice for desktop systems and other

- systems requiring fast interactive responses to events.

+ systems requiring fast interactive responses to events. Laptops

+ can also benefit from this choice without sacrificing battery life

+ if dynticks is also enabled.

+ config HZ_1500

+ bool "1500 HZ"

+ help

+ 1500 Hz is an insane value to use to run broken software that is Hz

+ limited.