The patch titled
Light weight counters: framework
has been removed from the -mm tree. Its filename is
light-weight-counters-framework.patch
This patch was dropped because it had testing failures
------------------------------------------------------
Subject: Light weight counters: framework
From: Christoph Lameter <clameter@xxxxxxx>
The remaining counters in page_state after the zoned VM counter patch has
been applied are all just for show in /proc/vmstat. They have no essential
function for the VM and therefore maybe we can make these counters
lightweight by making them per cpu and ignoring races. We can then get
away without disabling interrupts for these counters.
The patchset also adds an off switch for embedded systems that allows a
building of linux kernels without these counters.
This may be one case in which perhaps Andi's local_t can come into play to
avoid per cpu races on x86_64 and i386 in a light weight way. However, for
all other platforms we would not want the fallback to an atomic type.
The implementation of these counters is through inline code that typically
results in a simple increment of a global memory locations.
Also
- Rename page_state to event_state
- Make event state an array indexed by the event item like the zoned counters.
Caveat: If user space tools rely on these counters being accurate on SMP and UP
then this won't work.
Convert inc/add page_state to count_event(s)
Convert the page_state operations to count_event() and count_zone_event()
Signed-off-by: Christoph Lameter <clameter@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
arch/arm/mm/mm-armv.c | 2
arch/s390/appldata/appldata_base.c | 1
arch/s390/appldata/appldata_mem.c | 22 +--
arch/um/kernel/skas/mmu.c | 2
block/ll_rw_blk.c | 4
drivers/parisc/led.c | 6
fs/inode.c | 4
fs/ncpfs/mmap.c | 2
include/linux/page-flags.h | 163 ++++++++-------------------
init/Kconfig | 9 +
mm/filemap.c | 4
mm/memory.c | 4
mm/page_alloc.c | 147 ++++++++++--------------
mm/page_io.c | 4
mm/shmem.c | 2
mm/swap.c | 4
mm/vmscan.c | 23 +--
17 files changed, 165 insertions(+), 238 deletions(-)
diff -puN include/linux/page-flags.h~light-weight-counters-framework include/linux/page-flags.h
--- devel/include/linux/page-flags.h~light-weight-counters-framework 2006-06-10 09:26:09.000000000 -0700
+++ devel-akpm/include/linux/page-flags.h 2006-06-10 09:26:24.000000000 -0700
@@ -102,121 +102,66 @@
#define PG_uncached 31 /* Page has been mapped as uncached */
#endif
+#ifdef CONFIG_VM_EVENT_COUNTERS
/*
- * Global page accounting. One instance per CPU. Only unsigned longs are
- * allowed.
+ * Light weight per cpu counter implementation.
*
- * - Fields can be modified with xxx_page_state and xxx_page_state_zone at
- * any time safely (which protects the instance from modification by
- * interrupt.
- * - The __xxx_page_state variants can be used safely when interrupts are
- * disabled.
- * - The __xxx_page_state variants can be used if the field is only
- * modified from process context and protected from preemption, or only
- * modified from interrupt context. In this case, the field should be
- * commented here.
+ * Note that these can race. We do not bother to enable preemption
+ * or care about interrupt races. All we care about is to have some
+ * approximate count of events.
+ *
+ * Counters should only be incremented and no critical kernel component
+ * should rely on the counter values.
+ *
+ * Counters are handled completely inline. On many platforms the code
+ * generated will simply be the increment of a global address.
*/
-struct page_state {
- /*
- * The below are zeroed by get_page_state(). Use get_full_page_state()
- * to add up all these.
- */
- unsigned long pgpgin; /* Disk reads */
- unsigned long pgpgout; /* Disk writes */
- unsigned long pswpin; /* swap reads */
- unsigned long pswpout; /* swap writes */
-
- unsigned long pgalloc_high; /* page allocations */
- unsigned long pgalloc_normal;
- unsigned long pgalloc_dma32;
- unsigned long pgalloc_dma;
-
- unsigned long pgfree; /* page freeings */
- unsigned long pgactivate; /* pages moved inactive->active */
- unsigned long pgdeactivate; /* pages moved active->inactive */
-
- unsigned long pgfault; /* faults (major+minor) */
- unsigned long pgmajfault; /* faults (major only) */
-
- unsigned long pgrefill_high; /* inspected in refill_inactive_zone */
- unsigned long pgrefill_normal;
- unsigned long pgrefill_dma32;
- unsigned long pgrefill_dma;
-
- unsigned long pgsteal_high; /* total highmem pages reclaimed */
- unsigned long pgsteal_normal;
- unsigned long pgsteal_dma32;
- unsigned long pgsteal_dma;
-
- unsigned long pgscan_kswapd_high;/* total highmem pages scanned */
- unsigned long pgscan_kswapd_normal;
- unsigned long pgscan_kswapd_dma32;
- unsigned long pgscan_kswapd_dma;
-
- unsigned long pgscan_direct_high;/* total highmem pages scanned */
- unsigned long pgscan_direct_normal;
- unsigned long pgscan_direct_dma32;
- unsigned long pgscan_direct_dma;
-
- unsigned long pginodesteal; /* pages reclaimed via inode freeing */
- unsigned long slabs_scanned; /* slab objects scanned */
- unsigned long kswapd_steal; /* pages reclaimed by kswapd */
- unsigned long kswapd_inodesteal;/* reclaimed via kswapd inode freeing */
- unsigned long pageoutrun; /* kswapd's calls to page reclaim */
- unsigned long allocstall; /* direct reclaim calls */
+#define FOR_ALL_ZONES(x) x##_DMA, x##_DMA32, x##_NORMAL, x##_HIGH
- unsigned long pgrotated; /* pages rotated to tail of the LRU */
+enum vm_event_item { PGPGIN, PGPGOUT, PSWPIN, PSWPOUT,
+ FOR_ALL_ZONES(PGALLOC),
+ PGFREE, PGACTIVATE, PGDEACTIVATE,
+ PGFAULT, PGMAJFAULT,
+ FOR_ALL_ZONES(PGREFILL),
+ FOR_ALL_ZONES(PGSTEAL),
+ FOR_ALL_ZONES(PGSCAN_KSWAPD),
+ FOR_ALL_ZONES(PGSCAN_DIRECT),
+ PGINODESTEAL, SLABS_SCANNED, KSWAPD_STEAL, KSWAPD_INODESTEAL,
+ PAGEOUTRUN, ALLOCSTALL, PGROTATED,
+ NR_VM_EVENT_ITEMS
};
-extern void get_full_page_state(struct page_state *ret);
-extern unsigned long read_page_state_offset(unsigned long offset);
-extern void mod_page_state_offset(unsigned long offset, unsigned long delta);
-extern void __mod_page_state_offset(unsigned long offset, unsigned long delta);
-
-#define read_page_state(member) \
- read_page_state_offset(offsetof(struct page_state, member))
-
-#define mod_page_state(member, delta) \
- mod_page_state_offset(offsetof(struct page_state, member), (delta))
-
-#define __mod_page_state(member, delta) \
- __mod_page_state_offset(offsetof(struct page_state, member), (delta))
-
-#define inc_page_state(member) mod_page_state(member, 1UL)
-#define dec_page_state(member) mod_page_state(member, 0UL - 1)
-#define add_page_state(member,delta) mod_page_state(member, (delta))
-#define sub_page_state(member,delta) mod_page_state(member, 0UL - (delta))
-
-#define __inc_page_state(member) __mod_page_state(member, 1UL)
-#define __dec_page_state(member) __mod_page_state(member, 0UL - 1)
-#define __add_page_state(member,delta) __mod_page_state(member, (delta))
-#define __sub_page_state(member,delta) __mod_page_state(member, 0UL - (delta))
-
-#define page_state(member) (*__page_state(offsetof(struct page_state, member)))
-
-#define state_zone_offset(zone, member) \
-({ \
- unsigned offset; \
- if (is_highmem(zone)) \
- offset = offsetof(struct page_state, member##_high); \
- else if (is_normal(zone)) \
- offset = offsetof(struct page_state, member##_normal); \
- else if (is_dma32(zone)) \
- offset = offsetof(struct page_state, member##_dma32); \
- else \
- offset = offsetof(struct page_state, member##_dma); \
- offset; \
-})
-
-#define __mod_page_state_zone(zone, member, delta) \
- do { \
- __mod_page_state_offset(state_zone_offset(zone, member), (delta)); \
- } while (0)
-
-#define mod_page_state_zone(zone, member, delta) \
- do { \
- mod_page_state_offset(state_zone_offset(zone, member), (delta)); \
- } while (0)
+struct vm_event_state {
+ unsigned long event[NR_VM_EVENT_ITEMS];
+};
+
+DECLARE_PER_CPU(struct vm_event_state, vm_event_states);
+
+static inline unsigned long get_cpu_vm_events(enum vm_event_item item)
+{
+ return __get_cpu_var(vm_event_states).event[item];
+}
+
+static inline void count_vm_event(enum vm_event_item item)
+{
+ __get_cpu_var(vm_event_states).event[item]++;
+}
+
+static inline void count_vm_events(enum vm_event_item item, long delta)
+{
+ __get_cpu_var(vm_event_states).event[item] += delta;
+}
+
+extern void all_vm_events(unsigned long *);
+#else
+/* Disable counters */
+#define get_cpu_vm_events(e) 0L
+#define count_vm_event(e) do { } while (0)
+#define count_vm_events(e,d) do { } while (0)
+#endif
+
+#define count_zone_vm_event(item, zone) count_vm_event(item##_DMA + zone_idx(zone))
+#define count_zone_vm_events(item, zone, delta) count_vm_events(item##_DMA + zone_idx(zone), delta)
/*
* Zone based accounting with per cpu differentials.
diff -puN init/Kconfig~light-weight-counters-framework init/Kconfig
--- devel/init/Kconfig~light-weight-counters-framework 2006-06-10 09:26:09.000000000 -0700
+++ devel-akpm/init/Kconfig 2006-06-10 09:26:09.000000000 -0700
@@ -387,6 +387,15 @@ config SLOB
default !SLAB
bool
+config VM_EVENT_COUNTERS
+ default y
+ bool "Enable event counters for /proc/vmstat" if EMBEDDED
+ help
+ Event counters are only needed to display statistics. They
+ have no function for the kernel itself. This option allows
+ the disabling of the event counters. /proc/vmstat will only
+ contain essential counters.
+
menu "Loadable module support"
config MODULES
diff -puN mm/page_alloc.c~light-weight-counters-framework mm/page_alloc.c
--- devel/mm/page_alloc.c~light-weight-counters-framework 2006-06-10 09:26:09.000000000 -0700
+++ devel-akpm/mm/page_alloc.c 2006-06-10 09:26:24.000000000 -0700
@@ -456,7 +456,7 @@ static void __free_pages_ok(struct page
kernel_map_pages(page, 1 << order, 0);
local_irq_save(flags);
- __mod_page_state(pgfree, 1 << order);
+ count_vm_events(PGFREE, 1 << order);
free_one_page(page_zone(page), page, order);
local_irq_restore(flags);
}
@@ -1027,7 +1027,7 @@ static void fastcall free_hot_cold_page(
pcp = &zone_pcp(zone, get_cpu())->pcp[cold];
local_irq_save(flags);
- __inc_page_state(pgfree);
+ count_vm_event(PGFREE);
list_add(&page->lru, &pcp->list);
pcp->count++;
if (pcp->count >= pcp->high) {
@@ -1103,7 +1103,7 @@ again:
goto failed;
}
- __mod_page_state_zone(zone, pgalloc, 1 << order);
+ count_zone_vm_events(PGALLOC, zone, 1 << order);
zone_statistics(zonelist, zone, cpu);
local_irq_restore(flags);
put_cpu();
@@ -1509,79 +1509,42 @@ static void show_node(struct zone *zone)
#define show_node(zone) do { } while (0)
#endif
-/*
- * Accumulate the page_state information across all CPUs.
- * The result is unavoidably approximate - it can change
- * during and after execution of this function.
- */
-static DEFINE_PER_CPU(struct page_state, page_states) = {0};
+#ifdef CONFIG_VM_EVENT_COUNTERS
+DEFINE_PER_CPU(struct vm_event_state, vm_event_states) = {{0}};
+EXPORT_PER_CPU_SYMBOL(vm_event_states);
-static void __get_page_state(struct page_state *ret, int nr, cpumask_t *cpumask)
+static void sum_vm_events(unsigned long *ret, cpumask_t *cpumask)
{
- unsigned cpu;
-
- memset(ret, 0, nr * sizeof(unsigned long));
- cpus_and(*cpumask, *cpumask, cpu_online_map);
-
- for_each_cpu_mask(cpu, *cpumask) {
- unsigned long *in;
- unsigned long *out;
- unsigned off;
- unsigned next_cpu;
-
- in = (unsigned long *)&per_cpu(page_states, cpu);
-
- next_cpu = next_cpu(cpu, *cpumask);
- if (likely(next_cpu < NR_CPUS))
- prefetch(&per_cpu(page_states, next_cpu));
+ int cpu = 0;
+ int i;
- out = (unsigned long *)ret;
- for (off = 0; off < nr; off++)
- *out++ += *in++;
- }
-}
+ memset(ret, 0, NR_VM_EVENT_ITEMS * sizeof(unsigned long));
-void get_full_page_state(struct page_state *ret)
-{
- cpumask_t mask = CPU_MASK_ALL;
+ cpu = first_cpu(*cpumask);
+ while (cpu < NR_CPUS) {
+ struct vm_event_state *this = &per_cpu(vm_event_states, cpu);
- __get_page_state(ret, sizeof(*ret) / sizeof(unsigned long), &mask);
-}
+ cpu = next_cpu(cpu, *cpumask);
-unsigned long read_page_state_offset(unsigned long offset)
-{
- unsigned long ret = 0;
- int cpu;
+ if (cpu < NR_CPUS)
+ prefetch(&per_cpu(vm_event_states, cpu));
- for_each_online_cpu(cpu) {
- unsigned long in;
- in = (unsigned long)&per_cpu(page_states, cpu) + offset;
- ret += *((unsigned long *)in);
+ for (i=0; i< NR_VM_EVENT_ITEMS; i++)
+ ret[i] += this->event[i];
}
- return ret;
-}
-
-void __mod_page_state_offset(unsigned long offset, unsigned long delta)
-{
- void *ptr;
-
- ptr = &__get_cpu_var(page_states);
- *(unsigned long *)(ptr + offset) += delta;
}
-EXPORT_SYMBOL(__mod_page_state_offset);
-void mod_page_state_offset(unsigned long offset, unsigned long delta)
+/*
+ * Accumulate the vm event counters across all CPUs.
+ * The result is unavoidably approximate - it can change
+ * during and after execution of this function.
+*/
+void all_vm_events(unsigned long *ret)
{
- unsigned long flags;
- void *ptr;
-
- local_irq_save(flags);
- ptr = &__get_cpu_var(page_states);
- *(unsigned long *)(ptr + offset) += delta;
- local_irq_restore(flags);
+ sum_vm_events(ret, &cpu_online_map);
}
-EXPORT_SYMBOL(mod_page_state_offset);
+#endif
void __get_zone_counts(unsigned long *active, unsigned long *inactive,
unsigned long *free, struct pglist_data *pgdat)
@@ -2700,7 +2663,7 @@ static char *vmstat_text[] = {
"nr_unstable",
"nr_bounce",
- /* Page state */
+#ifdef CONFIG_VM_EVENT_COUNTERS
"pgpgin",
"pgpgout",
"pswpin",
@@ -2746,28 +2709,36 @@ static char *vmstat_text[] = {
"allocstall",
"pgrotated"
+#endif
};
static void *vmstat_start(struct seq_file *m, loff_t *pos)
{
unsigned long *v;
- struct page_state *ps;
+#ifdef CONFIG_VM_EVENT_COUNTERS
+ unsigned long *e;
+#endif
int i;
if (*pos >= ARRAY_SIZE(vmstat_text))
return NULL;
-
+#ifdef CONFIG_VM_EVENT_COUNTERS
v = kmalloc(NR_STAT_ITEMS * sizeof(unsigned long)
- + sizeof(struct page_state), GFP_KERNEL);
+ + sizeof(struct vm_event_state), GFP_KERNEL);
+#else
+ v = kmalloc(NR_STAT_ITEMS * sizeof(unsigned long), GFP_KERNEL);
+#endif
m->private = v;
if (!v)
return ERR_PTR(-ENOMEM);
for (i = 0; i < NR_STAT_ITEMS; i++)
v[i] = global_page_state(i);
- ps = (struct page_state *)(v + NR_STAT_ITEMS);
- get_full_page_state(ps);
- ps->pgpgin /= 2; /* sectors -> kbytes */
- ps->pgpgout /= 2;
+#ifdef CONFIG_VM_EVENT_COUNTERS
+ e = v + NR_STAT_ITEMS;
+ all_vm_events(e);
+ e[PGPGIN] /= 2; /* sectors -> kbytes */
+ e[PGPGOUT] /= 2;
+#endif
return v + *pos;
}
@@ -2804,28 +2775,34 @@ struct seq_operations vmstat_op = {
#endif /* CONFIG_PROC_FS */
#ifdef CONFIG_HOTPLUG_CPU
+/*
+ * Fold the foreign cpu states int our own.
+ *
+ * This is a pretty inconsistent thing to do since
+ * the event array is to count the events occurring
+ * for each processor. But we did this in the past
+ * so I guess that we need to continue.
+ */
+static void vm_events_fold_cpu(int cpu)
+{
+ struct vm_event_state *fold_state = &per_cpu(vm_event_states, cpu);
+ int i;
+
+ for (i = 0; i < NR_VM_EVENT_ITEMS; i++) {
+ count_vm_events(i, fold_state->event[i]);
+ fold_state->event[i] = 0;
+ }
+}
+
static int page_alloc_cpu_notify(struct notifier_block *self,
unsigned long action, void *hcpu)
{
int cpu = (unsigned long)hcpu;
- unsigned long *src, *dest;
if (action == CPU_DEAD) {
- int i;
-
local_irq_disable();
__drain_pages(cpu);
-
- /* Add dead cpu's page_states to our own. */
- dest = (unsigned long *)&__get_cpu_var(page_states);
- src = (unsigned long *)&per_cpu(page_states, cpu);
-
- for (i = 0; i < sizeof(struct page_state)/sizeof(unsigned long);
- i++) {
- dest[i] += src[i];
- src[i] = 0;
- }
-
+ vm_events_fold_cpu(cpu);
local_irq_enable();
refresh_cpu_vm_stats(cpu);
}
diff -puN block/ll_rw_blk.c~light-weight-counters-framework block/ll_rw_blk.c
--- devel/block/ll_rw_blk.c~light-weight-counters-framework 2006-06-10 09:26:09.000000000 -0700
+++ devel-akpm/block/ll_rw_blk.c 2006-06-10 09:26:09.000000000 -0700
@@ -3117,9 +3117,9 @@ void submit_bio(int rw, struct bio *bio)
BIO_BUG_ON(!bio->bi_io_vec);
bio->bi_rw |= rw;
if (rw & WRITE)
- mod_page_state(pgpgout, count);
+ count_vm_events(PGPGOUT, count);
else
- mod_page_state(pgpgin, count);
+ count_vm_events(PGPGIN, count);
if (unlikely(block_dump)) {
char b[BDEVNAME_SIZE];
diff -puN drivers/parisc/led.c~light-weight-counters-framework drivers/parisc/led.c
--- devel/drivers/parisc/led.c~light-weight-counters-framework 2006-06-10 09:26:09.000000000 -0700
+++ devel-akpm/drivers/parisc/led.c 2006-06-10 09:26:09.000000000 -0700
@@ -411,14 +411,12 @@ static __inline__ int led_get_net_activi
static __inline__ int led_get_diskio_activity(void)
{
static unsigned long last_pgpgin, last_pgpgout;
- struct page_state pgstat;
int changed;
- get_full_page_state(&pgstat); /* get no of sectors in & out */
-
/* Just use a very simple calculation here. Do not care about overflow,
since we only want to know if there was activity or not. */
- changed = (pgstat.pgpgin != last_pgpgin) || (pgstat.pgpgout != last_pgpgout);
+ changed = (get_global_events(PGPGIN) != last_pgpgin) ||
+ (get_global_events(PGPGOUT) != last_pgpgout);
last_pgpgin = pgstat.pgpgin;
last_pgpgout = pgstat.pgpgout;
diff -puN fs/inode.c~light-weight-counters-framework fs/inode.c
--- devel/fs/inode.c~light-weight-counters-framework 2006-06-10 09:26:09.000000000 -0700
+++ devel-akpm/fs/inode.c 2006-06-10 09:26:09.000000000 -0700
@@ -458,9 +458,9 @@ static void prune_icache(int nr_to_scan)
mutex_unlock(&iprune_mutex);
if (current_is_kswapd())
- mod_page_state(kswapd_inodesteal, reap);
+ count_vm_events(KSWAPD_INODESTEAL, reap);
else
- mod_page_state(pginodesteal, reap);
+ count_vm_events(PGINODESTEAL, reap);
}
/*
diff -puN fs/ncpfs/mmap.c~light-weight-counters-framework fs/ncpfs/mmap.c
--- devel/fs/ncpfs/mmap.c~light-weight-counters-framework 2006-06-10 09:26:09.000000000 -0700
+++ devel-akpm/fs/ncpfs/mmap.c 2006-06-10 09:26:09.000000000 -0700
@@ -93,7 +93,7 @@ static struct page* ncp_file_mmap_nopage
*/
if (type)
*type = VM_FAULT_MAJOR;
- inc_page_state(pgmajfault);
+ count_vm_event(PGMAJFAULT);
return page;
}
diff -puN mm/filemap.c~light-weight-counters-framework mm/filemap.c
--- devel/mm/filemap.c~light-weight-counters-framework 2006-06-10 09:26:09.000000000 -0700
+++ devel-akpm/mm/filemap.c 2006-06-10 09:26:09.000000000 -0700
@@ -1327,7 +1327,7 @@ retry_find:
*/
if (!did_readaround) {
majmin = VM_FAULT_MAJOR;
- inc_page_state(pgmajfault);
+ count_vm_event(PGMAJFAULT);
}
did_readaround = 1;
ra_pages = max_sane_readahead(file->f_ra.ra_pages);
@@ -1398,7 +1398,7 @@ no_cached_page:
page_not_uptodate:
if (!did_readaround) {
majmin = VM_FAULT_MAJOR;
- inc_page_state(pgmajfault);
+ count_vm_event(PGMAJFAULT);
}
lock_page(page);
diff -puN mm/memory.c~light-weight-counters-framework mm/memory.c
--- devel/mm/memory.c~light-weight-counters-framework 2006-06-10 09:26:09.000000000 -0700
+++ devel-akpm/mm/memory.c 2006-06-10 09:26:09.000000000 -0700
@@ -1950,7 +1950,7 @@ static int do_swap_page(struct mm_struct
/* Had to read the page from swap area: Major fault */
ret = VM_FAULT_MAJOR;
- inc_page_state(pgmajfault);
+ count_vm_event(PGMAJFAULT);
grab_swap_token();
}
@@ -2323,7 +2323,7 @@ int __handle_mm_fault(struct mm_struct *
__set_current_state(TASK_RUNNING);
- inc_page_state(pgfault);
+ count_vm_event(PGFAULT);
if (unlikely(is_vm_hugetlb_page(vma)))
return hugetlb_fault(mm, vma, address, write_access);
diff -puN mm/page_io.c~light-weight-counters-framework mm/page_io.c
--- devel/mm/page_io.c~light-weight-counters-framework 2006-06-10 09:26:09.000000000 -0700
+++ devel-akpm/mm/page_io.c 2006-06-10 09:26:09.000000000 -0700
@@ -101,7 +101,7 @@ int swap_writepage(struct page *page, st
}
if (wbc->sync_mode == WB_SYNC_ALL)
rw |= (1 << BIO_RW_SYNC);
- inc_page_state(pswpout);
+ count_vm_event(PSWPOUT);
set_page_writeback(page);
unlock_page(page);
submit_bio(rw, bio);
@@ -123,7 +123,7 @@ int swap_readpage(struct file *file, str
ret = -ENOMEM;
goto out;
}
- inc_page_state(pswpin);
+ count_vm_event(PSWPIN);
submit_bio(READ, bio);
out:
return ret;
diff -puN mm/shmem.c~light-weight-counters-framework mm/shmem.c
--- devel/mm/shmem.c~light-weight-counters-framework 2006-06-10 09:26:09.000000000 -0700
+++ devel-akpm/mm/shmem.c 2006-06-10 09:26:09.000000000 -0700
@@ -1049,7 +1049,7 @@ repeat:
spin_unlock(&info->lock);
/* here we actually do the io */
if (type && *type == VM_FAULT_MINOR) {
- inc_page_state(pgmajfault);
+ count_vm_event(PGMAJFAULT);
*type = VM_FAULT_MAJOR;
}
swappage = shmem_swapin(info, swap, idx);
diff -puN mm/swap.c~light-weight-counters-framework mm/swap.c
--- devel/mm/swap.c~light-weight-counters-framework 2006-06-10 09:26:09.000000000 -0700
+++ devel-akpm/mm/swap.c 2006-06-10 09:26:09.000000000 -0700
@@ -88,7 +88,7 @@ int rotate_reclaimable_page(struct page
if (PageLRU(page) && !PageActive(page)) {
list_del(&page->lru);
list_add_tail(&page->lru, &zone->inactive_list);
- inc_page_state(pgrotated);
+ count_vm_event(PGROTATED);
}
if (!test_clear_page_writeback(page))
BUG();
@@ -108,7 +108,7 @@ void fastcall activate_page(struct page
del_page_from_inactive_list(zone, page);
SetPageActive(page);
add_page_to_active_list(zone, page);
- inc_page_state(pgactivate);
+ count_vm_event(PGACTIVATE);
}
spin_unlock_irq(&zone->lru_lock);
}
diff -puN mm/vmscan.c~light-weight-counters-framework mm/vmscan.c
--- devel/mm/vmscan.c~light-weight-counters-framework 2006-06-10 09:26:09.000000000 -0700
+++ devel-akpm/mm/vmscan.c 2006-06-10 09:26:09.000000000 -0700
@@ -215,7 +215,7 @@ unsigned long shrink_slab(unsigned long
break;
if (shrink_ret < nr_before)
ret += nr_before - shrink_ret;
- mod_page_state(slabs_scanned, this_scan);
+ count_vm_events(SLABS_SCANNED, this_scan);
total_scan -= this_scan;
cond_resched();
@@ -569,7 +569,7 @@ keep:
list_splice(&ret_pages, page_list);
if (pagevec_count(&freed_pvec))
__pagevec_release_nonlru(&freed_pvec);
- mod_page_state(pgactivate, pgactivate);
+ count_vm_events(PGACTIVATE, pgactivate);
return nr_reclaimed;
}
@@ -659,11 +659,11 @@ static unsigned long shrink_inactive_lis
nr_reclaimed += nr_freed;
local_irq_disable();
if (current_is_kswapd()) {
- __mod_page_state_zone(zone, pgscan_kswapd, nr_scan);
- __mod_page_state(kswapd_steal, nr_freed);
+ count_zone_vm_events(PGSCAN_KSWAPD, zone, nr_scan);
+ count_vm_events(KSWAPD_STEAL, nr_freed);
} else
- __mod_page_state_zone(zone, pgscan_direct, nr_scan);
- __mod_page_state_zone(zone, pgsteal, nr_freed);
+ count_zone_vm_events(PGSCAN_DIRECT, zone, nr_scan);
+ count_vm_events(PGACTIVATE, nr_freed);
if (nr_taken == 0)
goto done;
@@ -840,11 +840,10 @@ static void shrink_active_list(unsigned
}
}
zone->nr_active += pgmoved;
- spin_unlock(&zone->lru_lock);
+ spin_unlock_irq(&zone->lru_lock);
- __mod_page_state_zone(zone, pgrefill, pgscanned);
- __mod_page_state(pgdeactivate, pgdeactivate);
- local_irq_enable();
+ count_zone_vm_events(PGREFILL, zone, pgscanned);
+ count_vm_events(PGDEACTIVATE, pgdeactivate);
pagevec_release(&pvec);
}
@@ -976,7 +975,7 @@ unsigned long try_to_free_pages(struct z
.swappiness = vm_swappiness,
};
- inc_page_state(allocstall);
+ count_vm_event(ALLOCSTALL);
for (i = 0; zones[i] != NULL; i++) {
struct zone *zone = zones[i];
@@ -1074,7 +1073,7 @@ loop_again:
nr_reclaimed = 0;
sc.may_writepage = !laptop_mode,
- inc_page_state(pageoutrun);
+ count_vm_event(PAGEOUTRUN);
for (i = 0; i < pgdat->nr_zones; i++) {
struct zone *zone = pgdat->node_zones + i;
diff -puN arch/s390/appldata/appldata_mem.c~light-weight-counters-framework arch/s390/appldata/appldata_mem.c
--- devel/arch/s390/appldata/appldata_mem.c~light-weight-counters-framework 2006-06-10 09:26:24.000000000 -0700
+++ devel-akpm/arch/s390/appldata/appldata_mem.c 2006-06-10 09:26:26.000000000 -0700
@@ -107,21 +107,21 @@ static void appldata_get_mem_data(void *
* serialized through the appldata_ops_lock and can use static
*/
static struct sysinfo val;
- static struct page_state ps;
+ unsigned long ev[NR_VM_EVENT_ITEMS];
struct appldata_mem_data *mem_data;
mem_data = data;
mem_data->sync_count_1++;
- get_full_page_state(&ps);
- mem_data->pgpgin = ps.pgpgin >> 1;
- mem_data->pgpgout = ps.pgpgout >> 1;
- mem_data->pswpin = ps.pswpin;
- mem_data->pswpout = ps.pswpout;
- mem_data->pgalloc = ps.pgalloc_high + ps.pgalloc_normal +
- ps.pgalloc_dma;
- mem_data->pgfault = ps.pgfault;
- mem_data->pgmajfault = ps.pgmajfault;
+ all_vm_events(ev);
+ mem_data->pgpgin = ev[PGPGIN] >> 1;
+ mem_data->pgpgout = ev[PGPGOUT] >> 1;
+ mem_data->pswpin = ev[PSWPIN];
+ mem_data->pswpout = ev[PSWPOUT];
+ mem_data->pgalloc = ev[PGALLOC_HIGH] + ev[PGALLOC_NORMAL] +
+ ev[PGALLOC_DMA];
+ mem_data->pgfault = ev[PGFAULT];
+ mem_data->pgmajfault = ev[PGMAJFAULT];
si_meminfo(&val);
mem_data->sharedram = val.sharedram;
@@ -130,7 +130,7 @@ static void appldata_get_mem_data(void *
mem_data->totalhigh = P2K(val.totalhigh);
mem_data->freehigh = P2K(val.freehigh);
mem_data->bufferram = P2K(val.bufferram);
- mem_data->cached = P2K(atomic_read(&nr_pagecache) - val.bufferram);
+ mem_data->cached = P2K(global_page_state(NR_PAGECACHE) - val.bufferram);
si_swapinfo(&val);
mem_data->totalswap = P2K(val.totalswap);
diff -puN arch/s390/appldata/appldata_base.c~light-weight-counters-framework arch/s390/appldata/appldata_base.c
--- devel/arch/s390/appldata/appldata_base.c~light-weight-counters-framework 2006-06-10 09:26:28.000000000 -0700
+++ devel-akpm/arch/s390/appldata/appldata_base.c 2006-06-10 09:26:28.000000000 -0700
@@ -767,7 +767,6 @@ unsigned long nr_iowait(void)
EXPORT_SYMBOL_GPL(si_swapinfo);
EXPORT_SYMBOL_GPL(nr_threads);
EXPORT_SYMBOL_GPL(avenrun);
-EXPORT_SYMBOL_GPL(get_full_page_state);
EXPORT_SYMBOL_GPL(nr_running);
EXPORT_SYMBOL_GPL(nr_iowait);
//EXPORT_SYMBOL_GPL(nr_context_switches);
diff -puN arch/arm/mm/mm-armv.c~light-weight-counters-framework arch/arm/mm/mm-armv.c
--- devel/arch/arm/mm/mm-armv.c~light-weight-counters-framework 2006-06-10 09:26:30.000000000 -0700
+++ devel-akpm/arch/arm/mm/mm-armv.c 2006-06-10 09:26:30.000000000 -0700
@@ -227,7 +227,7 @@ void free_pgd_slow(pgd_t *pgd)
pte = pmd_page(*pmd);
pmd_clear(pmd);
- dec_page_state(nr_page_table_pages);
+ dec_zone_page_state(virt_to_page((unsigned long *)pgd), NR_PAGETABLE);
pte_lock_deinit(pte);
pte_free(pte);
pmd_free(pmd);
diff -puN arch/um/kernel/skas/mmu.c~light-weight-counters-framework arch/um/kernel/skas/mmu.c
--- devel/arch/um/kernel/skas/mmu.c~light-weight-counters-framework 2006-06-10 09:26:32.000000000 -0700
+++ devel-akpm/arch/um/kernel/skas/mmu.c 2006-06-10 09:26:32.000000000 -0700
@@ -152,7 +152,7 @@ void destroy_context_skas(struct mm_stru
free_page(mmu->id.stack);
pte_lock_deinit(virt_to_page(mmu->last_page_table));
pte_free_kernel((pte_t *) mmu->last_page_table);
- dec_page_state(nr_page_table_pages);
+ dec_zone_page_state(virt_to_page(mmu->last_page_table), NR_PAGETABLE);
#ifdef CONFIG_3_LEVEL_PGTABLES
pmd_free((pmd_t *) mmu->last_pmd);
#endif
_
Patches currently in -mm which might be from clameter@xxxxxxx are
page-migration-make-do_swap_page-redo-the-fault.patch
slab-extract-cache_free_alien-from-__cache_free.patch
migration-remove-unnecessary-pageswapcache-checks.patch
page-migration-cleanup-rename-ignrefs-to-migration.patch
page-migration-cleanup-group-functions.patch
page-migration-cleanup-remove-useless-definitions.patch
page-migration-cleanup-drop-nr_refs-in-remove_references.patch
page-migration-cleanup-extract-try_to_unmap-from-migration-functions.patch
page-migration-cleanup-pass-mapping-to-migration-functions.patch
page-migration-cleanup-move-fallback-handling-into-special-function.patch
swapless-pm-add-r-w-migration-entries.patch
swapless-page-migration-rip-out-swap-based-logic.patch
swapless-page-migration-modify-core-logic.patch
more-page-migration-do-not-inc-dec-rss-counters.patch
more-page-migration-use-migration-entries-for-file-pages.patch
page-migration-update-documentation.patch
mm-remove-vm_locked-before-remap_pfn_range-and-drop-vm_shm.patch
page-migration-simplify-migrate_pages.patch
page-migration-simplify-migrate_pages-tweaks.patch
page-migration-handle-freeing-of-pages-in-migrate_pages.patch
page-migration-use-allocator-function-for-migrate_pages.patch
page-migration-support-moving-of-individual-pages.patch
page-migration-detailed-status-for-moving-of-individual-pages.patch
page-migration-support-moving-of-individual-pages-fixes.patch
page-migration-support-moving-of-individual-pages-x86_64-support.patch
page-migration-support-moving-of-individual-pages-x86-support.patch
page-migration-support-a-vma-migration-function.patch
allow-migration-of-mlocked-pages.patch
cpuset-remove-extra-cpuset_zone_allowed-check-in-__alloc_pages.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
