Tejun Heo
1f7dd3e5a6
cgroup: fix handling of multi-destination migration from subtree_control enabling ...
Consider the following v2 hierarchy.
P0 (+memory) --- P1 (-memory) --- A
\- B
P0 has memory enabled in its subtree_control while P1 doesn't. If
both A and B contain processes, they would belong to the memory css of
P1. Now if memory is enabled on P1's subtree_control, memory csses
should be created on both A and B and A's processes should be moved to
the former and B's processes the latter. IOW, enabling controllers
can cause atomic migrations into different csses.
The core cgroup migration logic has been updated accordingly but the
controller migration methods haven't and still assume that all tasks
migrate to a single target css; furthermore, the methods were fed the
css in which subtree_control was updated which is the parent of the
target csses. pids controller depends on the migration methods to
move charges and this made the controller attribute charges to the
wrong csses often triggering the following warning by driving a
counter negative.
WARNING: CPU: 1 PID: 1 at kernel/cgroup_pids.c:97 pids_cancel.constprop.6+0x31/0x40()
Modules linked in:
CPU: 1 PID: 1 Comm: systemd Not tainted 4.4.0-rc1+ #29
...
ffffffff81f65382 ffff88007c043b90 ffffffff81551ffc 0000000000000000
ffff88007c043bc8 ffffffff810de202 ffff88007a752000 ffff88007a29ab00
ffff88007c043c80 ffff88007a1d8400 0000000000000001 ffff88007c043bd8
Call Trace:
[<ffffffff81551ffc>] dump_stack+0x4e/0x82
[<ffffffff810de202>] warn_slowpath_common+0x82/0xc0
[<ffffffff810de2fa>] warn_slowpath_null+0x1a/0x20
[<ffffffff8118e031>] pids_cancel.constprop.6+0x31/0x40
[<ffffffff8118e0fd>] pids_can_attach+0x6d/0xf0
[<ffffffff81188a4c>] cgroup_taskset_migrate+0x6c/0x330
[<ffffffff81188e05>] cgroup_migrate+0xf5/0x190
[<ffffffff81189016>] cgroup_attach_task+0x176/0x200
[<ffffffff8118949d>] __cgroup_procs_write+0x2ad/0x460
[<ffffffff81189684>] cgroup_procs_write+0x14/0x20
[<ffffffff811854e5>] cgroup_file_write+0x35/0x1c0
[<ffffffff812e26f1>] kernfs_fop_write+0x141/0x190
[<ffffffff81265f88>] __vfs_write+0x28/0xe0
[<ffffffff812666fc>] vfs_write+0xac/0x1a0
[<ffffffff81267019>] SyS_write+0x49/0xb0
[<ffffffff81bcef32>] entry_SYSCALL_64_fastpath+0x12/0x76
This patch fixes the bug by removing @css parameter from the three
migration methods, ->can_attach, ->cancel_attach() and ->attach() and
updating cgroup_taskset iteration helpers also return the destination
css in addition to the task being migrated. All controllers are
updated accordingly.
* Controllers which don't care whether there are one or multiple
target csses can be converted trivially. cpu, io, freezer, perf,
netclassid and netprio fall in this category.
* cpuset's current implementation assumes that there's single source
and destination and thus doesn't support v2 hierarchy already. The
only change made by this patchset is how that single destination css
is obtained.
* memory migration path already doesn't do anything on v2. How the
single destination css is obtained is updated and the prep stage of
mem_cgroup_can_attach() is reordered to accomodate the change.
* pids is the only controller which was affected by this bug. It now
correctly handles multi-destination migrations and no longer causes
counter underflow from incorrect accounting.
Signed-off-by: Tejun Heo <tj@kernel.org>
Reported-and-tested-by: Daniel Wagner <daniel.wagner@bmw-carit.de>
Cc: Aleksa Sarai <cyphar@cyphar.com>
2015-12-03 10:18:21 -05:00
libceph: add nocephx_sign_messages option
2015-11-02 23:37:46 +01:00
powerpc/fsl: Move fsl_guts.h out of arch/powerpc
2015-10-21 18:05:50 -05:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-11-15 09:10:53 -08:00
lockd: get rid of reference-counted NSM RPC clients
2015-10-23 15:57:27 -04:00
platform/chrome: Branch for v4.4
2015-11-13 21:53:18 -08:00
Initial 4.4 merge window submission
2015-11-07 13:33:07 -08:00
mmc: mmc: extend the mmc_send_tuning()
2015-10-27 10:38:41 +01:00
drivers/pinctrl: Add the concept of an "init" state
2015-10-27 11:24:23 +01:00
ARM: SoC platform updates for v4.4
2015-11-10 14:56:23 -08:00
qed: Add statistics support
2015-10-27 19:34:54 -07:00
ARM: SoC driver updates for v4.4
2015-11-10 15:00:03 -08:00
ARM: SoC cleanups for v4.4
2015-11-10 14:48:36 -08:00
Mainly smaller bugfixes and cleanup. We're still finding some bugs from
2015-11-11 20:11:28 -08:00
Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending
2015-11-13 20:04:17 -08:00
More power management and ACPI updates for v4.4-rc1
2015-11-12 11:50:33 -08:00
atomic: remove all traces of READ_ONCE_CTRL() and atomic*_read_ctrl()
2015-11-03 17:22:17 -08:00
audit: audit_string_contains_control can be boolean
2015-11-04 08:23:51 -05:00
Merge branch 'for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2015-11-05 14:51:32 -08:00
bitops.h: add sign_extend64()
2015-11-06 17:50:42 -08:00
blkcg: fix incorrect read/write sync/async stat accounting
2015-10-27 15:04:56 +09:00
block: add block polling support
2015-11-07 10:40:47 -07:00
block: don't hardcode blk_qc_t -> tag mask
2015-11-11 09:37:34 -07:00
block: add block polling support
2015-11-07 10:40:47 -07:00
bpf: add support for persistent maps/progs
2015-11-02 22:48:39 -05:00
vfs: remove unused wrapper block_page_mkwrite()
2015-11-11 02:19:33 -05:00
cgroup: fix handling of multi-destination migration from subtree_control enabling
2015-12-03 10:18:21 -05:00
cgroup: fix handling of multi-destination migration from subtree_control enabling
2015-12-03 10:18:21 -05:00
clk: Add clk_hw_is_enabled() for use by clk providers
2015-10-26 12:36:55 -07:00
mm: cma: fix incorrect type conversion for size during dma allocation
2015-10-23 17:55:10 +09:00
mm, compaction: distinguish contended status in tracepoints
2015-11-05 19:34:48 -08:00
include/linux/compiler-gcc.h: improve __visible documentation
2015-11-06 17:50:42 -08:00
compiler.h: add support for function attribute assume_aligned
2015-11-05 19:34:48 -08:00
context_tracking: avoid irq_save/irq_restore on guest entry and exit
2015-11-10 12:06:23 +01:00
cpufreq: create cpu/cpufreq/policyX directories
2015-10-28 09:21:12 +01:00
mm, page_alloc: remove unnecessary taking of a seqlock when cpusets are disabled
2015-11-06 17:50:42 -08:00
thermal: devfreq_cooling: use a thermal_cooling_device for register and unregister
2015-11-02 13:14:44 -08:00
dm: refactor ioctl handling
2015-10-31 19:05:59 -04:00
mm: cma: fix incorrect type conversion for size during dma allocation
2015-10-23 17:55:10 +09:00
dma-mapping: tidy up dma_parms default handling
2015-11-06 17:50:42 -08:00
driver core update for 4.4-rc1
2015-11-04 21:50:37 -08:00
efi: Use correct type for struct efi_memory_map::phys_map
2015-10-28 12:28:06 +01:00
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2015-11-10 09:33:06 -08:00
vfs: Fix pathological performance case for __alloc_fd()
2015-10-31 16:12:10 -07:00
dma-buf/fence: add fence_is_later()
2015-10-30 01:47:27 -04:00
Merge branch 'for-linus-2' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-11-11 09:45:24 -08:00
tracing: Rename max_stack_lock to stack_trace_max_lock
2015-11-03 14:50:15 -05:00
Power management and ACPI updates for v4.4-rc1
2015-11-04 18:10:13 -08:00
block: move blk_integrity to request_queue
2015-10-21 14:43:42 -06:00
mm: page_alloc: hide some GFP internals and document the bits and flag combinations
2015-11-06 17:50:42 -08:00
HID: hid-input: allow input_configured callback return errors
2015-11-05 09:51:50 -08:00
kmap_atomic_to_page() has no users, remove it
2015-11-09 15:11:24 -08:00
mm: hugetlb: proc: add HugetlbPages field to /proc/PID/status
2015-11-05 19:34:48 -08:00
mm: make compound_head() robust
2015-11-06 17:50:42 -08:00
drivers/hv: share Hyper-V SynIC constants with userspace
2015-11-04 16:24:33 +01:00
if_link: Add control trust VF
2015-10-23 05:44:28 -07:00
Merge branch 'for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2015-11-05 14:51:32 -08:00
iommu/vt-d: Expose struct svm_dev_ops without CONFIG_INTEL_IOMMU_SVM
2015-10-27 08:36:08 +09:00
iommu-common: Fix error code used in iommu_tbl_range_{alloc,free}().
2015-11-04 11:30:57 -08:00
iommu: Add generic_device_group() function
2015-10-22 00:00:49 +02:00
Document that IRQ_NONE should be returned when IRQ not actually handled
2015-10-30 10:13:26 +01:00
Merge branch 'for-4.4' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup
2015-11-05 14:51:32 -08:00
include/linux/kdev_t.h: old/new_valid_dev() can return bool
2015-11-09 15:11:24 -08:00
remove abs64()
2015-11-09 15:11:24 -08:00
KEYS: Merge the type-specific data with the payload data
2015-10-21 15:18:36 +01:00
KEYS: Merge the type-specific data with the payload data
2015-10-21 15:18:36 +01:00
KVM: x86: Add a common TSC scaling function
2015-11-10 12:06:15 +01:00
arcnet: com20020-pci: add led trigger support
2015-10-26 09:10:56 +01:00
block: change ->make_request_fn() and users to return a queue cookie
2015-11-07 10:40:46 -07:00
KVM: x86: Replace call-back set_tsc_khz() with a common function
2015-11-10 12:06:16 +01:00
mm/memblock: make memblock_remove_range() static
2015-11-05 19:34:48 -08:00
Merge branch 'akpm' (patches from Andrew)
2015-11-05 23:10:54 -08:00
mm: memory hotplug with an existing resource
2015-10-23 14:19:58 +01:00
Input: add userio module
2015-10-27 18:55:31 -07:00
mm: use 'unsigned int' for page order
2015-11-06 17:50:42 -08:00
mm: use 'unsigned int' for compound_dtor/compound_order on 64BIT
2015-11-06 17:50:42 -08:00
include/linux/mmzone.h: reflow comment
2015-11-06 17:50:42 -08:00
sound updates for 4.4-rc1
2015-11-06 11:04:07 -08:00
module: export param_free_charp()
2015-11-06 17:50:42 -08:00
PCI changes for the v4.4 merge window:
2015-11-06 11:29:53 -08:00
net/core: fix for_each_netdev_feature
2015-11-03 11:29:57 -05:00
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
2015-11-10 18:11:41 -08:00
nfs: Remove unused xdr page offsets in getacl/setacl arguments
2015-11-03 12:33:01 -05:00
kernel/watchdog.c: perform all-CPU backtrace in case of hard lockup
2015-11-05 19:34:48 -08:00
of: Provide static inline function for of_translate_address if needed
2015-11-10 17:27:12 -06:00
of: Provide static inline function for of_translate_address if needed
2015-11-10 17:27:12 -06:00
DeviceTree updates for 4.4:
2015-11-06 12:17:09 -08:00
More power management and ACPI updates for v4.4-rc1
2015-11-12 11:50:33 -08:00
ARM: OMAP1: fix incorrect INT_DMA_LCD
2015-10-28 10:05:58 -07:00
mm: make compound_head() robust
2015-11-06 17:50:42 -08:00
mm: page_counter: let page_counter_try_charge() return bool
2015-11-05 19:34:48 -08:00
mm: use 'unsigned int' for page order
2015-11-06 17:50:42 -08:00
mm, fs: introduce mapping_gfp_constraint()
2015-11-06 17:50:42 -08:00
PCI: Turn off Request Attributes to avoid Chelsio T5 Completion erratum
2015-10-22 21:58:08 -05:00
net: phy: Add nested variants of mdiobus read/write
2015-10-23 05:57:43 -07:00
PM / Domains: Merge measurements for PM QoS device latencies
2015-10-28 04:33:04 +01:00
block: add an API for Persistent Reservations
2015-10-21 14:46:56 -06:00
device property: ACPI: Remove unused DMA APIs
2015-11-07 01:29:22 +01:00
pstore: add pstore unregister
2015-10-22 08:59:18 -07:00
ptp: Change ptp_class to a proper bitmask
2015-11-03 11:08:22 -05:00
pwm: Set enable state properly on failed call to enable
2015-11-10 13:06:16 +01:00
spi: pxa2xx: Add support for Intel Broxton
2015-10-30 11:18:05 +09:00
rbtree: clarify documentation of rbtree_postorder_for_each_entry_safe()
2015-11-06 17:50:42 -08:00
ring_buffer: ring_buffer_empty{cpu}() can return boolean
2015-11-02 14:23:38 -05:00
libnvdimm for 4.4:
2015-11-10 12:07:22 -08:00
seccomp, ptrace: add support for dumping seccomp filters
2015-10-27 19:55:13 -07:00
mm, page_alloc: distinguish between being unable to sleep, unwilling to sleep and avoiding waking kswapd
2015-11-06 17:50:42 -08:00
slab: convert slab_is_available() to boolean
2015-11-05 19:34:48 -08:00
bus: sunxi-rsb: Add driver for Allwinner Reduced Serial Bus
2015-10-26 10:11:58 +09:00
mm: mlock: add new mlock system call
2015-11-05 19:34:48 -08:00
platform/chrome: Branch for v4.4
2015-11-13 21:53:18 -08:00
block: Consolidate static integrity profile properties
2015-10-21 14:42:38 -06:00
tcp: fix req->saved_syn race
2015-11-05 14:36:09 -05:00
tracing: Implement event pid filtering
2015-10-25 21:33:56 -04:00
memcg: punt high overage reclaim to return-to-userland path
2015-11-05 19:34:48 -08:00
tracepoints: Fix documentation of RCU lockdep checks
2015-11-02 17:52:49 -05:00
rcu: force alignment on struct callback_head/rcu_head
2015-11-05 19:34:48 -08:00
uaccess: reimplement probe_kernel_address() using probe_kernel_read()
2015-11-05 19:34:48 -08:00
vfio: Include No-IOMMU mode
2015-11-04 09:56:16 -07:00
vga_switcheroo: Drop client power state VGA_SWITCHEROO_INIT
2015-11-05 11:07:36 +10:00
include/linux/vm_event_item.h: change HIGHMEM_ZONE macro definition
2015-11-05 19:34:48 -08:00
mm: get rid of 'vmalloc_info' from /proc/meminfo
2015-11-01 17:09:15 -08:00
mm: remove refresh_cpu_vm_stats() definition for !SMP kernel
2015-11-05 19:34:48 -08:00
watchdog: include: add units for timeout values in kerneldoc
2015-11-03 20:46:26 +01:00
9p: xattr simplifications
2015-11-13 20:34:33 -05:00
mm: zsmalloc: constify struct zs_pool name
2015-11-06 17:50:42 -08:00
mm: zsmalloc: constify struct zs_pool name
2015-11-06 17:50:42 -08:00
include/linux/zutil.h: fix usage example of zlib_adler32()
2015-11-06 17:50:42 -08:00
