From: Peter Zijlstra <a.p.zijlstra@chello.nl> To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: miklos@szeredi.hu, akpm@linux-foundation.org, neilb@suse.de, dgc@sgi.com, tomoki.sekiyama.qu@hitachi.com, a.p.zijlstra@chello.nl, nikita@clusterfs.com, trond.myklebust@fys.uio.no, yingchao.zhou@gmail.com, richard@rsk.demon.co.uk, torvalds@linux-foundation.org Subject: [PATCH 16/23] mm: scalable bdi statistics counters. Date: Tue, 11 Sep 2007 21:54:06 +0200 [thread overview] Message-ID: <20070911200015.098843000@chello.nl> (raw) In-Reply-To: 20070911195350.825778000@chello.nl [-- Attachment #1: bdi_stat.patch --] [-- Type: text/plain, Size: 4063 bytes --] Provide scalable per backing_dev_info statistics counters. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> --- include/linux/backing-dev.h | 85 ++++++++++++++++++++++++++++++++++++++++++-- mm/backing-dev.c | 27 +++++++++++++ 2 files changed, 109 insertions(+), 3 deletions(-) Index: linux-2.6/include/linux/backing-dev.h =================================================================== --- linux-2.6.orig/include/linux/backing-dev.h +++ linux-2.6/include/linux/backing-dev.h @@ -8,6 +8,8 @@ #ifndef _LINUX_BACKING_DEV_H #define _LINUX_BACKING_DEV_H +#include <linux/percpu_counter.h> +#include <linux/log2.h> #include <asm/atomic.h> struct page; @@ -24,6 +26,12 @@ enum bdi_state { typedef int (congested_fn)(void *, int); +enum bdi_stat_item { + NR_BDI_STAT_ITEMS +}; + +#define BDI_STAT_BATCH (8*(1+ilog2(nr_cpu_ids))) + struct backing_dev_info { unsigned long ra_pages; /* max readahead in PAGE_CACHE_SIZE units */ unsigned long state; /* Always use atomic bitops on this */ @@ -32,15 +40,86 @@ struct backing_dev_info { void *congested_data; /* Pointer to aux data for congested func */ void (*unplug_io_fn)(struct backing_dev_info *, struct page *); void *unplug_io_data; + + struct percpu_counter bdi_stat[NR_BDI_STAT_ITEMS]; }; -static inline int bdi_init(struct backing_dev_info *bdi) +int bdi_init(struct backing_dev_info *bdi); +void bdi_destroy(struct backing_dev_info *bdi); + +static inline void __add_bdi_stat(struct backing_dev_info *bdi, + enum bdi_stat_item item, s64 amount) { - return 0; + __percpu_counter_add(&bdi->bdi_stat[item], amount, BDI_STAT_BATCH); } -static inline void bdi_destroy(struct backing_dev_info *bdi) +static inline void __inc_bdi_stat(struct backing_dev_info *bdi, + enum bdi_stat_item item) { + __add_bdi_stat(bdi, item, 1); +} + +static inline void inc_bdi_stat(struct backing_dev_info *bdi, + enum bdi_stat_item item) +{ + unsigned long flags; + + local_irq_save(flags); + __inc_bdi_stat(bdi, item); + local_irq_restore(flags); +} + +static inline void __dec_bdi_stat(struct backing_dev_info *bdi, + enum bdi_stat_item item) +{ + __add_bdi_stat(bdi, item, -1); +} + +static inline void dec_bdi_stat(struct backing_dev_info *bdi, + enum bdi_stat_item item) +{ + unsigned long flags; + + local_irq_save(flags); + __dec_bdi_stat(bdi, item); + local_irq_restore(flags); +} + +static inline s64 bdi_stat(struct backing_dev_info *bdi, + enum bdi_stat_item item) +{ + return percpu_counter_read_positive(&bdi->bdi_stat[item]); +} + +static inline s64 __bdi_stat_sum(struct backing_dev_info *bdi, + enum bdi_stat_item item) +{ + return percpu_counter_sum_positive(&bdi->bdi_stat[item]); +} + +static inline s64 bdi_stat_sum(struct backing_dev_info *bdi, + enum bdi_stat_item item) +{ + s64 sum; + unsigned long flags; + + local_irq_save(flags); + sum = __bdi_stat_sum(bdi, item); + local_irq_restore(flags); + + return sum; +} + +/* + * maximal error of a stat counter. + */ +static inline unsigned long bdi_stat_error(struct backing_dev_info *bdi) +{ +#ifdef CONFIG_SMP + return nr_cpu_ids * BDI_STAT_BATCH; +#else + return 1; +#endif } /* Index: linux-2.6/mm/backing-dev.c =================================================================== --- linux-2.6.orig/mm/backing-dev.c +++ linux-2.6/mm/backing-dev.c @@ -5,6 +5,33 @@ #include <linux/sched.h> #include <linux/module.h> +int bdi_init(struct backing_dev_info *bdi) +{ + int i, j; + int err; + + for (i = 0; i < NR_BDI_STAT_ITEMS; i++) { + err = percpu_counter_init_irq(&bdi->bdi_stat[i], 0); + if (err) { + for (j = 0; j < i; j++) + percpu_counter_destroy(&bdi->bdi_stat[i]); + break; + } + } + + return err; +} +EXPORT_SYMBOL(bdi_init); + +void bdi_destroy(struct backing_dev_info *bdi) +{ + int i; + + for (i = 0; i < NR_BDI_STAT_ITEMS; i++) + percpu_counter_destroy(&bdi->bdi_stat[i]); +} +EXPORT_SYMBOL(bdi_destroy); + static wait_queue_head_t congestion_wqh[2] = { __WAIT_QUEUE_HEAD_INITIALIZER(congestion_wqh[0]), __WAIT_QUEUE_HEAD_INITIALIZER(congestion_wqh[1]) --
WARNING: multiple messages have this Message-ID (diff)
From: Peter Zijlstra <a.p.zijlstra@chello.nl> To: linux-mm@kvack.org, linux-kernel@vger.kernel.org Cc: miklos@szeredi.hu, akpm@linux-foundation.org, neilb@suse.de, dgc@sgi.com, tomoki.sekiyama.qu@hitachi.com, a.p.zijlstra@chello.nl, nikita@clusterfs.com, trond.myklebust@fys.uio.no, yingchao.zhou@gmail.com, richard@rsk.demon.co.uk, torvalds@linux-foundation.org Subject: [PATCH 16/23] mm: scalable bdi statistics counters. Date: Tue, 11 Sep 2007 21:54:06 +0200 [thread overview] Message-ID: <20070911200015.098843000@chello.nl> (raw) In-Reply-To: 20070911195350.825778000@chello.nl [-- Attachment #1: bdi_stat.patch --] [-- Type: text/plain, Size: 4288 bytes --] Provide scalable per backing_dev_info statistics counters. Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> --- include/linux/backing-dev.h | 85 ++++++++++++++++++++++++++++++++++++++++++-- mm/backing-dev.c | 27 +++++++++++++ 2 files changed, 109 insertions(+), 3 deletions(-) Index: linux-2.6/include/linux/backing-dev.h =================================================================== --- linux-2.6.orig/include/linux/backing-dev.h +++ linux-2.6/include/linux/backing-dev.h @@ -8,6 +8,8 @@ #ifndef _LINUX_BACKING_DEV_H #define _LINUX_BACKING_DEV_H +#include <linux/percpu_counter.h> +#include <linux/log2.h> #include <asm/atomic.h> struct page; @@ -24,6 +26,12 @@ enum bdi_state { typedef int (congested_fn)(void *, int); +enum bdi_stat_item { + NR_BDI_STAT_ITEMS +}; + +#define BDI_STAT_BATCH (8*(1+ilog2(nr_cpu_ids))) + struct backing_dev_info { unsigned long ra_pages; /* max readahead in PAGE_CACHE_SIZE units */ unsigned long state; /* Always use atomic bitops on this */ @@ -32,15 +40,86 @@ struct backing_dev_info { void *congested_data; /* Pointer to aux data for congested func */ void (*unplug_io_fn)(struct backing_dev_info *, struct page *); void *unplug_io_data; + + struct percpu_counter bdi_stat[NR_BDI_STAT_ITEMS]; }; -static inline int bdi_init(struct backing_dev_info *bdi) +int bdi_init(struct backing_dev_info *bdi); +void bdi_destroy(struct backing_dev_info *bdi); + +static inline void __add_bdi_stat(struct backing_dev_info *bdi, + enum bdi_stat_item item, s64 amount) { - return 0; + __percpu_counter_add(&bdi->bdi_stat[item], amount, BDI_STAT_BATCH); } -static inline void bdi_destroy(struct backing_dev_info *bdi) +static inline void __inc_bdi_stat(struct backing_dev_info *bdi, + enum bdi_stat_item item) { + __add_bdi_stat(bdi, item, 1); +} + +static inline void inc_bdi_stat(struct backing_dev_info *bdi, + enum bdi_stat_item item) +{ + unsigned long flags; + + local_irq_save(flags); + __inc_bdi_stat(bdi, item); + local_irq_restore(flags); +} + +static inline void __dec_bdi_stat(struct backing_dev_info *bdi, + enum bdi_stat_item item) +{ + __add_bdi_stat(bdi, item, -1); +} + +static inline void dec_bdi_stat(struct backing_dev_info *bdi, + enum bdi_stat_item item) +{ + unsigned long flags; + + local_irq_save(flags); + __dec_bdi_stat(bdi, item); + local_irq_restore(flags); +} + +static inline s64 bdi_stat(struct backing_dev_info *bdi, + enum bdi_stat_item item) +{ + return percpu_counter_read_positive(&bdi->bdi_stat[item]); +} + +static inline s64 __bdi_stat_sum(struct backing_dev_info *bdi, + enum bdi_stat_item item) +{ + return percpu_counter_sum_positive(&bdi->bdi_stat[item]); +} + +static inline s64 bdi_stat_sum(struct backing_dev_info *bdi, + enum bdi_stat_item item) +{ + s64 sum; + unsigned long flags; + + local_irq_save(flags); + sum = __bdi_stat_sum(bdi, item); + local_irq_restore(flags); + + return sum; +} + +/* + * maximal error of a stat counter. + */ +static inline unsigned long bdi_stat_error(struct backing_dev_info *bdi) +{ +#ifdef CONFIG_SMP + return nr_cpu_ids * BDI_STAT_BATCH; +#else + return 1; +#endif } /* Index: linux-2.6/mm/backing-dev.c =================================================================== --- linux-2.6.orig/mm/backing-dev.c +++ linux-2.6/mm/backing-dev.c @@ -5,6 +5,33 @@ #include <linux/sched.h> #include <linux/module.h> +int bdi_init(struct backing_dev_info *bdi) +{ + int i, j; + int err; + + for (i = 0; i < NR_BDI_STAT_ITEMS; i++) { + err = percpu_counter_init_irq(&bdi->bdi_stat[i], 0); + if (err) { + for (j = 0; j < i; j++) + percpu_counter_destroy(&bdi->bdi_stat[i]); + break; + } + } + + return err; +} +EXPORT_SYMBOL(bdi_init); + +void bdi_destroy(struct backing_dev_info *bdi) +{ + int i; + + for (i = 0; i < NR_BDI_STAT_ITEMS; i++) + percpu_counter_destroy(&bdi->bdi_stat[i]); +} +EXPORT_SYMBOL(bdi_destroy); + static wait_queue_head_t congestion_wqh[2] = { __WAIT_QUEUE_HEAD_INITIALIZER(congestion_wqh[0]), __WAIT_QUEUE_HEAD_INITIALIZER(congestion_wqh[1]) -- -- To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to majordomo@kvack.org. For more info on Linux MM, see: http://www.linux-mm.org/ . Don't email: <a href=mailto:"dont@kvack.org"> email@kvack.org </a>
next prev parent reply other threads:[~2007-09-11 20:08 UTC|newest] Thread overview: 59+ messages / expand[flat|nested] mbox.gz Atom feed top 2007-09-11 19:53 [PATCH 00/23] per device dirty throttling -v10 Peter Zijlstra 2007-09-11 19:53 ` Peter Zijlstra 2007-09-11 19:53 ` [PATCH 01/23] nfs: remove congestion_end() Peter Zijlstra 2007-09-11 19:53 ` Peter Zijlstra 2007-09-11 19:53 ` [PATCH 02/23] lib: percpu_counter_add Peter Zijlstra 2007-09-11 19:53 ` Peter Zijlstra 2007-09-11 19:53 ` [PATCH 03/23] lib: percpu_counter_sub Peter Zijlstra 2007-09-11 19:53 ` Peter Zijlstra 2007-09-11 19:53 ` [PATCH 04/23] lib: percpu_counter variable batch Peter Zijlstra 2007-09-11 19:53 ` Peter Zijlstra 2007-09-11 19:53 ` [PATCH 05/23] lib: make percpu_counter_add take s64 Peter Zijlstra 2007-09-11 19:53 ` Peter Zijlstra 2007-09-11 19:53 ` [PATCH 06/23] lib: percpu_counter_set Peter Zijlstra 2007-09-11 19:53 ` Peter Zijlstra 2007-09-11 19:53 ` [PATCH 07/23] lib: percpu_counter_sum_positive Peter Zijlstra 2007-09-11 19:53 ` Peter Zijlstra 2007-09-11 19:53 ` [PATCH 08/23] lib: percpu_count_sum() Peter Zijlstra 2007-09-11 19:53 ` Peter Zijlstra 2007-09-11 19:53 ` [PATCH 09/23] lib: percpu_counter_init error handling Peter Zijlstra 2007-09-11 19:53 ` Peter Zijlstra 2007-09-11 19:54 ` [PATCH 10/23] lib: percpu_counter_init_irq Peter Zijlstra 2007-09-11 19:54 ` Peter Zijlstra 2007-09-11 19:54 ` [PATCH 11/23] mm: bdi init hooks Peter Zijlstra 2007-09-11 19:54 ` Peter Zijlstra 2007-09-11 19:54 ` [PATCH 12/23] containers: " Peter Zijlstra 2007-09-11 19:54 ` Peter Zijlstra 2007-09-11 19:54 ` [PATCH 13/23] mtd: " Peter Zijlstra 2007-09-11 19:54 ` Peter Zijlstra 2007-09-11 19:54 ` [PATCH 14/23] mtd: clean up the backing_dev_info usage Peter Zijlstra 2007-09-11 19:54 ` Peter Zijlstra 2007-09-11 19:54 ` [PATCH 15/23] mtd: give mtdconcat devices their own backing_dev_info Peter Zijlstra 2007-09-11 19:54 ` Peter Zijlstra 2007-09-11 19:54 ` Peter Zijlstra [this message] 2007-09-11 19:54 ` [PATCH 16/23] mm: scalable bdi statistics counters Peter Zijlstra 2007-09-11 19:54 ` [PATCH 17/23] mm: count reclaimable pages per BDI Peter Zijlstra 2007-09-11 19:54 ` Peter Zijlstra 2007-09-11 19:54 ` [PATCH 18/23] mm: count writeback " Peter Zijlstra 2007-09-11 19:54 ` Peter Zijlstra 2007-09-11 19:54 ` [PATCH 19/23] mm: expose BDI statistics in sysfs Peter Zijlstra 2007-09-11 19:54 ` Peter Zijlstra 2007-09-11 19:54 ` [PATCH 20/23] lib: floating proportions Peter Zijlstra 2007-09-11 19:54 ` Peter Zijlstra 2007-09-11 19:54 ` [PATCH 21/23] mm: per device dirty threshold Peter Zijlstra 2007-09-11 19:54 ` Peter Zijlstra 2007-09-12 2:36 ` John Stoffel 2007-09-12 2:36 ` John Stoffel 2007-09-12 8:45 ` Peter Zijlstra 2007-09-11 19:54 ` [PATCH 22/23] mm: dirty balancing for tasks Peter Zijlstra 2007-09-11 19:54 ` Peter Zijlstra 2007-09-11 19:54 ` [PATCH 23/23] debug: sysfs files for the current ratio/size/total Peter Zijlstra 2007-09-11 19:54 ` Peter Zijlstra 2007-09-12 2:31 ` [PATCH 00/23] per device dirty throttling -v10 John Stoffel 2007-09-12 2:31 ` John Stoffel 2007-09-12 9:00 ` Peter Zijlstra -- strict thread matches above, loose matches on Subject: below -- 2007-08-16 7:45 [PATCH 00/23] per device dirty throttling -v9 Peter Zijlstra 2007-08-16 7:45 ` [PATCH 16/23] mm: scalable bdi statistics counters Peter Zijlstra 2007-08-16 7:45 ` Peter Zijlstra 2007-08-17 16:20 ` Josef Sipek 2007-08-17 16:20 ` Josef Sipek 2007-08-17 16:23 ` Peter Zijlstra
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=20070911200015.098843000@chello.nl \ --to=a.p.zijlstra@chello.nl \ --cc=akpm@linux-foundation.org \ --cc=dgc@sgi.com \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mm@kvack.org \ --cc=miklos@szeredi.hu \ --cc=neilb@suse.de \ --cc=nikita@clusterfs.com \ --cc=richard@rsk.demon.co.uk \ --cc=tomoki.sekiyama.qu@hitachi.com \ --cc=torvalds@linux-foundation.org \ --cc=trond.myklebust@fys.uio.no \ --cc=yingchao.zhou@gmail.com \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.