Linus Torvalds
14d0ee0517
This contains 4 fixes. ...
The first two fix the case where full RCU debugging is enabled, enabling
function tracing causes a live lock of the system. This is due to the added
debug checks in rcu_dereference_raw() that is used by the function tracer.
These checks are also traced by the function tracer as well as cause enough
overhead to the function tracer to slow down the system enough that
the time to finish an interrupt can take longer than when the next
interrupt is triggered, causing a live lock from the timer interrupt.
Talking this over with Paul McKenney, we came up with a fix that adds
a new rcu_dereference_raw_notrace() that does not perform these added checks,
and let the function tracer use that.
The third commit fixes a failed compile when branch tracing is enabled,
due to the conversion of the trace_test_buffer() selftest that the
branch trace wasn't converted for.
The forth patch fixes a bug caught by the RCU lockdep code where a
rcu_read_lock() is performed when rcu is disabled (either going to
or from idle, or user space). This happened on the irqsoff tracer
as it calls task_uid(). The fix here was to use current_uid() when
possible that doesn't use rcu locking. Which luckily, is always used
when irqsoff calls this code.
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQEcBAABAgAGBQJRsQZhAAoJEOdOSU1xswtMquIH/0zyrqrLTnkc5MsNnnJ8kH5R
z1cULts4FqBTUNZ1hdb3BTOu4zywjREIkWfM9qqpBmq9Mq6PBxX7gxWTqYvD4jiX
EatiiCKa7Fyddx4iHJNfvtWgKVYt9WKSNeloRugS9h7NxIZ1wpz21DUpENFQzW2f
jWRnq/AKXFmZ0vn1953mPePtRsg61RYpb7DCkTE1gtUnvL43wMd/Mo6p6BLMEG26
1dDK6EWO/uewl8A4oP5JZYP+AP5Ckd4x1PuQK682AtQw+8S6etaGfeJr0WZmKQoD
0aDZ/NXXSNKChlUFGJusBNJCWryONToa+sdiKuk1h/lW/k9Mail/FChiHBzMiwk=
=uvlD
-----END PGP SIGNATURE-----
Merge tag 'trace-fixes-v3.10-rc3-v3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace
Pull tracing fixes from Steven Rostedt:
"This contains 4 fixes.
The first two fix the case where full RCU debugging is enabled,
enabling function tracing causes a live lock of the system. This is
due to the added debug checks in rcu_dereference_raw() that is used by
the function tracer. These checks are also traced by the function
tracer as well as cause enough overhead to the function tracer to slow
down the system enough that the time to finish an interrupt can take
longer than when the next interrupt is triggered, causing a live lock
from the timer interrupt.
Talking this over with Paul McKenney, we came up with a fix that adds
a new rcu_dereference_raw_notrace() that does not perform these added
checks, and let the function tracer use that.
The third commit fixes a failed compile when branch tracing is
enabled, due to the conversion of the trace_test_buffer() selftest
that the branch trace wasn't converted for.
The forth patch fixes a bug caught by the RCU lockdep code where a
rcu_read_lock() is performed when rcu is disabled (either going to or
from idle, or user space). This happened on the irqsoff tracer as it
calls task_uid(). The fix here was to use current_uid() when possible
that doesn't use rcu locking. Which luckily, is always used when
irqsoff calls this code."
* tag 'trace-fixes-v3.10-rc3-v3' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-trace:
tracing: Use current_uid() for critical time tracing
tracing: Fix bad parameter passed in branch selftest
ftrace: Use the rcu _notrace variants for rcu_dereference_raw() and friends
rcu: Add _notrace variation of rcu_dereference_raw() and hlist_for_each_entry_rcu()
2013-06-07 18:46:51 -07:00
bcma: add more core IDs
2013-05-17 14:31:05 -04:00
libceph: use slab cache for osd client requests
2013-05-02 11:58:41 -05:00
ARM: arm-soc driver changes for 3.10
2013-05-04 12:31:18 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-04-30 09:36:50 -07:00
For 3.10 we have a few new MFD drivers for:
2013-05-05 17:36:20 -07:00
Cleanups for Allwinner sunXi architecture:
2013-04-11 03:39:00 -07:00
mfd: ab8500-sysctrl: Always enable pm_power_off handler
2013-05-17 00:42:33 +02:00
net/mlx4: Strengthen VLAN tags/priorities enforcement in VST mode
2013-05-11 16:12:44 -07:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cooloney/linux-leds
2013-05-06 15:41:42 -07:00
- Lots of cleanups from Artem, including deletion of some obsolete drivers
2013-05-09 10:15:46 -07:00
netfilter: ipset: set match: add support to match the counters
2013-04-29 20:09:03 +02:00
pinctrl: generic: Fix typos and clarify comments
2013-05-14 13:40:45 +02:00
Merge branch 'fixes' of git://git.infradead.org/users/vkoul/slave-dma
2013-05-25 20:30:31 -07:00
ab8500_bmdata: Export abx500_res_to_temp tables for hwmon
2013-04-16 17:38:10 -07:00
Merge remote-tracking branch 'regulator/topic/max8952' into v3.9-rc8
2013-04-28 02:13:43 +01:00
Merge remote-tracking branch 'spi/fix/grant' into spi-linus
2013-05-13 18:27:18 +04:00
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless
2013-04-23 14:09:39 -04:00
Merge branch 'nfs-for-next' of git://linux-nfs.org/~trondmy/nfs-2.6 into for-3.10
2013-04-29 16:23:34 -04:00
USB: serial: add generic wait_until_sent implementation
2013-05-16 17:32:21 -07:00
Power management and ACPI updates for 3.10-rc1
2013-04-30 15:21:02 -07:00
dma: acpi-dma: parse CSRT to extract additional resources
2013-05-14 10:23:57 +05:30
gpiolib-acpi: introduce acpi_get_gpio_by_index() helper
2013-04-12 00:31:18 +02:00
aerdrv: Move cper_print_aer() call out of interrupt context
2013-05-30 10:51:20 -07:00
aio: kill ki_retry
2013-05-07 19:46:02 -07:00
audit: Make testing for a valid loginuid explicit.
2013-05-07 22:27:15 -04:00
gpio: gpio-generic: Add 16 and 32 bit big endian byte order support
2013-04-10 23:41:16 +02:00
new helper: read_code()
2013-04-29 15:40:23 -04:00
Merge branch 'for-3.10/core' of git://git.kernel.dk/linux-block
2013-05-08 10:13:35 -07:00
Merge branch 'for-3.10/core' of git://git.kernel.dk/linux-block
2013-05-08 10:13:35 -07:00
Revert "block: add missing block_bio_complete() tracepoint"
2013-04-18 09:00:26 -07:00
mm, nobootmem: clean-up of free_low_memory_core_early()
2013-04-29 15:54:39 -07:00
broadcom: add include guards to include/linux/brcmphy.h
2013-05-15 14:42:15 -07:00
Mostly performance and bug fixes, plus some cleanups. The one new
2013-05-01 08:04:12 -07:00
Add file_ns_capable() helper function for open-time capability checking
2013-04-14 10:06:31 -07:00
cgroup: fix a subtle bug in descendant pre-order walk
2013-05-24 10:50:24 +09:00
mm: cleancache: clean up cleancache_enabled
2013-04-30 17:04:01 -07:00
clk: composite: rename 'div' references to 'rate'
2013-04-12 11:22:35 -07:00
clk: Properly handle notifier return values
2013-04-10 16:33:53 -07:00
Power management and ACPI updates for 3.10-rc1
2013-04-30 15:21:02 -07:00
ARM: arm-soc cleanup for 3.10
2013-05-02 09:03:55 -07:00
unify compat fanotify_mark(2), switch to COMPAT_SYSCALL_DEFINE
2013-05-09 13:46:38 -04:00
gcc4: disable __compiletime_object_size for GCC 4.6+
2013-04-29 18:28:13 -07:00
early_printk: consolidate random copies of identical code
2013-04-29 18:28:13 -07:00
thermal: cpu_cooling: improve line breaking
2013-04-27 09:25:59 +08:00
Merge branch 'release' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux
2013-05-11 15:23:17 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
lib, net: make isodigit() public and use it
2013-04-29 18:28:19 -07:00
debug_locks.h: make warning more verbose
2013-04-29 15:54:27 -07:00
dm: document iterate_devices
2013-05-10 14:37:17 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2013-05-01 13:20:04 -07:00
dma-buf: Add debugfs support
2013-05-01 16:36:22 +05:30
Merge branch 'topic/of' into for-linus
2013-05-02 21:52:26 +05:30
dump_stack: implement arch-specific hardware description in task dumps
2013-04-30 17:04:02 -07:00
efi, pstore: Read data from variable store before memcpy()
2013-04-30 16:03:10 +01:00
aio: remove retry-based AIO
2013-05-07 18:38:27 -07:00
fat: restructure export_operations
2013-04-29 18:28:40 -07:00
don't bother with deferred freeing of fdtables
2013-05-01 17:31:42 -04:00
filter: fix va_list build error
2013-05-01 16:28:48 -04:00
frontswap: get rid of swap_lock dependency
2013-04-30 17:04:00 -07:00
make blkdev_put() return void
2013-05-07 02:16:31 -04:00
inotify: convert inotify_add_to_idr() to use idr_alloc_cyclic()
2013-04-29 18:28:41 -07:00
ftrace, kprobes: Fix a deadlock on ftrace_regex_lock
2013-05-09 20:10:22 -04:00
tracing: Modify soft-mode only if there's no other referrer
2013-05-09 20:14:25 -04:00
genalloc: add devres support, allow to find a managed pool by device
2013-04-29 18:28:13 -07:00
ARM: pxa: move PXA_GPIO_TO_IRQ macro
2013-04-11 10:00:05 +08:00
Convert selectors of GENERIC_GPIO to GPIOLIB
2013-04-16 18:47:14 +09:00
HID: debug: break out hid_dump_report() into hid-debug
2013-04-30 10:09:06 +02:00
HID: debug: fix RCU preemption issue
2013-05-06 13:07:33 +02:00
mm: thp: add split tail pages to shrink page list in page reclaim
2013-04-29 15:54:38 -07:00
hugetlbfs: fix mmap failure in unaligned size request
2013-05-07 18:38:27 -07:00
drivers/video: add Hyper-V Synthetic Video Frame Buffer Driver
2013-04-29 15:54:26 -07:00
ipv6: Kill ipv6 dependency of icmpv6_send().
2013-04-29 13:54:36 -04:00
Merge branch 'for-3.10/drivers' of git://git.kernel.dk/linux-block
2013-05-08 11:51:05 -07:00
mac80211: parse VHT channel switch IEs
2013-04-16 15:29:45 +02:00
net: vlan: fix dummy function signatures for CONFIG_VLAN=n
2013-04-21 15:56:59 -04:00
Merge branches 'iommu/fixes', 'x86/vt-d', 'x86/amd', 'ppc/pamu', 'core' and 'arm/tegra' into next
2013-05-02 12:10:19 +02:00
resource: add release_mem_region_adjustable()
2013-04-29 15:54:37 -07:00
ipc: sysv shared memory limited to 8TiB
2013-05-01 08:12:58 -07:00
jbd: use kmem_cache_zalloc instead of kmem_cache_alloc/memset
2013-04-25 15:25:23 +02:00
jbd2: use kmem_cache_zalloc instead of kmem_cache_alloc/memset
2013-04-19 17:49:23 -04:00
jbd,jbd2: fix oops in jbd2_journal_put_journal_head()
2013-05-13 09:45:01 -04:00
proc: Split kcore bits from linux/procfs.h into linux/kcore.h
2013-04-29 15:42:02 -04:00
linux/kernel.h: fix kernel-doc warning
2013-05-24 16:22:51 -07:00
x86, kdump: Retore crashkernel= to allocate under 896M
2013-04-17 12:35:33 -07:00
kmod: remove call_usermodehelper_fns()
2013-04-30 17:04:06 -07:00
Merge branch 'queue' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2013-05-16 07:55:07 -07:00
kthread: implement probe_kthread_data()
2013-04-30 17:04:02 -07:00
net: socket: move ktime2ts to ktime header api
2013-04-19 16:39:13 -04:00
Merge tag 'kvm-3.10-1' of git://git.kernel.org/pub/scm/virt/kvm/kvm
2013-05-05 14:47:31 -07:00
We get rid of the general module prefix confusion with a binary config option,
2013-05-05 10:58:06 -07:00
list: introduce list_first_entry_or_null
2013-05-31 17:31:52 -07:00
Revert "math64: New div64_u64_rem helper"
2013-04-30 19:13:05 +02:00
arm: mach-mv78xx0: convert to use the mvebu-mbus driver
2013-04-15 14:06:39 +00:00
memory hotplug: fix warnings
2013-04-30 17:04:00 -07:00
mm, hotplug: avoid compiling memory hotremove functions when disabled
2013-04-29 15:54:37 -07:00
include/linux/mm.h: complete the mm_walk definition
2013-05-07 18:38:26 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial
2013-04-30 09:36:50 -07:00
PCI: Remove "extern" from function declarations
2013-04-23 09:50:30 -06:00
mutex: Queue mutex spinners with MCS lock to reduce cacheline contention
2013-04-19 09:33:36 +02:00
net: rename random32 to prandom
2013-04-29 18:28:44 -07:00
net: Restore NETIF_F_* bit ordering.
2013-05-02 07:34:58 -07:00
bonding: allow TSO being set on bonding master
2013-05-16 15:02:01 -07:00
netfilter: add nf_ipv6_ops hook to fix xt_addrtype with IPv6
2013-05-23 11:58:55 +02:00
netlink: implement memory mapped recvmsg()
2013-04-19 14:57:58 -04:00
netpoll: convert mutex into a semaphore
2013-05-01 15:00:24 -04:00
NFSv4.1: Set the RPC_CLNT_CREATE_INFINITE_SLOTS flag for NFSv4.1 transports
2013-04-14 12:59:28 -04:00
NFSv4: Convert nfs41_free_stateid to use an asynchronous RPC call
2013-05-06 17:24:22 -04:00
include/linux/memory.h: implement register_hotmemory_notifier()
2013-04-29 15:54:36 -07:00
nubus: Kill nubus_proc_detach_device()
2013-05-04 14:47:26 -04:00
NVMe: Simplify Firmware Activate code slightly
2013-05-08 09:55:05 -04:00
ARM: arm-soc: late cleanups
2013-05-07 11:22:14 -07:00
dma:of: Use a mutex to protect the of_dma_list
2013-05-02 21:50:38 +05:30
<linux/of_platform.h>: fix compilation warnings with DT disabled
2013-04-09 14:58:32 -05:00
vm: adjust ifdef for TINY_RCU
2013-04-29 15:54:28 -07:00
ata: arasan: remove the need for platform_data
2013-04-19 22:25:51 +02:00
PCI: acpiphp: Re-enumerate devices when host bridge receives Bus Check
2013-05-17 14:12:06 -06:00
PCI: Remove "extern" from function declarations
2013-04-17 10:21:17 -06:00
PCI: Remove "extern" from function declarations
2013-04-17 10:21:17 -06:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2013-05-01 14:08:52 -07:00
PCI: Remove "extern" from function declarations
2013-04-17 10:21:17 -06:00
[SCSI] bnx2fc: Include chip number in the symbolic name
2013-05-02 07:32:24 -07:00
PCI: Remove "extern" from function declarations
2013-04-17 10:21:17 -06:00
Merge commit ' 8700c95adb' into timers/nohz
2013-05-02 17:54:19 +02:00
aio: don't include aio.h in sched.h
2013-05-07 20:16:25 -07:00
get rid of the last free_pipe_info() callers
2013-04-09 14:13:02 -04:00
Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2013-05-05 13:23:27 -07:00
power_supply: Populate supplied_from hierarchy from the device tree
2013-04-16 18:51:16 -07:00
spinlocks and preemption points need to be at least compiler barriers
2013-04-09 10:48:33 -07:00
Add include dependencies to <linux/printk.h>.
2013-05-22 01:34:24 +02:00
proc: Move non-public stuff from linux/proc_fs.h to fs/proc/internal.h
2013-05-01 17:29:47 -04:00
proc: Split the namespace stuff out into linux/proc_ns.h
2013-05-01 17:29:39 -04:00
create_proc_cpu_mask() doesn't need an argument...
2013-04-09 14:13:35 -04:00
mm/shmem.c: remove an ifdef
2013-04-29 15:54:28 -07:00
remove unused random32() and srandom32()
2013-05-07 18:38:27 -07:00
rcu: Add _notrace variation of rcu_dereference_raw() and hlist_for_each_entry_rcu()
2013-05-28 22:47:13 -04:00
net: force a reload of first item in hlist_nulls_for_each_entry_rcu
2013-06-02 20:53:59 -07:00
rcu: Add _notrace variation of rcu_dereference_raw() and hlist_for_each_entry_rcu()
2013-05-28 22:47:13 -04:00
kernel/relay.c: move FIX_SIZE macro into relay.c
2013-04-30 17:04:09 -07:00
Merge branch 'for-3.10' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2013-04-29 19:14:20 -07:00
reset: Add reset controller API
2013-04-12 10:26:23 +02:00
reset: Add reset controller API
2013-04-12 10:26:23 +02:00
rapidio: add enumeration/discovery start from user space
2013-05-24 16:22:50 -07:00
rapidio: make enumeration/discovery configurable
2013-05-24 16:22:50 -07:00
drivers/rtc/class.c: use struct device as the first argument for devm_rtc_device_register()
2013-04-29 18:28:22 -07:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2013-05-02 19:40:34 -07:00
Merge git://git.infradead.org/users/eparis/audit
2013-05-11 14:29:11 -07:00
net: sctp: introduce uapi header for sctp
2013-04-09 13:19:39 -04:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2013-04-30 16:27:51 -07:00
new helper: single_open_size()
2013-04-09 14:13:29 -04:00
tty: serial/samsung: make register definitions global
2013-04-11 13:14:36 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2013-05-01 17:51:54 -07:00
udp6: Fix udp fragmentation for tunnel traffic.
2013-05-31 17:06:07 -07:00
slab: Return NULL for oversized allocations
2013-05-06 09:24:16 +03:00
kernel/smp.c: remove 'priv' of call_single_data
2013-04-30 17:04:03 -07:00
sock_diag: allow to dump bpf filters
2013-04-29 13:21:30 -04:00
net: Unbreak compat_sys_{send,recv}msg
2013-06-06 11:52:14 -07:00
spinlocks and preemption points need to be at least compiler barriers
2013-04-09 10:48:33 -07:00
lib/string_helpers: introduce generic string_unescape
2013-04-30 17:04:03 -07:00
sudmac: add support for SUDMAC
2013-04-30 15:50:12 +05:30
mm: thp: add split tail pages to shrink page list in page reclaim
2013-04-29 15:54:38 -07:00
x86, kdump: Set crashkernel_low automatically
2013-04-17 12:35:32 -07:00
Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux
2013-05-09 09:40:49 -07:00
nohz: Re-evaluate the tick for the new task after a context switch
2013-04-22 20:29:07 +02:00
time: Revert ALWAYS_USE_PERSISTENT_CLOCK compile time optimizaitons
2013-05-14 20:54:06 +02:00
hwrng: timeriomem - update to support more than one device
2013-04-25 21:01:45 +08:00
Merge git://git.infradead.org/users/eparis/audit
2013-05-11 14:29:11 -07:00
mfd: ucb1400: Pass ucb1400-gpio data through ac97 bus
2013-04-19 00:40:07 +02:00
Move utf16 functions to kernel core and rename
2013-04-15 21:23:03 +01:00
Hoist memcpy_fromiovec/memcpy_toiovec into lib/
2013-05-20 10:24:22 +09:30
uretprobes: Limit the depth of return probe nestedness
2013-04-13 15:31:58 +02:00
Lots of virtio work which wasn't quite ready for last merge window. Plus
2013-05-02 14:14:04 -07:00
kexec, vmalloc: export additional vmalloc layer information
2013-04-29 15:54:34 -07:00
memcg: add memory.pressure_level events
2013-04-29 15:54:38 -07:00
mm: remove CONFIG_HOTPLUG ifdefs
2013-04-29 15:54:37 -07:00
tty/vt: Fix vc_deallocate() lock order
2013-05-20 12:15:59 -07:00
wait: fix false timeouts when using wait_event_timeout()
2013-05-24 16:22:50 -07:00
workqueue: include workqueue info when printing debug dump of a worker task
2013-04-30 17:04:02 -07:00
aio: don't include aio.h in sched.h
2013-05-07 20:16:25 -07:00
