From: "Theodore Ts'o" <tytso@mit.edu>
To: Linux Kernel Developers List <linux-kernel@vger.kernel.org>
Cc: "Theodore Ts'o" <tytso@mit.edu>
Subject: [PATCH 04/49] ext4: Fallback to vmalloc if kmalloc can't allocate s_flex_groups array
Date: Mon, 8 Jun 2009 15:22:22 -0400 [thread overview]
Message-ID: <1244488987-32564-5-git-send-email-tytso@mit.edu> (raw)
In-Reply-To: <1244488987-32564-4-git-send-email-tytso@mit.edu>
For very large filesystems, the s_flex_groups array can get quite big.
For example, a filesystem that can be resized up to 16TB will have
8192 flex groups (assuming the default flex_bg size of 16), so the
array is 96k, which is *very* marginal for kmalloc(). On the other
hand, a 160GB filesystem without the resize_inode feature will only
require 960 bytes. So we try to allocate the array first using
kmalloc(), and if that fails, we'll try to use vmalloc() instead.
Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
---
fs/ext4/super.c | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 2958f4e..3f4475d 100644
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -20,6 +20,7 @@
#include <linux/string.h>
#include <linux/fs.h>
#include <linux/time.h>
+#include <linux/vmalloc.h>
#include <linux/jbd2.h>
#include <linux/slab.h>
#include <linux/init.h>
@@ -586,7 +587,10 @@ static void ext4_put_super(struct super_block *sb)
for (i = 0; i < sbi->s_gdb_count; i++)
brelse(sbi->s_group_desc[i]);
kfree(sbi->s_group_desc);
- kfree(sbi->s_flex_groups);
+ if (is_vmalloc_addr(sbi->s_flex_groups))
+ vfree(sbi->s_flex_groups);
+ else
+ kfree(sbi->s_flex_groups);
percpu_counter_destroy(&sbi->s_freeblocks_counter);
percpu_counter_destroy(&sbi->s_freeinodes_counter);
percpu_counter_destroy(&sbi->s_dirs_counter);
@@ -1620,6 +1624,7 @@ static int ext4_fill_flex_info(struct super_block *sb)
ext4_group_t flex_group_count;
ext4_group_t flex_group;
int groups_per_flex = 0;
+ size_t size;
int i;
if (!sbi->s_es->s_log_groups_per_flex) {
@@ -1634,8 +1639,13 @@ static int ext4_fill_flex_info(struct super_block *sb)
flex_group_count = ((sbi->s_groups_count + groups_per_flex - 1) +
((le16_to_cpu(sbi->s_es->s_reserved_gdt_blocks) + 1) <<
EXT4_DESC_PER_BLOCK_BITS(sb))) / groups_per_flex;
- sbi->s_flex_groups = kzalloc(flex_group_count *
- sizeof(struct flex_groups), GFP_KERNEL);
+ size = flex_group_count * sizeof(struct flex_groups);
+ sbi->s_flex_groups = kzalloc(size, GFP_KERNEL);
+ if (sbi->s_flex_groups == NULL) {
+ sbi->s_flex_groups = vmalloc(size);
+ if (sbi->s_flex_groups)
+ memset(sbi->s_flex_groups, 0, size);
+ }
if (sbi->s_flex_groups == NULL) {
printk(KERN_ERR "EXT4-fs: not enough memory for "
"%u flex groups\n", flex_group_count);
@@ -2842,6 +2852,12 @@ failed_mount4:
sbi->s_journal = NULL;
}
failed_mount3:
+ if (sbi->s_flex_groups) {
+ if (is_vmalloc_addr(sbi->s_flex_groups))
+ vfree(sbi->s_flex_groups);
+ else
+ kfree(sbi->s_flex_groups);
+ }
percpu_counter_destroy(&sbi->s_freeblocks_counter);
percpu_counter_destroy(&sbi->s_freeinodes_counter);
percpu_counter_destroy(&sbi->s_dirs_counter);
--
1.6.3.2.1.gb9f7d.dirty
next prev parent reply other threads:[~2009-06-08 19:24 UTC|newest]
Thread overview: 52+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-06-08 19:22 [PATCH 00/49] Ext4 patches currently queued for mainline Theodore Ts'o
2009-06-08 19:22 ` [PATCH 01/49] ext4: Properly initialize the buffer_head state Theodore Ts'o
2009-06-08 19:22 ` [PATCH 02/49] vfs: Add BUG_ON for delayed and unwritten flags in submit_bh() Theodore Ts'o
2009-06-08 19:22 ` [PATCH 03/49] ext4: Mark the unwritten buffer_head as mapped during write_begin Theodore Ts'o
2009-06-08 19:22 ` Theodore Ts'o [this message]
2009-06-08 19:22 ` [PATCH 05/49] ext4: Use is_power_of_2() for clarity Theodore Ts'o
2009-06-08 19:22 ` [PATCH 06/49] ext3: avoid unnecessary spinlock in critical POSIX ACL path Theodore Ts'o
2009-06-08 19:22 ` [PATCH 07/49] ext4: " Theodore Ts'o
2009-06-08 19:22 ` [PATCH 08/49] ext4: Simplify ext4_commit_super()'s function signature Theodore Ts'o
2009-06-08 19:22 ` [PATCH 09/49] ext4: Fix and simplify s_dirt handling Theodore Ts'o
2009-06-08 19:22 ` [PATCH 10/49] ext4: Use separate super_operations structure for no_journal filesystems Theodore Ts'o
2009-06-08 19:22 ` [PATCH 11/49] ext4: Avoid races caused by on-line resizing and SMP memory reordering Theodore Ts'o
2009-06-08 19:22 ` [PATCH 12/49] ext4: Remove outdated comment about lock_super() Theodore Ts'o
2009-06-08 19:22 ` [PATCH 13/49] ext4: ext4_mark_recovery_complete() doesn't need to use lock_super Theodore Ts'o
2009-06-08 19:22 ` [PATCH 14/49] ext4: Replace lock/unlock_super() with an explicit lock for the orphan list Theodore Ts'o
2009-06-08 19:22 ` [PATCH 15/49] ext4: Replace lock/unlock_super() with an explicit lock for resizing Theodore Ts'o
2009-06-08 19:22 ` [PATCH 16/49] ext4: Don't avoid using BLOCK_UNINIT block groups in mballoc Theodore Ts'o
2009-06-08 19:22 ` [PATCH 17/49] ext4: Move the ext4_i.h header file into ext4.h Theodore Ts'o
2009-06-08 19:22 ` [PATCH 18/49] ext4: Move the ext4_sb.h " Theodore Ts'o
2009-06-08 19:22 ` [PATCH 19/49] ext4: Move fs/ext4/namei.h " Theodore Ts'o
2009-06-08 19:22 ` [PATCH 20/49] ext4: Move fs/ext4/group.h " Theodore Ts'o
2009-06-08 19:22 ` [PATCH 21/49] ext4: Make the length of the mb_history file tunable Theodore Ts'o
2009-06-08 19:22 ` [PATCH 22/49] ext4: hook fiemap operation for directories Theodore Ts'o
2009-06-08 19:22 ` [PATCH 23/49] vfs: Enable FS_IOC_FIEMAP and FIGETBSZ for all filetypes Theodore Ts'o
2009-06-08 19:22 ` [PATCH 24/49] ext4: fix for fiemap last-block test Theodore Ts'o
2009-06-08 19:22 ` [PATCH 25/49] ext4: fix the length returned by fiemap for an unallocated extent Theodore Ts'o
2009-06-08 19:22 ` [PATCH 26/49] ext4: Convert ext4_lock_group to use sb_bgl_lock Theodore Ts'o
2009-06-08 19:22 ` [PATCH 27/49] ext4: Fix spinlock assertions on UP systems Theodore Ts'o
2009-06-08 19:22 ` [PATCH 28/49] ext4: Simplify function signature for ext4_da_get_block_write() Theodore Ts'o
2009-06-08 19:22 ` [PATCH 29/49] ext4: Rename ext4_get_blocks_handle() to be ext4_ind_get_blocks() Theodore Ts'o
2009-06-08 19:22 ` [PATCH 30/49] ext4: Rename ext4_get_blocks_wrap() to be ext4_get_blocks() Theodore Ts'o
2009-06-08 19:22 ` [PATCH 31/49] ext4: Define a new set of flags for ext4_get_blocks() Theodore Ts'o
2009-06-08 19:22 ` [PATCH 32/49] ext4: Add documentation to the ext4_*get_block* functions Theodore Ts'o
2009-06-08 19:22 ` [PATCH 33/49] ext4: Add BUG_ON debugging checks to noalloc_get_block_write() Theodore Ts'o
2009-06-08 19:22 ` [PATCH 34/49] ext4: Merge ext4_da_get_block_write() into mpage_da_map_blocks() Theodore Ts'o
2009-06-08 19:22 ` [PATCH 35/49] ext4: Clean up ext4_get_blocks() so it does not depend on bh_result->b_state Theodore Ts'o
2009-06-08 19:22 ` [PATCH 36/49] ext4: Add a comprehensive block validity check to ext4_get_blocks() Theodore Ts'o
2009-06-08 19:22 ` [PATCH 37/49] ext4: down i_data_sem only for read when walking tree for fiemap Theodore Ts'o
2009-06-08 19:22 ` [PATCH 38/49] ext4: Fix memory leak in ext4_fill_super() in case of a failed mount Theodore Ts'o
2009-06-08 19:22 ` [PATCH 39/49] ext3: Fix memory leak in ext3_fill_super() " Theodore Ts'o
2009-06-08 19:22 ` [PATCH 40/49] ext2: Fix memory leak in ext2_fill_super() " Theodore Ts'o
2009-06-08 19:22 ` [PATCH 41/49] ext4: remove unused function __ext4_write_dirty_metadata Theodore Ts'o
2009-06-08 19:23 ` [PATCH 42/49] ext4: Clean up calls to ext4_get_group_desc() Theodore Ts'o
2009-06-08 19:23 ` [PATCH 43/49] jbd2: Fix minor typos in comments in fs/jbd2/journal.c Theodore Ts'o
2009-06-08 19:23 ` [PATCH 44/49] ext4: super.c whitespace cleanup Theodore Ts'o
2009-06-08 19:23 ` [PATCH 45/49] ext4: Get rid of EXTEND_DISKSIZE flag of ext4_get_blocks_handle() Theodore Ts'o
2009-06-08 19:23 ` [PATCH 46/49] ext4: Change all super.c messages to print the device Theodore Ts'o
2009-06-08 19:23 ` [PATCH 47/49] ext4: Avoid leaking blocks after a block allocation failure Theodore Ts'o
2009-06-08 19:23 ` [PATCH 48/49] ext4: truncate the file properly if we fail to copy data from userspace Theodore Ts'o
2009-06-08 19:23 ` [PATCH 49/49] ext4: fix dx_map_entry to support 256k directory blocks Theodore Ts'o
2009-06-08 19:41 ` [PATCH 43/49] jbd2: Fix minor typos in comments in fs/jbd2/journal.c Alberto Bertogli
2009-06-09 4:06 ` Theodore Tso
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=1244488987-32564-5-git-send-email-tytso@mit.edu \
--to=tytso@mit.edu \
--cc=linux-kernel@vger.kernel.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