Linus Torvalds
b0a1ea51bd
Merge branch 'for-4.3/blkcg' of git://git.kernel.dk/linux-block ...
Pull blk-cg updates from Jens Axboe:
"A bit later in the cycle, but this has been in the block tree for a a
while. This is basically four patchsets from Tejun, that improve our
buffered cgroup writeback. It was dependent on the other cgroup
changes, but they went in earlier in this cycle.
Series 1 is set of 5 patches that has cgroup writeback updates:
- bdi_writeback iteration fix which could lead to some wb's being
skipped or repeated during e.g. sync under memory pressure.
- Simplification of wb work wait mechanism.
- Writeback tracepoints updated to report cgroup.
Series 2 is is a set of updates for the CFQ cgroup writeback handling:
cfq has always charged all async IOs to the root cgroup. It didn't
have much choice as writeback didn't know about cgroups and there
was no way to tell who to blame for a given writeback IO.
writeback finally grew support for cgroups and now tags each
writeback IO with the appropriate cgroup to charge it against.
This patchset updates cfq so that it follows the blkcg each bio is
tagged with. Async cfq_queues are now shared across cfq_group,
which is per-cgroup, instead of per-request_queue cfq_data. This
makes all IOs follow the weight based IO resource distribution
implemented by cfq.
- Switched from GFP_ATOMIC to GFP_NOWAIT as suggested by Jeff.
- Other misc review points addressed, acks added and rebased.
Series 3 is the blkcg policy cleanup patches:
This patchset contains assorted cleanups for blkcg_policy methods
and blk[c]g_policy_data handling.
- alloc/free added for blkg_policy_data. exit dropped.
- alloc/free added for blkcg_policy_data.
- blk-throttle's async percpu allocation is replaced with direct
allocation.
- all methods now take blk[c]g_policy_data instead of blkcg_gq or
blkcg.
And finally, series 4 is a set of patches cleaning up the blkcg stats
handling:
blkcg's stats have always been somwhat of a mess. This patchset
tries to improve the situation a bit.
- The following patches added to consolidate blkcg entry point and
blkg creation. This is in itself is an improvement and helps
colllecting common stats on bio issue.
- per-blkg stats now accounted on bio issue rather than request
completion so that bio based and request based drivers can behave
the same way. The issue was spotted by Vivek.
- cfq-iosched implements custom recursive stats and blk-throttle
implements custom per-cpu stats. This patchset make blkcg core
support both by default.
- cfq-iosched and blk-throttle keep track of the same stats
multiple times. Unify them"
* 'for-4.3/blkcg' of git://git.kernel.dk/linux-block: (45 commits)
blkcg: use CGROUP_WEIGHT_* scale for io.weight on the unified hierarchy
blkcg: s/CFQ_WEIGHT_*/CFQ_WEIGHT_LEGACY_*/
blkcg: implement interface for the unified hierarchy
blkcg: misc preparations for unified hierarchy interface
blkcg: separate out tg_conf_updated() from tg_set_conf()
blkcg: move body parsing from blkg_conf_prep() to its callers
blkcg: mark existing cftypes as legacy
blkcg: rename subsystem name from blkio to io
blkcg: refine error codes returned during blkcg configuration
blkcg: remove unnecessary NULL checks from __cfqg_set_weight_device()
blkcg: reduce stack usage of blkg_rwstat_recursive_sum()
blkcg: remove cfqg_stats->sectors
blkcg: move io_service_bytes and io_serviced stats into blkcg_gq
blkcg: make blkg_[rw]stat_recursive_sum() to be able to index into blkcg_gq
blkcg: make blkcg_[rw]stat per-cpu
blkcg: add blkg_[rw]stat->aux_cnt and replace cfq_group->dead_stats with it
blkcg: consolidate blkg creation in blkcg_bio_issue_check()
blk-throttle: improve queue bypass handling
blkcg: move root blkg lookup optimization from throtl_lookup_tg() to __blkg_lookup()
blkcg: inline [__]blkg_lookup()
...
2015-09-10 18:56:14 -07:00
Revert "uart: pl011: Add support to ZTE ZX296702 uart"
2015-09-04 09:14:20 -07:00
bcma: switch GPIO portions to use GPIOLIB_IRQCHIP
2015-08-18 09:08:47 +03:00
ARM: SoC driver updates for v4.3
2015-09-01 13:00:04 -07:00
fsl /bestcomm
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux
2015-09-04 15:49:32 -07:00
ARM:
2015-09-10 16:42:49 -07:00
sound updates for 4.3-rc1
2015-09-04 11:46:02 -07:00
Changes for 4.3
2015-09-09 08:33:31 -07:00
Changes for 4.3
2015-09-09 08:33:31 -07:00
mmc: block: skip trim for some kingston eMMCs
2015-08-27 14:50:52 +02:00
arch, drivers: don't include <asm/io.h> directly, use <linux/io.h> instead
2015-08-10 23:07:05 -04:00
netfilter: nf_conntrack: make nf_ct_zone_dflt built-in
2015-09-02 16:32:56 -07:00
MMC core:
2015-09-08 16:33:16 -07:00
Merge remote-tracking branches 'regulator/topic/qcom-smd', 'regulator/topic/qcom-spmi', 'regulator/topic/rk808', 'regulator/topic/stub' and 'regulator/topic/tol' into regulator-next
2015-08-30 14:40:11 +01:00
ARM: SoC driver updates for v4.3
2015-09-01 13:00:04 -07:00
Changes for 4.3
2015-09-09 08:33:31 -07:00
Revert "usb: interface authorization: Introduces the default interface authorization"
2015-08-18 09:58:45 -07:00
Merge branches 'acpi-pci', 'acpi-soc', 'acpi-ec' and 'acpi-osl'
2015-09-01 03:41:19 +02:00
locking/atomics: Add _{acquire|release|relaxed}() variants of some atomic operations
2015-08-12 11:58:59 +02:00
average: remove out-of-line implementation
2015-08-20 14:10:23 -07:00
blkcg: rename subsystem name from blkio to io
2015-08-18 15:49:18 -07:00
block: Replace SG_GAPS with new queue limits mask
2015-08-19 14:26:02 -07:00
blkcg: use CGROUP_WEIGHT_* scale for io.weight on the unified hierarchy
2015-08-18 15:49:36 -07:00
Merge branch 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs
2015-09-03 12:28:30 -07:00
libnvdimm for 4.3:
2015-09-08 14:35:59 -07:00
bpf: Implement function bpf_perf_event_read() that get the selected hardware PMU conuter
2015-08-09 22:50:06 -07:00
Merge branch 'for-4.3-unified-base' into for-4.3
2015-08-25 14:19:29 -04:00
Merge branch 'for-4.3-unified-base' into for-4.3
2015-08-25 14:19:29 -04:00
Merge branch 'for-4.3/blkcg' of git://git.kernel.dk/linux-block
2015-09-10 18:56:14 -07:00
clk: Constify clk_hw argument to provider APIs
2015-08-24 16:49:11 -07:00
locking, compiler.h: Cast away attributes in the WRITE_ONCE() magic
2015-08-12 11:58:58 +02:00
Merge branch 'pm-opp'
2015-09-01 15:52:41 +02:00
cpuidle/coupled: Remove cpuidle_device::safe_state_index
2015-08-28 15:14:54 +02:00
capabilities: ambient capabilities
2015-09-04 16:54:41 -07:00
crypto: aead - Remove CRYPTO_ALG_AEAD_NEW flag
2015-08-17 16:53:53 +08:00
dax: add huge page fault support
2015-09-08 15:35:28 -07:00
block: kill merge_bvec_fn() completely
2015-08-13 12:31:57 -06:00
Power management and ACPI material for v4.3-rc1
2015-09-01 19:45:46 -07:00
dmaengine: Stricter legacy checking in dma_request_slave_channel_compat()
2015-08-20 12:01:03 +05:30
mm: add dma_pool_zalloc() call to DMA API
2015-09-08 15:35:28 -07:00
net: fix endian check warning in etherdevice.h
2015-08-17 12:14:53 -07:00
extcon: Remove optional print_state() function pointer of struct extcon_dev
2015-08-10 11:48:55 +09:00
f2fs: add annotation for space utilization of regular/inline dentry
2015-08-21 22:45:13 -07:00
fbdev: fix cea_modes array size
2015-08-20 10:20:11 +03:00
dax: move DAX-related functions to a new header
2015-09-08 15:35:28 -07:00
drivers: usb: fsl: Workaround for USB erratum-A005275
2015-08-14 16:50:36 -07:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2015-09-05 20:34:28 -07:00
genalloc: add support of multiple gen_pools per device
2015-09-04 16:54:41 -07:00
mm: use numa_mem_id() in alloc_pages_node()
2015-09-08 15:35:28 -07:00
dax: don't use set_huge_zero_page()
2015-09-08 15:35:28 -07:00
hugetlbfs: add hugetlbfs_fallocate()
2015-09-08 15:35:28 -07:00
i2c: core: Add support for best effort block read emulation
2015-08-24 14:05:19 +02:00
mac80211: fix BIT position for TDLS WIDE extended cap
2015-08-14 17:49:53 +02:00
IGMP: Inhibit reports for local multicast groups
2015-08-28 13:28:47 -07:00
iommu/vt-d: Split up iommu->domains array
2015-08-12 16:23:33 +02:00
arch, drivers: don't include <asm/io.h> directly, use <linux/io.h> instead
2015-08-10 23:07:05 -04:00
add devm_memremap_pages
2015-08-27 19:40:58 -04:00
ipmi: Don't flush messages in sender() in run-to-completion mode
2015-09-03 15:02:28 -05:00
net: ipv6 sysctl option to ignore routes when nexthop link is down
2015-08-13 21:27:19 -07:00
Merge branch 'irq-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-09-01 14:33:35 -07:00
Pretty much all bug fixes and clean ups for 4.3, after a lot of
2015-09-03 12:52:19 -07:00
Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-09-01 14:04:50 -07:00
x86/kasan, mm: Introduce generic kasan_populate_zero_shadow()
2015-08-22 14:54:55 +02:00
kernfs: implement kernfs_path_len()
2015-08-18 15:49:15 -07:00
kexec: split kexec_load syscall from kexec core code
2015-09-10 13:29:01 -07:00
kmod: use system_unbound_wq instead of khelper
2015-09-10 13:29:01 -07:00
kernel/kthread.c:kthread_create_on_node(): clarify documentation
2015-09-04 16:54:41 -07:00
KVM: make halt_poll_ns per-vCPU
2015-09-06 16:27:10 +02:00
libnvdimm, pmem: direct map legacy pmem by default
2015-08-28 23:40:05 -04:00
inode: add hlist_fake to avoid the inode hash lock in evict
2015-08-17 18:39:45 -04:00
locking, include/llist: Use linux/atomic.h instead of asm/cmpxchg.h
2015-08-12 11:59:08 +02:00
mailbox: switch to hrtimer for tx_complete polling
2015-08-10 14:29:27 +05:30
mem-hotplug: handle node hole when initializing numa_meminfo.
2015-09-08 15:35:28 -07:00
memcg: zap try_get_mem_cgroup_from_page
2015-09-10 13:29:01 -07:00
mm: ZONE_DEVICE for "device memory"
2015-08-27 19:40:58 -04:00
add microchip LAN88xx phy driver
2015-09-09 17:19:14 -07:00
mm, mpx: add "vm_flags_t vm_flags" arg to do_mmap_pgoff()
2015-09-10 13:29:01 -07:00
mm: drop __nocast from vm_flags_t definition
2015-09-08 15:35:28 -07:00
mm: introduce idle page tracking
2015-09-10 13:29:01 -07:00
libnvdimm for 4.3:
2015-09-08 14:35:59 -07:00
net: Add info for NETDEV_CHANGEUPPER event
2015-08-30 18:08:49 -04:00
netfilter: nf_conntrack: make nf_ct_zone_dflt built-in
2015-09-02 16:32:56 -07:00
netfilter: Define v6ops in !CONFIG_NETFILTER case.
2015-08-27 16:35:51 -07:00
netlink, mmap: fix edge-case leakages in nf queue zero-copy
2015-09-09 21:43:22 -07:00
pnfs: move common blocklayout XDR defintions to nfs4.h
2015-08-17 13:22:49 -05:00
NFS: Remove nfs_release()
2015-08-17 13:32:56 -05:00
NFS: Get suppattr_exclcreat when getting server capabilities
2015-08-27 19:45:27 -04:00
NFSv4: Express delegation limit in units of pages
2015-09-07 12:36:13 -04:00
Merge branch 'nmi' of git://ftp.arm.linux.org.uk/~rmk/linux-arm
2015-09-08 12:28:10 -07:00
NVMe: Add nvme subsystem reset IOCTL
2015-08-18 11:56:13 -06:00
device property: check fwnode type in to_of_node()
2015-08-26 01:46:39 +02:00
of/platform: add function to populate default bus
2015-08-25 11:29:55 -05:00
PKCS#7: Add OIDs for sha224, sha284 and sha512 hash algos and use them
2015-09-01 09:59:20 +10:00
mm, oom: add description of struct oom_control
2015-09-08 15:35:28 -07:00
mm: introduce idle page tracking
2015-09-10 13:29:01 -07:00
mm, page_isolation: make set/unset_migratetype_isolate() file-local
2015-09-08 15:35:28 -07:00
mm: introduce idle page tracking
2015-09-10 13:29:01 -07:00
mm: introduce idle page tracking
2015-09-10 13:29:01 -07:00
PCI: Move ATS declarations to linux/pci.h so they're all together
2015-08-13 15:59:58 -05:00
pci: mm: add pci_pool_zalloc() call
2015-09-08 15:35:28 -07:00
[media] tw68: Move PCI vendor and device IDs to pci_ids.h
2015-08-16 13:26:01 -03:00
percpu-rwsem: introduce percpu_rwsem_release() and percpu_rwsem_acquire()
2015-08-15 13:52:10 +02:00
perf: add the necessary core perf APIs when accessing events counters in eBPF programs
2015-08-09 22:50:05 -07:00
net: phy: Allow PHY devices to identify themselves as Ethernet switches, etc.
2015-08-31 14:48:01 -07:00
phy: fixed_phy: Add gpio to determine link up/down.
2015-08-31 14:48:02 -07:00
PM / Domains: Remove unusable governor dummies
2015-08-29 01:54:43 +02:00
x86, pmem: clarify that ARCH_HAS_PMEM_API implies PMEM mapped WB
2015-08-27 19:40:59 -04:00
include/linux/poison.h: remove not-used poison pointer macros
2015-09-10 13:29:01 -07:00
hexdump: do not print debug dumps for !CONFIG_DEBUG
2015-09-10 13:29:01 -07:00
Add a matching set of device_ functions for determining mac/phy
2015-08-13 16:58:29 -07:00
pwm: Clean up kerneldoc
2015-08-17 15:40:20 +02:00
Merge remote-tracking branches 'regmap/topic/lockdep' and 'regmap/topic/seq-delay' into regmap-next
2015-09-04 17:22:10 +01:00
reset: Add (devm_)reset_control_get stub functions
2015-09-01 09:56:58 +02:00
mm: send one IPI per CPU to TLB flush all entries after unmapping pages
2015-09-04 16:54:41 -07:00
lib: scatterlist: add sg splitting function
2015-08-24 14:28:01 -06:00
mm: defer flush of writable TLB entries
2015-09-04 16:54:41 -07:00
seq_file: provide an analogue of print_hex_dump()
2015-09-10 13:29:01 -07:00
flow_dissector: Use 'const' where possible.
2015-09-01 21:19:17 -07:00
slab: infrastructure for bulk object allocation and freeing
2015-09-04 16:54:41 -07:00
smpboot: allow passing the cpumask on per-cpu thread registration
2015-09-04 16:54:41 -07:00
Merge branch 'x86-asm-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2015-09-01 08:40:25 -07:00
lib/string_helpers: rename "esc" arg to "only"
2015-09-10 13:29:01 -07:00
mm: swap: zswap: maybe_preload & refactoring
2015-09-08 15:35:28 -07:00
mm/hwpoison: fix race between soft_offline_page and unpoison_memory
2015-09-08 15:35:28 -07:00
userfaultfd: activate syscall
2015-09-04 16:54:41 -07:00
time: Introduce struct itimerspec64
2015-08-17 11:25:28 -07:00
Merge branch 'fortglx/4.3/time' of https://git.linaro.org/people/john.stultz/linux into timers/core
2015-08-20 21:13:22 +02:00
lib: introduce strncpy_from_unsafe()
2015-08-28 16:27:27 -07:00
Revert "usb: interface authorization: Declare authorized attribute"
2015-08-18 09:59:12 -07:00
userfaultfd: mcopy_atomic|mfill_zeropage: UFFDIO_COPY|UFFDIO_ZEROPAGE preparation
2015-09-04 16:54:41 -07:00
PKCS#7: Appropriately restrict authenticated attributes and content type
2015-08-12 17:01:01 +01:00
userfaultfd: waitqueue: add nr wake parameter to __wake_up_locked_key
2015-09-04 16:54:41 -07:00
kernel/watchdog: move NMI function header declarations from watchdog.h to nmi.h
2015-09-04 16:54:41 -07:00
workqueue: fix some docbook warnings
2015-08-17 15:48:24 -04:00
mm: zbud: constify the zbud_ops
2015-09-08 15:35:28 -07:00
zpool: add zpool_has_pool()
2015-09-10 13:29:01 -07:00
zsmalloc: account the number of compacted pages
2015-09-08 15:35:28 -07:00
