Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 07031431 authored by Mingming Cao's avatar Mingming Cao Committed by Theodore Ts'o
Browse files

ext4: mballoc avoid use root reserved blocks for non root allocation 



mballoc allocation missed check for blocks reserved for root users. Add
ext4_has_free_blocks() check before allocation. Also modified
ext4_has_free_blocks() to support multiple block allocation request.

Signed-off-by: default avatarMingming Cao <cmm@us.ibm.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent d755fb38

fs/ext4/balloc.c

+33 −18
Original line number Original line Diff line number Diff line
@@ -1600,23 +1600,35 @@ ext4_try_to_allocate_with_rsv(struct super_block *sb, handle_t *handle, 
/**

/**

 * ext4_has_free_blocks()

 * ext4_has_free_blocks()

 * @sbi:	in-core super block structure.

 * @sbi:	in-core super block structure.

 * @nblocks:	number of neeed blocks

 *

 *

 * Check if filesystem has at least 1 free block available for allocation.

 * Check if filesystem has free blocks available for allocation.

 * Return the number of blocks avaible for allocation for this request

 * On success, return nblocks

 */

 */

static int ext4_has_free_blocks(struct ext4_sb_info *sbi)

ext4_fsblk_t ext4_has_free_blocks(struct ext4_sb_info *sbi,

						ext4_fsblk_t nblocks)

{

{

	ext4_fsblk_t free_blocks, root_blocks;

	ext4_fsblk_t free_blocks;

	ext4_fsblk_t root_blocks = 0;





	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);

	free_blocks = percpu_counter_read_positive(&sbi->s_freeblocks_counter);

	root_blocks = ext4_r_blocks_count(sbi->s_es);



	if (free_blocks < root_blocks + 1 && !capable(CAP_SYS_RESOURCE) &&

	if (!capable(CAP_SYS_RESOURCE) &&

		sbi->s_resuid != current->fsuid &&

		sbi->s_resuid != current->fsuid &&

		(sbi->s_resgid == 0 || !in_group_p (sbi->s_resgid))) {

		(sbi->s_resgid == 0 || !in_group_p(sbi->s_resgid)))

		return 0;

		root_blocks = ext4_r_blocks_count(sbi->s_es);

	}

#ifdef CONFIG_SMP

	return 1;

	if (free_blocks - root_blocks < FBC_BATCH)

		free_blocks =

			percpu_counter_sum_positive(&sbi->s_freeblocks_counter);

#endif

	if (free_blocks - root_blocks < nblocks)

		return free_blocks - root_blocks;

	return nblocks;

 }

 }







/**

/**

 * ext4_should_retry_alloc()

 * ext4_should_retry_alloc()

 * @sb:			super block

 * @sb:			super block
@@ -1631,7 +1643,7 @@ static int ext4_has_free_blocks(struct ext4_sb_info *sbi) 
 */

 */

int ext4_should_retry_alloc(struct super_block *sb, int *retries)

int ext4_should_retry_alloc(struct super_block *sb, int *retries)

{

{

	if (!ext4_has_free_blocks(EXT4_SB(sb)) || (*retries)++ > 3)

	if (!ext4_has_free_blocks(EXT4_SB(sb), 1) || (*retries)++ > 3)

		return 0;

		return 0;





	jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id);

	jbd_debug(1, "%s: retrying operation after ENOSPC\n", sb->s_id);
@@ -1681,13 +1693,21 @@ ext4_fsblk_t ext4_old_new_blocks(handle_t *handle, struct inode *inode, 
	ext4_group_t ngroups;

	ext4_group_t ngroups;

	unsigned long num = *count;

	unsigned long num = *count;





	*errp = -ENOSPC;

	sb = inode->i_sb;

	sb = inode->i_sb;

	if (!sb) {

	if (!sb) {

		*errp = -ENODEV;

		printk("ext4_new_block: nonexistent device");

		printk("ext4_new_block: nonexistent device");

		return 0;

		return 0;

	}

	}





	sbi = EXT4_SB(sb);

	*count = ext4_has_free_blocks(sbi, *count);

	if (*count == 0) {

		*errp = -ENOSPC;

		return 0;	/*return with ENOSPC error */

	}

	num = *count;



	/*

	/*

	 * Check quota for allocation of this block.

	 * Check quota for allocation of this block.

	 */

	 */
@@ -1711,11 +1731,6 @@ ext4_fsblk_t ext4_old_new_blocks(handle_t *handle, struct inode *inode, 
	if (block_i && ((windowsz = block_i->rsv_window_node.rsv_goal_size) > 0))

	if (block_i && ((windowsz = block_i->rsv_window_node.rsv_goal_size) > 0))

		my_rsv = &block_i->rsv_window_node;

		my_rsv = &block_i->rsv_window_node;





	if (!ext4_has_free_blocks(sbi)) {

		*errp = -ENOSPC;

		goto out;

	}



	/*

	/*

	 * First, test whether the goal block is free.

	 * First, test whether the goal block is free.

	 */

	 */

fs/ext4/ext4.h

+2 −0
Original line number Original line Diff line number Diff line
@@ -979,6 +979,8 @@ extern ext4_fsblk_t ext4_new_blocks(handle_t *handle, struct inode *inode, 
					unsigned long *count, int *errp);

					unsigned long *count, int *errp);

extern ext4_fsblk_t ext4_old_new_blocks(handle_t *handle, struct inode *inode,

extern ext4_fsblk_t ext4_old_new_blocks(handle_t *handle, struct inode *inode,

			ext4_fsblk_t goal, unsigned long *count, int *errp);

			ext4_fsblk_t goal, unsigned long *count, int *errp);

extern ext4_fsblk_t ext4_has_free_blocks(struct ext4_sb_info *sbi,

						ext4_fsblk_t nblocks);

extern void ext4_free_blocks (handle_t *handle, struct inode *inode,

extern void ext4_free_blocks (handle_t *handle, struct inode *inode,

			ext4_fsblk_t block, unsigned long count, int metadata);

			ext4_fsblk_t block, unsigned long count, int metadata);

extern void ext4_free_blocks_sb (handle_t *handle, struct super_block *sb,

extern void ext4_free_blocks_sb (handle_t *handle, struct super_block *sb,

fs/ext4/mballoc.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -4045,6 +4045,12 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle, 
					    &(ar->len), errp);

					    &(ar->len), errp);

		return block;

		return block;

	}

	}

	ar->len = ext4_has_free_blocks(sbi, ar->len);



	if (ar->len == 0) {

		*errp = -ENOSPC;

		return 0;

	}





	while (ar->len && DQUOT_ALLOC_BLOCK(ar->inode, ar->len)) {

	while (ar->len && DQUOT_ALLOC_BLOCK(ar->inode, ar->len)) {

		ar->flags |= EXT4_MB_HINT_NOPREALLOC;

		ar->flags |= EXT4_MB_HINT_NOPREALLOC;
@@ -4073,7 +4079,6 @@ ext4_fsblk_t ext4_mb_new_blocks(handle_t *handle, 




	ac->ac_op = EXT4_MB_HISTORY_PREALLOC;

	ac->ac_op = EXT4_MB_HISTORY_PREALLOC;

	if (!ext4_mb_use_preallocated(ac)) {

	if (!ext4_mb_use_preallocated(ac)) {



		ac->ac_op = EXT4_MB_HISTORY_ALLOC;

		ac->ac_op = EXT4_MB_HISTORY_ALLOC;

		ext4_mb_normalize_request(ac, ar);

		ext4_mb_normalize_request(ac, ar);

repeat:

repeat: