commits November 2009

commits@lists.open-mesh.org

1 participants
989 discussions

[git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24

by postmaster＠open-mesh.net

The following commit has been merged in the linux branch: commit 608221fdf9a2170962295dcfbea53dc5c50d1a74 Merge: 72cc129e8dae988d2a132467cfd0ecd7623c35fb b84ff7d6f1b7f8a43414e74d972ec4c8f3361db4 Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Thu Nov 5 10:56:47 2009 -0800 Merge branch 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'sched-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: sched: Fix kthread_bind() by moving the body of kthread_bind() to sched.c sched: Disable SD_PREFER_LOCAL at node level sched: Fix boot crash by zalloc()ing most of the cpu masks sched: Strengthen buddies and mitigate buddy induced latencies diff --combined kernel/sched.c index a455dca,5cb7d63..28dd4f4 --- a/kernel/sched.c +++ b/kernel/sched.c @@@ -1564,7 -1564,11 +1564,7 @@@ static unsigned long cpu_avg_load_per_t #ifdef CONFIG_FAIR_GROUP_SCHED -struct update_shares_data { - unsigned long rq_weight[NR_CPUS]; -}; - -static DEFINE_PER_CPU(struct update_shares_data, update_shares_data); +static __read_mostly unsigned long *update_shares_data; static void __set_se_shares(struct sched_entity *se, unsigned long shares); @@@ -1574,12 -1578,12 +1574,12 @@@ static void update_group_shares_cpu(struct task_group *tg, int cpu, unsigned long sd_shares, unsigned long sd_rq_weight, - struct update_shares_data *usd) + unsigned long *usd_rq_weight) { unsigned long shares, rq_weight; int boost = 0; - rq_weight = usd->rq_weight[cpu]; + rq_weight = usd_rq_weight[cpu]; if (!rq_weight) { boost = 1; rq_weight = NICE_0_LOAD; @@@ -1614,7 -1618,7 +1614,7 @@@ static int tg_shares_up(struct task_group *tg, void *data) { unsigned long weight, rq_weight = 0, shares = 0; - struct update_shares_data *usd; + unsigned long *usd_rq_weight; struct sched_domain *sd = data; unsigned long flags; int i; @@@ -1623,11 -1627,11 +1623,11 @@@ return 0; local_irq_save(flags); - usd = &__get_cpu_var(update_shares_data); + usd_rq_weight = per_cpu_ptr(update_shares_data, smp_processor_id()); for_each_cpu(i, sched_domain_span(sd)) { weight = tg->cfs_rq[i]->load.weight; - usd->rq_weight[i] = weight; + usd_rq_weight[i] = weight; /* * If there are currently no tasks on the cpu pretend there @@@ -1648,7 -1652,7 +1648,7 @@@ shares = tg->shares; for_each_cpu(i, sched_domain_span(sd)) - update_group_shares_cpu(tg, i, shares, rq_weight, usd); + update_group_shares_cpu(tg, i, shares, rq_weight, usd_rq_weight); local_irq_restore(flags); @@@ -1992,6 -1996,38 +1992,38 @@@ static inline void check_class_changed( p->sched_class->prio_changed(rq, p, oldprio, running); } + /** + * kthread_bind - bind a just-created kthread to a cpu. + * @k: thread created by kthread_create(). + * @cpu: cpu (might not be online, must be possible) for @k to run on. + * + * Description: This function is equivalent to set_cpus_allowed(), + * except that @cpu doesn't need to be online, and the thread must be + * stopped (i.e., just returned from kthread_create()). + * + * Function lives here instead of kthread.c because it messes with + * scheduler internals which require locking. + */ + void kthread_bind(struct task_struct *p, unsigned int cpu) + { + struct rq *rq = cpu_rq(cpu); + unsigned long flags; + + /* Must have done schedule() in kthread() before we set_task_cpu */ + if (!wait_task_inactive(p, TASK_UNINTERRUPTIBLE)) { + WARN_ON(1); + return; + } + + spin_lock_irqsave(&rq->lock, flags); + set_task_cpu(p, cpu); + p->cpus_allowed = cpumask_of_cpu(cpu); + p->rt.nr_cpus_allowed = 1; + p->flags |= PF_THREAD_BOUND; + spin_unlock_irqrestore(&rq->lock, flags); + } + EXPORT_SYMBOL(kthread_bind); + #ifdef CONFIG_SMP /* * Is this task likely cache-hot: @@@ -2004,7 -2040,7 +2036,7 @@@ task_hot(struct task_struct *p, u64 now /* * Buddy candidates are cache hot: */ - if (sched_feat(CACHE_HOT_BUDDY) && + if (sched_feat(CACHE_HOT_BUDDY) && this_rq()->nr_running && (&p->se == cfs_rq_of(&p->se)->next || &p->se == cfs_rq_of(&p->se)->last)) return 1; @@@ -6720,6 -6756,9 +6752,6 @@@ EXPORT_SYMBOL(yield) /* * This task is about to go to sleep on IO. Increment rq->nr_iowait so * that process accounting knows that this is a task in IO wait state. - * - * But don't do that if it is a deliberate, throttling IO wait (this task - * has set its backing_dev_info: the queue against which it should throttle) */ void __sched io_schedule(void) { @@@ -9403,10 -9442,6 +9435,10 @@@ void __init sched_init(void #endif /* CONFIG_USER_SCHED */ #endif /* CONFIG_GROUP_SCHED */ +#if defined CONFIG_FAIR_GROUP_SCHED && defined CONFIG_SMP + update_shares_data = __alloc_percpu(nr_cpu_ids * sizeof(unsigned long), + __alignof__(unsigned long)); +#endif for_each_possible_cpu(i) { struct rq *rq; @@@ -9532,13 -9567,13 +9564,13 @@@ current->sched_class = &fair_sched_class; /* Allocate the nohz_cpu_mask if CONFIG_CPUMASK_OFFSTACK */ - alloc_cpumask_var(&nohz_cpu_mask, GFP_NOWAIT); + zalloc_cpumask_var(&nohz_cpu_mask, GFP_NOWAIT); #ifdef CONFIG_SMP #ifdef CONFIG_NO_HZ - alloc_cpumask_var(&nohz.cpu_mask, GFP_NOWAIT); + zalloc_cpumask_var(&nohz.cpu_mask, GFP_NOWAIT); alloc_cpumask_var(&nohz.ilb_grp_nohz_mask, GFP_NOWAIT); #endif - alloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT); + zalloc_cpumask_var(&cpu_isolated_map, GFP_NOWAIT); #endif /* SMP */ perf_event_init(); -- batman-adv

13 years, 4 months

[git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24

by postmaster＠open-mesh.net

The following commit has been merged in the linux branch: commit 72cc129e8dae988d2a132467cfd0ecd7623c35fb Merge: 411094acb70f171a111710cf32031c749ffdd28c ed146b25942b428f8e8056587b7638ce76573c2f Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Thu Nov 5 10:56:25 2009 -0800 Merge branch 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'tracing-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: ftrace: Fix unmatched locking in ftrace_regex_write() ring-buffer: Synchronize resizing buffer with reader lock -- batman-adv

13 years, 4 months

[git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24

by postmaster＠open-mesh.net

The following commit has been merged in the linux branch: commit 8fcf4e5a572af520580b14abd9017760e6fcdada Merge: bd901751e7ab9ddba335b19643605b3cf8517078 45cdd473301aae36e1f10664b9fe7ef5aad3f182 Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Thu Nov 5 10:53:49 2009 -0800 Merge branch 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev * 'for-linus' of git://www.linux-m32r.org/git/takata/linux-2.6_dev: m32r: Should index be positive? m32r: bzip2/lzma kernel compression support m32r: add NOTES to vmlinux.lds.S to remove .note.gnu.build-id section arch/m32r: Use DIV_ROUND_CLOSEST -- batman-adv

13 years, 4 months

[git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24

by postmaster＠open-mesh.net

The following commit has been merged in the linux branch: commit 411094acb70f171a111710cf32031c749ffdd28c Merge: 8fcf4e5a572af520580b14abd9017760e6fcdada 89240ba059ca468ae7a8346edf7f95082458c2fc Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Thu Nov 5 10:54:08 2009 -0800 Merge branch 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip * 'x86-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: x86, fs: Fix x86 procfs stack information for threads on 64-bit x86: Add reboot quirk for 3 series Mac mini x86: Fix printk message typo in mtrr cleanup code dma-debug: Fix compile warning with PAE enabled x86/amd-iommu: Un__init function required on shutdown x86/amd-iommu: Workaround for erratum 63 -- batman-adv

13 years, 4 months

[git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24

by postmaster＠open-mesh.net

The following commit has been merged in the linux branch: commit bd901751e7ab9ddba335b19643605b3cf8517078 Merge: d39b7dd1dcbf394a1cb897457c862dafe9a20ac5 17adea01b9606e416ea5116a27d02d47fe7e6c8d Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Thu Nov 5 10:53:24 2009 -0800 Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp * 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp: amd64_edac: fix CECCs reporting amd64_edac: fix a wrong goto clause in amd64_edac.c -- batman-adv

13 years, 4 months

[git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24

by postmaster＠open-mesh.net

The following commit has been merged in the linux branch: commit 38634e6769920929385f1ffc8820dc3e893cc630 Author: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> Date: Thu Nov 5 17:10:34 2009 +1100 powerpc/kvm: Remove problematic BUILD_BUG_ON statement Signed-off-by: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> diff --git a/arch/powerpc/kvm/timing.h b/arch/powerpc/kvm/timing.h index bb13b1f..806ef67 100644 --- a/arch/powerpc/kvm/timing.h +++ b/arch/powerpc/kvm/timing.h @@ -48,7 +48,11 @@ static inline void kvmppc_set_exit_type(struct kvm_vcpu *vcpu, int type) {} static inline void kvmppc_account_exit_stat(struct kvm_vcpu *vcpu, int type) { /* type has to be known at build time for optimization */ + + /* The BUILD_BUG_ON below breaks in funny ways, commented out + * for now ... -BenH BUILD_BUG_ON(__builtin_constant_p(type)); + */ switch (type) { case EXT_INTR_EXITS: vcpu->stat.ext_intr_exits++; -- batman-adv

13 years, 4 months

[git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24

by postmaster＠open-mesh.net

The following commit has been merged in the linux branch: commit d39b7dd1dcbf394a1cb897457c862dafe9a20ac5 Author: Linus Torvalds <torvalds(a)linux-foundation.org> Date: Thu Nov 5 10:48:30 2009 -0800 sgi-gru: decrapfiy options_write() function Not a single line of actual code in the function was really fundamentally correct. Problems ranged from lack of proper range checking, to removing the last character written (which admittedly is usually '\n'), to not accepting hex numbers even though the 'show' routine would show the data in that format. This tries to do better. Acked-by: Michael Buesch <mb(a)bu3sch.de> Tested-and-acked-by: Jack Steiner <steiner(a)sgi.com> Cc: stable(a)kernel.org Cc: Jiri Kosina <jkosina(a)suse.cz> Cc: Michael Gilbert <michael.s.gilbert(a)gmail.com> Signed-off-by: Linus Torvalds <torvalds(a)linux-foundation.org> diff --git a/drivers/misc/sgi-gru/gruprocfs.c b/drivers/misc/sgi-gru/gruprocfs.c index ccd4408..3f2375c 100644 --- a/drivers/misc/sgi-gru/gruprocfs.c +++ b/drivers/misc/sgi-gru/gruprocfs.c @@ -161,14 +161,15 @@ static int options_show(struct seq_file *s, void *p) static ssize_t options_write(struct file *file, const char __user *userbuf, size_t count, loff_t *data) { - unsigned long val; - char buf[80]; + char buf[20]; - if (strncpy_from_user(buf, userbuf, sizeof(buf) - 1) < 0) + if (count >= sizeof(buf)) + return -EINVAL; + if (copy_from_user(buf, userbuf, count)) return -EFAULT; - buf[count - 1] = '\0'; - if (!strict_strtoul(buf, 10, &val)) - gru_options = val; + buf[count] = '\0'; + if (strict_strtoul(buf, 0, &gru_options)) + return -EINVAL; return count; } -- batman-adv

13 years, 4 months

[git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24

by postmaster＠open-mesh.net

The following commit has been merged in the linux branch: commit 8435b027b87a78145992c37b0b8ed0f1b7761bf0 Author: Andre Detsch <adetsch(a)br.ibm.com> Date: Wed Nov 4 13:03:19 2009 -0200 powerpc/pci: Fix regression in powerpc MSI-X Patch f598282f5145036312d90875d0ed5c14b49fd8a7 exposed a problem in powerpc MSI-X functionality, making network interfaces such as ixgbe and cxgb3 stop to work when MSI-X is enabled. RX interrupts were not being generated. The problem was caused because MSI irq was not being effectively unmasked after device initialization. Signed-off-by: Andre Detsch <adetsch(a)br.ibm.com> Signed-off-by: Michael Ellerman <michael(a)ellerman.id.au> Signed-off-by: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> diff --git a/arch/powerpc/platforms/pseries/msi.c b/arch/powerpc/platforms/pseries/msi.c index bf2e1ac..1164c34 100644 --- a/arch/powerpc/platforms/pseries/msi.c +++ b/arch/powerpc/platforms/pseries/msi.c @@ -432,8 +432,6 @@ static int rtas_setup_msi_irqs(struct pci_dev *pdev, int nvec, int type) /* Read config space back so we can restore after reset */ read_msi_msg(virq, &msg); entry->msg = msg; - - unmask_msi_irq(virq); } return 0; diff --git a/arch/powerpc/platforms/pseries/xics.c b/arch/powerpc/platforms/pseries/xics.c index 419f8a6..b9bf0ee 100644 --- a/arch/powerpc/platforms/pseries/xics.c +++ b/arch/powerpc/platforms/pseries/xics.c @@ -18,6 +18,7 @@ #include <linux/init.h> #include <linux/radix-tree.h> #include <linux/cpu.h> +#include <linux/msi.h> #include <linux/of.h> #include <asm/firmware.h> @@ -219,6 +220,14 @@ static void xics_unmask_irq(unsigned int virq) static unsigned int xics_startup(unsigned int virq) { + /* + * The generic MSI code returns with the interrupt disabled on the + * card, using the MSI mask bits. Firmware doesn't appear to unmask + * at that level, so we do it here by hand. + */ + if (irq_to_desc(virq)->msi_desc) + unmask_msi_irq(virq); + /* unmask it */ xics_unmask_irq(virq); return 0; -- batman-adv

13 years, 4 months

[git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24

by postmaster＠open-mesh.net

The following commit has been merged in the linux branch: commit f1167fb318f0ff0bcb9cbb57bb6d16ad450f0cfb Author: Benjamin Herrenschmidt <benh(a)au1.ibm.com> Date: Wed Nov 4 13:39:52 2009 +0000 powerpc/mm: Remove debug context clamping from nohash code I inadvertently left that debug code enabled, causing the number of contexts to be clamped to 31 which is going to slow things down on 4xx and just plain breaks 8xx Signed-off-by: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> diff --git a/arch/powerpc/mm/mmu_context_nohash.c b/arch/powerpc/mm/mmu_context_nohash.c index c2f93dc..be4f34c 100644 --- a/arch/powerpc/mm/mmu_context_nohash.c +++ b/arch/powerpc/mm/mmu_context_nohash.c @@ -25,8 +25,8 @@ * also clear mm->cpu_vm_mask bits when processes are migrated */ -#define DEBUG_MAP_CONSISTENCY -#define DEBUG_CLAMP_LAST_CONTEXT 31 +//#define DEBUG_MAP_CONSISTENCY +//#define DEBUG_CLAMP_LAST_CONTEXT 31 //#define DEBUG_HARDER /* We don't use DEBUG because it tends to be compiled in always nowadays -- batman-adv

13 years, 4 months

[git] batman-adv branch, linux, updated. 31791c214a69092cb9feb5a6198a695a21fa0b24

by postmaster＠open-mesh.net

The following commit has been merged in the linux branch: commit 978d7eb31d44de34a7f71e04ed4158f3f854688d Author: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> Date: Sun Nov 1 19:11:03 2009 +0000 powerpc: Avoid giving out RTC dates below EPOCH Doing so causes xtime to be negative which crashes the timekeeping code in funny ways when doing suspend/resume Signed-off-by: Benjamin Herrenschmidt <benh(a)kernel.crashing.org> diff --git a/arch/powerpc/kernel/time.c b/arch/powerpc/kernel/time.c index 92dc844..a136a11 100644 --- a/arch/powerpc/kernel/time.c +++ b/arch/powerpc/kernel/time.c @@ -777,7 +777,7 @@ int update_persistent_clock(struct timespec now) return ppc_md.set_rtc_time(&tm); } -void read_persistent_clock(struct timespec *ts) +static void __read_persistent_clock(struct timespec *ts) { struct rtc_time tm; static int first = 1; @@ -800,10 +800,23 @@ void read_persistent_clock(struct timespec *ts) return; } ppc_md.get_rtc_time(&tm); + ts->tv_sec = mktime(tm.tm_year+1900, tm.tm_mon+1, tm.tm_mday, tm.tm_hour, tm.tm_min, tm.tm_sec); } +void read_persistent_clock(struct timespec *ts) +{ + __read_persistent_clock(ts); + + /* Sanitize it in case real time clock is set below EPOCH */ + if (ts->tv_sec < 0) { + ts->tv_sec = 0; + ts->tv_nsec = 0; + } + +} + /* clocksource code */ static cycle_t rtc_read(struct clocksource *cs) { -- batman-adv

13 years, 4 months

Jump to page:

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

commits November 2009