diff -urNp linux-2.6.4/fs/ext3/balloc.c 264-rsv-no_debug/fs/ext3/balloc.c --- linux-2.6.4/fs/ext3/balloc.c 2004-03-10 18:55:21.000000000 -0800 +++ 264-rsv-no_debug/fs/ext3/balloc.c 2004-03-30 07:29:58.559179056 -0800 @@ -96,6 +96,332 @@ read_block_bitmap(struct super_block *sb error_out: return bh; } +/* + * The reservation window structure operations + * -------------------------------------------- + * Operations include: + * dump, find, add, remove, is_empty, find_next_reservable_window, etc. + * + * We use sorted double linked list for the per-filesystem reservation + * window list. (like in vm_region). + * + * Initially, we keep those small operations in the abstract functions, + * so later if we need a better searching tree than double linked-list, + * we could easily switch to that without changing too much + * code. + */ +#ifdef LATER +static inline void rsv_window_dump(struct reserve_window *head, char *fn) +{ + struct reserve_window *rsv; + printk("Block Allocation Reservation Windows Map (%s):\n", fn); + list_for_each_entry(rsv, &head->rsv_list, rsv_list) { + printk("reservation window 0x%x start: %ld, end: %ld(%d)\n", + rsv, rsv->rsv_start, rsv->rsv_end, + rsv->rsv_end-c->rsv_start); + } +} +#endif + +static inline int goal_in_my_reservation(struct reserve_window *rsv, int goal) +{ + return ((goal >= rsv->rsv_start) && (goal <= rsv->rsv_end)); +} + +/* + * find if the given block is within any reservation on the list + */ +static inline int rsv_window_find(struct reserve_window *start, int block, int last_block) +{ + struct reserve_window *rsv; + + list_for_each_entry(rsv, &start->rsv_list, rsv_list) { + if (goal_in_my_reservation(rsv, block)) + return 1; /* found it*/ + if (rsv->rsv_start > last_block) + return 0; + } + return 0; +} + +static inline void rsv_window_add(struct reserve_window *rsv, struct reserve_window *prev) +{ + /* insert the new reservation window after the head */ + list_add(&rsv->rsv_list, &prev->rsv_list); +} + +static inline void rsv_window_remove(struct reserve_window *rsv) +{ + rsv->rsv_start = 0; + rsv->rsv_end = 0; + list_del(&rsv->rsv_list); +} +static inline int rsv_is_empty(struct reserve_window *rsv) +{ + /* a valid reservation end block could not be 0 */ + return (rsv->rsv_end == 0); +} + +void ext3_discard_reservation(struct inode *inode) +{ + struct ext3_inode_info *ei = EXT3_I(inode); + struct reserve_window *rsv = &ei->i_rsv_window; + spinlock_t * rsv_lock = &EXT3_SB(inode->i_sb)->s_rsv_window_lock; + + if (!rsv_is_empty(rsv)) { + spin_lock(rsv_lock); + rsv_window_remove(rsv); + spin_unlock(rsv_lock); + } +} +/** + * find_next_reservable_window(): + * find a reservable space within the given range + * It does not allocate the reservation window for now + * alloc_new_reservation() will do the work later. + * + * @search_head: the head of the searching list; + * This is not necessary the list head of the whole filesystem + * + * we have both head and start_block to assist the search + * for the reservable space. The list start from head, + * but we will shift to the place where start_block is, + * then start from there, we looking for a resevable space. + * @fs_rsv_head: per-filesystem reservation list head + * + * @size: the target new reservation window size + * @group_first_block: the first block we consider to start the real search from + * + * @last_block: + * the maxium block number that our goal reservable space + * could start from. This is normally the last block in this + * group. The search will end when we found the start of next + * possiblereservable space is out of this boundary. + * This could handle the cross bounday reservation window request. + * + * basically we search from the given range, rather than the whole + * reservation double linked list, (start_block, last_block) + * to find a free region that of of my size and has not + * been reserved. + * + * on succeed, it returns the reservation window to be append to. + * failed, return NULL. + */ +static inline +struct reserve_window* find_next_reservable_window( + struct reserve_window *search_head, + struct reserve_window *fs_rsv_head, + int size, int *start_block, int last_block) +{ + struct reserve_window *rsv; + int cur; + + /* TODO: make the start of the reservation window byte alligned */ + cur = *start_block; + rsv = list_entry(search_head->rsv_list.next, struct reserve_window, rsv_list); + while (rsv != fs_rsv_head) { + if (cur + size <= rsv->rsv_start) { + /* + * found a reserable space big enough + * we could have a reservation cross + * the group boundary here + */ + goto found; + } + if (cur <= rsv->rsv_end) + cur = rsv->rsv_end + 1; + + /* TODO? + * in the case we could not find a reservable space + * that is what is expected, during the research, we could + * remember what's the largest reservable space we could have + * and return that on. + * + * for now it will fail if we could not find the reservable + * space with expected-size (or more)... + */ + rsv = list_entry(rsv->rsv_list.next, struct reserve_window, rsv_list); + if (cur > last_block) + goto out; + } +found: + /* + * we come here either : + * when we rearch to the end of the whole list, + * and there is empty reservable space after last entry in the list. + * append it to the end of the list. + * + * or we found one reservable space in the middle of the list, + * return the reservation window that we could append to. + * succeed. + */ + *start_block = cur; + return list_entry(rsv->rsv_list.prev, struct reserve_window, rsv_list); +out: + return NULL; /* failed */ +} + +/** + * alloc_new_reservation()--allocate a new reservation window + * if there is an existing reservation, discard it first + * then allocate the new one from there + * otherwise allocate the new reservation from the given + * start block, or the beginning of the group, if a goal + * is not given. + * + * To make a new reservation, we search part of the filesystem + * reservation list(the list that inside the group). + * + * If we have a old reservation, the search goal is the end of + * last reservation. If we do not have a old reservatio, then we + * start from a given goal, or the first block of the group, if + * the goal is not given. + * + * We first find a reservable space after the goal, then from + * there,we check the bitmap for the first free block after + * it. If there is no free block until the end of group, then the + * whole group is full, we failed. Otherwise, check if the free block + * is inside the expected reservable space, if so, we succeed. + * If the first free block is outside the reseravle space, then + * start from the first free block, we search for next avalibale + * space, and go on. + * + * on succeed, a new reservation will be found and inserted into the list + * It contains at least one free block, and it is not overlap with other + * reservation window. + * + * failed: we failed to found a reservation window in this group + * + * @rsv: the reservation + * + * @start_block: The goal. It is where the search for a + * free reservable space should start from. + * if we have a old reservation, start_block is the end of + * old reservation. Otherwise, + * if we have a goal(start_block >0 ), then start from there, + * no goal(start_block = -1-, we start from the first block + * of the group. + * + * @sb: the super block + * @group: the group we are trying to do allocate in + * @bitmap_bh: the block group block bitmap + */ +static int alloc_new_reservation(struct reserve_window *my_rsv, int start_block, + struct super_block *sb, int group, struct buffer_head *bitmap_bh) +{ + struct reserve_window *search_head; + int group_first_block, group_end_block, first_free_block; + int reservable_space_start; + struct reserve_window *prev_rsv; + struct reserve_window *fs_rsv_head = &EXT3_SB(sb)->s_rsv_window_head; + int size; + + group_first_block = le32_to_cpu(EXT3_SB(sb)->s_es->s_first_data_block) + + group * EXT3_BLOCKS_PER_GROUP(sb); + group_end_block = group_first_block + EXT3_BLOCKS_PER_GROUP(sb) - 1; + + if (start_block < 0) + start_block = 0; + start_block += group_first_block; + + /* if we have a old reservation, discard it first */ + if (!rsv_is_empty(my_rsv)) { + /* + * if the old reservation is cross group boundary + * we will come here when we just failed to allocate from + * the first part of the window. We still have another part + * that belongs to the next group. In this case, there is no + * point to discard our window and try to allocate a new one + * in this group(which will fail). we should + * keep the reservation window, just simply move on. + * + * Maybe we could shift the start block of the reservation window + * to the first block of next group... + */ + if (my_rsv->rsv_end >= group_end_block) + return -1; + + /* remember where we are before we discard the old one */ + if (my_rsv->rsv_end + 1 > start_block) + start_block = my_rsv->rsv_end + 1; + search_head = list_entry(my_rsv->rsv_list.prev, + struct reserve_window, rsv_list); + + rsv_window_remove(my_rsv); + } + else { + /* + * we don't have a reservation, + * we set our goal(start_block) and + * the list head for the search + */ + search_head = fs_rsv_head; + } + + /* + * find_next_reservable_window() simply find a reservable window + * inside the given range(start_block, group_end_block). + * + * To make sure the reservation window has a free bit inside it, we need + * to check the bitmap after we found a reservable window. + */ + size = my_rsv->rsv_goal_size; +retry: + prev_rsv = find_next_reservable_window(search_head, fs_rsv_head, size, + &start_block, group_end_block); + if (prev_rsv == NULL) + goto failed; + + reservable_space_start = start_block; + /* + * on succeed, find_next_reservable_window() returns the + * reservation window where there is a reservable space after it. + * Before we reserve this reservable space, we need + * to make sure there is at least a free block inside this region. + * + * searching the first free bit on the block bitmap, start from + * the start block of the reservable space we just found. + */ + first_free_block = ext3_find_next_zero_bit(bitmap_bh->b_data, + group_end_block - group_first_block + 1, + reservable_space_start - group_first_block); + if (first_free_block < 0) + /* + * no free block left on the bitmap, no point + * to reserve the space. return failed. + */ + goto failed; + + start_block = first_free_block + group_first_block; + /* + * check if the first free block is within the + * free space we just found + */ + if ((start_block >= reservable_space_start) && + (start_block < reservable_space_start + size)) + goto found_rsv_window; + /* + * if the first free bit we found is out of the reservable space + * this means there is no free block on the reservable space + * we should continue search for next reservable space, + * start from where the free block is, + * we also shift the list head to where we stopped last time + */ + search_head = prev_rsv; + goto retry; + +found_rsv_window: + /* + * great! the reservable space contains some free blocks. + * Insert it to the list. + */ + rsv_window_add(my_rsv, prev_rsv); + my_rsv->rsv_start = reservable_space_start; + my_rsv->rsv_end = my_rsv->rsv_start + size - 1; + return 0; /* succeed */ +failed: + return -1; /* failed */ +} /* Free given blocks, update quota and i_blocks field */ void ext3_free_blocks (handle_t *handle, struct inode * inode, @@ -407,11 +733,12 @@ claim_block(spinlock_t *lock, int block, */ static int ext3_try_to_allocate(struct super_block *sb, handle_t *handle, int group, - struct buffer_head *bitmap_bh, int goal, int *errp) + struct buffer_head *bitmap_bh, int goal, + struct reserve_window * my_rsv, int *errp) { - int i; int fatal; int credits = 0; + int group_first_block, start, end; *errp = 0; @@ -426,26 +753,49 @@ ext3_try_to_allocate(struct super_block *errp = fatal; goto fail; } + /* if EXT3_RESERVATION */ + if (my_rsv) { + group_first_block = + le32_to_cpu(EXT3_SB(sb)->s_es->s_first_data_block) + + group * EXT3_BLOCKS_PER_GROUP(sb); + if (my_rsv->rsv_start >= group_first_block) + start = my_rsv->rsv_start - group_first_block; + else + /* reservation window cross group boundary */ + start = group_first_block; + end = my_rsv->rsv_end - group_first_block; + if (end > EXT3_BLOCKS_PER_GROUP(sb)) + /* reservation window cross group boundary */ + end = EXT3_BLOCKS_PER_GROUP(sb); + } + else { + if (goal > 0) + start = goal; + else + start = 0; + end = EXT3_BLOCKS_PER_GROUP(sb); + } repeat: if (goal < 0 || !ext3_test_allocatable(goal, bitmap_bh)) { - goal = find_next_usable_block(goal, bitmap_bh, - EXT3_BLOCKS_PER_GROUP(sb)); + goal = find_next_usable_block(start, bitmap_bh, end); if (goal < 0) goto fail_access; - for (i = 0; i < 7 && goal > 0 && + /*for (i = 0; i < 7 && goal > 0 && ext3_test_allocatable(goal - 1, bitmap_bh); i++, goal--); + */ } + start = goal; if (!claim_block(sb_bgl_lock(EXT3_SB(sb), group), goal, bitmap_bh)) { /* * The block was allocated by another thread, or it was * allocated and then freed by another thread */ - goal++; - if (goal >= EXT3_BLOCKS_PER_GROUP(sb)) + start++; + if (start >= end) goto fail_access; goto repeat; } @@ -466,6 +816,118 @@ fail: } /* + * This is the main function used to allocate a new block and + * it's reservation window. + * each time when a new block allocation is need, first try to allocate + * from it's own reservation. + * If it does not have a reservation window, instead of looking + * for a free bit on bitmap first, then look up the reservation list to see if + * it is inside somebody else's reservation window, + * we try to allocate a reservation window for it start from the goal first. + * Then do the block allocation within the reservation window. + * + * This will aviod keep searching the reservation list again and again + * when someboday is looking for a free block(without reservation), + * and there are lots of free blocks, but they are all being reserved + * + * We use a sorted double linked list for the per-filesystem reservation list. + * The insert, remove and find a free space(non-reserved) operations for the + * sorted double linked list should be fast. + * + */ +static int +ext3_try_to_allocate_with_rsv(struct super_block *sb, handle_t *handle, + int group, struct buffer_head *bitmap_bh, + int goal, struct reserve_window * my_rsv,int *errp) +{ + spinlock_t *rsv_lock; + int group_first_block; + int ret; +#ifdef EXT3_RESERVATION + rsv_lock = &EXT3_SB(sb)->s_rsv_window_lock; + /* + * goal is a group relative block number (if there is a goal) + * 0 < goal < EXT3_BLOCKS_PER_GROUP(sb) + * first block is a filesystem wide block number + * first block is the block number of the first block in this group + */ + group_first_block = le32_to_cpu(EXT3_SB(sb)->s_es->s_first_data_block) + + group * EXT3_BLOCKS_PER_GROUP(sb); + /* + * if we don't have a reservation, get a reservation first + * then try to allocation from the reservation + */ + if (rsv_is_empty(my_rsv)) { + spin_lock(rsv_lock); + ret = alloc_new_reservation(my_rsv, goal, sb, group, bitmap_bh); + spin_unlock(rsv_lock); + if (ret < 0) + /* + * alloc_new_reservation() failed when there is + * no "free" window for reservation in this group + * from the start point. + * In that case, we should move onto next group + */ + return -1; + if (!goal_in_my_reservation(my_rsv, goal)) + goal = -1; + goto alloc_from_rsv; + } + /* + * we already have a reservation + * if we come here with a goal, and the goal is inside the reservation + * then try to allocate from the reservation, start from the goal + * if we donot have a goal here, + * then try to allocate from reservation, start from the beginning + */ + if ((goal < 0 ) || (goal_in_my_reservation(my_rsv, goal+group_first_block))) + goto alloc_from_rsv; + + /* + * here, we have a reservation, but our goal is outside of the + * reservation, we should discard the reservation, + * get a new reservation based on the goal, + * then try to allocate from the new reservation. + * + * there is another way to deal with this case, + * we could keep the old reservation, give up the goal, + * try to allocate from the old reservation + * in the normal case, we already allocated all blocks + * in our reservation, going back may just waste of time + * and also, the goal already indicate that the reservation + * window is out-dated. so... + */ + spin_lock(rsv_lock); + ret = alloc_new_reservation(my_rsv, goal, sb, group, bitmap_bh); + spin_unlock(rsv_lock); + if (ret < 0) + return -1; + goal = -1; + +alloc_from_rsv: + ret = ext3_try_to_allocate(sb, handle, group, bitmap_bh, goal, + my_rsv, errp); + if (ret < 0) { + spin_lock(rsv_lock); + ret = alloc_new_reservation(my_rsv, goal, sb, group, bitmap_bh); + spin_unlock(rsv_lock); + + if (ret < 0 ) + return -1; + + goal = -1; + goto alloc_from_rsv; + } + /* + * okey, we successfully allocate a block from my reservation + */ + return ret; /* succeed */ +#else + return ext3_try_to_allocate(sb, handle, group, bitmap, goal, NULL, errp); +#endif +} + +/* * ext3_new_block uses a goal block to assist allocation. If the goal is * free, or there is a free block within 32 blocks of the goal, that block * is allocated. Otherwise a forward search is made for a free block; within @@ -490,6 +952,7 @@ ext3_new_block(handle_t *handle, struct struct ext3_group_desc *gdp; struct ext3_super_block *es; struct ext3_sb_info *sbi; + struct reserve_window *my_rsv = &EXT3_I(inode)->i_rsv_window; #ifdef EXT3FS_DEBUG static int goal_hits, goal_attempts; #endif @@ -540,8 +1003,8 @@ ext3_new_block(handle_t *handle, struct bitmap_bh = read_block_bitmap(sb, group_no); if (!bitmap_bh) goto io_error; - ret_block = ext3_try_to_allocate(sb, handle, group_no, - bitmap_bh, ret_block, &fatal); + ret_block = ext3_try_to_allocate_with_rsv(sb, handle, group_no, + bitmap_bh, ret_block, my_rsv, &fatal); if (fatal) goto out; if (ret_block >= 0) @@ -569,8 +1032,8 @@ ext3_new_block(handle_t *handle, struct bitmap_bh = read_block_bitmap(sb, group_no); if (!bitmap_bh) goto io_error; - ret_block = ext3_try_to_allocate(sb, handle, group_no, - bitmap_bh, -1, &fatal); + ret_block = ext3_try_to_allocate_with_rsv(sb, handle, group_no, + bitmap_bh, -1, my_rsv, &fatal); if (fatal) goto out; if (ret_block >= 0) diff -urNp linux-2.6.4/fs/ext3/ialloc.c 264-rsv-no_debug/fs/ext3/ialloc.c --- linux-2.6.4/fs/ext3/ialloc.c 2004-03-10 18:55:27.000000000 -0800 +++ 264-rsv-no_debug/fs/ext3/ialloc.c 2004-03-29 19:42:06.664888408 -0800 @@ -585,6 +585,12 @@ got: ei->i_prealloc_block = 0; ei->i_prealloc_count = 0; #endif +#ifdef EXT3_RESERVATION + ei->i_rsv_window.rsv_start = 0; + ei->i_rsv_window.rsv_end= 0; + ei->i_rsv_window.rsv_goal_size = EXT3_DEFAULT_RESERVE_BLOCKS; + INIT_LIST_HEAD(&ei->i_rsv_window.rsv_list); +#endif ei->i_block_group = group; ext3_set_inode_flags(inode); diff -urNp linux-2.6.4/fs/ext3/inode.c 264-rsv-no_debug/fs/ext3/inode.c --- linux-2.6.4/fs/ext3/inode.c 2004-03-10 18:55:35.000000000 -0800 +++ 264-rsv-no_debug/fs/ext3/inode.c 2004-03-29 19:42:06.672887192 -0800 @@ -186,7 +186,9 @@ static int ext3_journal_test_restart(han void ext3_put_inode(struct inode *inode) { if (!is_bad_inode(inode)) - ext3_discard_prealloc(inode); + + ext3_discard_reservation(inode); + /* ext3_discard_prealloc(inode); */ } /* @@ -2137,8 +2139,9 @@ void ext3_truncate(struct inode * inode) return; if (IS_APPEND(inode) || IS_IMMUTABLE(inode)) return; - - ext3_discard_prealloc(inode); + + ext3_discard_reservation(inode); + /* ext3_discard_prealloc(inode); */ /* * We have to lock the EOF page here, because lock_page() nests diff -urNp linux-2.6.4/fs/ext3/super.c 264-rsv-no_debug/fs/ext3/super.c --- linux-2.6.4/fs/ext3/super.c 2004-03-10 18:55:44.000000000 -0800 +++ 264-rsv-no_debug/fs/ext3/super.c 2004-03-29 19:42:06.677886432 -0800 @@ -1291,6 +1291,13 @@ static int ext3_fill_super (struct super sbi->s_gdb_count = db_count; get_random_bytes(&sbi->s_next_generation, sizeof(u32)); spin_lock_init(&sbi->s_next_gen_lock); + /* per fileystem reservation list head & lock */ + spin_lock_init(&sbi->s_rsv_window_lock); + INIT_LIST_HEAD(&sbi->s_rsv_window_head.rsv_list); + sbi->s_rsv_window_head.rsv_start = 0; + sbi->s_rsv_window_head.rsv_end = 0; + sbi->s_rsv_window_head.rsv_goal_size = 0; + /* * set up enough so that it can read an inode */ diff -urNp linux-2.6.4/include/linux/ext3_fs.h 264-rsv-no_debug/include/linux/ext3_fs.h --- linux-2.6.4/include/linux/ext3_fs.h 2004-03-10 18:55:33.000000000 -0800 +++ 264-rsv-no_debug/include/linux/ext3_fs.h 2004-03-30 07:42:26.299505248 -0800 @@ -37,7 +37,8 @@ struct statfs; */ #undef EXT3_PREALLOCATE /* @@@ Fix this! */ #define EXT3_DEFAULT_PREALLOC_BLOCKS 8 - +#define EXT3_RESERVATION +#define EXT3_DEFAULT_RESERVE_BLOCKS 8 /* * Always enable hashed directories */ @@ -728,6 +729,7 @@ extern void ext3_put_inode (struct inode extern void ext3_delete_inode (struct inode *); extern int ext3_sync_inode (handle_t *, struct inode *); extern void ext3_discard_prealloc (struct inode *); +extern void ext3_discard_reservation (struct inode *); extern void ext3_dirty_inode(struct inode *); extern int ext3_change_inode_journal_flag(struct inode *, int); extern void ext3_truncate (struct inode *); diff -urNp linux-2.6.4/include/linux/ext3_fs_i.h 264-rsv-no_debug/include/linux/ext3_fs_i.h --- linux-2.6.4/include/linux/ext3_fs_i.h 2004-03-10 18:55:21.000000000 -0800 +++ 264-rsv-no_debug/include/linux/ext3_fs_i.h 2004-03-29 19:42:06.681885824 -0800 @@ -18,8 +18,15 @@ #include +struct reserve_window{ + struct list_head rsv_list; + __u32 rsv_start; + __u32 rsv_end; + int rsv_goal_size; +}; + /* - * second extended file system inode data in memory + * third extended file system inode data in memory */ struct ext3_inode_info { __u32 i_data[15]; @@ -61,6 +68,9 @@ struct ext3_inode_info { __u32 i_prealloc_block; __u32 i_prealloc_count; #endif + /* block reservation window */ + struct reserve_window i_rsv_window; + __u32 i_dir_start_lookup; #ifdef CONFIG_EXT3_FS_XATTR /* diff -urNp linux-2.6.4/include/linux/ext3_fs_sb.h 264-rsv-no_debug/include/linux/ext3_fs_sb.h --- linux-2.6.4/include/linux/ext3_fs_sb.h 2004-03-10 18:55:44.000000000 -0800 +++ 264-rsv-no_debug/include/linux/ext3_fs_sb.h 2004-03-29 19:42:06.682885672 -0800 @@ -59,6 +59,10 @@ struct ext3_sb_info { struct percpu_counter s_dirs_counter; struct blockgroup_lock s_blockgroup_lock; + /* head of the per fs reservation window tree */ + spinlock_t s_rsv_window_lock; + struct reserve_window s_rsv_window_head; + /* Journaling */ struct inode * s_journal_inode; struct journal_s * s_journal;