From: Kirill Korotaev <dev@sw.ru>
To: Andrew Morton <akpm@osdl.org>
Cc: Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
Alan Cox <alan@lxorguk.ukuu.org.uk>,
Christoph Hellwig <hch@infradead.org>,
Pavel Emelianov <xemul@openvz.org>, Andrey Savochkin <saw@sw.ru>,
devel@openvz.org, Rik van Riel <riel@redhat.com>,
Andi Kleen <ak@suse.de>, Oleg Nesterov <oleg@tv-sign.ru>,
Alexey Dobriyan <adobriyan@mail.ru>,
Matt Helsley <matthltc@us.ibm.com>,
CKRM-Tech <ckrm-tech@lists.sourceforge.net>,
Hugh Dickins <hugh@veritas.com>
Subject: [PATCH 8/13] BC: locked pages (core)
Date: Tue, 05 Sep 2006 19:27:47 +0400 [thread overview]
Message-ID: <44FD9773.8000804@sw.ru> (raw)
In-Reply-To: <44FD918A.7050501@sw.ru>
Introduce new resource BC_LOCKEDPAGES which stands for accounting
of mlock-ed user pages.
Locked pages are important to be accounted separately
as they are unreclaimable.
Pages are charged to mm_struct BC.
Signed-Off-By: Pavel Emelianov <xemul@sw.ru>
Signed-Off-By: Kirill Korotaev <dev@sw.ru>
---
include/bc/beancounter.h | 3 -
include/bc/vmpages.h | 95 +++++++++++++++++++++++++++++++++++++++++++++++
include/linux/sched.h | 3 +
include/linux/shmem_fs.h | 5 ++
kernel/bc/Makefile | 1
kernel/bc/beancounter.c | 2
kernel/bc/vmpages.c | 75 +++++++++++++++++++++++++++++++++++++
kernel/fork.c | 11 +++--
mm/shmem.c | 4 +
9 files changed, 195 insertions(+), 4 deletions(-)
--- ./include/bc/beancounter.h.bclockcore 2006-09-05 12:54:40.000000000 +0400
+++ ./include/bc/beancounter.h 2006-09-05 12:59:27.000000000 +0400
@@ -13,8 +13,9 @@
*/
#define BC_KMEMSIZE 0
+#define BC_LOCKEDPAGES 1
-#define BC_RESOURCES 1
+#define BC_RESOURCES 2
struct bc_resource_parm {
unsigned long barrier; /* A barrier over which resource allocations
--- /dev/null 2006-07-18 14:52:43.075228448 +0400
+++ ./include/bc/vmpages.h 2006-09-05 13:04:03.000000000 +0400
@@ -0,0 +1,95 @@
+/*
+ * include/bc/vmpages.h
+ *
+ * Copyright (C) 2006 OpenVZ. SWsoft Inc
+ *
+ */
+
+#ifndef __BC_VMPAGES_H_
+#define __BC_VMPAGES_H_
+
+#include <bc/beancounter.h>
+#include <bc/task.h>
+
+struct mm_struct;
+struct file;
+struct shmem_inode_info;
+
+#ifdef CONFIG_BEANCOUNTERS
+int __must_check bc_memory_charge(struct mm_struct *mm, unsigned long size,
+ unsigned long vm_flags, struct file *vm_file, int strict);
+void bc_memory_uncharge(struct mm_struct *mm, unsigned long size,
+ unsigned long vm_flags, struct file *vm_file);
+
+int __must_check bc_locked_charge(struct mm_struct *mm, unsigned long size);
+void bc_locked_uncharge(struct mm_struct *mm, unsigned long size);
+
+int __must_check bc_locked_shm_charge(struct shmem_inode_info *info,
+ unsigned long size);
+void bc_locked_shm_uncharge(struct shmem_inode_info *info,
+ unsigned long size);
+
+/*
+ * mm's beancounter should be the same as the exec one
+ * of taks using this mm. thus we have two cases of its
+ * initialisation:
+ * 1. new mm is done for fork-ed task
+ * 2. new mm is done for exec-ing task
+ */
+#define mm_init_bc(mm, t) do { \
+ (mm)->mm_bc = get_beancounter((t)->task_bc.exec_bc); \
+ } while (0)
+#define mm_free_bc(mm) do { \
+ put_beancounter((mm)->mm_bc); \
+ } while (0)
+
+#define shmi_init_bc(info) do { \
+ (info)->shm_bc = get_beancounter(get_exec_bc()); \
+ } while (0)
+#define shmi_free_bc(info) do { \
+ put_beancounter((info)->shm_bc); \
+ } while (0)
+
+#else /* CONFIG_BEANCOUNTERS */
+
+static inline int __must_check bc_memory_charge(struct mm_struct *mm,
+ unsigned long size, unsigned long vm_flags,
+ struct file *vm_file, int strict)
+{
+ return 0;
+}
+
+static inline void bc_memory_uncharge(struct mm_struct *mm, unsigned long size,
+ unsigned long vm_flags, struct file *vm_file)
+{
+}
+
+static inline int __must_check bc_locked_charge(struct mm_struct *mm,
+ unsigned long size)
+{
+ return 0;
+}
+
+static inline void bc_locked_uncharge(struct mm_struct *mm, unsigned long size)
+{
+}
+
+static inline int __must_check bc_locked_shm_charge(struct shmem_inode_info *i,
+ unsigned long size)
+{
+ return 0;
+}
+
+static inline void bc_locked_shm_uncharge(struct shmem_inode_info *i,
+ unsigned long size)
+{
+}
+
+#define mm_init_bc(mm, t) do { } while (0)
+#define mm_free_bc(mm) do { } while (0)
+#define shmi_init_bc(info) do { } while (0)
+#define shmi_free_bc(info) do { } while (0)
+
+#endif /* CONFIG_BEANCOUNTERS */
+#endif
+
--- ./include/linux/sched.h.bclockcore 2006-09-05 12:54:21.000000000 +0400
+++ ./include/linux/sched.h 2006-09-05 12:59:27.000000000 +0400
@@ -358,6 +358,9 @@ struct mm_struct {
/* aio bits */
rwlock_t ioctx_list_lock;
struct kioctx *ioctx_list;
+#ifdef CONFIG_BEANCOUNTERS
+ struct beancounter *mm_bc;
+#endif
};
struct sighand_struct {
--- ./include/linux/shmem_fs.h.bclockcore 2006-04-21 11:59:36.000000000 +0400
+++ ./include/linux/shmem_fs.h 2006-09-05 12:59:27.000000000 +0400
@@ -8,6 +8,8 @@
#define SHMEM_NR_DIRECT 16
+struct beancounter;
+
struct shmem_inode_info {
spinlock_t lock;
unsigned long flags;
@@ -19,6 +21,9 @@ struct shmem_inode_info {
swp_entry_t i_direct[SHMEM_NR_DIRECT]; /* first blocks */
struct list_head swaplist; /* chain of maybes on swap */
struct inode vfs_inode;
+#ifdef CONFIG_BEANCOUNTERS
+ struct beancounter *shm_bc;
+#endif
};
struct shmem_sb_info {
--- ./kernel/bc/Makefile.bclockcore 2006-09-05 12:54:50.000000000 +0400
+++ ./kernel/bc/Makefile 2006-09-05 12:59:37.000000000 +0400
@@ -8,3 +8,4 @@ obj-y += beancounter.o
obj-y += misc.o
obj-y += sys.o
obj-y += kmem.o
+obj-y += vmpages.o
--- ./kernel/bc/beancounter.c.bclockcore 2006-09-05 12:55:13.000000000 +0400
+++ ./kernel/bc/beancounter.c 2006-09-05 12:59:45.000000000 +0400
@@ -21,6 +21,7 @@ struct beancounter init_bc;
const char *bc_rnames[] = {
"kmemsize", /* 0 */
+ "lockedpages",
};
#define BC_HASH_BITS 8
@@ -232,6 +233,7 @@ static void init_beancounter_syslimits(s
int k;
bc->bc_parms[BC_KMEMSIZE].limit = 32 * 1024 * 1024;
+ bc->bc_parms[BC_LOCKEDPAGES].limit = 8;
for (k = 0; k < BC_RESOURCES; k++)
bc->bc_parms[k].barrier = bc->bc_parms[k].limit;
--- /dev/null 2006-07-18 14:52:43.075228448 +0400
+++ ./kernel/bc/vmpages.c 2006-09-05 12:59:27.000000000 +0400
@@ -0,0 +1,75 @@
+/*
+ * kernel/bc/vmpages.c
+ *
+ * Copyright (C) 2006 OpenVZ. SWsoft Inc
+ *
+ */
+
+#include <linux/sched.h>
+#include <linux/mm.h>
+#include <linux/shmem_fs.h>
+
+#include <bc/beancounter.h>
+#include <bc/vmpages.h>
+
+#include <asm/page.h>
+
+int bc_memory_charge(struct mm_struct *mm, unsigned long size,
+ unsigned long vm_flags, struct file *vm_file, int strict)
+{
+ struct beancounter *bc;
+
+ bc = mm->mm_bc;
+ size >>= PAGE_SHIFT;
+
+ if (vm_flags & VM_LOCKED)
+ if (bc_charge(bc, BC_LOCKEDPAGES, size, strict))
+ return -ENOMEM;
+ return 0;
+}
+
+void bc_memory_uncharge(struct mm_struct *mm, unsigned long size,
+ unsigned long vm_flags, struct file *vm_file)
+{
+ struct beancounter *bc;
+
+ bc = mm->mm_bc;
+ size >>= PAGE_SHIFT;
+
+ if (vm_flags & VM_LOCKED)
+ bc_uncharge(bc, BC_LOCKEDPAGES, size);
+}
+
+static inline int locked_charge(struct beancounter *bc,
+ unsigned long size)
+{
+ size >>= PAGE_SHIFT;
+ return bc_charge(bc, BC_LOCKEDPAGES, size, BC_BARRIER);
+}
+
+static inline void locked_uncharge(struct beancounter *bc,
+ unsigned long size)
+{
+ size >>= PAGE_SHIFT;
+ bc_uncharge(bc, BC_LOCKEDPAGES, size);
+}
+
+int bc_locked_charge(struct mm_struct *mm, unsigned long size)
+{
+ return locked_charge(mm->mm_bc, size);
+}
+
+void bc_locked_uncharge(struct mm_struct *mm, unsigned long size)
+{
+ locked_uncharge(mm->mm_bc, size);
+}
+
+int bc_locked_shm_charge(struct shmem_inode_info *info, unsigned long size)
+{
+ return locked_charge(info->shm_bc, size);
+}
+
+void bc_locked_shm_uncharge(struct shmem_inode_info *info, unsigned long size)
+{
+ locked_uncharge(info->shm_bc, size);
+}
--- ./kernel/fork.c.bclockcore 2006-09-05 12:58:17.000000000 +0400
+++ ./kernel/fork.c 2006-09-05 12:59:59.000000000 +0400
@@ -49,6 +49,7 @@
#include <linux/taskstats_kern.h>
#include <bc/task.h>
+#include <bc/vmpages.h>
#include <asm/pgtable.h>
#include <asm/pgalloc.h>
@@ -322,7 +323,8 @@ static inline void mm_free_pgd(struct mm
#include <linux/init_task.h>
-static struct mm_struct * mm_init(struct mm_struct * mm)
+static struct mm_struct * mm_init(struct mm_struct * mm,
+ struct task_struct *tsk)
{
atomic_set(&mm->mm_users, 1);
atomic_set(&mm->mm_count, 1);
@@ -339,6 +341,7 @@ static struct mm_struct * mm_init(struct
mm->cached_hole_size = ~0UL;
if (likely(!mm_alloc_pgd(mm))) {
+ mm_init_bc(mm, tsk);
mm->def_flags = 0;
return mm;
}
@@ -356,7 +359,7 @@ struct mm_struct * mm_alloc(void)
mm = allocate_mm();
if (mm) {
memset(mm, 0, sizeof(*mm));
- mm = mm_init(mm);
+ mm = mm_init(mm, current);
}
return mm;
}
@@ -371,6 +374,7 @@ void fastcall __mmdrop(struct mm_struct
BUG_ON(mm == &init_mm);
mm_free_pgd(mm);
destroy_context(mm);
+ mm_free_bc(mm);
free_mm(mm);
}
@@ -477,7 +481,7 @@ static struct mm_struct *dup_mm(struct t
memcpy(mm, oldmm, sizeof(*mm));
- if (!mm_init(mm))
+ if (!mm_init(mm, tsk))
goto fail_nomem;
if (init_new_context(tsk, mm))
@@ -504,6 +508,7 @@ fail_nocontext:
* because it calls destroy_context()
*/
mm_free_pgd(mm);
+ mm_free_bc(mm);
free_mm(mm);
return NULL;
}
--- ./mm/shmem.c.bclockcore 2006-09-05 12:58:17.000000000 +0400
+++ ./mm/shmem.c 2006-09-05 12:59:27.000000000 +0400
@@ -47,6 +47,8 @@
#include <linux/migrate.h>
#include <linux/highmem.h>
+#include <bc/vmpages.h>
+
#include <asm/uaccess.h>
#include <asm/div64.h>
#include <asm/pgtable.h>
@@ -698,6 +700,7 @@ static void shmem_delete_inode(struct in
sbinfo->free_inodes++;
spin_unlock(&sbinfo->stat_lock);
}
+ shmi_free_bc(info);
clear_inode(inode);
}
@@ -1359,6 +1362,7 @@ shmem_get_inode(struct super_block *sb,
info = SHMEM_I(inode);
memset(info, 0, (char *)inode - (char *)info);
spin_lock_init(&info->lock);
+ shmi_init_bc(info);
INIT_LIST_HEAD(&info->swaplist);
switch (mode & S_IFMT) {
next prev parent reply other threads:[~2006-09-05 15:24 UTC|newest]
Thread overview: 144+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-09-05 15:02 [PATCH] BC: resource beancounters (v4) (added user memory) Kirill Korotaev
2006-09-05 15:19 ` [PATCH 1/13] BC: introduce atomic_dec_and_lock_irqsave() Kirill Korotaev
2006-09-05 15:20 ` [PATCH 2/13] BC: kconfig Kirill Korotaev
2006-09-05 15:21 ` [PATCH 3/17] BC: beancounters core (API) Kirill Korotaev
2006-09-05 15:23 ` [PATCH 4/13] BC: context inheriting and changing Kirill Korotaev
2006-09-05 15:24 ` [PATCH 5/13] BC: user interface (syscalls) Kirill Korotaev
2006-09-05 16:04 ` [ckrm-tech] " Balbir Singh
2006-09-06 8:29 ` Pavel Emelianov
2006-09-06 8:57 ` Balbir Singh
2006-09-06 10:42 ` Pavel Emelianov
2006-09-06 13:23 ` Balbir Singh
2006-09-06 13:45 ` Balbir Singh
2006-09-06 14:23 ` Kirill Korotaev
2006-09-05 15:25 ` [PATCH 6/13] BC: kernel memory (core) Kirill Korotaev
2006-09-05 15:26 ` [PATCH 7/13] BC: kernel memory (marks) Kirill Korotaev
2006-09-06 14:19 ` Cedric Le Goater
2006-09-05 15:27 ` Kirill Korotaev [this message]
2006-09-05 15:29 ` [PATCH 9/13] BC: locked pages (charge hooks) Kirill Korotaev
2006-09-06 3:43 ` Nick Piggin
2006-09-06 8:45 ` Pavel Emelianov
2006-09-06 9:41 ` Nick Piggin
2006-09-06 14:16 ` [ckrm-tech] " Kirill Korotaev
2006-09-05 15:30 ` [PATCH 10/13] BC: privvm pages Kirill Korotaev
2006-09-05 15:31 ` [PATCH 11/13] BC: vmrss (preparations) Kirill Korotaev
2006-09-05 22:09 ` Cedric Le Goater
2006-09-06 13:59 ` Kirill Korotaev
2006-09-07 16:28 ` [ckrm-tech] " Balbir Singh
2006-09-05 15:32 ` [PATCH 12/13] BC: vmrss (core) Kirill Korotaev
2006-09-05 15:33 ` [PATCH 13/13] BC: vmrss (charges) Kirill Korotaev
2006-09-05 16:53 ` [ckrm-tech] [PATCH] BC: resource beancounters (v4) (added user memory) Balbir Singh
2006-09-06 8:34 ` Pavel Emelianov
2006-09-06 13:06 ` Kirill Korotaev
2006-09-06 19:17 ` Balbir Singh
2006-09-06 22:06 ` Chandra Seetharaman
2006-09-07 3:08 ` Balbir Singh
2006-09-08 7:33 ` Pavel Emelianov
2006-09-08 15:43 ` Dave Hansen
2006-09-08 18:26 ` Balbir Singh
2006-09-11 6:56 ` Pavel Emelianov
2006-09-11 7:54 ` Balbir Singh
2006-09-11 8:13 ` Pavel Emelianov
2006-09-11 8:19 ` Balbir Singh
2006-09-12 10:39 ` Pavel Emelianov
2006-09-12 10:40 ` Pavel Emelianov
2006-09-12 12:01 ` Balbir Singh
2006-09-13 13:39 ` Pavel Emelianov
2006-09-11 10:21 ` Srivatsa Vaddagiri
2006-09-12 10:35 ` Pavel Emelianov
2006-09-11 18:49 ` Chandra Seetharaman
2006-09-12 10:48 ` Pavel Emelianov
2006-09-12 23:58 ` Chandra Seetharaman
2006-09-13 8:06 ` Pavel Emelianov
2006-09-13 12:15 ` Srivatsa Vaddagiri
2006-09-13 13:35 ` Pavel Emelianov
2006-09-13 22:31 ` Chandra Seetharaman
2006-09-14 7:53 ` Pavel Emelianov
2006-09-14 8:06 ` Balbir Singh
2006-09-14 13:02 ` Pavel Emelianov
2006-09-15 0:02 ` Chandra Seetharaman
2006-09-15 7:21 ` Pavel Emelianov
2006-09-15 8:49 ` Kirill Korotaev
2006-09-18 23:51 ` Chandra Seetharaman
2006-09-14 23:42 ` Chandra Seetharaman
2006-09-15 7:15 ` Pavel Emelianov
2006-09-15 8:55 ` Kirill Korotaev
2006-09-15 11:15 ` Pavel Emelianov
2006-09-18 8:25 ` Balbir Singh
2006-09-18 8:56 ` Pavel Emelianov
2006-09-18 11:20 ` Balbir Singh
2006-09-18 11:32 ` Pavel Emelianov
2006-09-19 0:05 ` Chandra Seetharaman
2006-09-19 8:04 ` Pavel Emelianov
2006-09-18 11:27 ` Balbir Singh
2006-09-18 12:37 ` Pavel Emelianov
2006-09-19 0:08 ` Chandra Seetharaman
2006-09-19 8:06 ` Pavel Emelianov
2006-09-18 23:48 ` Chandra Seetharaman
2006-09-11 18:44 ` Chandra Seetharaman
2006-09-15 8:57 ` Kirill Korotaev
2006-09-18 23:57 ` Chandra Seetharaman
2006-09-08 19:23 ` Chandra Seetharaman
2006-09-08 21:43 ` Rohit Seth
2006-09-11 18:25 ` Chandra Seetharaman
2006-09-11 19:10 ` Rohit Seth
2006-09-11 19:42 ` Chandra Seetharaman
2006-09-11 23:58 ` Rohit Seth
2006-09-12 9:53 ` Balbir Singh
2006-09-12 23:54 ` Chandra Seetharaman
2006-09-13 0:39 ` Rohit Seth
2006-09-13 1:10 ` Chandra Seetharaman
2006-09-13 1:25 ` Rohit Seth
2006-09-13 4:41 ` Srivatsa Vaddagiri
2006-09-13 22:20 ` Chandra Seetharaman
2006-09-14 1:22 ` Rohit Seth
2006-09-14 23:13 ` Chandra Seetharaman
2006-09-11 19:48 ` [Devel] " Kir Kolyshkin
2006-09-12 0:28 ` Rohit Seth
2006-09-12 10:44 ` Srivatsa Vaddagiri
2006-09-12 17:22 ` Rohit Seth
2006-09-12 17:40 ` Srivatsa Vaddagiri
2006-09-12 18:02 ` Rohit Seth
2006-09-13 0:02 ` Chandra Seetharaman
2006-09-13 0:43 ` Rohit Seth
2006-09-13 1:13 ` Chandra Seetharaman
2006-09-13 1:33 ` Rohit Seth
2006-09-13 22:24 ` Chandra Seetharaman
2006-09-14 1:27 ` Rohit Seth
2006-09-14 23:28 ` Chandra Seetharaman
2006-09-15 9:26 ` Kirill Korotaev
2006-09-15 16:52 ` Rohit Seth
2006-09-15 21:21 ` [Devel] " Kir Kolyshkin
2006-09-15 21:58 ` Rohit Seth
2006-09-19 0:02 ` [ckrm-tech] [Devel] " Chandra Seetharaman
2006-09-18 23:59 ` [ckrm-tech] " Chandra Seetharaman
2006-09-06 21:47 ` Chandra Seetharaman
2006-09-08 15:33 ` Dave Hansen
2006-09-08 15:57 ` [RFC] Add tgid aggregation to beancounters (was Re: [ckrm-tech] [PATCH] BC: resource beancounters (v4) (added user memory)) Balbir Singh
2006-09-11 21:24 ` V2: " Balbir Singh
2006-09-15 16:40 ` [ckrm-tech] V2: Add tgid aggregation to beancounters (was " Kirill Korotaev
2006-10-09 8:23 ` Balbir Singh
2006-09-05 17:46 ` [ckrm-tech] [PATCH] BC: resource beancounters (v4) (added user memory) Dave Hansen
2006-09-05 18:28 ` Balbir Singh
2006-09-06 0:17 ` Rohit Seth
2006-09-08 15:30 ` Dave Hansen
2006-09-08 17:10 ` Rohit Seth
2006-09-08 17:26 ` Shailabh Nagar
2006-09-08 21:15 ` Rohit Seth
2006-09-08 21:28 ` Shailabh Nagar
2006-09-06 13:57 ` Kirill Korotaev
2006-09-06 21:54 ` Chandra Seetharaman
2006-09-07 7:29 ` Pavel Emelianov
2006-09-07 19:16 ` Chandra Seetharaman
2006-09-08 7:22 ` Pavel Emelianov
2006-09-08 19:07 ` Chandra Seetharaman
2006-09-11 7:02 ` Pavel Emelianov
2006-09-11 13:04 ` Srivatsa Vaddagiri
2006-09-12 10:24 ` Pavel Emelianov
2006-09-12 10:29 ` Srivatsa Vaddagiri
2006-09-12 11:06 ` Pavel Emelianov
2006-09-12 12:04 ` Srivatsa Vaddagiri
2006-09-11 18:47 ` Chandra Seetharaman
2006-09-07 19:29 ` Chandra Seetharaman
2006-09-08 7:26 ` Pavel Emelianov
2006-09-08 19:10 ` Chandra Seetharaman
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=44FD9773.8000804@sw.ru \
--to=dev@sw.ru \
--cc=adobriyan@mail.ru \
--cc=ak@suse.de \
--cc=akpm@osdl.org \
--cc=alan@lxorguk.ukuu.org.uk \
--cc=ckrm-tech@lists.sourceforge.net \
--cc=devel@openvz.org \
--cc=hch@infradead.org \
--cc=hugh@veritas.com \
--cc=linux-kernel@vger.kernel.org \
--cc=matthltc@us.ibm.com \
--cc=oleg@tv-sign.ru \
--cc=riel@redhat.com \
--cc=saw@sw.ru \
--cc=xemul@openvz.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).