Tejun Heo 229641a6f1 Linux 3.9-rc5 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJRWLTrAAoJEHm+PkMAQRiGe8oH/iMy48mecVWvxVZn74Tx3Cef xmW/PnAIj28EhSPqK49N/Ow6AfQToFKf7AP0ge20KAf5teTq95AY+tH74DAANt8F BjKXXTZiR5xwBvRkq7CR5wDcCvEcBAAz8fgTEd6SEDB2d2VXFf5eKdKUqt1avTCh Z6Hup5kuwX+ddtwY2DCBXtp2n6fL0Rm5yLzY1A3OOBye1E7VyLTF7M5BR603Q44P 4kRLxn8+R7jy3hTuZIhAeoS8TKUoBwVk7DmKxEzrhTHZVOmvwE9lEHybRnIyOpd/ k1JnbRbiPsLsCVFOn10SQkGDAIk00lro3tuWP2C1ljERiD/OOh5Ui9nXYAhMkbI= =q15K -----END PGP SIGNATURE----- Merge tag 'v3.9-rc5' into wq/for-3.10 Writeback conversion to workqueue will be based on top of wq/for-3.10 branch to take advantage of custom attrs and NUMA support for unbound workqueues. Mainline currently contains two commits which result in non-trivial merge conflicts with wq/for-3.10 and because block/for-3.10/core is based on v3.9-rc3 which contains one of the conflicting commits, we need a pre-merge-window merge anyway. Let's pull v3.9-rc5 into wq/for-3.10 so that the block tree doesn't suffer from workqueue merge conflicts. The two conflicts and their resolutions: * e68035fb65 ("workqueue: convert to idr_alloc()") in mainline changes worker_pool_assign_id() to use idr_alloc() instead of the old idr interface. worker_pool_assign_id() goes through multiple locking changes in wq/for-3.10 causing the following conflict. static int worker_pool_assign_id(struct worker_pool *pool) { int ret; <<<<<<< HEAD lockdep_assert_held(&wq_pool_mutex); do { if (!idr_pre_get(&worker_pool_idr, GFP_KERNEL)) return -ENOMEM; ret = idr_get_new(&worker_pool_idr, pool, &pool->id); } while (ret == -EAGAIN); ======= mutex_lock(&worker_pool_idr_mutex); ret = idr_alloc(&worker_pool_idr, pool, 0, 0, GFP_KERNEL); if (ret >= 0) pool->id = ret; mutex_unlock(&worker_pool_idr_mutex); >>>>>>> c67bf5361e7e66a0ff1f4caf95f89347d55dfb89 return ret < 0 ? ret : 0; } We want locking from the former and idr_alloc() usage from the latter, which can be combined to the following. static int worker_pool_assign_id(struct worker_pool *pool) { int ret; lockdep_assert_held(&wq_pool_mutex); ret = idr_alloc(&worker_pool_idr, pool, 0, 0, GFP_KERNEL); if (ret >= 0) { pool->id = ret; return 0; } return ret; } * eb2834285c ("workqueue: fix possible pool stall bug in wq_unbind_fn()") updated wq_unbind_fn() such that it has single larger for_each_std_worker_pool() loop instead of two separate loops with a schedule() call inbetween. wq/for-3.10 renamed pool->assoc_mutex to pool->manager_mutex causing the following conflict (earlier function body and comments omitted for brevity). static void wq_unbind_fn(struct work_struct *work) { ... spin_unlock_irq(&pool->lock); <<<<<<< HEAD mutex_unlock(&pool->manager_mutex); } ======= mutex_unlock(&pool->assoc_mutex); >>>>>>> c67bf5361e7e66a0ff1f4caf95f89347d55dfb89 schedule(); <<<<<<< HEAD for_each_cpu_worker_pool(pool, cpu) ======= >>>>>>> c67bf5361e7e66a0ff1f4caf95f89347d55dfb89 atomic_set(&pool->nr_running, 0); spin_lock_irq(&pool->lock); wake_up_worker(pool); spin_unlock_irq(&pool->lock); } } The resolution is mostly trivial. We want the control flow of the latter with the rename of the former. static void wq_unbind_fn(struct work_struct *work) { ... spin_unlock_irq(&pool->lock); mutex_unlock(&pool->manager_mutex); schedule(); atomic_set(&pool->nr_running, 0); spin_lock_irq(&pool->lock); wake_up_worker(pool); spin_unlock_irq(&pool->lock); } } Signed-off-by: Tejun Heo <tj@kernel.org>		2013-04-01 18:45:36 -07:00
..
power	PM / QoS: Remove device PM QoS sysfs attributes at the right place	2013-03-04 14:23:12 +01:00
regmap	regmap: PM fix for v3.9	2013-03-07 13:06:21 -08:00
attribute_container.c	drivers: base: Convert dev_printk(KERN_<LEVEL> to dev_<level>(	2012-10-30 17:38:43 -07:00
base.h	driver/base: implement subsys_virtual_register()	2013-03-12 11:36:35 -07:00
bus.c	driver/base: implement subsys_virtual_register()	2013-03-12 11:36:35 -07:00
class.c	driver-core: constify data for class_find_device()	2013-02-06 12:18:56 -08:00
core.c	driver/base: implement subsys_virtual_register()	2013-03-12 11:36:35 -07:00
cpu.c	drivers/base/cpu.c: Fix typo in comment	2013-01-16 12:34:34 -08:00
dd.c	Driver core patches for 3.9-rc1	2013-02-21 12:05:51 -08:00
devres.c	drivers: base: Convert dev_printk(KERN_<LEVEL> to dev_<level>(	2012-10-30 17:38:43 -07:00
devtmpfs.c	switch vfs_getattr() to struct path	2013-02-26 02:46:08 -05:00
dma-buf.c	CHROMIUM: dma-buf: restore args on failure of dma_buf_mmap	2013-02-27 15:14:02 +05:30
dma-coherent.c	drivers: dma-coherent: Fix typo in dma_mmap_from_coherent documentation	2012-10-23 14:05:32 +02:00
dma-contiguous.c	drivers: cma: represent physical addresses as phys_addr_t	2012-12-11 09:28:09 +01:00
dma-mapping.c	[media] dma-mapping: fix dma_common_get_sgtable() conditional compilation	2012-11-27 09:42:31 -02:00
driver.c	driver core: don't trigger uevent after failure	2012-07-17 10:40:23 -07:00
firmware_class.c	Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs	2013-02-26 20:16:07 -08:00
firmware.c	firmware: change firmware_kset to firmware_kobj	2008-01-24 20:40:23 -08:00
hypervisor.c	drivers/base: Add export.h for EXPORT_SYMBOL/THIS_MODULE as required.	2011-10-31 19:31:38 -04:00
init.c	driver-core: implement 'sysdev' functionality for regular devices and buses	2011-12-14 14:29:38 -08:00
isa.c	dma-mapping: replace all DMA_24BIT_MASK macro with DMA_BIT_MASK(24)	2009-04-07 08:31:12 -07:00
Kconfig	firmware: Make user-mode helper optional	2013-02-03 17:57:40 -08:00
Makefile	drivers/pinctrl: grab default handles from device core	2013-01-23 16:39:51 +01:00
map.c
memory.c	memory-hotplug: check whether all memory blocks are offlined or not when removing memory	2013-02-23 17:50:11 -08:00
module.c	driver core: module.c: Use kasprintf	2010-05-21 09:37:29 -07:00
node.c	numa: add CONFIG_MOVABLE_NODE for movable-dedicated node	2012-12-12 17:38:34 -08:00
pinctrl.c	drivers/pinctrl: grab default handles from device core	2013-01-23 16:39:51 +01:00
platform.c	Driver core updates for 3.8-rc1	2012-12-11 13:13:55 -08:00
soc.c	mode_t whack-a-mole: ->is_visible() returns umode_t...	2012-05-29 23:28:42 -04:00
syscore.c	PM: Reintroduce dropped call to check_wakeup_irqs	2011-07-11 10:51:49 +02:00
topology.c	cpu: convert 'cpu' and 'machinecheck' sysdev_class to a regular subsystem	2011-12-21 14:29:42 -08:00
transport_class.c	drivers/base: transport_class explicitly requires EXPORT_SYMBOL	2011-10-31 19:31:15 -04:00