3.4.29-rt42-rc1 stable review
Subsystems (6)
Steven Rostedt
reviewercover 3.4.29-rt42-rc1 stable review
Dear RT Folks,
This is the RT stable review cycle of patch 3.4.29-rt42-rc1.
Please scream at me if I messed something up. Please test the patches too.
The -rc release will be uploaded to kernel.org and will be deleted when the final release is out. This is just a review release (or release candidate).
The pre-releases will not be pushed to the git repository, only the final release is.
If all goes well, this patch will be converted to the next main release on 2/8/2013.
Enjoy,
-- Steve
To build 3.4.29-rt42-rc1 directly, the following patches should be applied:
http://www.kernel.org/pub/linux/kernel/v3.x/linux-3.4.tar.xz
http://www.kernel.org/pub/linux/kernel/v3.x/patch-3.4.29.xz
http://www.kernel.org/pub/linux/kernel/projects/rt/3.4/patch-3.4.29-rt42-rc1.patch.xz
You can also build from 3.4.29-rt41 by applying the incremental patch:
http://www.kernel.org/pub/linux/kernel/projects/rt/3.4/incr/patch-3.4.29-rt41-rt42-rc1.patch.xz
Changes from 3.4.29-rt41:
---
Steven Rostedt (1):
Linux 3.4.29-rt42-rc1
Thomas Gleixner (5):
drivers-tty-pl011-irq-disable-madness.patch
mmci: Remove bogus local_irq_save()
sched: Init idle->on_rq in init_idle()
sched: Check for idle task in might_sleep()
mm: swap: Initialize local locks early
----
drivers/mmc/host/mmci.c | 5 ----- drivers/tty/serial/amba-pl011.c | 15 ++++++++++----- kernel/sched/core.c | 4 +++- localversion-rt | 2 +- mm/swap.c | 12 +++++++++--- 5 files changed, 23 insertions(+), 15 deletions(-)
Steven Rostedt
reviewerPATCH 1/6 drivers-tty-pl011-irq-disable-madness.patch
From: Thomas Gleixner <[email protected]>
--- drivers/tty/serial/amba-pl011.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-)
drivers/tty/serial/amba-pl011.c +10 -5
@@ -1788,13 +1788,19 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)clk_enable (uap->clk); -local_irq_save (flags); +/* +* local_irq_save(flags); +* +* This local_irq_save() is nonsense. If we come in via sysrq +* handling then interrupts are already disabled. Aside of +* that the port.sysrq check is racy on SMP regardless. +*/ if (uap->port.sysrq) locked =0 ;else if (oops_in_progress) - locked =spin_trylock (&uap->port.lock); + locked =spin_trylock_irqsave (&uap->port.lock, flags);else -spin_lock (&uap->port.lock); +spin_lock_irqsave (&uap->port.lock, flags);/* * First save the CR then disable the interrupts
@@ -1816,8 +1822,7 @@ pl011_console_write(struct console *co, const char *s, unsigned int count)writew (old_cr, uap->port.membase +UART011_CR );if (locked) -spin_unlock (&uap->port.lock); -local_irq_restore (flags); +spin_unlock_irqrestore (&uap->port.lock, flags);clk_disable (uap->clk); }
Signature · 1 line
1.7.10.4
Steven Rostedt
reviewerPATCH 2/6 mmci: Remove bogus local_irq_save()
In reply to Steven RostedtFrom: Thomas Gleixner <[email protected]>
On !RT interrupt runs with interrupts disabled. On RT it's in a thread, so no need to disable interrupts at all.
--- drivers/mmc/host/mmci.c | 5 ----- 1 file changed, 5 deletions(-)
drivers/mmc/host/mmci.c +0 -4
@@ -910,15 +910,12 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id)struct sg_mapping_iter *sg_miter = &host->sg_miter;struct variant_data *variant = host->variant;void __iomem *base = host->base; -unsigned long flags;u32 status; status =readl (base +MMCISTATUS );dev_dbg (mmc_dev (host->mmc),"irq1 (pio) %08x\n" , status); -local_irq_save (flags); - do { unsigned int remain, len; char *buffer;
@@ -958,8 +955,6 @@ static irqreturn_t mmci_pio_irq(int irq, void *dev_id)sg_miter_stop (sg_miter); -local_irq_restore (flags);
Steven Rostedt
reviewerPATCH 3/6 sched: Init idle->on_rq in init_idle()
In reply to Steven RostedtFrom: Thomas Gleixner <[email protected]>
--- kernel/sched/core.c | 1 + 1 file changed, 1 insertion(+)
kernel/sched/core.c +1 -0
@@ -5264,6 +5264,7 @@ void __cpuinit init_idle(struct task_struct *idle, int cpu)rcu_read_unlock (); rq->curr = rq->idle = idle; + idle->on_rq =1 ;#if defined(CONFIG_SMP ) idle->on_cpu =1 ;#endif
Signature · 1 line
1.7.10.4
Steven Rostedt
reviewerPATCH 4/6 sched: Check for idle task in might_sleep()
In reply to Steven RostedtFrom: Thomas Gleixner <[email protected]>
Idle is not allowed to call sleeping functions ever!
--- kernel/sched/core.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
kernel/sched/core.c +2 -1
@@ -7536,7 +7536,8 @@ void __might_sleep(const char *file, int line, int preempt_offset)static unsigned long prev_jiffy;/* ratelimiting */ rcu_sleep_check ();/* WARN_ON_ONCE() by default, no rate limit reqd. */ -if ((preempt_count_equals (preempt_offset) && !irqs_disabled ()) || +if ((preempt_count_equals (preempt_offset) && !irqs_disabled () && + !is_idle_task (current)) || system_state !=SYSTEM_RUNNING || oops_in_progress)return ;if (time_before (jiffies, prev_jiffy +HZ ) && prev_jiffy)
Signature · 1 line
1.7.10.4
Steven Rostedt
reviewerPATCH 5/6 mm: swap: Initialize local locks early
In reply to Steven RostedtFrom: Thomas Gleixner <[email protected]>
--- mm/swap.c | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-)
mm/swap.c +9 -3
@@ -767,6 +767,15 @@ unsigned pagevec_lookup_tag(struct pagevec *pvec, struct address_space *mapping, }EXPORT_SYMBOL (pagevec_lookup_tag); +/* Early setup for the local locks */ +static int __init swap_init_locks (void ) +{ +local_irq_lock_init (rotate_lock); +local_irq_lock_init (swap_lock); +return 1 ; +} +early_initcall (swap_init_locks); +/* * Perform any setup for the swap system */
@@ -774,9 +783,6 @@ void __init swap_setup(void) {unsigned long megs = totalram_pages >> (20 -PAGE_SHIFT ); -local_irq_lock_init (rotate_lock); -local_irq_lock_init (swap_lock); -#ifdef CONFIG_SWAP bdi_init (swapper_space.backing_dev_info);#endif
Signature · 1 line
1.7.10.4
Steven Rostedt
reviewerPATCH 6/6 Linux 3.4.29-rt42-rc1
In reply to Steven RostedtFrom: Steven Rostedt <[email protected]>
--- localversion-rt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
localversion-rt +1 -1
@@ -1 +1 @@ --rt41 +-rt42-rc1
Signature · 1 line
1.7.10.4