Greg Thelen
2e898e4c0a
writeback: safer lock nesting ...
lock_page_memcg()/unlock_page_memcg() use spin_lock_irqsave/restore() if
the page's memcg is undergoing move accounting, which occurs when a
process leaves its memcg for a new one that has
memory.move_charge_at_immigrate set.
unlocked_inode_to_wb_begin,end() use spin_lock_irq/spin_unlock_irq() if
the given inode is switching writeback domains. Switches occur when
enough writes are issued from a new domain.
This existing pattern is thus suspicious:
lock_page_memcg(page);
unlocked_inode_to_wb_begin(inode, &locked);
...
unlocked_inode_to_wb_end(inode, locked);
unlock_page_memcg(page);
If both inode switch and process memcg migration are both in-flight then
unlocked_inode_to_wb_end() will unconditionally enable interrupts while
still holding the lock_page_memcg() irq spinlock. This suggests the
possibility of deadlock if an interrupt occurs before unlock_page_memcg().
truncate
__cancel_dirty_page
lock_page_memcg
unlocked_inode_to_wb_begin
unlocked_inode_to_wb_end
<interrupts mistakenly enabled>
<interrupt>
end_page_writeback
test_clear_page_writeback
lock_page_memcg
<deadlock>
unlock_page_memcg
Due to configuration limitations this deadlock is not currently possible
because we don't mix cgroup writeback (a cgroupv2 feature) and
memory.move_charge_at_immigrate (a cgroupv1 feature).
If the kernel is hacked to always claim inode switching and memcg
moving_account, then this script triggers lockup in less than a minute:
cd /mnt/cgroup/memory
mkdir a b
echo 1 > a/memory.move_charge_at_immigrate
echo 1 > b/memory.move_charge_at_immigrate
(
echo $BASHPID > a/cgroup.procs
while true; do
dd if=/dev/zero of=/mnt/big bs=1M count=256
done
) &
while true; do
sync
done &
sleep 1h &
SLEEP=$!
while true; do
echo $SLEEP > a/cgroup.procs
echo $SLEEP > b/cgroup.procs
done
The deadlock does not seem possible, so it's debatable if there's any
reason to modify the kernel. I suggest we should to prevent future
surprises. And Wang Long said "this deadlock occurs three times in our
environment", so there's more reason to apply this, even to stable.
Stable 4.4 has minor conflicts applying this patch. For a clean 4.4 patch
see "[PATCH for-4.4] writeback: safer lock nesting"
https://lkml.org/lkml/2018/4/11/146
Wang Long said "this deadlock occurs three times in our environment"
[gthelen@google.com: v4]
Link: http://lkml.kernel.org/r/20180411084653.254724-1-gthelen@google.com
[akpm@linux-foundation.org: comment tweaks, struct initialization simplification]
Change-Id: Ibb773e8045852978f6207074491d262f1b3fb613
Link: http://lkml.kernel.org/r/20180410005908.167976-1-gthelen@google.com
Fixes: 682aa8e1a6
2018-04-20 17:18:35 -07:00
crypto: Deduplicate le32_to_cpu_array() and cpu_to_le32_array()
2018-03-31 01:33:09 +08:00
ceph: quota: add initial infrastructure to support cephfs quotas
2018-04-02 11:17:51 +02:00
The large diff this time around is from the addition of a new clk driver
2018-04-13 15:51:06 -07:00
extcon: gpio: Localize platform data
2018-03-21 13:58:08 +09:00
firmware /meson
bus: fsl-mc: change mc_command in fsl_mc_command
2018-03-23 15:52:48 +01:00
gpiolib: Support 'gpio-reserved-ranges' property
2018-03-27 15:34:20 +02:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2018-04-04 15:19:26 -07:00
Changes to chrome-platform for v4.17
2018-04-13 16:20:36 -07:00
RDMA/mlx4: Move flag constants to uapi header
2018-03-15 15:58:03 -06:00
Merge candidates for 4.17 merge window
2018-04-06 17:35:43 -07:00
Core changes:
2018-04-04 22:11:36 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next
2018-03-30 11:41:18 -04:00
phy: fix structure documentation
2018-03-08 13:56:24 +05:30
Changes to chrome-platform for v4.17
2018-04-13 16:20:36 -07:00
qed: Adapter flash update support.
2018-03-29 14:29:55 -04:00
powerpc updates for 4.17
2018-04-07 12:08:19 -07:00
exec: pass stack rlimit into mm layout functions
2018-04-11 10:28:37 -07:00
remoteproc updates for v4.17
2018-04-10 12:09:27 -07:00
NFS client updates for Linux 4.17
2018-04-12 12:55:50 -07:00
sound updates for 4.17-rc1
2018-04-05 10:42:07 -07:00
audit: remove path param from link denied function
2018-03-21 11:17:41 -04:00
writeback: safer lock nesting
2018-04-20 17:18:35 -07:00
writeback: safer lock nesting
2018-04-20 17:18:35 -07:00
exec: pin stack limit during exec
2018-04-11 10:28:37 -07:00
bitmap: fix memset optimization on big-endian systems
2018-04-02 20:52:27 -07:00
blk-throttle: fix race between blkcg_bio_issue_check() and cgroup_rmdir()
2018-03-16 10:35:12 -06:00
blk-mq: Allow PCI vector offset for mapping queues
2018-03-27 21:25:36 -06:00
blk-mq: remove blk_mq_delay_queue()
2018-04-10 08:38:46 -06:00
block: use 32-bit blk_status_t on Alpha
2018-03-21 19:23:33 -06:00
block: Move SECTOR_SIZE and SECTOR_SHIFT definitions into <linux/blkdev.h>
2018-03-17 14:45:23 -06:00
mm: remove obsolete alloc_remap()
2018-03-16 10:56:13 +01:00
bpf: Post-hooks for sys_bind
2018-03-31 02:16:26 +02:00
bpf: Check attach type at prog load time
2018-03-31 02:14:44 +02:00
bpf: Hooks for sys_bind
2018-03-31 02:15:18 +02:00
bpf: Add bpf_verifier_vlog() and bpf_verifier_log_needed()
2018-03-26 09:58:17 +02:00
bsg: split handling of SCSI CDBs vs transport requeues
2018-03-13 11:40:24 -06:00
bsg: split handling of SCSI CDBs vs transport requeues
2018-03-13 11:40:24 -06:00
Merge branch 'for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2018-04-03 18:00:13 -07:00
clk: divider: read-only divider can propagate rate change
2018-03-12 15:10:26 -07:00
clk: add more __must_check for bulk APIs
2018-03-16 15:45:51 -07:00
Merge branch 'x86-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2018-04-15 16:12:35 -07:00
task_struct: only use anon struct under randstruct plugin
2018-04-11 10:28:35 -07:00
task_struct: only use anon struct under randstruct plugin
2018-04-11 10:28:35 -07:00
linux/const.h: move UL() macro to include/linux/const.h
2018-04-11 10:28:38 -07:00
cpufreq: Drop cpufreq_table_validate_and_show()
2018-04-10 08:40:45 +02:00
arch: remove blackfin port
2018-03-16 10:55:47 +01:00
cpuidle: Return nohz hint from cpuidle_select()
2018-04-06 09:29:34 +02:00
libcrc32c: Add crc32c_impl function
2018-03-26 15:09:38 +02:00
crypto: doc - Document remaining members in struct crypto_alg
2018-03-23 23:48:43 +08:00
dax, dm: allow device-mapper to operate without dax support
2018-04-03 05:41:19 -07:00
Merge branch 'old.dcache' into work.dcache
2018-04-04 00:40:19 -04:00
- DM core passthrough ioctl fix to retain reference to DM table, and
2018-04-06 11:50:19 -07:00
Driver core patches for 4.17-rc1
2018-04-04 19:41:45 -07:00
dm bufio: move dm-bufio.h to include/linux/
2018-04-03 15:04:23 -04:00
dma/direct: Handle the memory encryption bit in common code
2018-03-20 10:01:59 +01:00
dma-mapping updates for 4.17:
2018-04-05 10:23:24 -07:00
mm: Add NO_DMA dummies for DMA pool API
2018-03-16 19:58:27 +01:00
* Add NVDIMM support to EDAC (Tony Luck)
2018-04-05 14:21:13 -07:00
EDAC: Add new memory type for non-volatile DIMMs
2018-03-14 12:32:06 +01:00
efi: Use efi_mm in x86 as well as ARM
2018-03-12 10:05:01 +01:00
net: ethtool: extend RXNFC API to support RSS spreading of filter matches
2018-03-08 21:54:52 -05:00
extcon: add possibility to get extcon device by OF node
2018-03-08 10:34:44 +09:00
f2fs: align memory boundary for bitops
2018-03-17 13:57:39 +09:00
mm: make should_failslab always available for fault injection
2018-04-05 21:36:26 -07:00
fbdev: remove blackfin drivers
2018-03-26 15:56:44 +02:00
bpf: Hooks for sys_bind
2018-03-31 02:15:18 +02:00
firmware: add firmware_request_cache() to help with cache on reboot
2018-03-22 18:33:26 +01:00
Merge branch 'work.thaw' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2018-04-12 12:28:32 -07:00
fscache: Pass object size in rather than calling back for it
2018-04-06 14:05:14 +01:00
fscache: Maintain a catalogue of allocated cookies
2018-04-06 14:05:14 +01:00
mtd: nand: fsl_ifc: Read ECCSTAT0 and ECCSTAT1 registers for IFC 2.0
2018-03-21 10:22:28 +01:00
fsnotify: fix typo in a comment about mark->g_list
2018-04-13 15:54:13 +02:00
mm: use do_futex() instead of sys_futex() in mm_release()
2018-04-02 20:15:02 +02:00
Input: gpio-keys - add support for wakeup event action
2018-03-14 10:13:22 -07:00
HID: input: fix battery level reporting on BT mice
2018-04-09 09:26:12 +02:00
mm: Allow arch code to override copy_highpage()
2018-03-18 07:38:48 -07:00
mm/hmm: fix header file if/else/endif maze, again
2018-04-11 10:28:31 -07:00
Merge branches 'pm-cpuidle' and 'pm-qos'
2018-04-11 13:22:46 +02:00
perf/core: Implement fast breakpoint modification via _IOC_MODIFY_ATTRIBUTES
2018-03-13 15:24:02 +01:00
ARM:
2018-04-09 11:42:31 -07:00
jailhouse: Provide detection for non-x86 systems
2018-03-08 12:30:37 +01:00
i2c: pca-platform: drop gpio from platform data
2018-03-24 13:26:13 +01:00
for-4.17/block-20180402
2018-04-05 14:27:02 -07:00
xarray: add the xa_lock to the radix_tree_root
2018-04-11 10:28:39 -07:00
vhost_net: examine pointer types during un-producing
2018-03-09 12:02:59 -05:00
vlan: Fix reading memory beyond skb->tail in skb_vlan_tagged_multi
2018-04-17 13:59:28 -04:00
net/utils: Introduce inet_addr_is_any
2018-03-26 08:53:43 -06:00
ipc: Move IPCMNI from include/ipc.h into ipc/util.h
2018-03-24 11:25:36 -05:00
genirq: Add CONFIG_GENERIC_IRQ_MULTI_HANDLER
2018-03-14 21:46:29 +01:00
jiffies: Introduce USER_TICK_USEC and redefine TICK_USEC
2018-04-06 09:28:50 +02:00
jump_label: Disable jump labels in __exit code
2018-03-20 08:57:17 +01:00
kasan: make kasan_cache_create() work with 32-bit slab cache sizes
2018-04-05 21:36:24 -07:00
kbuild: get <linux/compiler_types.h> out of <linux/kconfig.h>
2018-03-31 12:22:38 +09:00
taint: add taint for randstruct
2018-04-11 10:28:35 -07:00
kernel/kexec_file.c: allow archs to set purgatory load address
2018-04-13 17:10:28 -07:00
include/linux/kfifo.h: fix comment
2018-04-11 10:28:38 -07:00
leds: Extends disk trigger for reads and writes
2018-03-11 20:01:55 +01:00
libata: add refcounting to ata_host
2018-03-13 13:29:10 -07:00
libnvdimm: Add of_node to region and bus descriptors
2018-04-07 07:53:23 -07:00
lightnvm: pblk: implement get log report chunk
2018-03-29 17:29:09 -06:00
video/logo: remove obsolete logo files
2018-03-26 15:56:42 +02:00
mm: make counting of list_lru_one::nr_items lockless
2018-04-05 21:36:27 -07:00
livepatch: Allow to call a custom callback when freeing shadow variables
2018-04-17 13:42:48 +02:00
lockref: Add lockref_put_not_zero
2018-04-12 09:41:19 -07:00
lib: Add generic PIO mapping method
2018-03-21 17:18:34 -05:00
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2018-04-07 16:53:59 -07:00
powerpc updates for 4.17
2018-04-07 12:08:19 -07:00
mm: memcg: make sure memory.events is uptodate when waking pollers
2018-04-11 10:28:31 -07:00
mm/memory_hotplug: optimize memory hotplug
2018-04-05 21:36:25 -07:00
mm/cma: manage the memory of the CMA area by using the ZONE_MOVABLE
2018-04-11 10:28:32 -07:00
lan78xx: PHY DSP registers initialization to address EEE link drop issues with long cables
2018-04-12 21:46:10 -04:00
mm: unclutter THP migration
2018-04-11 10:28:32 -07:00
page cache: use xa_lock
2018-04-11 10:28:39 -07:00
mm: change return type to vm_fault_t
2018-04-05 21:36:27 -07:00
mm: Add address parameter to arch_validate_prot()
2018-03-18 07:38:47 -07:00
include/linux/mmdebug.h: make VM_WARN* non-rvals
2018-04-05 21:36:27 -07:00
mm/page_alloc: don't reserve ZONE_HIGHMEM for ZONE_MOVABLE request
2018-04-11 10:28:32 -07:00
firmware: dmi_scan: Add DMI_OEM_STRING support to dmi_matches
2018-04-13 15:37:59 +02:00
ip6mr: Add refcounting to mfc
2018-03-26 13:14:43 -04:00
ip6mr: Add API for default_rule fib
2018-03-26 13:14:43 -04:00
ip6mr: Add refcounting to mfc
2018-03-26 13:14:43 -04:00
msg: Move struct msg_queue into ipc/msg.c
2018-03-24 11:25:35 -05:00
Merge branch 'linus' into locking/core, to pick up fixes and dependencies
2018-03-10 10:19:28 +01:00
libnvdimm: provide module_nd_driver wrapper
2018-03-15 07:17:21 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-03-23 11:31:58 -04:00
net/dim: Fix int overflow
2018-03-30 12:56:22 -04:00
ethtool: enable Inline TLS in HW
2018-03-31 23:37:32 -04:00
sfp/phylink: move module EEPROM ethtool access into netdev core ethtool
2018-03-30 10:11:06 -04:00
NFS: More fine grained attribute tracking
2018-04-10 16:06:22 -04:00
NFS: Remove the unused return_delegation() callback
2018-04-10 16:06:22 -04:00
mm/memory_hotplug: don't read nid from struct page during hotplug
2018-04-05 21:36:25 -07:00
nvmem: Introduce devm_nvmem_(un)register()
2018-03-14 19:28:13 +01:00
of_net: Implement of_get_nvmem_mac_address helper
2018-03-30 10:40:18 -04:00
mm: uninitialized struct page poisoning sanity checking
2018-04-05 21:36:25 -07:00
mm, migrate: remove reason argument from new_page_t
2018-04-11 10:28:32 -07:00
mm/page_ref: use atomic_set_release in page_ref_unfreeze
2018-04-05 21:36:25 -07:00
page cache: use xa_lock
2018-04-11 10:28:39 -07:00
PCI: endpoint: Make epc->ops->clear_bar()/pci_epc_clear_bar() take struct *epf_bar
2018-04-03 12:38:05 +01:00
PCI: endpoint: Simplify epc->ops->set_bar()/pci_epc_set_bar()
2018-04-03 12:23:38 +01:00
pci-v4.17-changes
2018-04-06 18:31:06 -07:00
pci-v4.17-changes
2018-04-06 18:31:06 -07:00
percpu_ref: Update doc to dissuade users from depending on internal RCU grace periods
2018-03-19 10:09:44 -07:00
perf/x86/pt, coresight: Clean up address filter structure
2018-03-29 16:07:22 +02:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2018-03-23 11:31:58 -04:00
sfp/phylink: move module EEPROM ethtool access into netdev core ethtool
2018-03-30 10:11:06 -04:00
printk: move dump stack related code to lib/dump_stack.c
2018-03-15 13:25:36 +01:00
pstore/ram: Do not use stack VLA for parity workspace
2018-03-07 12:47:06 -08:00
quota: Kill an unused extern entry form quota.h
2018-03-26 13:11:35 +02:00
fs/quota: add kernel_quotactl() helper; remove in-kernel call to syscall
2018-04-02 20:15:46 +02:00
xarray: add the xa_lock to the radix_tree_root
2018-04-11 10:28:39 -07:00
reset: modify the way reset lookup works for board files
2018-03-27 10:39:47 +02:00
rhashtable: reorganize struct rhashtable layout
2018-03-31 23:25:39 -04:00
ring-buffer: Add nesting for adding events within events
2018-03-10 16:06:04 -05:00
rtc: Add useful timestamp definitions
2018-03-17 14:20:55 +01:00
net: Introduce net_rwsem to protect net_namespace_list
2018-03-29 13:47:53 -04:00
for-4.17/block-20180402
2018-04-05 14:27:02 -07:00
sched/core: Force proper alignment of 'struct util_est'
2018-04-05 10:56:16 +02:00
Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2018-04-07 16:53:59 -07:00
sem: Move struct sem and struct sem_array into ipc/sem.c
2018-03-22 21:30:56 -05:00
seq_file: allocate seq_file from kmem_cache
2018-04-11 10:28:36 -07:00
powerpc: Mark the variable earlycon_acpi_spcr_enable maybe_unused
2018-03-15 17:42:55 +01:00
set_memory.h: Provide set_memory_{en,de}crypted() stubs
2018-03-20 10:01:58 +01:00
kernel/kexec_file.c: move purgatories sha256 to common code
2018-04-13 17:10:28 -07:00
ipc/shm: fix up for struct file no longer being available in shm.h
2018-03-28 13:29:57 -05:00
mm,vmscan: Allow preallocating memory for register_shrinker().
2018-04-16 02:06:47 -04:00
arm64/kernel: kaslr: reduce module randomization range to 4 GB
2018-03-08 13:49:26 +00:00
inet: frags: get rid of ipfrag_skb_cb/FRAG_CB
2018-03-31 23:25:40 -04:00
headers: untangle kmemleak.h from mm.h
2018-04-05 21:36:27 -07:00
slab: make usercopy region 32-bit
2018-04-05 21:36:24 -07:00
slub: make struct kmem_cache_order_objects::x unsigned int
2018-04-05 21:36:24 -07:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-next
2018-04-03 14:04:18 -07:00
stm class: Add SPDX GPL-2.0 header to replace GPLv2 boilerplate
2018-03-28 18:47:17 +03:00
mm: swap: unify cluster-based and vma-based swap readahead
2018-04-05 21:36:25 -07:00
dma/swiotlb: Remove swiotlb_{alloc,free}_coherent()
2018-03-20 10:01:59 +01:00
syscalls/core, syscalls/x86: Clean up syscall stub naming convention
2018-04-09 16:47:27 +02:00
textsearch: fix kernel-doc warnings and add kernel-api section
2018-04-16 18:53:13 -04:00
thermal: Add cooling device's statistics in sysfs
2018-04-02 21:49:01 +08:00
fork: unconditionally clear stack on fork
2018-04-20 17:18:35 -07:00
thunderbolt: Introduce USB only (SL4) security level
2018-03-09 12:54:11 +03:00
cpuidle: menu: Refine idle state selection for running tick
2018-04-09 11:54:56 +02:00
y2038: Introduce struct __kernel_old_timeval
2018-03-19 15:23:03 +01:00
timekeeping: Add the new CLOCK_MONOTONIC_ACTIVE clock
2018-03-13 07:34:21 +01:00
* Fix 2032 time access issues and new compiler warnings
2018-04-12 10:21:19 -07:00
tpm: cmd_ready command can be issued only after granting locality
2018-03-23 10:18:05 +02:00
New features:
2018-04-10 11:27:30 -07:00
bpf: introduce BPF_RAW_TRACEPOINT
2018-03-28 22:55:19 +02:00
net: usbnet: fix potential deadlock on 32bit hosts
2018-03-07 11:46:39 -05:00
uts: create "struct uts_namespace" from kmem_cache
2018-04-11 10:28:35 -07:00
vga_switcheroo: Use device link for HDA controller
2018-03-13 22:58:09 +01:00
mm, vmscan, tracing: use pointer to reclaim_stat struct in trace event
2018-04-11 10:28:30 -07:00
sched/wait: Remove the wait_on_atomic_t() API
2018-03-20 08:23:24 +01:00
Merge branch 'for-4.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq
2018-04-03 18:00:13 -07:00
xarray: add the xa_lock to the radix_tree_root
2018-04-11 10:28:39 -07:00
zsmalloc: introduce zs_huge_class_size()
2018-04-05 21:36:26 -07:00
