Sergey Senozhatsky
7d3f393823
zsmalloc/zram: introduce zs_pool_stats api ...
`zs_compact_control' accounts the number of migrated objects but it has
a limited lifespan -- we lose it as soon as zs_compaction() returns back
to zram. It worked fine, because (a) zram had it's own counter of
migrated objects and (b) only zram could trigger compaction. However,
this does not work for automatic pool compaction (not issued by zram).
To account objects migrated during auto-compaction (issued by the
shrinker) we need to store this number in zs_pool.
Define a new `struct zs_pool_stats' structure to keep zs_pool's stats
there. It provides only `num_migrated', as of this writing, but it
surely can be extended.
A new zsmalloc zs_pool_stats() symbol exports zs_pool's stats back to
caller.
Use zs_pool_stats() in zram and remove `num_migrated' from zram_stats.
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Suggested-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2015-09-08 15:35:28 -07:00
uart: pl011: Add support to ZTE ZX296702 uart
2015-08-04 22:07:26 -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
Input: atmel_mxt_ts - use deep sleep mode when stopped
2015-08-04 17:03:52 -07:00
iio: Add inverse unit conversion macros
2015-08-08 12:50:40 +01:00
Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
2015-09-03 16:55:55 -07:00
sound updates for 4.3-rc1
2015-09-04 11:46:02 -07:00
net/mlx5e: Support ethtool get/set_pauseparam
2015-08-17 15:51:36 -07:00
netfilter: nf_conntrack: make nf_ct_zone_dflt built-in
2015-09-02 16:32:56 -07:00
arm: perf: factor arm_pmu core out to drivers
2015-07-31 15:01:14 +01:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
2015-09-04 12:02:11 -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
NFS client updates for Linux 4.3
2015-09-07 14:02:24 -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
Revert "libata: Implement NCQ autosense"
2015-08-03 12:01:54 -04: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
block: Replace SG_GAPS with new queue limits mask
2015-08-19 14:26:02 -07:00
linux/bitmap: Force inlining of bitmap weight functions
2015-08-05 09:38:08 +02:00
linux/bitmap: Force inlining of bitmap weight functions
2015-08-05 09:38:08 +02:00
blk-cgroup: Drop unlikely before IS_ERR(_OR_NULL)
2015-08-13 10:45:09 -06: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
block: Replace SG_GAPS with new queue limits mask
2015-08-19 14:26:02 -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
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
coresight: Fix implicit inclusion of linux/sched.h
2015-08-05 13:30:16 -07: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
bpf: also show process name/pid in bpf_jit_dump
2015-07-30 11:13:21 -07: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
fsl_ifc: Change IO accessor based on endianness
2015-08-07 22:59:34 -05: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
Drivers: hv: vmbus: Further improve CPU affiliation logic
2015-08-05 11:44:28 -07: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
sched/cputime: Guarantee stime + utime == rtime
2015-08-03 12:21:21 +02: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
genirq: Provide irq_desc_has_action
2015-08-06 00:14:59 +02: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
jump label, locking/static_keys: Update docs
2015-08-03 11:51:14 +02:00
x86/kasan, mm: Introduce generic kasan_populate_zero_shadow()
2015-08-22 14:54:55 +02:00
kexec: define kexec_in_progress in !CONFIG_KEXEC case
2015-08-04 22:25:28 -07:00
perf/x86/hw_breakpoints: Disallow kernel breakpoints unless kprobe-safe
2015-08-04 10:16:54 +02:00
kernel/kthread.c:kthread_create_on_node(): clarify documentation
2015-09-04 16:54:41 -07: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
mei: bus: add and call callback on notify event
2015-08-03 17:30:00 -07:00
mem-hotplug: handle node hole when initializing numa_meminfo.
2015-09-08 15:35:28 -07:00
memcg: get rid of extern for functions in memcontrol.h
2015-09-08 15:35:28 -07:00
char: make misc_deregister a void function
2015-08-05 10:35:49 -07:00
mm/hwpoison: introduce put_hwpoison_page to put refcount for memory error handling
2015-09-08 15:35:28 -07:00
mm: drop __nocast from vm_flags_t definition
2015-09-08 15:35:28 -07:00
mm: remove struct node_active_region
2015-09-04 16:54:41 -07:00
mod_devicetable: add space before */
2015-08-07 15:03:42 +02:00
net_dbg_ratelimited: turn into no-op when !DEBUG
2015-08-06 23:51:30 -07:00
net: kill long time unused bonding private flags
2015-08-27 16:28:35 -07: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
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
watchdog: rename watchdog_suspend() and watchdog_resume()
2015-09-04 16:54:41 -07:00
NVMe: Add nvme subsystem reset IOCTL
2015-08-18 11:56:13 -06:00
nvmem: Add nvmem_device based consumer apis.
2015-08-05 13:43:44 -07:00
nvmem: Add a simple NVMEM framework for nvmem providers
2015-08-05 13:43:12 -07: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
mm, oom: add description of struct oom_control
2015-09-08 15:35:28 -07:00
mm: check __PG_HWPOISON separately from PAGE_FLAGS_CHECK_AT_*
2015-08-07 04:39:42 +03:00
mm, page_isolation: make set/unset_migratetype_isolate() file-local
2015-09-08 15:35:28 -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
PM / OPP: add dev_pm_opp_is_turbo() helper
2015-08-07 03:17:06 +02:00
sched/preempt: Fix cond_resched_lock() and cond_resched_softirq()
2015-08-03 12:21:24 +02:00
Add a matching set of device_ functions for determining mac/phy
2015-08-13 16:58:29 -07:00
proportions: Spelling s/consitent/consistent/
2015-08-07 14:37:04 +02:00
arm64: psci: factor invocation code to drivers
2015-08-03 12:33:39 +01:00
spi: pxa2xx: Add support for Intel Sunrisepoint
2015-07-31 19:13:33 +01:00
Merge remote-tracking branches 'asoc/topic/rcar', 'asoc/topic/reg-default', 'asoc/topic/rl6231', 'asoc/topic/rockchip' and 'asoc/topic/rt286' into asoc-next
2015-08-30 15:55:54 +01: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
fs: create and use seq_show_option for escaping
2015-09-04 16:54:41 -07:00
dmaengine: shdma: Make dummy shdma_chan_filter() always return false
2015-08-05 08:48:00 +05:30
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
stop_machine: Use 'cpu_stop_fn_t' where possible
2015-08-03 12:21:27 +02:00
memcg: export struct mem_cgroup
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
Revert "ti-st: add device tree support"
2015-08-05 13:24:12 -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
tracing, perf: Implement BPF programs attached to uprobes
2015-08-06 15:29:14 -03:00
Avoid usb reset crashes by making tty_io cdevs truly dynamic
2015-08-03 15:24:43 -07:00
lib: introduce strncpy_from_unsafe()
2015-08-28 16:27:27 -07:00
uprobes/x86: Make arch_uretprobe_is_alive(RP_CHECK_CALL) more clever
2015-07-31 10:38:06 +02: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
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
zsmalloc/zram: introduce zs_pool_stats api
2015-09-08 15:35:28 -07:00
