5df096d67e
As spotted by kmemtrace, struct ext3_sb_info is 17152 bytes on 64-bit which makes it a very bad fit for SLAB allocators. The culprit of the wasted memory is ->s_blockgroup_lock which can be as big as 16 KB when NR_CPUS >= 32. To fix that, allocate ->s_blockgroup_lock, which fits nicely in a order 2 page in the worst case, separately. This shinks down struct ext3_sb_info enough to fit a 1 KB slab cache so now we allocate 16 KB + 1 KB instead of 32 KB saving 15 KB of memory. Acked-by: Andreas Dilger <adilger@sun.com> Signed-off-by: Pekka Enberg <penberg@cs.helsinki.fi> Cc: <linux-ext4@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
92 lines
2.9 KiB
C
92 lines
2.9 KiB
C
/*
|
|
* linux/include/linux/ext3_fs_sb.h
|
|
*
|
|
* Copyright (C) 1992, 1993, 1994, 1995
|
|
* Remy Card (card@masi.ibp.fr)
|
|
* Laboratoire MASI - Institut Blaise Pascal
|
|
* Universite Pierre et Marie Curie (Paris VI)
|
|
*
|
|
* from
|
|
*
|
|
* linux/include/linux/minix_fs_sb.h
|
|
*
|
|
* Copyright (C) 1991, 1992 Linus Torvalds
|
|
*/
|
|
|
|
#ifndef _LINUX_EXT3_FS_SB
|
|
#define _LINUX_EXT3_FS_SB
|
|
|
|
#ifdef __KERNEL__
|
|
#include <linux/timer.h>
|
|
#include <linux/wait.h>
|
|
#include <linux/blockgroup_lock.h>
|
|
#include <linux/percpu_counter.h>
|
|
#endif
|
|
#include <linux/rbtree.h>
|
|
|
|
/*
|
|
* third extended-fs super-block data in memory
|
|
*/
|
|
struct ext3_sb_info {
|
|
unsigned long s_frag_size; /* Size of a fragment in bytes */
|
|
unsigned long s_frags_per_block;/* Number of fragments per block */
|
|
unsigned long s_inodes_per_block;/* Number of inodes per block */
|
|
unsigned long s_frags_per_group;/* Number of fragments in a group */
|
|
unsigned long s_blocks_per_group;/* Number of blocks in a group */
|
|
unsigned long s_inodes_per_group;/* Number of inodes in a group */
|
|
unsigned long s_itb_per_group; /* Number of inode table blocks per group */
|
|
unsigned long s_gdb_count; /* Number of group descriptor blocks */
|
|
unsigned long s_desc_per_block; /* Number of group descriptors per block */
|
|
unsigned long s_groups_count; /* Number of groups in the fs */
|
|
unsigned long s_overhead_last; /* Last calculated overhead */
|
|
unsigned long s_blocks_last; /* Last seen block count */
|
|
struct buffer_head * s_sbh; /* Buffer containing the super block */
|
|
struct ext3_super_block * s_es; /* Pointer to the super block in the buffer */
|
|
struct buffer_head ** s_group_desc;
|
|
unsigned long s_mount_opt;
|
|
ext3_fsblk_t s_sb_block;
|
|
uid_t s_resuid;
|
|
gid_t s_resgid;
|
|
unsigned short s_mount_state;
|
|
unsigned short s_pad;
|
|
int s_addr_per_block_bits;
|
|
int s_desc_per_block_bits;
|
|
int s_inode_size;
|
|
int s_first_ino;
|
|
spinlock_t s_next_gen_lock;
|
|
u32 s_next_generation;
|
|
u32 s_hash_seed[4];
|
|
int s_def_hash_version;
|
|
struct percpu_counter s_freeblocks_counter;
|
|
struct percpu_counter s_freeinodes_counter;
|
|
struct percpu_counter s_dirs_counter;
|
|
struct blockgroup_lock *s_blockgroup_lock;
|
|
|
|
/* root of the per fs reservation window tree */
|
|
spinlock_t s_rsv_window_lock;
|
|
struct rb_root s_rsv_window_root;
|
|
struct ext3_reserve_window_node s_rsv_window_head;
|
|
|
|
/* Journaling */
|
|
struct inode * s_journal_inode;
|
|
struct journal_s * s_journal;
|
|
struct list_head s_orphan;
|
|
unsigned long s_commit_interval;
|
|
struct block_device *journal_bdev;
|
|
#ifdef CONFIG_JBD_DEBUG
|
|
struct timer_list turn_ro_timer; /* For turning read-only (crash simulation) */
|
|
wait_queue_head_t ro_wait_queue; /* For people waiting for the fs to go read-only */
|
|
#endif
|
|
#ifdef CONFIG_QUOTA
|
|
char *s_qf_names[MAXQUOTAS]; /* Names of quota files with journalled quota */
|
|
int s_jquota_fmt; /* Format of quota to use */
|
|
#endif
|
|
};
|
|
|
|
static inline spinlock_t *
|
|
sb_bgl_lock(struct ext3_sb_info *sbi, unsigned int block_group)
|
|
{
|
|
return bgl_lock_ptr(sbi->s_blockgroup_lock, block_group);
|
|
}
|
|
|
|
#endif /* _LINUX_EXT3_FS_SB */
|