Vladimir Davydov
52383431b3
mm: get rid of __GFP_KMEMCG ...
Currently to allocate a page that should be charged to kmemcg (e.g.
threadinfo), we pass __GFP_KMEMCG flag to the page allocator. The page
allocated is then to be freed by free_memcg_kmem_pages. Apart from
looking asymmetrical, this also requires intrusion to the general
allocation path. So let's introduce separate functions that will
alloc/free pages charged to kmemcg.
The new functions are called alloc_kmem_pages and free_kmem_pages. They
should be used when the caller actually would like to use kmalloc, but
has to fall back to the page allocator for the allocation is large.
They only differ from alloc_pages and free_pages in that besides
allocating or freeing pages they also charge them to the kmem resource
counter of the current memory cgroup.
[sfr@canb.auug.org.au: export kmalloc_order() to modules]
Signed-off-by: Vladimir Davydov <vdavydov@parallels.com>
Acked-by: Greg Thelen <gthelen@google.com>
Cc: Johannes Weiner <hannes@cmpxchg.org>
Acked-by: Michal Hocko <mhocko@suse.cz>
Cc: Glauber Costa <glommer@gmail.com>
Cc: Christoph Lameter <cl@linux-foundation.org>
Cc: Pekka Enberg <penberg@kernel.org>
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2014-06-04 16:53:56 -07:00
arch: Mass conversion of smp_mb__*()
2014-04-18 14:20:48 +02:00
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-03 13:18:00 -07:00
gcov: reuse kbasename helper
2013-11-13 12:09:34 +09:00
genirq: x86: Ensure that dynamic irq allocation does not conflict
2014-04-28 12:20:00 +02:00
Merge branch 'sched-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-03 14:00:15 -07:00
Merge branches 'pnp', 'powercap', 'pm-runtime' and 'pm-opp'
2014-06-03 23:13:00 +02:00
TTY/Serial driver patches for 3.16-rc1
2014-06-03 09:01:02 -07:00
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-03 12:57:53 -07:00
Merge branch 'pm-cpuidle'
2014-06-03 23:10:15 +02:00
tick-sched: Check tick_nohz_enabled in tick_nohz_switch_to_nohz()
2014-04-15 20:26:58 +02:00
tracing: Use rcu_dereference_sched() for trace event triggers
2014-05-02 23:12:42 -04:00
Ignore generated file kernel/x509_certificate_list
2013-12-10 18:21:34 +00:00
net: Use netlink_ns_capable to verify the permisions of netlink messages
2014-04-24 13:44:54 -04:00
audit: Use struct net not pid_t to remember the network namespce to reply in
2014-03-20 10:10:53 -04:00
inotify: Fix reporting of cookies for inotify events
2014-02-18 11:17:17 +01:00
inotify: Fix reporting of cookies for inotify events
2014-02-18 11:17:17 +01:00
Merge git://git.infradead.org/users/eparis/audit
2014-04-12 12:38:53 -07:00
Merge git://git.infradead.org/users/eparis/audit
2014-04-12 12:38:53 -07:00
mm: do not allocate page->ptl dynamically, if spinlock_t fits to long
2013-12-20 12:25:45 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security
2014-04-03 09:26:18 -07:00
kernfs: move the last knowledge of sysfs out from kernfs
2014-05-27 14:33:17 -07:00
cgroup: fix rcu_read_lock() leak in update_if_frozen()
2014-05-13 11:28:30 -04:00
Merge branch 'x86-x32-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-04-02 12:51:41 -07:00
asmlinkage: Add explicit __visible to drivers/*, lib/*, kernel/*
2014-05-05 16:07:46 -07:00
sched: Fix hotplug vs. set_cpus_allowed_ptr()
2014-05-22 10:21:31 +02:00
Merge branch 'akpm' (incoming from Andrew)
2014-04-03 16:22:16 -07:00
kernel/delayacct.c: remove redundant checking in __delayacct_add_tsk()
2013-11-13 12:09:12 +09:00
switch elf_core_write_extra_phdrs() to dump_emit()
2013-11-09 00:16:23 -05:00
wait: WSTOPPED|WCONTINUED doesn't work if a zombie leader is traced by another process
2014-04-07 16:36:06 -07:00
asmlinkage: Make main_extable_sort_needed visible
2014-02-13 18:13:22 -08:00
mm: get rid of __GFP_KMEMCG
2014-06-04 16:53:56 -07:00
libata, freezer: avoid block device removal while system is frozen
2013-12-19 13:50:32 -05:00
Merge branch 'locking-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-03 12:57:53 -07:00
compat: Get rid of (get|put)_compat_time(val|spec)
2014-02-02 14:09:12 -08:00
kernel/groups.c: remove return value of set_groups
2014-04-03 16:21:05 -07:00
Merge branch 'perf-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip into next
2014-06-03 13:18:00 -07:00
kernel: audit/fix non-modular users of module_init in core code
2014-04-03 16:21:07 -07:00
perf/x86: Warn to early_printk() in case irq_work is too slow
2014-02-21 21:49:07 +01:00
kernel: use macros from compiler.h instead of __attribute__((...))
2014-04-07 16:36:11 -07:00
kernel: remove CONFIG_USE_GENERIC_SMP_HELPERS
2013-11-15 09:32:22 +09:00
powerpc, kexec: Fix "Processor X is stuck" issue during kexec from ST mode
2014-05-28 13:24:26 +10:00
arch: Mass conversion of smp_mb__*()
2014-04-18 14:20:48 +02:00
kprobes: use KSYM_NAME_LEN to size identifier buffers
2013-11-13 12:09:26 +09:00
kobject: Make support for uevent_helper optional.
2014-04-25 12:00:49 -07:00
kthread: fix return value of kthread_create() upon SIGKILL.
2014-06-04 16:53:51 -07:00
Merge branch 'x86-asmlinkage-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
2014-03-31 14:13:25 -07:00
Fixed one missing place for the new taint flag, and remove a warning
2014-05-01 10:35:01 -07:00
keys: change asymmetric keys to use common hash definitions
2013-10-25 17:15:18 -04:00
notifier: Substitute rcu_access_pointer() for rcu_dereference_raw()
2014-02-26 06:35:13 -08:00
padata: Fix wrong usage of rcu_dereference()
2013-12-05 21:28:42 +08:00
kernel/panic.c: display reason at end + pr_emerg
2014-04-07 16:36:08 -07:00
params: improve standard definitions
2013-12-04 14:09:46 +10:30
pid_namespace: pidns_get() should check task_active_pid_ns() != NULL
2014-04-02 16:20:21 -07:00
posix-timers: Convert abuses of BUG_ON to WARN_ON
2013-12-09 16:56:29 +01:00
CPU hotplug notifiers registration fixes for 3.15-rc1
2014-04-07 14:55:46 -07:00
kernel/compat: convert to COMPAT_SYSCALL_DEFINE
2014-03-06 15:35:10 +01:00
kexec: migrate to reboot cpu
2013-12-18 19:04:50 -08:00
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs
2014-04-12 14:49:50 -07:00
res_counter: remove interface for locked charging and uncharging
2014-04-07 16:35:54 -07:00
resources: Clarify sanity check message
2014-05-23 10:47:21 -06:00
seccomp: fix memory leak on filter attach
2014-04-16 15:25:53 -04:00
kernel: use macros from compiler.h instead of __attribute__((...))
2014-04-07 16:36:11 -07:00
smp: Rename __smp_call_function_single() to smp_call_function_single_async()
2014-02-24 14:47:15 -08:00
Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into core/rcu
2014-05-22 11:36:10 +02:00
stop_machine: Fix^2 race between stop_two_cpus() and stop_cpus()
2014-03-11 11:33:47 +01:00
sched: Consolidate open coded implementations of nice level frobbing into nice_to_rlimit() and rlimit_to_nice()
2014-05-22 11:16:36 +02:00
fs, kernel: permit disabling the uselib syscall
2014-04-03 16:21:05 -07:00
kobject: Make support for uevent_helper optional.
2014-04-25 12:00:49 -07:00
kernel/sysctl_binary.c: use scnprintf() instead of snprintf()
2013-11-13 12:09:33 +09:00
KEYS: correct alignment of system_certificate_list content in assembly file
2013-12-10 18:25:28 +00:00
KEYS: correct alignment of system_certificate_list content in assembly file
2013-12-10 18:25:28 +00:00
genetlink: only pass array to genl_register_family_with_ops()
2013-11-19 16:39:05 -05:00
timer: Prevent overflow in apply_slack
2014-04-30 13:46:17 +02:00
torture: Remove __init from torture_init_begin/end
2014-05-14 09:46:30 -07:00
tracepoint: Fix use of tracepoint funcs after rcu free
2014-05-08 09:10:56 -04:00
smp: Rename __smp_call_function_single() to smp_call_function_single_async()
2014-02-24 14:47:15 -08:00
kernel: audit/fix non-modular users of module_init in core code
2014-04-03 16:21:07 -07:00
user namespace: fix incorrect memory barriers
2014-04-14 16:03:02 -07:00
kernel/watchdog.c:touch_softlockup_watchdog(): use raw_cpu_write()
2014-04-18 16:40:08 -07:00
Linux 3.15-rc6
2014-05-22 10:28:56 +02:00
52383431b3