Mel Gorman
d833352a43
mm: hugetlbfs: close race during teardown of hugetlbfs shared page tables ...
If a process creates a large hugetlbfs mapping that is eligible for page
table sharing and forks heavily with children some of whom fault and
others which destroy the mapping then it is possible for page tables to
get corrupted. Some teardowns of the mapping encounter a "bad pmd" and
output a message to the kernel log. The final teardown will trigger a
BUG_ON in mm/filemap.c.
This was reproduced in 3.4 but is known to have existed for a long time
and goes back at least as far as 2.6.37. It was probably was introduced
in 2.6.20 by [39dde65c#1 ] SMP
[ 127.186783] CPU 7
[ 127.186784] Modules linked in: af_packet cpufreq_conservative cpufreq_userspace cpufreq_powersave acpi_cpufreq mperf ext3 jbd dm_mod coretemp crc32c_intel usb_storage ghash_clmulni_intel aesni_intel i2c_i801 r8169 mii uas sr_mod cdrom sg iTCO_wdt iTCO_vendor_support shpchp serio_raw cryptd aes_x86_64 e1000e pci_hotplug dcdbas aes_generic container microcode ext4 mbcache jbd2 crc16 sd_mod crc_t10dif i915 drm_kms_helper drm i2c_algo_bit ehci_hcd ahci libahci usbcore rtc_cmos usb_common button i2c_core intel_agp video intel_gtt fan processor thermal thermal_sys hwmon ata_generic pata_atiixp libata scsi_mod
[ 127.186801]
[ 127.186802] Pid: 9017, comm: hugetlbfs-test Not tainted 3.4.0-autobuild #53 Dell Inc. OptiPlex 990/06D7TR
[ 127.186804] RIP: 0010:[<ffffffff810ed6ce>] [<ffffffff810ed6ce>] __delete_from_page_cache+0x15e/0x160
[ 127.186809] RSP: 0000:ffff8804144b5c08 EFLAGS: 00010002
[ 127.186810] RAX: 0000000000000001 RBX: ffffea000a5c9000 RCX: 00000000ffffffc0
[ 127.186811] RDX: 0000000000000000 RSI: 0000000000000009 RDI: ffff88042dfdad00
[ 127.186812] RBP: ffff8804144b5c18 R08: 0000000000000009 R09: 0000000000000003
[ 127.186813] R10: 0000000000000000 R11: 000000000000002d R12: ffff880412ff83d8
[ 127.186814] R13: ffff880412ff83d8 R14: 0000000000000000 R15: ffff880412ff83d8
[ 127.186815] FS: 00007fe18ed2c700(0000) GS:ffff88042dce0000(0000) knlGS:0000000000000000
[ 127.186816] CS: 0010 DS: 0000 ES: 0000 CR0: 000000008005003b
[ 127.186817] CR2: 00007fe340000503 CR3: 0000000417a14000 CR4: 00000000000407e0
[ 127.186818] DR0: 0000000000000000 DR1: 0000000000000000 DR2: 0000000000000000
[ 127.186819] DR3: 0000000000000000 DR6: 00000000ffff0ff0 DR7: 0000000000000400
[ 127.186820] Process hugetlbfs-test (pid: 9017, threadinfo ffff8804144b4000, task ffff880417f803c0)
[ 127.186821] Stack:
[ 127.186822] ffffea000a5c9000 0000000000000000 ffff8804144b5c48 ffffffff810ed83b
[ 127.186824] ffff8804144b5c48 000000000000138a 0000000000001387 ffff8804144b5c98
[ 127.186825] ffff8804144b5d48 ffffffff811bc925 ffff8804144b5cb8 0000000000000000
[ 127.186827] Call Trace:
[ 127.186829] [<ffffffff810ed83b>] delete_from_page_cache+0x3b/0x80
[ 127.186832] [<ffffffff811bc925>] truncate_hugepages+0x115/0x220
[ 127.186834] [<ffffffff811bca43>] hugetlbfs_evict_inode+0x13/0x30
[ 127.186837] [<ffffffff811655c7>] evict+0xa7/0x1b0
[ 127.186839] [<ffffffff811657a3>] iput_final+0xd3/0x1f0
[ 127.186840] [<ffffffff811658f9>] iput+0x39/0x50
[ 127.186842] [<ffffffff81162708>] d_kill+0xf8/0x130
[ 127.186843] [<ffffffff81162812>] dput+0xd2/0x1a0
[ 127.186845] [<ffffffff8114e2d0>] __fput+0x170/0x230
[ 127.186848] [<ffffffff81236e0e>] ? rb_erase+0xce/0x150
[ 127.186849] [<ffffffff8114e3ad>] fput+0x1d/0x30
[ 127.186851] [<ffffffff81117db7>] remove_vma+0x37/0x80
[ 127.186853] [<ffffffff81119182>] do_munmap+0x2d2/0x360
[ 127.186855] [<ffffffff811cc639>] sys_shmdt+0xc9/0x170
[ 127.186857] [<ffffffff81410a39>] system_call_fastpath+0x16/0x1b
[ 127.186858] Code: 0f 1f 44 00 00 48 8b 43 08 48 8b 00 48 8b 40 28 8b b0 40 03 00 00 85 f6 0f 88 df fe ff ff 48 89 df e8 e7 cb 05 00 e9 d2 fe ff ff <0f> 0b 55 83 e2 fd 48 89 e5 48 83 ec 30 48 89 5d d8 4c 89 65 e0
[ 127.186868] RIP [<ffffffff810ed6ce>] __delete_from_page_cache+0x15e/0x160
[ 127.186870] RSP <ffff8804144b5c08>
[ 127.186871] ---[ end trace 7cbac5d1db69f426 ]---
The bug is a race and not always easy to reproduce. To reproduce it I was
doing the following on a single socket I7-based machine with 16G of RAM.
$ hugeadm --pool-pages-max DEFAULT:13G
$ echo $((18*1048576*1024)) > /proc/sys/kernel/shmmax
$ echo $((18*1048576*1024)) > /proc/sys/kernel/shmall
$ for i in `seq 1 9000`; do ./hugetlbfs-test; done
On my particular machine, it usually triggers within 10 minutes but
enabling debug options can change the timing such that it never hits.
Once the bug is triggered, the machine is in trouble and needs to be
rebooted. The machine will respond but processes accessing proc like "ps
aux" will hang due to the BUG_ON. shutdown will also hang and needs a
hard reset or a sysrq-b.
The basic problem is a race between page table sharing and teardown. For
the most part page table sharing depends on i_mmap_mutex. In some cases,
it is also taking the mm->page_table_lock for the PTE updates but with
shared page tables, it is the i_mmap_mutex that is more important.
Unfortunately it appears to be also insufficient. Consider the following
situation
Process A Process B
--------- ---------
hugetlb_fault shmdt
LockWrite(mmap_sem)
do_munmap
unmap_region
unmap_vmas
unmap_single_vma
unmap_hugepage_range
Lock(i_mmap_mutex)
Lock(mm->page_table_lock)
huge_pmd_unshare/unmap tables <--- (1)
Unlock(mm->page_table_lock)
Unlock(i_mmap_mutex)
huge_pte_alloc ...
Lock(i_mmap_mutex) ...
vma_prio_walk, find svma, spte ...
Lock(mm->page_table_lock) ...
share spte ...
Unlock(mm->page_table_lock) ...
Unlock(i_mmap_mutex) ...
hugetlb_no_page <--- (2)
free_pgtables
unlink_file_vma
hugetlb_free_pgd_range
remove_vma_list
In this scenario, it is possible for Process A to share page tables with
Process B that is trying to tear them down. The i_mmap_mutex on its own
does not prevent Process A walking Process B's page tables. At (1) above,
the page tables are not shared yet so it unmaps the PMDs. Process A sets
up page table sharing and at (2) faults a new entry. Process B then trips
up on it in free_pgtables.
This patch fixes the problem by adding a new function
__unmap_hugepage_range_final that is only called when the VMA is about to
be destroyed. This function clears VM_MAYSHARE during
unmap_hugepage_range() under the i_mmap_mutex. This makes the VMA
ineligible for sharing and avoids the race. Superficially this looks like
it would then be vunerable to truncate and madvise issues but hugetlbfs
has its own truncate handlers so does not use unmap_mapping_range() and
does not support madvise(DONTNEED).
This should be treated as a -stable candidate if it is merged.
Test program is as follows. The test case was mostly written by Michal
Hocko with a few minor changes to reproduce this bug.
==== CUT HERE ====
static size_t huge_page_size = (2UL << 20);
static size_t nr_huge_page_A = 512;
static size_t nr_huge_page_B = 5632;
unsigned int get_random(unsigned int max)
{
struct timeval tv;
gettimeofday(&tv, NULL);
srandom(tv.tv_usec);
return random() % max;
}
static void play(void *addr, size_t size)
{
unsigned char *start = addr,
*end = start + size,
*a;
start += get_random(size/2);
/* we could itterate on huge pages but let's give it more time. */
for (a = start; a < end; a += 4096)
*a = 0;
}
int main(int argc, char **argv)
{
key_t key = IPC_PRIVATE;
size_t sizeA = nr_huge_page_A * huge_page_size;
size_t sizeB = nr_huge_page_B * huge_page_size;
int shmidA, shmidB;
void *addrA = NULL, *addrB = NULL;
int nr_children = 300, n = 0;
if ((shmidA = shmget(key, sizeA, IPC_CREAT|SHM_HUGETLB|0660)) == -1) {
perror("shmget:");
return 1;
}
if ((addrA = shmat(shmidA, addrA, SHM_R|SHM_W)) == (void *)-1UL) {
perror("shmat");
return 1;
}
if ((shmidB = shmget(key, sizeB, IPC_CREAT|SHM_HUGETLB|0660)) == -1) {
perror("shmget:");
return 1;
}
if ((addrB = shmat(shmidB, addrB, SHM_R|SHM_W)) == (void *)-1UL) {
perror("shmat");
return 1;
}
fork_child:
switch(fork()) {
case 0:
switch (n%3) {
case 0:
play(addrA, sizeA);
break;
case 1:
play(addrB, sizeB);
break;
case 2:
break;
}
break;
case -1:
perror("fork:");
break;
default:
if (++n < nr_children)
goto fork_child;
play(addrA, sizeA);
break;
}
shmdt(addrA);
shmdt(addrB);
do {
wait(NULL);
} while (--n > 0);
shmctl(shmidA, IPC_RMID, NULL);
shmctl(shmidB, IPC_RMID, NULL);
return 0;
}
[akpm@linux-foundation.org: name the declaration's args, fix CONFIG_HUGETLBFS=n build]
Signed-off-by: Hugh Dickins <hughd@google.com>
Reviewed-by: Michal Hocko <mhocko@suse.cz>
Signed-off-by: Mel Gorman <mgorman@suse.de>
Cc: <stable@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2012-07-31 18:42:50 -07:00
spi/pl022: cleanup pl022 header documentation
2012-07-02 13:55:36 +02:00
bcma: cc: update defines
2012-07-17 15:11:37 -04:00
can: mark bittiming_const pointer in struct can_priv as const
2012-07-20 12:31:05 +02:00
libceph: fix messenger retry
2012-07-17 19:35:59 -07:00
extcon: spelling of detach in function doc
2012-07-17 09:32:14 -07:00
GPIO changes for v3.6:
2012-07-26 13:56:38 -07:00
IIO channel type and modifiers for CCT and RGBC data
2012-07-10 18:49:26 +01:00
Input: add driver for FT5x06 based EDT displays
2012-07-24 23:55:03 -07:00
MFD bits for the 3.6 merge window.
2012-07-30 12:41:17 -07:00
InfiniBand/RDMA changes for the 3.6 merge window:
2012-07-24 13:56:26 -07:00
Merge branch 'next' of git://git.infradead.org/users/vkoul/slave-dma
2012-07-24 17:12:54 -07:00
netfilter: nfnetlink_queue: do not allow to set unsupported flag bits
2012-07-04 19:51:50 +02:00
pinctrl: add pinctrl_add_gpio_ranges function
2012-07-03 21:51:08 +02:00
backlight: move lp855x header into platform_data directory
2012-07-30 17:25:15 -07:00
Merge branch 'for_3.6/pm/sr-move' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap-pm into devel-driver
2012-06-26 06:55:23 -07:00
Merge branch 'regulator-drivers' into regulator-next
2012-07-22 19:32:00 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2012-07-26 12:59:53 -07:00
nfs: enable swap on NFS
2012-07-31 18:42:48 -07:00
USB patches for 3.6-rc1
2012-07-26 10:23:47 -07:00
Merge branch 'linux-next' of git://cavan.codon.org.uk/platform-drivers-x86
2012-07-30 11:54:53 -07:00
include/linux/aio.h: cpp->C conversions
2012-07-30 17:25:21 -07:00
[SCSI] async: make async_synchronize_full() flush all work regardless of domain
2012-07-20 09:07:37 +01:00
libata: detect Device Attention support
2012-06-29 11:38:17 -04:00
mm: prepare for removal of obsolete /proc/sys/vm/nr_pdflush_threads
2012-07-31 18:42:40 -07:00
mm: add get_kernel_page[s] for pinning of kernel addresses for I/O
2012-07-31 18:42:47 -07:00
block: Drop dead function blk_abort_queue()
2012-06-15 08:46:23 +02:00
mm: sparse: fix usemap allocation above node descriptor section
2012-07-11 16:04:49 -07:00
net: em_canid: Ematch rule to match CAN frames according to their identifiers
2012-07-04 13:07:05 +02:00
PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND
2012-07-17 21:37:27 +02:00
memcg: rename config variables
2012-07-31 18:42:43 -07:00
clk: Add CLK_IS_BASIC flag to identify basic clocks
2012-07-11 15:36:43 -07:00
clk: add DT fixed-clock binding support
2012-07-11 17:58:46 -07:00
clk: add non CONFIG_HAVE_CLK routines
2012-07-30 17:25:11 -07:00
mm/compaction: cleanup on compaction_deferred
2012-07-31 18:42:42 -07:00
ipc: use Kconfig options for __ARCH_WANT_[COMPAT_]IPC_PARSE_VERSION
2012-07-30 17:25:21 -07:00
ftrace: Make all inline tags also include notrace
2012-06-18 09:47:00 -04:00
workqueue: perform cpu down operations from low priority cpu_notifier()
2012-07-17 12:39:26 -07:00
net/rps: Protect cpu_rmap.h from double inclusion
2012-07-19 08:34:37 -07:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2012-07-26 14:28:55 -07:00
cpumask: cpulist_parse() comments correction
2012-07-27 09:29:42 +09:30
cpusets, hotplug: Restructure functions that are invoked during hotplug
2012-07-24 13:53:22 +02:00
stop passing nameidata * to ->d_revalidate()
2012-07-14 16:34:14 +04:00
dm thin: commit before gathering status
2012-07-27 15:08:16 +01:00
Driver core merge for 3.6-rc1
2012-07-26 11:25:33 -07:00
dm thin: commit before gathering status
2012-07-27 15:08:16 +01:00
common: DMA-mapping: add DMA_ATTR_SKIP_CPU_SYNC attribute
2012-07-30 12:25:47 +02:00
common: dma-mapping: introduce dma_get_sgtable() function
2012-07-30 12:25:46 +02:00
dmaengine: Add wrapper for device_tx_status callback
2012-06-20 15:38:27 +01:00
ARM: socfpga: initial support for Altera's SOCFPGA platform
2012-07-19 10:39:00 +02:00
edac: allow specifying the error count with fake_inject
2012-06-27 09:01:30 -03:00
etherdevice: Rename random_ether_addr to eth_random_addr
2012-07-16 22:38:27 -07:00
net: added support for 40GbE link.
2012-06-27 15:42:24 -07:00
PM: Rename CAP_EPOLLWAKEUP to CAP_BLOCK_SUSPEND
2012-07-17 21:37:27 +02:00
switch fput to task_work_add
2012-07-22 23:57:58 +04:00
- Small fixes and optimizations.
2012-07-30 09:32:39 -07:00
mm: swap: implement generic handler for swap_activate
2012-07-31 18:42:47 -07:00
tracing: Remove NR_CPUS array from trace_iterator
2012-06-28 13:52:15 -04:00
genetlink: define lockdep_genl_is_held() when CONFIG_LOCKDEP
2012-07-24 00:01:30 -07:00
driver-core: Move kobj_to_dev from genhd.h to device.h
2012-07-16 18:05:45 -07:00
netvm: allow skb allocation to use PFMEMALLOC reserves
2012-07-31 18:42:46 -07:00
gpio: fix bits conflict for gpio flags
2012-07-05 15:04:10 +02:00
HID: Add suport for the brightness control keys on HP keyboards
2012-07-09 16:23:33 +02:00
mm: add support for direct_IO to highmem pages
2012-07-31 18:42:47 -07:00
timekeeping: Provide hrtimer update function
2012-07-11 23:34:39 +02:00
mm: hugetlbfs: close race during teardown of hugetlbfs shared page tables
2012-07-31 18:42:50 -07:00
hugetlb/cgroup: migrate hugetlb cgroup info from oldpage to new page during migration
2012-07-31 18:42:41 -07:00
i2c: i2c-ocores: support for 16bit and 32bit IO
2012-07-14 13:30:25 +02:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-07-30 19:03:41 -07:00
wireless: 60g protocol constants
2012-07-02 15:11:12 +02:00
net: introduce new priv_flag indicating iface capable of change mac when running
2012-06-30 01:08:00 -07:00
canfd: add new data structures and constants
2012-06-19 21:39:50 +02:00
rtnl: allow to specify number of rx and tx queues on device creation
2012-07-20 11:07:00 -07:00
team: add multiqueue support
2012-07-20 11:07:00 -07:00
net/ipv4: VTI support new module for ip_vti.
2012-07-18 09:36:12 -07:00
init: add comments to keep initcall-names in sync with initcall levels
2012-07-27 09:29:42 +09:30
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-07-26 13:08:01 -07:00
Pull input changes from Henrik Rydberg, including large update to
2012-07-07 16:18:33 -07:00
powerpc: Disable /dev/port interface on systems without an ISA bridge
2012-07-11 18:22:32 +10:00
Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr' into next
2012-07-23 12:17:00 +02:00
ipv6: fix inet6_csk_xmit()
2012-07-18 08:59:58 -07:00
Merge branch 'x86-platform-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-07-22 12:19:36 -07:00
jump label: Remove static_branch()
2012-07-06 10:53:49 +02:00
Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
2012-07-30 19:03:41 -07:00
printk: remove the now unnecessary "C" annotation for KERN_CONT
2012-07-30 17:25:14 -07:00
Remove SYSTEM_SUSPEND_DISK system state
2012-07-21 13:58:17 -07:00
KEYS: linux/key-type.h needs linux/errno.h
2012-07-30 15:08:46 +10:00
key: Remove extraneous parentheses from rcu_assign_keypointer()
2012-07-02 12:34:23 -07:00
printk: Implement some unlocked kmsg_dump functions
2012-07-21 10:34:00 -07:00
kthread_worker: reimplement flush_kthread_work() to allow freeing the work item being executed
2012-07-22 10:15:28 -07:00
KVM updates for the 3.6 merge window
2012-07-24 12:01:20 -07:00
leds: Rename led_brightness_set() to led_set_brightness()
2012-07-24 07:52:34 +08:00
Merge branch 'master' [vanilla Linus master] into libata-dev.git/upstream
2012-07-25 15:58:48 -04:00
of/lib: Allow scripts/dtc/libfdt to be used from kernel code
2012-07-23 13:54:52 +01:00
of/lib: Allow scripts/dtc/libfdt to be used from kernel code
2012-07-23 13:54:52 +01:00
phy: add the EEE support and the way to access to the MMD registers.
2012-07-01 03:34:50 -07:00
memblock: free allocated memblock_reserved_regions later
2012-07-11 16:04:50 -07:00
mm: memcg: fix compaction/migration failing due to memcg limits
2012-07-31 18:42:48 -07:00
slab/mempolicy: always use local policy from interrupt context
2012-06-20 10:01:04 +03:00
hugetlb: simplify migrate_huge_page()
2012-07-31 18:42:40 -07:00
phy: add the EEE support and the way to access to the MMD registers.
2012-07-01 03:34:50 -07:00
xen/mce: Add mcelog support for Xen platform
2012-07-19 15:51:36 -04:00
mm: add get_kernel_page[s] for pinning of kernel addresses for I/O
2012-07-31 18:42:47 -07:00
mm: introduce __GFP_MEMALLOC to allow access to emergency reserves
2012-07-31 18:42:45 -07:00
mm: throttle direct reclaimers if PF_MEMALLOC reserves are low and swap is backed by network storage
2012-07-31 18:42:46 -07:00
USB: properly pad out usb_device_id.driver_info
2012-06-18 15:38:22 -07:00
video: mxsfb: move mxsfb.h into include/linux
2012-07-03 13:22:37 +08:00
fs: add nd_jump_link
2012-07-14 16:35:40 +04:00
net: netprio_cgroup: rework update socket logic
2012-07-22 12:44:01 -07:00
net: honour netif_set_real_num_tx_queues() retval
2012-07-20 11:06:59 -07:00
netfilter: nfnetlink_queue: fix compilation with CONFIG_NF_NAT=m and CONFIG_NF_CT_NETLINK=y
2012-06-22 02:49:52 +02:00
netfilter: add user-space connection tracking helper infrastructure
2012-06-16 15:40:02 +02:00
netfilter: add user-space connection tracking helper infrastructure
2012-06-16 15:40:02 +02:00
netlink: add nlk->netlink_bind hook for module auto-loading
2012-06-29 16:46:06 -07:00
netpoll: move np->dev and np->dev_name init into __netpoll_setup()
2012-07-17 09:02:36 -07:00
NFC: Add ISO 14443 type B protocol
2012-07-09 16:42:24 -04:00
nfs: enable swap on NFS
2012-07-31 18:42:48 -07:00
NFS: Treat NFS4ERR_CLID_INUSE as a fatal error
2012-07-16 15:12:16 -04:00
NFS: Cleanup - only store the write verifier in struct nfs_page
2012-06-28 17:20:50 -04:00
Merge commit ' 9249e17fe0' into nfs-for-3.6
2012-07-16 12:01:42 -04:00
nilfs2: add omitted comments for structures in nilfs2_fs.h
2012-07-30 17:25:19 -07:00
cfg80211: add cellular base station regulatory hint support
2012-07-17 12:16:39 +02:00
mac802154: add wpan device-class support
2012-06-26 21:06:11 -07:00
Merge branch 'for-3.6' of git://gitorious.org/linux-pwm/linux-pwm
2012-07-30 09:22:37 -07:00
iommu: Add DMA window parser, of_get_dma_window()
2012-06-25 13:50:28 +02:00
of: mtd: nuke useless const qualifier
2012-07-10 10:32:06 -05:00
mm, memcg: move all oom handling to memcontrol.c
2012-07-31 18:42:45 -07:00
mm: sl[au]b: add knowledge of PFMEMALLOC reserve pages
2012-07-31 18:42:45 -07:00
mm: factor out memory isolate functions
2012-07-31 18:42:45 -07:00
memcg: rename config variables
2012-07-31 18:42:43 -07:00
mm: methods for teaching filesystems about PG_swapcache pages
2012-07-31 18:42:47 -07:00
Viresh has moved
2012-06-20 14:39:36 -07:00
PCI/ACPI: provide MMCONFIG address for PCI host bridges
2012-06-22 15:16:51 -06:00
Merge branches 'iommu/fixes', 'x86/amd', 'groups', 'arm/tegra' and 'api/domain-attr' into next
2012-07-23 12:17:00 +02:00
Merge branch 'x86-mce-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2012-07-22 16:07:45 -07:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2012-07-26 14:18:18 -07:00
perf: Introduce perf_pmu_migrate_context()
2012-06-18 12:13:21 +02:00
phylib: Support registering a bunch of drivers
2012-07-09 00:10:56 -07:00
pipe: remove KM_USER0 from comments
2012-07-24 15:27:34 +08:00
net: sched: add ipset ematch
2012-07-12 07:54:46 -07:00
PM / Domains: Add device domain data reference counter
2012-07-05 22:12:32 +02:00
PM / QoS: Use NULL pointer instead of plain integer in pm_qos.h
2012-07-19 00:02:30 +02:00
posix_types.h: Cleanup stale __NFDBITS and related definitions
2012-07-26 13:36:43 -07:00
security: Minor improvements to no_new_privs documentation
2012-07-08 00:25:48 +10:00
printk: remove the now unnecessary "C" annotation for KERN_CONT
2012-07-30 17:25:14 -07:00
pstore: Headers should include all stuff they use
2012-07-17 12:15:30 -07:00
pstore/ram: Make tracing log versioned
2012-07-17 16:48:09 -07:00
pwm: Add device tree support
2012-06-15 12:56:57 +02:00
pwm-backlight: Add rudimentary device tree support
2012-07-23 13:23:52 +02:00
quota: Split dquot_quota_sync() to writeback and cache flushing part
2012-07-22 23:58:19 +04:00
quota: Split dquot_quota_sync() to writeback and cache flushing part
2012-07-22 23:58:19 +04:00
rcu: Fix broken strings in RCU's source code.
2012-07-06 06:01:49 -07:00
Revert "rcu: Move PREEMPT_RCU preemption to switch_to() invocation"
2012-07-02 11:39:19 -07:00
Merge branches 'regmap-core', 'regmap-irq' and 'regmap-page' into regmap-next
2012-07-22 19:26:07 +01:00
remoteproc: Support custom firmware handlers
2012-07-15 11:39:01 +03:00
rpmsg: make sure inflight messages don't invoke just-removed callbacks
2012-07-04 11:51:59 +03:00
rtnetlink: Remove ts/tsage args to rtnl_put_cacheinfo().
2012-07-10 22:40:13 -07:00
scatterlist: add sg_alloc_table_from_pages function
2012-07-30 12:25:44 +02:00
mm: allow PF_MEMALLOC from softirq context
2012-07-31 18:42:45 -07:00
serial/8250: Add LPC3220 standard UART type
2012-07-26 13:37:02 -07:00
ACPI: mark acpi_sfi_table_parse() as __init
2012-06-22 15:36:44 -06:00
dma: sh: provide a migration path for slave drivers to stop using .private
2012-07-20 11:28:20 +05:30
sh: pfc: Rudimentary pinctrl-backed GPIO support.
2012-07-10 12:08:14 +09:00
dma: sh: provide a migration path for slave drivers to stop using .private
2012-07-20 11:28:20 +05:30
ipc: add COMPAT_SHMLBA support
2012-07-30 17:25:20 -07:00
vmscan: remove obsolete shrink_control comment
2012-07-31 18:42:43 -07:00
ARM: 7430/1: sizes.h: move from asm-generic to <linux/sizes.h>
2012-06-28 17:14:34 +01:00
netvm: propagate page->pfmemalloc from skb_alloc_page to skb
2012-07-31 18:42:46 -07:00
mm, sl[aou]b: Common definition for boot state of the slab allocators
2012-07-09 12:13:35 +03:00
slab: rename gfpflags to allocflags
2012-07-02 13:40:06 +03:00
mm, sl[aou]b: Extract common fields from struct kmem_cache
2012-06-14 09:20:16 +03:00
net-tcp: Fast Open client - sending SYN-data
2012-07-19 11:02:03 -07:00
net: make sock diag per-namespace
2012-07-16 22:31:34 -07:00
net-tcp: Fast Open client - sendmsg(MSG_FASTOPEN)
2012-07-19 11:02:03 -07:00
splice: fix racy pipe->buffers uses
2012-06-13 21:16:42 +02:00
string: introduce memweight()
2012-07-30 17:25:16 -07:00
PM / Sleep: Separate printing suspend times from initcall_debug
2012-07-01 13:31:23 +02:00
mm: swap: implement generic handler for swap_activate
2012-07-31 18:42:47 -07:00
swap: fix shmem swapping when more than 8 areas
2012-06-15 21:48:14 -07:00
ipv4: Don't add deprecated new binary sysctl value.
2012-06-22 23:02:22 -07:00
merge task_work and rcu_head, get rid of separate allocation for keyring case
2012-07-22 23:57:56 +04:00
tcp: dont drop MTU reduction indications
2012-07-23 00:58:46 -07:00
Thermal: Add Hysteresis attributes
2012-07-24 23:19:26 -04:00
clocksource: time-armada-370-xp: Marvell Armada 370/XP SoC timer driver
2012-07-10 15:47:46 +02:00
posix_types.h: Cleanup stale __NFDBITS and related definitions
2012-07-26 13:36:43 -07:00
tipc: remove print_buf and deprecated log buffer code
2012-07-13 19:34:43 -04:00
trim task_work: get rid of hlist
2012-07-22 23:57:55 +04:00
tracepoint: Use static_key_false(), since static_branch() is deprecated
2012-07-06 10:53:49 +02:00
merge task_work and rcu_head, get rid of separate allocation for keyring case
2012-07-22 23:57:56 +04:00
HID: uhid: implement feature requests
2012-06-18 13:42:03 +02:00
USB: add USB_VENDOR_AND_INTERFACE_INFO() macro
2012-07-16 17:43:04 -07:00
[SCSI] usb-storage: add support for write cache quirk
2012-07-20 08:59:00 +01:00
usbdevfs: Use scatter-gather lists for large bulk transfers
2012-07-06 10:53:20 -07:00
[media] uvcvideo: Document the struct uvc_xu_control_query query field
2012-07-06 15:26:45 -03:00
[media] v4l: Unify selection flags
2012-07-06 20:17:46 -03:00
[media] v4l: Unify selection flags
2012-07-06 20:17:46 -03:00
vga_switcheroo: Add include guard
2012-06-21 09:32:16 +01:00
[media] v4l: Unify selection flags
2012-07-06 20:17:46 -03:00
[SCSI] virtio-scsi: Add vdrv->scan for post VIRTIO_CONFIG_S_DRIVER_OK LUN scanning
2012-07-20 08:59:03 +01:00
virtio-blk: return VIRTIO_BLK_F_FLUSH to header.
2012-07-30 13:30:52 +09:30
virtio ids: fix comment for virtio-rng
2012-07-30 13:30:49 +09:30
[SCSI] virtio-scsi: hotplug support for virtio-scsi
2012-07-20 08:58:58 +01:00
mm: account for the number of times direct reclaimers get throttled
2012-07-31 18:42:46 -07:00
ARM: dma-mapping: remove custom consistent dma region
2012-07-30 12:25:45 +02:00
mm: remove redundant initialization
2012-07-31 18:42:50 -07:00
mm: prepare for removal of obsolete /proc/sys/vm/nr_pdflush_threads
2012-07-31 18:42:40 -07:00
d833352a43