3.14.33-stable review
Subsystems (5)
Greg Kroah-Hartman
maintainercover 3.14.33-stable review
This is the start of the stable review cycle for the 3.14.33 release. There are 20 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed Feb 11 08:30:18 UTC 2015. Anything received after that time might be too late.
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v3.0/stable-review/patch-3.14.33-rc1.gz
and the diffstat can be found below.
thanks,
greg k-h
-------------
Pseudo-Shortlog of commits:
Greg Kroah-Hartman <[email protected]>
Linux 3.14.33-rc1
Andy Lutomirski <[email protected]>
x86,kvm,vmx: Preserve CR4 across VM entry
Lai Jiangshan <[email protected]>
smpboot: Add missing get_online_cpus() in smpboot_register_percpu_thread()
Takashi Iwai <[email protected]>
ALSA: ak411x: Fix stall in work callback
Eric Nelson <[email protected]>
ASoC: sgtl5000: add delay before first I2C access
Bo Shen <[email protected]>
ASoC: atmel_ssc_dai: fix start event for I2S mode
karl beldan <[email protected]>
lib/checksum.c: fix build for generic csum_tcpudp_nofold
Dmitry Monakhov <[email protected]>
ext4: prevent bugon on race between write/fcntl
Mark Rutland <[email protected]>
arm64: Fix up /proc/cpuinfo
Peter Kümmel <[email protected]>
kconfig: Fix warning "‘jump’ may be used uninitialized"
Ryusuke Konishi <[email protected]>
nilfs2: fix deadlock of segment constructor over I_SYNC flag
karl beldan <[email protected]>
lib/checksum.c: fix carry in csum_tcpudp_nofold
Shiraz Hashim <[email protected]>
mm: pagewalk: call pte_hole() for VM_PFNMAP during walk_page_range
Sachin Prabhu <[email protected]>
Complete oplock break jobs before closing file handle
Will Deacon <[email protected]>
ARM: 8299/1: mm: ensure local active ASID is marked as allocated on rollover
Hemmo Nieminen <[email protected]>
MIPS: Fix kernel lockup or crash after CPU offline/online
Aaro Koskinen <[email protected]>
MIPS: OCTEON: fix kernel crash when offlining a CPU
Felix Fietkau <[email protected]>
MIPS: IRQ: Fix disable_irq on CPU IRQs
Charlotte Richardson <[email protected]>
PCI: Add NEC variants to Stratus ftServer PCIe DMI check
Johan Hovold <[email protected]>
gpio: sysfs: fix memory leak in gpiod_sysfs_set_active_low
Johan Hovold <[email protected]>
gpio: sysfs: fix memory leak in gpiod_export_link
-------------
Diffstat:
Makefile | 4 +- arch/arm/mm/context.c | 26 +++++------ arch/arm64/include/asm/cputype.h | 2 + arch/arm64/kernel/setup.c | 99 +++++++++++++++++++++++++++++----------- arch/arm64/kernel/smp.c | 5 ++ arch/mips/cavium-octeon/smp.c | 2 - arch/mips/kernel/irq_cpu.c | 4 ++ arch/mips/kernel/smp.c | 2 +- arch/x86/kvm/vmx.c | 16 ++++++- arch/x86/pci/common.c | 16 +++++++ drivers/gpio/gpiolib.c | 3 +- fs/cifs/file.c | 6 ++- fs/ext4/file.c | 8 ++-- fs/nilfs2/nilfs.h | 2 - fs/nilfs2/segment.c | 44 ++++++++++++++++-- fs/nilfs2/segment.h | 5 ++ include/sound/ak4113.h | 2 +- include/sound/ak4114.h | 2 +- kernel/smpboot.c | 2 + lib/checksum.c | 12 ++++- mm/pagewalk.c | 5 +- scripts/kconfig/menu.c | 4 +- sound/i2c/other/ak4113.c | 17 ++++--- sound/i2c/other/ak4114.c | 18 ++++---- sound/soc/atmel/atmel_ssc_dai.c | 18 ++------ sound/soc/codecs/sgtl5000.c | 3 ++ 26 files changed, 226 insertions(+), 101 deletions(-)
Greg Kroah-Hartman
maintainerPATCH 1/20 gpio: sysfs: fix memory leak in gpiod_export_link
3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 0f303db08df0df9bd0966443ad6001e63960af16 upstream.
Fix memory leak in the gpio sysfs interface due to failure to drop reference to device returned by class_find_device when creating a link.
--- drivers/gpio/gpiolib.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpio/gpiolib.c +1 -0
@@ -911,6 +911,7 @@ int gpiod_export_link(struct device *devif (tdev !=NULL ) { status =sysfs_create_link (&dev->kobj, &tdev->kobj, name); +put_device (tdev); }else { status = -ENODEV ; }
Greg Kroah-Hartman
maintainerPATCH 2/20 gpio: sysfs: fix memory leak in gpiod_sysfs_set_active_low
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Johan Hovold <[email protected]>
commit 49d2ca84e433dab854c7a866bc6add09cfab682d upstream.
Fix memory leak in the gpio sysfs interface due to failure to drop reference to device returned by class_find_device when setting the gpio-line polarity.
--- drivers/gpio/gpiolib.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpio/gpiolib.c +1 -1
@@ -959,7 +959,7 @@ int gpiod_sysfs_set_active_low(struct gp } status =sysfs_set_active_low (desc, dev, value); - +put_device (dev); unlock:mutex_unlock (&sysfs_lock);
Greg Kroah-Hartman
maintainerPATCH 3/20 PCI: Add NEC variants to Stratus ftServer PCIe DMI check
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Charlotte Richardson <[email protected]>
commit 51ac3d2f0c505ca36ffc9715ffd518d756589ef8 upstream.
NEC OEMs the same platforms as Stratus does, which have multiple devices on some PCIe buses under downstream ports.
--- arch/x86/pci/common.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
arch/x86/pci/common.c +16 -0
@@ -448,6 +448,22 @@ static const struct dmi_system_id pcipro DMI_MATCH(DMI_PRODUCT_NAME, "ftServer"), }, }, + { + .callback = set_scan_all, + .ident = "Stratus/NEC ftServer", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "NEC"), + DMI_MATCH(DMI_PRODUCT_NAME, "Express5800/R32"), + }, + }, + { + .callback = set_scan_all, + .ident = "Stratus/NEC ftServer", + .matches = { + DMI_MATCH(DMI_SYS_VENDOR, "NEC"), + DMI_MATCH(DMI_PRODUCT_NAME, "Express5800/R31"), + }, + }, {} };
Greg Kroah-Hartman
maintainerPATCH 4/20 MIPS: IRQ: Fix disable_irq on CPU IRQs
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Felix Fietkau <[email protected]>
commit a3e6c1eff54878506b2dddcc202df9cc8180facb upstream.
If the irq_chip does not define .irq_disable, any call to disable_irq will defer disabling the IRQ until it fires while marked as disabled. This assumes that the handler function checks for this condition, which handle_percpu_irq does not. In this case, calling disable_irq leads to an IRQ storm, if the interrupt fires while disabled.
This optimization is only useful when disabling the IRQ is slow, which is not true for the MIPS CPU IRQ.
Disable this optimization by implementing .irq_disable and .irq_enable
Patchwork: https://patchwork.linux-mips.org/patch/8949/
--- arch/mips/kernel/irq_cpu.c | 4 ++++ 1 file changed, 4 insertions(+)
arch/mips/kernel/irq_cpu.c +4 -0
@@ -56,6 +56,8 @@ static struct irq_chip mips_cpu_irq_cont .irq_mask_ack = mask_mips_irq, .irq_unmask = unmask_mips_irq, .irq_eoi = unmask_mips_irq, + .irq_disable = mask_mips_irq, + .irq_enable = unmask_mips_irq, };/*
@@ -92,6 +94,8 @@ static struct irq_chip mips_mt_cpu_irq_c .irq_mask_ack = mips_mt_cpu_irq_ack, .irq_unmask = unmask_mips_irq, .irq_eoi = unmask_mips_irq, + .irq_disable = mask_mips_irq, + .irq_enable = unmask_mips_irq, };void __init mips_cpu_irq_init (void )
Greg Kroah-Hartman
maintainerPATCH 5/20 MIPS: OCTEON: fix kernel crash when offlining a CPU
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Aaro Koskinen <[email protected]>
commit 63a87fe0d0de2ce126a8cec9a299a133cfd5658e upstream.
octeon_cpu_disable() will unconditionally enable interrupts when called. We can assume that the routine is always called with interrupts disabled, so just delete the incorrect local_irq_disable/enable().
The patch fixes the following crash when offlining a CPU:
[ 93.818785] ------------[ cut here ]------------ [ 93.823421] WARNING: CPU: 1 PID: 10 at kernel/smp.c:231 flush_smp_call_function_queue+0x1c4/0x1d0() [ 93.836215] Modules linked in: [ 93.839287] CPU: 1 PID: 10 Comm: migration/1 Not tainted 3.19.0-rc4-octeon-los_b5f0 #1 [ 93.847212] Stack : 0000000000000001 ffffffff81b2cf90 0000000000000004 ffffffff81630000 0000000000000000 0000000000000000 0000000000000000 000000000000004a 0000000000000006 ffffffff8117e550 0000000000000000 0000000000000000 ffffffff81b30000 ffffffff81b26808 8000000032c77748 ffffffff81627e07 ffffffff81595ec8 ffffffff81b26808 000000000000000a 0000000000000001 0000000000000001 0000000000000003 0000000010008ce1 ffffffff815030c8 8000000032cbbb38 ffffffff8113d42c 0000000010008ce1 ffffffff8117f36c 8000000032c77300 8000000032cbba50 0000000000000001 ffffffff81503984 0000000000000000 0000000000000000 0000000000000000 0000000000000000 0000000000000000 ffffffff81121668 0000000000000000 0000000000000000 ... [ 93.912819] Call Trace: [ 93.915273] [<ffffffff81121668>] show_stack+0x68/0x80 [ 93.920335] [<ffffffff81503984>] dump_stack+0x6c/0x90 [ 93.925395] [<ffffffff8113d58c>] warn_slowpath_common+0x94/0xd8 [ 93.931324] [<ffffffff811a402c>] flush_smp_call_function_queue+0x1c4/0x1d0 [ 93.938208] [<ffffffff811a4128>] hotplug_cfd+0xf0/0x108 [ 93.943444] [<ffffffff8115bacc>] notifier_call_chain+0x5c/0xb8 [ 93.949286] [<ffffffff8113d704>] cpu_notify+0x24/0x60 [ 93.954348] [<ffffffff81501738>] take_cpu_down+0x38/0x58 [ 93.959670] [<ffffffff811b343c>] multi_cpu_stop+0x154/0x180 [ 93.965250] [<ffffffff811b3768>] cpu_stopper_thread+0xd8/0x160 [ 93.971093] [<ffffffff8115ea4c>] smpboot_thread_fn+0x1ec/0x1f8 [ 93.976936] [<ffffffff8115ab04>] kthread+0xd4/0xf0 [ 93.981735] [<ffffffff8111c4f0>] ret_from_kernel_thread+0x14/0x1c [ 93.987835] [ 93.989326] ---[ end trace c9e3815ee655bda9 ]--- [ 93.993951] Kernel bug detected[#1]: [ 93.997533] CPU: 1 PID: 10 Comm: migration/1 Tainted: G W 3.19.0-rc4-octeon-los_b5f0 #1 [ 94.006591] task: 8000000032c77300 ti: 8000000032cb8000 task.ti: 8000000032cb8000 [ 94.014081] $ 0 : 0000000000000000 0000000010000ce1 0000000000000001 ffffffff81620000 [ 94.022146] $ 4 : 8000000002c72ac0 0000000000000000 00000000000001a7 ffffffff813b06f0 [ 94.030210] $ 8 : ffffffff813b20d8 0000000000000000 0000000000000000 ffffffff81630000 [ 94.038275] $12 : 0000000000000087 0000000000000000 0000000000000086 0000000000000000 [ 94.046339] $16 : ffffffff81623168 0000000000000001 0000000000000000 0000000000000008 [ 94.054405] $20 : 0000000000000001 0000000000000001 0000000000000001 0000000000000003 [ 94.062470] $24 : 0000000000000038 ffffffff813b7f10 [ 94.070536] $28 : 8000000032cb8000 8000000032cbbc20 0000000010008ce1 ffffffff811bcaf4 [ 94.078601] Hi : 0000000000f188e8 [ 94.082179] Lo : d4fdf3b646c09d55 [ 94.085760] epc : ffffffff811bc9d0 irq_work_run_list+0x8/0xf8 [ 94.091686] Tainted: G W [ 94.095613] ra : ffffffff811bcaf4 irq_work_run+0x34/0x60 [ 94.101192] Status: 10000ce3 KX SX UX KERNEL EXL IE [ 94.106235] Cause : 40808034 [ 94.109119] PrId : 000d9301 (Cavium Octeon II) [ 94.113653] Modules linked in: [ 94.116721] Process migration/1 (pid: 10, threadinfo=8000000032cb8000, task=8000000032c77300, tls=0000000000000000) [ 94.127168] Stack : 8000000002c74c80 ffffffff811a4128 0000000000000001 ffffffff81635720 fffffffffffffff2 ffffffff8115bacc 80000000320fbce0 80000000320fbca4 80000000320fbc80 0000000000000002 0000000000000004 ffffffff8113d704 80000000320fbce0 ffffffff81501738 0000000000000003 ffffffff811b343c 8000000002c72aa0 8000000002c72aa8 ffffffff8159cae8 ffffffff8159caa0 ffffffff81650000 80000000320fbbf0 80000000320fbc80 ffffffff811b32e8 0000000000000000 ffffffff811b3768 ffffffff81622b80 ffffffff815148a8 8000000032c77300 8000000002c73e80 ffffffff815148a8 8000000032c77300 ffffffff81622b80 ffffffff815148a8 8000000032c77300 ffffffff81503f48 ffffffff8115ea0c ffffffff81620000 0000000000000000 ffffffff81174d64 ... [ 94.192771] Call Trace: [ 94.195222] [<ffffffff811bc9d0>] irq_work_run_list+0x8/0xf8 [ 94.200802] [<ffffffff811bcaf4>] irq_work_run+0x34/0x60 [ 94.206036] [<ffffffff811a4128>] hotplug_cfd+0xf0/0x108 [ 94.211269] [<ffffffff8115bacc>] notifier_call_chain+0x5c/0xb8 [ 94.217111] [<ffffffff8113d704>] cpu_notify+0x24/0x60 [ 94.222171] [<ffffffff81501738>] take_cpu_down+0x38/0x58 [ 94.227491] [<ffffffff811b343c>] multi_cpu_stop+0x154/0x180 [ 94.233072] [<ffffffff811b3768>] cpu_stopper_thread+0xd8/0x160 [ 94.238914] [<ffffffff8115ea4c>] smpboot_thread_fn+0x1ec/0x1f8 [ 94.244757] [<ffffffff8115ab04>] kthread+0xd4/0xf0 [ 94.249555] [<ffffffff8111c4f0>] ret_from_kernel_thread+0x14/0x1c [ 94.255654] [ 94.257146] Code: a2423c40 40026000 30420001 <00020336> dc820000 10400037 00000000 0000010f 0000010f [ 94.267183] ---[ end trace c9e3815ee655bdaa ]--- [ 94.271804] Fatal exception: panic in 5 seconds
Patchwork: https://patchwork.linux-mips.org/patch/8952/
--- arch/mips/cavium-octeon/smp.c | 2 -- 1 file changed, 2 deletions(-)
arch/mips/cavium-octeon/smp.c +0 -2
@@ -263,9 +263,7 @@ static int octeon_cpu_disable(void)set_cpu_online (cpu, false);cpu_clear (cpu, cpu_callin_map); -local_irq_disable ();octeon_fixup_irqs (); -local_irq_enable ();flush_cache_all ();local_flush_tlb_all ();
Greg Kroah-Hartman
maintainerPATCH 6/20 MIPS: Fix kernel lockup or crash after CPU offline/online
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Hemmo Nieminen <[email protected]>
commit c7754e75100ed5e3068ac5085747f2bfc386c8d6 upstream.
As printk() invocation can cause e.g. a TLB miss, printk() cannot be called before the exception handlers have been properly initialized. This can happen e.g. when netconsole has been loaded as a kernel module and the TLB table has been cleared when a CPU was offline.
Call cpu_report() in start_secondary() only after the exception handlers have been initialized to fix this.
Without the patch the kernel will randomly either lockup or crash after a CPU is onlined and the console driver is a module.
Patchwork: https://patchwork.linux-mips.org/patch/8953/
--- arch/mips/kernel/smp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/kernel/smp.c +1 -1
@@ -109,10 +109,10 @@ asmlinkage void start_secondary(void) else#endif /* CONFIG_MIPS_MT_SMTC */ cpu_probe (); -cpu_report ();per_cpu_trap_init (false);mips_clockevent_init (); mp_ops->init_secondary (); +cpu_report ();/* * XXX parity protection should be folded in here when it's converted
Greg Kroah-Hartman
maintainerPATCH 7/20 ARM: 8299/1: mm: ensure local active ASID is marked as allocated on rollover
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Will Deacon <[email protected]>
commit 8e64806672466392acf19e14427d1c29df3e58b9 upstream.
Commit e1a5848e3398 ("ARM: 7924/1: mm: don't bother with reserved ttbr0 when running with LPAE") removed the use of the reserved TTBR0 value for LPAE systems, since the ASID is held in the TTBR and can be updated atomicly with the pgd of the next mm.
Unfortunately, this patch forgot to update flush_context, which deliberately avoids marking the local active ASID as allocated, since we used to switch via ASID zero and didn't need to allocate the ASID of the previous mm. The side-effect of this is that we can allocate the same ASID to the next mm and, between flushing the local TLB and updating TTBR0, we can perform speculative TLB fills for userspace nG mappings using the page table of the previous mm.
The consequence of this is that the next mm can erroneously hit some mappings of the previous mm. Note that this was made significantly harder to hit by a391263cd84e ("ARM: 8203/1: mm: try to re-use old ASID assignments following a rollover") but is still theoretically possible.
This patch fixes the problem by removing the code from flush_context that forces the allocated ASID to zero for the local CPU. Many thanks to the Broadcom guys for tracking this one down.
--- arch/arm/mm/context.c | 26 +++++++++++--------------- 1 file changed, 11 insertions(+), 15 deletions(-)
arch/arm/mm/context.c +11 -15
@@ -144,21 +144,17 @@ static void flush_context(unsigned int c/* Update the list of reserved ASIDs and the ASID bitmap. */ bitmap_clear (asid_map,0 ,NUM_USER_ASIDS );for_each_possible_cpu (i) { -if (i == cpu) { - asid =0 ; - }else { - asid =atomic64_xchg (&per_cpu (active_asids, i),0 ); -/* -* If this CPU has already been through a -* rollover, but hasn't run another task in -* the meantime, we must preserve its reserved -* ASID, as this is the only trace we have of -* the process it is still running. -*/ -if (asid ==0 ) - asid =per_cpu (reserved_asids, i); -__set_bit (asid & ~ASID_MASK , asid_map); - } + asid =atomic64_xchg (&per_cpu (active_asids, i),0 ); +/* +* If this CPU has already been through a +* rollover, but hasn't run another task in +* the meantime, we must preserve its reserved +* ASID, as this is the only trace we have of +* the process it is still running. +*/ +if (asid ==0 ) + asid =per_cpu (reserved_asids, i); +__set_bit (asid & ~ASID_MASK , asid_map);per_cpu (reserved_asids, i) = asid; }
Greg Kroah-Hartman
maintainerPATCH 8/20 Complete oplock break jobs before closing file handle
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Sachin Prabhu <[email protected]>
commit ca7df8e0bb2a5ec79691de8a1a4c0e611fe04e60 upstream.
Commitc11f1df5003d534fd067f0168bfad7befffb3b5c
requires writers to wait for any pending oplock break handler to complete before proceeding to write. This is done by waiting on bit CIFS_INODE_PENDING_OPLOCK_BREAK in cifsFileInfo->flags. This bit is cleared by the oplock break handler job queued on the workqueue once it has completed handling the oplock break allowing writers to proceed with writing to the file.
While testing, it was noticed that the filehandle could be closed while there is a pending oplock break which results in the oplock break handler on the cifsiod workqueue being cancelled before it has had a chance to execute and clear the CIFS_INODE_PENDING_OPLOCK_BREAK bit. Any subsequent attempt to write to this file hangs waiting for the CIFS_INODE_PENDING_OPLOCK_BREAK bit to be cleared.
We fix this by ensuring that we also clear the bit CIFS_INODE_PENDING_OPLOCK_BREAK when we remove the oplock break handler from the workqueue.
The bug was found by Red Hat QA while testing using ltp's fsstress command.
--- fs/cifs/file.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
fs/cifs/file.c +5 -1
@@ -366,6 +366,7 @@ void cifsFileInfo_put(struct cifsFileInfstruct cifsLockInfo *li, *tmp;struct cifs_fid fid;struct cifs_pending_open open; +bool oplock_break_cancelled;spin_lock (&cifs_file_list_lock);if (--cifs_file->count >0 ) {
@@ -397,7 +398,7 @@ void cifsFileInfo_put(struct cifsFileInf }spin_unlock (&cifs_file_list_lock); -cancel_work_sync (&cifs_file->oplock_break); + oplock_break_cancelled =cancel_work_sync (&cifs_file->oplock_break);if (!tcon->need_reconnect && !cifs_file->invalidHandle) {struct TCP_Server_Info *server = tcon->ses->server;
@@ -409,6 +410,9 @@ void cifsFileInfo_put(struct cifsFileInf_free_xid (xid); } +if (oplock_break_cancelled) +cifs_done_oplock_break (cifsi); +cifs_del_pending_open (&open);/*
Greg Kroah-Hartman
maintainerPATCH 9/20 mm: pagewalk: call pte_hole() for VM_PFNMAP during walk_page_range
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Shiraz Hashim <[email protected]>
commit 23aaed6659df9adfabe9c583e67a36b54e21df46 upstream.
walk_page_range() silently skips vma having VM_PFNMAP set, which leads to undesirable behaviour at client end (who called walk_page_range). Userspace applications get the wrong data, so the effect is like just confusing users (if the applications just display the data) or sometimes killing the processes (if the applications do something with misunderstanding virtual addresses due to the wrong data.)
For example for pagemap_read, when no callbacks are called against VM_PFNMAP vma, pagemap_read may prepare pagemap data for next virtual address range at wrong index.
Eventually userspace may get wrong pagemap data for a task. Corresponding to a VM_PFNMAP marked vma region, kernel may report mappings from subsequent vma regions. User space in turn may account more pages (than really are) to the task.
In my case I was using procmem, procrack (Android utility) which uses pagemap interface to account RSS pages of a task. Due to this bug it was giving a wrong picture for vmas (with VM_PFNMAP set).
--- mm/pagewalk.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
mm/pagewalk.c +4 -1
@@ -199,7 +199,10 @@ int walk_page_range(unsigned long addr,*/ if ((vma->vm_start <= addr) && (vma->vm_flags &VM_PFNMAP )) { - next = vma->vm_end; +if (walk->pte_hole) + err = walk->pte_hole (addr, next, walk); +if (err) +break ; pgd =pgd_offset (walk->mm, next);continue ; }
Greg Kroah-Hartman
maintainerPATCH 10/20 lib/checksum.c: fix carry in csum_tcpudp_nofold
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: karl beldan <[email protected]>
commit 150ae0e94634714b23919f0c333fee28a5b199d5 upstream.
The carry from the 64->32bits folding was dropped, e.g with:
saddr=0xFFFFFFFF daddr=0xFF0000FF len=0xFFFF proto=0 sum=1, csum_tcpudp_nofold returned 0 instead of 1.
--- lib/checksum.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
lib/checksum.c +10 -2
@@ -47,6 +47,15 @@ static inline unsigned short from32to16(return x; } +static inline u32 from64to32 (u64 x) +{ +/* add up 32-bit and 32-bit for 32+c bit */ + x = (x &0xffffffff ) + (x >>32 ); +/* add up carry.. */ + x = (x &0xffffffff ) + (x >>32 ); +return (u32 )x; +} +static unsigned int do_csum (const unsigned char *buff,int len) {int odd;
@@ -195,8 +204,7 @@ __wsum csum_tcpudp_nofold(__be32 saddr,#else s += (proto + len) <<8 ;#endif - s += (s >>32 ); - return (__force __wsum)s; + return (__force __wsum)from64to32(s); }EXPORT_SYMBOL (csum_tcpudp_nofold);#endif
Greg Kroah-Hartman
maintainerPATCH 11/20 nilfs2: fix deadlock of segment constructor over I_SYNC flag
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Ryusuke Konishi <[email protected]>
commit 7ef3ff2fea8bf5e4a21cef47ad87710a3d0fdb52 upstream.
Nilfs2 eventually hangs in a stress test with fsstress program. This issue was caused by the following deadlock over I_SYNC flag between nilfs_segctor_thread() and writeback_sb_inodes():
nilfs_segctor_thread()
nilfs_segctor_thread_construct()
nilfs_segctor_unlock()
nilfs_dispose_list()
iput()
iput_final()
evict()
inode_wait_for_writeback() * wait for I_SYNC flag writeback_sb_inodes()
* set I_SYNC flag on inode->i_state
__writeback_single_inode()
do_writepages()
nilfs_writepages()
nilfs_construct_dsync_segment()
nilfs_segctor_sync()
* wait for completion of segment constructor
inode_sync_complete()
* clear I_SYNC flag after __writeback_single_inode() completed
writeback_sb_inodes() calls do_writepages() for dirty inodes after setting I_SYNC flag on inode->i_state. do_writepages() in turn calls nilfs_writepages(), which can run segment constructor and wait for its completion. On the other hand, segment constructor calls iput(), which can call evict() and wait for the I_SYNC flag on inode_wait_for_writeback().
Since segment constructor doesn't know when I_SYNC will be set, it cannot know whether iput() will block or not unless inode->i_nlink has a non-zero count. We can prevent evict() from being called in iput() by implementing sop->drop_inode(), but it's not preferable to leave inodes with i_nlink == 0 for long periods because it even defers file truncation and inode deallocation. So, this instead resolves the deadlock by calling iput() asynchronously with a workqueue for inodes with i_nlink == 0.
--- fs/nilfs2/nilfs.h | 2 -- fs/nilfs2/segment.c | 44 +++++++++++++++++++++++++++++++++++++++----- fs/nilfs2/segment.h | 5 +++++ 3 files changed, 44 insertions(+), 7 deletions(-)
fs/nilfs2/nilfs.h +0 -2
@@ -141,7 +141,6 @@ enum {* @ti_save: Backup of journal_info field of task_struct * @ti_flags: Flags * @ti_count: Nest level -* @ti_garbage: List of inode to be put when releasing semaphore */ struct nilfs_transaction_info {u32 ti_magic;
@@ -150,7 +149,6 @@ struct nilfs_transaction_info {one of other filesystems has a bug. */ unsigned short ti_flags;unsigned short ti_count; -struct list_head ti_garbage; };/* ti_magic */
fs/nilfs2/segment.c +39 -5
101 lines not on this page · raw message
fs/nilfs2/segment.h +5 -0
@@ -26,6 +26,7 @@#include <linux/types.h> #include <linux/fs.h> #include <linux/buffer_head.h> +#include <linux/workqueue.h> #include <linux/nilfs2_fs.h> #include "nilfs.h"
@@ -92,6 +93,8 @@ struct nilfs_segsum_pointer {* @sc_nblk_inc: Block count of current generation * @sc_dirty_files: List of files to be written * @sc_gc_inodes: List of GC inodes having blocks to be written +* @sc_iput_queue: list of inodes for which iput should be done +* @sc_iput_work: work struct to defer iput call * @sc_freesegs: array of segment numbers to be freed * @sc_nfreesegs: number of segments on @sc_freesegs * @sc_dsync_inode: inode whose data pages are written for a sync operation
@@ -135,6 +138,8 @@ struct nilfs_sc_info {struct list_head sc_dirty_files;struct list_head sc_gc_inodes; +struct list_head sc_iput_queue; +struct work_struct sc_iput_work;__u64 *sc_freesegs;size_t sc_nfreesegs;
Greg Kroah-Hartman
maintainerPATCH 13/20 arm64: Fix up /proc/cpuinfo
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Mark Rutland <[email protected]>
commit 44b82b7700d05a52cd983799d3ecde1a976b3bed upstream.
Commit d7a49086f263164a (arm64: cpuinfo: print info for all CPUs) attempted to clean up /proc/cpuinfo, but due to concerns regarding further changes was reverted in commit 5e39977edf6500fd (Revert "arm64:
cpuinfo: print info for all CPUs").
There are two major issues with the arm64 /proc/cpuinfo format currently:
* The "Features" line describes (only) the 64-bit hwcaps, which is problematic for some 32-bit applications which attempt to parse it. As the same names are used for analogous ISA features (e.g. aes) despite these generally being architecturally unrelated, it is not possible to simply append the 64-bit and 32-bit hwcaps in a manner that might not be misleading to some applications.
Various potential solutions have appeared in vendor kernels. Typically the format of the Features line varies depending on whether the task is 32-bit.
* Information is only printed regarding a single CPU. This does not match the ARM format, and does not provide sufficient information in big.LITTLE systems where CPUs are heterogeneous. The CPU information printed is queried from the current CPU's registers, which is racy w.r.t. cross-cpu migration.
This patch attempts to solve these issues. The following changes are made:
* When a task with a LINUX32 personality attempts to read /proc/cpuinfo, the "Features" line contains the decoded 32-bit hwcaps, as with the arm port. Otherwise, the decoded 64-bit hwcaps are shown. This aligns with the behaviour of COMPAT_UTS_MACHINE and COMPAT_ELF_PLATFORM. In the absense of compat support, the Features line is empty.
The set of hwcaps injected into a task's auxval are unaffected.
* Properties are printed per-cpu, as with the ARM port. The per-cpu information is queried from pre-recorded cpu information (as used by the sanity checks).
* As with the previous attempt at fixing up /proc/cpuinfo, the hardware field is removed. The only users so far are 32-bit applications tied to particular boards, so no portable applications should be affected, and this should prevent future tying to particular boards.
The following differences remain:
* No model_name is printed, as this cannot be queried from the hardware and cannot be provided in a stable fashion. Use of the CPU {implementor,variant,part,revision} fields is sufficient to identify a CPU and is portable across arm and arm64.
* The following system-wide properties are not provided, as they are not possible to provide generally. Programs relying on these are already tied to particular (32-bit only) boards:
- Hardware
- Revision
- Serial
No software has yet been identified for which these remaining differences are problematic.
--- arch/arm64/include/asm/cputype.h | 2 arch/arm64/kernel/setup.c | 99 ++++++++++++++++++++++++++++----------- arch/arm64/kernel/smp.c | 5 + 3 files changed, 80 insertions(+), 26 deletions(-)
arch/arm64/include/asm/cputype.h +2 -0
@@ -77,6 +77,8 @@ static inline u32 __attribute_const__ rereturn read_cpuid (CTR_EL0 ); } +void cpuinfo_store_cpu (void ); +#endif /* __ASSEMBLY__ */ #endif
arch/arm64/kernel/setup.c +73 -26
158 lines not on this page · raw message
arch/arm64/kernel/smp.c +5 -0
@@ -148,6 +148,11 @@ asmlinkage void secondary_start_kernel(v cpu_ops[cpu]->cpu_postboot ();/* +* Log the CPU info before it is marked online and might get read. +*/ +cpuinfo_store_cpu (); + +/* * Enable GIC and timers. */ notify_cpu_starting (cpu);
Greg Kroah-Hartman
maintainerPATCH 14/20 ext4: prevent bugon on race between write/fcntl
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Dmitry Monakhov <[email protected]>
commit a41537e69b4aa43f0fea02498c2595a81267383b upstream.
O_DIRECT flags can be toggeled via fcntl(F_SETFL). But this value checked twice inside ext4_file_write_iter() and __generic_file_write() which result in BUG_ON inside ext4_direct_IO.
Let's initialize iocb->private unconditionally.
TESTCASE: xfstest:generic/036 https://patchwork.ozlabs.org/patch/402445/
#TYPICAL STACK TRACE:
kernel BUG at fs/ext4/inode.c:2960!
invalid opcode: 0000 [#1] SMP
Modules linked in: brd iTCO_wdt lpc_ich mfd_core igb ptp dm_mirror dm_region_hash dm_log dm_mod CPU: 6 PID: 5505 Comm: aio-dio-fcntl-r Not tainted 3.17.0-rc2-00176-gff5c017 #161 Hardware name: Intel Corporation W2600CR/W2600CR, BIOS SE5C600.86B.99.99.x028.061320111235 06/13/2011 task: ffff88080e95a7c0 ti: ffff88080f908000 task.ti: ffff88080f908000 RIP: 0010:[<ffffffff811fabf2>] [<ffffffff811fabf2>] ext4_direct_IO+0x162/0x3d0 RSP: 0018:ffff88080f90bb58 EFLAGS: 00010246 RAX: 0000000000000400 RBX: ffff88080fdb2a28 RCX: 00000000a802c818 RDX: 0000040000080000 RSI: ffff88080d8aeb80 RDI: 0000000000000001 RBP: ffff88080f90bbc8 R08: 0000000000000000 R09: 0000000000001581 R10: 0000000000000000 R11: 0000000000000000 R12: ffff88080d8aeb80 R13: ffff88080f90bbf8 R14: ffff88080fdb28c8 R15: ffff88080fdb2a28 FS: 00007f23b2055700(0000) GS:ffff880818400000(0000) knlGS:0000000000000000 CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 CR2: 00007f23b2045000 CR3: 000000080cedf000 CR4: 00000000000407e0 Stack: ffff88080f90bb98 0000000000000000 7ffffffffffffffe ffff88080fdb2c30 0000000000000200 0000000000000200 0000000000000001 0000000000000200 ffff88080f90bbc8 ffff88080fdb2c30 ffff88080f90be08 0000000000000200 Call Trace: [<ffffffff8112ca9d>] generic_file_direct_write+0xed/0x180 [<ffffffff8112f2b2>] __generic_file_write_iter+0x222/0x370 [<ffffffff811f495b>] ext4_file_write_iter+0x34b/0x400 [<ffffffff811bd709>] ? aio_run_iocb+0x239/0x410 [<ffffffff811bd709>] ? aio_run_iocb+0x239/0x410 [<ffffffff810990e5>] ? local_clock+0x25/0x30 [<ffffffff810abd94>] ? __lock_acquire+0x274/0x700 [<ffffffff811f4610>] ? ext4_unwritten_wait+0xb0/0xb0 [<ffffffff811bd756>] aio_run_iocb+0x286/0x410 [<ffffffff810990e5>] ? local_clock+0x25/0x30 [<ffffffff810ac359>] ? lock_release_holdtime+0x29/0x190 [<ffffffff811bc05b>] ? lookup_ioctx+0x4b/0xf0 [<ffffffff811bde3b>] do_io_submit+0x55b/0x740 [<ffffffff811bdcaa>] ? do_io_submit+0x3ca/0x740 [<ffffffff811be030>] SyS_io_submit+0x10/0x20 [<ffffffff815ce192>] system_call_fastpath+0x16/0x1b Code: 01 48 8b 80 f0 01 00 00 48 8b 18 49 8b 45 10 0f 85 f1 01 00 00 48 03 45 c8 48 3b 43 48 0f 8f e3 01 00 00 49 83 7c
24 18 00 75 04 <0f> 0b eb fe f0 ff 83 ec 01 00 00 49 8b 44 24 18 8b 00 85 c0 89 RIP [<ffffffff811fabf2>] ext4_direct_IO+0x162/0x3d0
RSP <ffff88080f90bb58>
[hujianyang: Backported to 3.10
- Move initialization of iocb->private to ext4_file_write() as we don't have ext4_file_write_iter(), which is introduced by commit 9b884164.
- Adjust context to make 'overwrite' changes apply to ext4_file_dio_write() as ext4_file_dio_write() is not move into ext4_file_write()]
--- fs/ext4/file.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
fs/ext4/file.c +4 -4
@@ -100,7 +100,7 @@ ext4_file_dio_write(struct kiocb *iocb,struct blk_plug plug;int unaligned_aio =0 ;ssize_t ret; -int overwrite =0 ; +int *overwrite = iocb->private;size_t length =iov_length (iov, nr_segs); if (ext4_test_inode_flag(inode, EXT4_INODE_EXTENTS) &&
@@ -118,8 +118,6 @@ ext4_file_dio_write(struct kiocb *iocb,mutex_lock (&inode->i_mutex);blk_start_plug (&plug); - iocb->private = &overwrite; -/* check whether we do a DIO overwrite or not */ if (ext4_should_dioread_nolock (inode) && !unaligned_aio && !file->f_mapping->nrpages && pos + length <=i_size_read (inode)) {
@@ -143,7 +141,7 @@ ext4_file_dio_write(struct kiocb *iocb,* So we should check these two conditions. */ if (err == len && (map.m_flags &EXT4_MAP_MAPPED )) - overwrite =1 ; + *overwrite =1 ; } ret =__generic_file_aio_write (iocb, iov, nr_segs, &iocb->ki_pos);
@@ -170,6 +168,7 @@ ext4_file_write(struct kiocb *iocb, cons {struct inode *inode =file_inode (iocb->ki_filp);ssize_t ret; +int overwrite =0 ;/* * If we have encountered a bitmap-format file, the size limit
@@ -190,6 +189,7 @@ ext4_file_write(struct kiocb *iocb, cons } } + iocb->private = &overwrite;if (unlikely (iocb->ki_filp->f_flags &O_DIRECT )) ret =ext4_file_dio_write (iocb, iov, nr_segs, pos);else
Greg Kroah-Hartman
maintainerPATCH 15/20 lib/checksum.c: fix build for generic csum_tcpudp_nofold
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: karl beldan <[email protected]>
commit 9ce357795ef208faa0d59894d9d119a7434e37f3 upstream.
Fixed commit added from64to32 under _#ifndef do_csum_ but used it under _#ifndef csum_tcpudp_nofold_, breaking some builds (Fengguang's robot reported TILEGX's). Move from64to32 under the latter.
--- lib/checksum.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
lib/checksum.c +9 -9
@@ -47,15 +47,6 @@ static inline unsigned short from32to16(return x; } -static inline u32 from64to32 (u64 x) -{ -/* add up 32-bit and 32-bit for 32+c bit */ - x = (x &0xffffffff ) + (x >>32 ); -/* add up carry.. */ - x = (x &0xffffffff ) + (x >>32 ); -return (u32 )x; -} -static unsigned int do_csum (const unsigned char *buff,int len) {int odd;
@@ -190,6 +181,15 @@ csum_partial_copy(const void *src, voidEXPORT_SYMBOL (csum_partial_copy);#ifndef csum_tcpudp_nofold +static inline u32 from64to32 (u64 x) +{ +/* add up 32-bit and 32-bit for 32+c bit */ + x = (x &0xffffffff ) + (x >>32 ); +/* add up carry.. */ + x = (x &0xffffffff ) + (x >>32 ); +return (u32 )x; +} + __wsum csum_tcpudp_nofold(__be32 saddr, __be32 daddr, unsigned short len, unsigned short proto,
Greg Kroah-Hartman
maintainerPATCH 16/20 ASoC: atmel_ssc_dai: fix start event for I2S mode
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Bo Shen <[email protected]>
commit a43bd7e125143b875caae6d4f9938855b440faaf upstream.
According to the I2S specification information as following:
- WS = 0, channel 1 (left)
- WS = 1, channel 2 (right)
So, the start event should be TF/RF falling edge.
--- sound/soc/atmel/atmel_ssc_dai.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-)
sound/soc/atmel/atmel_ssc_dai.c +4 -14
@@ -344,7 +344,6 @@ static int atmel_ssc_hw_params(struct snstruct atmel_pcm_dma_params *dma_params;int dir, channels, bits;u32 tfmr, rfmr, tcmr, rcmr; -int start_event;int ret;/*
@@ -451,19 +450,10 @@ static int atmel_ssc_hw_params(struct sn* The SSC transmit clock is obtained from the BCLK signal on * on the TK line, and the SSC receive clock is * generated from the transmit clock. -* -* For single channel data, one sample is transferred -* on the falling edge of the LRC clock. -* For two channel data, one sample is -* transferred on both edges of the LRC clock. */ - start_event = ((channels ==1 ) - ?SSC_START_FALLING_RF - :SSC_START_EDGE_RF ); - rcmr =SSC_BF (RCMR_PERIOD ,0 ) |SSC_BF (RCMR_STTDLY ,START_DELAY ) - |SSC_BF (RCMR_START , start_event) + |SSC_BF (RCMR_START ,SSC_START_FALLING_RF ) |SSC_BF (RCMR_CKI ,SSC_CKI_RISING ) |SSC_BF (RCMR_CKO ,SSC_CKO_NONE ) |SSC_BF (RCMR_CKS ,SSC_CKS_CLOCK );
@@ -471,14 +461,14 @@ static int atmel_ssc_hw_params(struct sn rfmr =SSC_BF (RFMR_FSEDGE ,SSC_FSEDGE_POSITIVE ) |SSC_BF (RFMR_FSOS ,SSC_FSOS_NONE ) |SSC_BF (RFMR_FSLEN ,0 ) - |SSC_BF (RFMR_DATNB ,0 ) + |SSC_BF (RFMR_DATNB , (channels -1 )) |SSC_BIT (RFMR_MSBF ) |SSC_BF (RFMR_LOOP ,0 ) |SSC_BF (RFMR_DATLEN , (bits -1 )); tcmr =SSC_BF (TCMR_PERIOD ,0 ) |SSC_BF (TCMR_STTDLY ,START_DELAY ) - |SSC_BF (TCMR_START , start_event) + |SSC_BF (TCMR_START ,SSC_START_FALLING_RF ) |SSC_BF (TCMR_CKI ,SSC_CKI_FALLING ) |SSC_BF (TCMR_CKO ,SSC_CKO_NONE ) |SSC_BF (TCMR_CKS ,SSC_CKS_PIN );
@@ -487,7 +477,7 @@ static int atmel_ssc_hw_params(struct sn | SSC_BF(TFMR_FSDEN, 0) |SSC_BF (TFMR_FSOS ,SSC_FSOS_NONE ) |SSC_BF (TFMR_FSLEN ,0 ) - |SSC_BF (TFMR_DATNB ,0 ) + |SSC_BF (TFMR_DATNB , (channels -1 )) |SSC_BIT (TFMR_MSBF ) |SSC_BF (TFMR_DATDEF ,0 ) |SSC_BF (TFMR_DATLEN , (bits -1 ));
Greg Kroah-Hartman
maintainerPATCH 17/20 ASoC: sgtl5000: add delay before first I2C access
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Eric Nelson <[email protected]>
commit 58cc9c9a175885bbf6bae3acf18233d0a8229a84 upstream.
To quote from section 1.3.1 of the data sheet:
The SGTL5000 has an internal reset that is deasserted 8 SYS_MCLK cycles after all power rails have been brought up. After this time, communication can start
...
1.0us represents 8 SYS_MCLK cycles at the minimum 8.0 MHz SYS_MCLK.
--- sound/soc/codecs/sgtl5000.c | 3 +++ 1 file changed, 3 insertions(+)
sound/soc/codecs/sgtl5000.c +3 -0
@@ -1521,6 +1521,9 @@ static int sgtl5000_i2c_probe(struct i2cif (ret)return ret; +/* Need 8 clocks before I2C accesses */ +udelay (1 ); +/* read chip information */ ret =regmap_read (sgtl5000->regmap,SGTL5000_CHIP_ID , ®);if (ret)
Greg Kroah-Hartman
maintainerPATCH 18/20 ALSA: ak411x: Fix stall in work callback
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Takashi Iwai <[email protected]>
commit 4161b4505f1690358ac0a9ee59845a7887336b21 upstream.
When ak4114 work calls its callback and the callback invokes ak4114_reinit(), it stalls due to flush_delayed_work(). For avoiding this, control the reentrance by introducing a refcount. Also flush_delayed_work() is replaced with cancel_delayed_work_sync().
The exactly same bug is present in ak4113.c and fixed as well.
--- include/sound/ak4113.h | 2 +- include/sound/ak4114.h | 2 +- sound/i2c/other/ak4113.c | 17 ++++++++--------- sound/i2c/other/ak4114.c | 18 ++++++++---------- 4 files changed, 18 insertions(+), 21 deletions(-)
include/sound/ak4113.h +1 -1
@@ -286,7 +286,7 @@ struct ak4113 {ak4113_write_t *write;ak4113_read_t *read;void *private_data; - unsigned int init:1; +atomic_t wq_processing;spinlock_t lock;unsigned char regmap[AK4113_WRITABLE_REGS ];struct snd_kcontrol *kctls[AK4113_CONTROLS ];
include/sound/ak4114.h +1 -1
@@ -168,7 +168,7 @@ struct ak4114 {ak4114_write_t * write;ak4114_read_t * read;void * private_data; - unsigned int init: 1; +atomic_t wq_processing;spinlock_t lock;unsigned char regmap[6 ];unsigned char txcsb[5 ];
sound/i2c/other/ak4113.c +8 -9
@@ -56,8 +56,7 @@ static inline unsigned char reg_read(strstatic void snd_ak4113_free (struct ak4113 *chip) { - chip->init =1 ;/* don't schedule new work */ -mb (); +atomic_inc (&chip->wq_processing);/* don't schedule new work */ cancel_delayed_work_sync (&chip->work);kfree (chip); }
@@ -89,6 +88,7 @@ int snd_ak4113_create(struct snd_card *c chip->write = write; chip->private_data = private_data;INIT_DELAYED_WORK (&chip->work, ak4113_stats); +atomic_set (&chip->wq_processing,0 );for (reg =0 ; reg <AK4113_WRITABLE_REGS ; reg++) chip->regmap[reg] = pgm[reg];
@@ -139,13 +139,11 @@ static void ak4113_init_regs(struct ak41void snd_ak4113_reinit (struct ak4113 *chip) { - chip->init =1 ; -mb (); -flush_delayed_work (&chip->work); +if (atomic_inc_return (&chip->wq_processing) ==1 ) +cancel_delayed_work_sync (&chip->work);ak4113_init_regs (chip);/* bring up statistics / event queing */ - chip->init =0 ; -if (chip->kctls[0 ]) +if (atomic_dec_and_test (&chip->wq_processing))schedule_delayed_work (&chip->work,HZ /10 ); }EXPORT_SYMBOL_GPL (snd_ak4113_reinit);
@@ -632,8 +630,9 @@ static void ak4113_stats(struct work_str { struct ak4113 *chip = container_of(work, struct ak4113, work.work); -if (!chip->init) +if (atomic_inc_return (&chip->wq_processing) ==1 )snd_ak4113_check_rate_and_errors (chip, chip->check_flags); -schedule_delayed_work (&chip->work,HZ /10 ); +if (atomic_dec_and_test (&chip->wq_processing)) +schedule_delayed_work (&chip->work,HZ /10 ); }
sound/i2c/other/ak4114.c +8 -10
@@ -66,8 +66,7 @@ static void reg_dump(struct ak4114 *ak41static void snd_ak4114_free (struct ak4114 *chip) { - chip->init =1 ;/* don't schedule new work */ -mb (); +atomic_inc (&chip->wq_processing);/* don't schedule new work */ cancel_delayed_work_sync (&chip->work);kfree (chip); }
@@ -100,6 +99,7 @@ int snd_ak4114_create(struct snd_card *c chip->write = write; chip->private_data = private_data;INIT_DELAYED_WORK (&chip->work, ak4114_stats); +atomic_set (&chip->wq_processing,0 );for (reg =0 ; reg <6 ; reg++) chip->regmap[reg] = pgm[reg];
@@ -152,13 +152,11 @@ static void ak4114_init_regs(struct ak41void snd_ak4114_reinit (struct ak4114 *chip) { - chip->init =1 ; -mb (); -flush_delayed_work (&chip->work); +if (atomic_inc_return (&chip->wq_processing) ==1 ) +cancel_delayed_work_sync (&chip->work);ak4114_init_regs (chip);/* bring up statistics / event queing */ - chip->init =0 ; -if (chip->kctls[0 ]) +if (atomic_dec_and_test (&chip->wq_processing))schedule_delayed_work (&chip->work,HZ /10 ); }
@@ -612,10 +610,10 @@ static void ak4114_stats(struct work_str { struct ak4114 *chip = container_of(work, struct ak4114, work.work); -if (!chip->init) +if (atomic_inc_return (&chip->wq_processing) ==1 )snd_ak4114_check_rate_and_errors (chip, chip->check_flags); - -schedule_delayed_work (&chip->work,HZ /10 ); +if (atomic_dec_and_test (&chip->wq_processing)) +schedule_delayed_work (&chip->work,HZ /10 ); }EXPORT_SYMBOL (snd_ak4114_create);
Greg Kroah-Hartman
maintainerPATCH 19/20 smpboot: Add missing get_online_cpus() in smpboot_register_percpu_thread()
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Lai Jiangshan <[email protected]>
commit 4bee96860a65c3a62d332edac331b3cf936ba3ad upstream.
The following race exists in the smpboot percpu threads management:
CPU0 CPU1cpu_up(2)
get_online_cpus();
smpboot_create_threads(2); smpboot_register_percpu_thread(); for_each_online_cpu(); __smpboot_create_thread();
__cpu_up(2);
This results in a missing per cpu thread for the newly onlined cpu2 and in a NULL pointer dereference on a consecutive offline of that cpu.
Proctect smpboot_register_percpu_thread() with get_online_cpus() to prevent that.
[ tglx: Massaged changelog and removed the change in
smpboot_unregister_percpu_thread() because that's an optimization and therefor not stable material. ]
--- kernel/smpboot.c | 2 ++ 1 file changed, 2 insertions(+)
kernel/smpboot.c +2 -0
@@ -279,6 +279,7 @@ int smpboot_register_percpu_thread(strucunsigned int cpu;int ret =0 ; +get_online_cpus ();mutex_lock (&smpboot_threads_lock);for_each_online_cpu (cpu) { ret =__smpboot_create_thread (plug_thread, cpu);
@@ -291,6 +292,7 @@ int smpboot_register_percpu_thread(struclist_add (&plug_thread->list, &hotplug_threads); out:mutex_unlock (&smpboot_threads_lock); +put_online_cpus ();return ret; }EXPORT_SYMBOL_GPL (smpboot_register_percpu_thread);
Greg Kroah-Hartman
maintainerPATCH 20/20 x86,kvm,vmx: Preserve CR4 across VM entry
In reply to Greg Kroah-Hartman3.14-stable review patch. If anyone has any objections, please let me know.
------------------
From: Andy Lutomirski <[email protected]>
commit d974baa398f34393db76be45f7d4d04fbdbb4a0a upstream.
CR4 isn't constant; at least the TSD and PCE bits can vary.
TBH, treating CR0 and CR3 as constant scares me a bit, too, but it looks like it's correct.
This adds a branch and a read from cr4 to each vm entry. Because it is extremely likely that consecutive entries into the same vcpu will have the same host cr4 value, this fixes up the vmcs instead of restoring cr4 after the fact. A subsequent patch will add a kernel-wide cr4 shadow, reducing the overhead in the common case to just two memory reads and a branch.
--- arch/x86/kvm/vmx.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-)
arch/x86/kvm/vmx.c +14 -2
@@ -441,6 +441,7 @@ struct vcpu_vmx {#endif int gs_ldt_reload_needed;int fs_reload_needed; +unsigned long vmcs_host_cr4;/* May not match real cr4 */ } host_state;struct {int vm86_active;
@@ -4165,11 +4166,16 @@ static void vmx_set_constant_host_state(u32 low32, high32;unsigned long tmpl;struct desc_ptr dt; +unsigned long cr4;vmcs_writel (HOST_CR0 ,read_cr0 () & ~X86_CR0_TS );/* 22.2.3 */ -vmcs_writel (HOST_CR4 ,read_cr4 ());/* 22.2.3, 22.2.5 */ vmcs_writel (HOST_CR3 ,read_cr3 ());/* 22.2.3 FIXME: shadow tables */ +/* Save the most likely value for this task's CR4 in the VMCS. */ + cr4 =read_cr4 (); +vmcs_writel (HOST_CR4 , cr4);/* 22.2.3, 22.2.5 */ + vmx->host_state.vmcs_host_cr4 = cr4; +vmcs_write16 (HOST_CS_SELECTOR , __KERNEL_CS);/* 22.2.4 */ #ifdef CONFIG_X86_64 /*
@@ -7196,7 +7202,7 @@ static void atomic_switch_perf_msrs(strustatic void __noclone vmx_vcpu_run (struct kvm_vcpu *vcpu) {struct vcpu_vmx *vmx =to_vmx (vcpu); -unsigned long debugctlmsr; +unsigned long debugctlmsr, cr4;/* Record the guest's net vcpu time for enforced NMI injections. */ if (unlikely (!cpu_has_virtual_nmis () && vmx->soft_vnmi_blocked))
@@ -7217,6 +7223,12 @@ static void __noclone vmx_vcpu_run(strucif (test_bit (VCPU_REGS_RIP , (unsigned long *)&vcpu->arch.regs_dirty))vmcs_writel (GUEST_RIP , vcpu->arch.regs[VCPU_REGS_RIP ]); + cr4 =read_cr4 (); +if (unlikely (cr4 != vmx->host_state.vmcs_host_cr4)) { +vmcs_writel (HOST_CR4 , cr4); + vmx->host_state.vmcs_host_cr4 = cr4; + } +/* When single-stepping over STI and MOV SS, we must clear the * corresponding interruptibility bits in the guest state. Otherwise * vmentry fails as it then expects bit 14 (BS) in pending debug
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.14.33 release. There are 20 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed Feb 11 08:30:18 UTC 2015. Anything received after that time might be too late.
Build results:
total: 123 pass: 123 fail: 0 Qemu tests: total: 30 pass: 30 fail: 0
Details are available at http://server.roeck-us.net:8010/builders.
Guenter
Quoted 8 lines · Greg Kroah-Hartman
This is the start of the stable review cycle for the 3.14.33 release. There are 20 patches in this series, all will be posted as a response to this one. If anyone has any issues with these being applied, please let me know.
Responses should be made by Wed Feb 11 08:30:18 UTC 2015. Anything received after that time might be too late.
Quoted 8 lines
The whole patch series can be found in one patch at:
kernel.org/pub/linux/kernel/v3.0/stable-review/patch-3.14.33-rc1.gzand the diffstat can be found below.
thanks,
greg k-h
Compiled and booted on my test system. No dmesg regressions.
thanks,
-- Shuah
Signature · 5 lines
Shuah Khan Sr. Linux Kernel Developer Open Source Innovation Group Samsung Research America (Silicon Valley) [email protected] | (970) 217-8978