From: Peter Zijlstra <a.p.zijlstra@chello.nl>
To: Josef Sipek <jsipek@fsl.cs.sunysb.edu>
Cc: linux-mm@kvack.org, linux-kernel@vger.kernel.org,
miklos@szeredi.hu, akpm@linux-foundation.org, neilb@suse.de,
dgc@sgi.com, tomoki.sekiyama.qu@hitachi.com,
nikita@clusterfs.com, trond.myklebust@fys.uio.no,
yingchao.zhou@gmail.com, richard@rsk.demon.co.uk,
torvalds@linux-foundation.org
Subject: [PATCH 09/23] lib: percpu_counter_init error handling
Date: Sat, 18 Aug 2007 10:09:34 +0200 [thread overview]
Message-ID: <1187424574.6114.136.camel@twins> (raw)
In-Reply-To: <20070817155659.GD24323@filer.fsl.cs.sunysb.edu>
[-- Attachment #1: Type: text/plain, Size: 7713 bytes --]
On Fri, 2007-08-17 at 11:56 -0400, Josef Sipek wrote:
> On Thu, Aug 16, 2007 at 09:45:34AM +0200, Peter Zijlstra wrote:
> > Index: linux-2.6/fs/ext2/super.c
> > ===================================================================
> > --- linux-2.6.orig/fs/ext2/super.c
> > +++ linux-2.6/fs/ext2/super.c
> > @@ -725,6 +725,7 @@ static int ext2_fill_super(struct super_
> > int db_count;
> > int i, j;
> > __le32 features;
> > + int err;
> >
> > sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
> > if (!sbi)
> > @@ -996,12 +997,16 @@ static int ext2_fill_super(struct super_
> > sbi->s_rsv_window_head.rsv_goal_size = 0;
> > ext2_rsv_window_add(sb, &sbi->s_rsv_window_head);
> >
> > - percpu_counter_init(&sbi->s_freeblocks_counter,
> > + err = percpu_counter_init(&sbi->s_freeblocks_counter,
> > ext2_count_free_blocks(sb));
> > - percpu_counter_init(&sbi->s_freeinodes_counter,
> > + err |= percpu_counter_init(&sbi->s_freeinodes_counter,
> > ext2_count_free_inodes(sb));
> > - percpu_counter_init(&sbi->s_dirs_counter,
> > + err |= percpu_counter_init(&sbi->s_dirs_counter,
> > ext2_count_dirs(sb));
> > + if (err) {
> > + printk(KERN_ERR "EXT2-fs: insufficient memory\n");
> > + goto failed_mount3;
> > + }
>
> Can percpu_counter_init fail with only one error code? If not, the error
> code potentially used in future at failed_mount3 could be nonsensical
> because of the bitwise or-ing.
The actual value of err is irrelevant, it is not used after this not
zero check.
But how about this:
---
Subject: lib: percpu_counter_init error handling
alloc_percpu can fail, propagate that error.
Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
---
fs/ext2/super.c | 15 ++++++++++++---
fs/ext3/super.c | 21 +++++++++++++++------
fs/ext4/super.c | 21 +++++++++++++++------
include/linux/percpu_counter.h | 5 +++--
lib/percpu_counter.c | 8 +++++++-
5 files changed, 52 insertions(+), 18 deletions(-)
Index: linux-2.6/fs/ext2/super.c
===================================================================
--- linux-2.6.orig/fs/ext2/super.c
+++ linux-2.6/fs/ext2/super.c
@@ -725,6 +725,7 @@ static int ext2_fill_super(struct super_
int db_count;
int i, j;
__le32 features;
+ int err;
sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
if (!sbi)
@@ -996,12 +997,20 @@ static int ext2_fill_super(struct super_
sbi->s_rsv_window_head.rsv_goal_size = 0;
ext2_rsv_window_add(sb, &sbi->s_rsv_window_head);
- percpu_counter_init(&sbi->s_freeblocks_counter,
+ err = percpu_counter_init(&sbi->s_freeblocks_counter,
ext2_count_free_blocks(sb));
- percpu_counter_init(&sbi->s_freeinodes_counter,
+ if (!err) {
+ err = percpu_counter_init(&sbi->s_freeinodes_counter,
ext2_count_free_inodes(sb));
- percpu_counter_init(&sbi->s_dirs_counter,
+ }
+ if (!err) {
+ err = percpu_counter_init(&sbi->s_dirs_counter,
ext2_count_dirs(sb));
+ }
+ if (err) {
+ printk(KERN_ERR "EXT2-fs: insufficient memory\n");
+ goto failed_mount3;
+ }
/*
* set up enough so that it can read an inode
*/
Index: linux-2.6/fs/ext3/super.c
===================================================================
--- linux-2.6.orig/fs/ext3/super.c
+++ linux-2.6/fs/ext3/super.c
@@ -1485,6 +1485,7 @@ static int ext3_fill_super (struct super
int i;
int needs_recovery;
__le32 features;
+ int err;
sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
if (!sbi)
@@ -1745,12 +1746,20 @@ static int ext3_fill_super (struct super
get_random_bytes(&sbi->s_next_generation, sizeof(u32));
spin_lock_init(&sbi->s_next_gen_lock);
- percpu_counter_init(&sbi->s_freeblocks_counter,
- ext3_count_free_blocks(sb));
- percpu_counter_init(&sbi->s_freeinodes_counter,
- ext3_count_free_inodes(sb));
- percpu_counter_init(&sbi->s_dirs_counter,
- ext3_count_dirs(sb));
+ err = percpu_counter_init(&sbi->s_freeblocks_counter,
+ ext3_count_free_blocks(sb));
+ if (!err) {
+ err = percpu_counter_init(&sbi->s_freeinodes_counter,
+ ext3_count_free_inodes(sb));
+ }
+ if (!err) {
+ err = percpu_counter_init(&sbi->s_dirs_counter,
+ ext3_count_dirs(sb));
+ }
+ if (err) {
+ printk(KERN_ERR "EXT3-fs: insufficient memory\n");
+ goto failed_mount3;
+ }
/* per fileystem reservation list head & lock */
spin_lock_init(&sbi->s_rsv_window_lock);
Index: linux-2.6/fs/ext4/super.c
===================================================================
--- linux-2.6.orig/fs/ext4/super.c
+++ linux-2.6/fs/ext4/super.c
@@ -1576,6 +1576,7 @@ static int ext4_fill_super (struct super
int needs_recovery;
__le32 features;
__u64 blocks_count;
+ int err;
sbi = kzalloc(sizeof(*sbi), GFP_KERNEL);
if (!sbi)
@@ -1857,12 +1858,20 @@ static int ext4_fill_super (struct super
get_random_bytes(&sbi->s_next_generation, sizeof(u32));
spin_lock_init(&sbi->s_next_gen_lock);
- percpu_counter_init(&sbi->s_freeblocks_counter,
- ext4_count_free_blocks(sb));
- percpu_counter_init(&sbi->s_freeinodes_counter,
- ext4_count_free_inodes(sb));
- percpu_counter_init(&sbi->s_dirs_counter,
- ext4_count_dirs(sb));
+ err = percpu_counter_init(&sbi->s_freeblocks_counter,
+ ext4_count_free_blocks(sb));
+ if (!err) {
+ err = percpu_counter_init(&sbi->s_freeinodes_counter,
+ ext4_count_free_inodes(sb));
+ }
+ if (!err) {
+ err = percpu_counter_init(&sbi->s_dirs_counter,
+ ext4_count_dirs(sb));
+ }
+ if (err) {
+ printk(KERN_ERR "EXT4-fs: insufficient memory\n");
+ goto failed_mount3;
+ }
/* per fileystem reservation list head & lock */
spin_lock_init(&sbi->s_rsv_window_lock);
Index: linux-2.6/include/linux/percpu_counter.h
===================================================================
--- linux-2.6.orig/include/linux/percpu_counter.h
+++ linux-2.6/include/linux/percpu_counter.h
@@ -30,7 +30,7 @@ struct percpu_counter {
#define FBC_BATCH (NR_CPUS*4)
#endif
-void percpu_counter_init(struct percpu_counter *fbc, s64 amount);
+int percpu_counter_init(struct percpu_counter *fbc, s64 amount);
void percpu_counter_destroy(struct percpu_counter *fbc);
void percpu_counter_set(struct percpu_counter *fbc, s64 amount);
void __percpu_counter_add(struct percpu_counter *fbc, s64 amount, s32 batch);
@@ -78,9 +78,10 @@ struct percpu_counter {
s64 count;
};
-static inline void percpu_counter_init(struct percpu_counter *fbc, s64 amount)
+static inline int percpu_counter_init(struct percpu_counter *fbc, s64 amount)
{
fbc->count = amount;
+ return 0;
}
static inline void percpu_counter_destroy(struct percpu_counter *fbc)
Index: linux-2.6/lib/percpu_counter.c
===================================================================
--- linux-2.6.orig/lib/percpu_counter.c
+++ linux-2.6/lib/percpu_counter.c
@@ -68,21 +68,27 @@ s64 __percpu_counter_sum(struct percpu_c
}
EXPORT_SYMBOL(__percpu_counter_sum);
-void percpu_counter_init(struct percpu_counter *fbc, s64 amount)
+int percpu_counter_init(struct percpu_counter *fbc, s64 amount)
{
spin_lock_init(&fbc->lock);
fbc->count = amount;
fbc->counters = alloc_percpu(s32);
+ if (!fbc->counters)
+ return -ENOMEM;
#ifdef CONFIG_HOTPLUG_CPU
mutex_lock(&percpu_counters_lock);
list_add(&fbc->list, &percpu_counters);
mutex_unlock(&percpu_counters_lock);
#endif
+ return 0;
}
EXPORT_SYMBOL(percpu_counter_init);
void percpu_counter_destroy(struct percpu_counter *fbc)
{
+ if (!fbc->counters)
+ return;
+
free_percpu(fbc->counters);
#ifdef CONFIG_HOTPLUG_CPU
mutex_lock(&percpu_counters_lock);
[-- Attachment #2: This is a digitally signed message part --]
[-- Type: application/pgp-signature, Size: 189 bytes --]
next prev parent reply other threads:[~2007-08-18 8:09 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-08-16 7:45 [PATCH 00/23] per device dirty throttling -v9 Peter Zijlstra
2007-08-16 7:45 ` [PATCH 01/23] nfs: remove congestion_end() Peter Zijlstra
2007-08-16 7:45 ` [PATCH 02/23] lib: percpu_counter_add Peter Zijlstra
2007-08-17 15:48 ` Josef Sipek
2007-08-16 7:45 ` [PATCH 03/23] lib: percpu_counter_sub Peter Zijlstra
2007-08-16 7:45 ` [PATCH 04/23] lib: percpu_counter variable batch Peter Zijlstra
2007-08-16 7:45 ` [PATCH 05/23] lib: make percpu_counter_add take s64 Peter Zijlstra
2007-08-16 7:45 ` [PATCH 06/23] lib: percpu_counter_set Peter Zijlstra
2007-08-16 7:45 ` [PATCH 07/23] lib: percpu_counter_sum_positive Peter Zijlstra
2007-08-16 7:45 ` [PATCH 08/23] lib: percpu_count_sum() Peter Zijlstra
2007-08-16 7:45 ` [PATCH 09/23] lib: percpu_counter_init error handling Peter Zijlstra
2007-08-17 15:56 ` Josef Sipek
2007-08-17 16:03 ` Peter Zijlstra
2007-08-18 8:09 ` Peter Zijlstra [this message]
2007-08-23 18:24 ` Josef Sipek
2007-08-16 7:45 ` [PATCH 10/23] lib: percpu_counter_init_irq Peter Zijlstra
2007-08-16 7:45 ` [PATCH 11/23] mm: bdi init hooks Peter Zijlstra
2007-08-17 16:10 ` Josef Sipek
2007-08-17 16:15 ` Peter Zijlstra
2007-08-16 7:45 ` [PATCH 12/23] containers: " Peter Zijlstra
2007-08-16 7:45 ` [PATCH 13/23] mtd: " Peter Zijlstra
2007-08-16 7:45 ` [PATCH 14/23] mtd: clean up the backing_dev_info usage Peter Zijlstra
2007-08-16 7:45 ` [PATCH 15/23] mtd: give mtdconcat devices their own backing_dev_info Peter Zijlstra
2007-08-16 7:45 ` [PATCH 16/23] mm: scalable bdi statistics counters Peter Zijlstra
2007-08-17 16:20 ` Josef Sipek
2007-08-17 16:23 ` Peter Zijlstra
2007-08-16 7:45 ` [PATCH 17/23] mm: count reclaimable pages per BDI Peter Zijlstra
2007-08-17 16:23 ` Josef Sipek
2007-08-16 7:45 ` [PATCH 18/23] mm: count writeback " Peter Zijlstra
2007-08-16 7:45 ` [PATCH 19/23] mm: expose BDI statistics in sysfs Peter Zijlstra
2007-08-16 7:45 ` [PATCH 20/23] lib: floating proportions Peter Zijlstra
2007-08-16 7:45 ` [PATCH 21/23] mm: per device dirty threshold Peter Zijlstra
2007-08-16 7:45 ` [PATCH 22/23] mm: dirty balancing for tasks Peter Zijlstra
2007-08-16 7:45 ` [PATCH 23/23] debug: sysfs files for the current ratio/size/total Peter Zijlstra
2007-08-16 21:29 ` [PATCH 00/23] per device dirty throttling -v9 Christoph Lameter
2007-08-17 7:19 ` Peter Zijlstra
2007-08-17 20:37 ` Christoph Lameter
2007-09-11 19:53 [PATCH 00/23] per device dirty throttling -v10 Peter Zijlstra
2007-09-11 19:53 ` [PATCH 09/23] lib: percpu_counter_init error handling 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=1187424574.6114.136.camel@twins \
--to=a.p.zijlstra@chello.nl \
--cc=akpm@linux-foundation.org \
--cc=dgc@sgi.com \
--cc=jsipek@fsl.cs.sunysb.edu \
--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: 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