linux-ext4.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: tytso@mit.edu, darrick.wong@oracle.com
Cc: linux-ext4@vger.kernel.org
Subject: [PATCH 23/32] libext2fs: find a range of empty blocks
Date: Sat, 01 Mar 2014 23:19:05 -0800	[thread overview]
Message-ID: <20140302071905.28217.98626.stgit@birch.djwong.org> (raw)
In-Reply-To: <20140302071639.28217.57302.stgit@birch.djwong.org>

Provide a function that, given a goal pblk and a range, will try to
find a run of free blocks to satisfy the allocation.  By default the
function will look anywhere in the filesystem for the run, though this
can be constrained with optional flags.  One flag indicates that the
range must start at the goal block; the other flag indicates that we
should not return a range shorter than len.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
---
 lib/ext2fs/alloc.c  |  104 +++++++++++++++++++++++++++++++++++++++++++++++++++
 lib/ext2fs/ext2fs.h |    6 +++
 2 files changed, 110 insertions(+)


diff --git a/lib/ext2fs/alloc.c b/lib/ext2fs/alloc.c
index aa084ac..7bc86f1 100644
--- a/lib/ext2fs/alloc.c
+++ b/lib/ext2fs/alloc.c
@@ -26,6 +26,16 @@
 #include "ext2_fs.h"
 #include "ext2fs.h"
 
+#define min(a, b) ((a) < (b) ? (a) : (b))
+
+#undef DEBUG
+
+#ifdef DEBUG
+# define dbg_printf(f, a...)  do {printf(f, ## a); fflush(stdout); } while (0)
+#else
+# define dbg_printf(f, a...)
+#endif
+
 /*
  * Clear the uninit block bitmap flag if necessary
  */
@@ -303,3 +313,97 @@ blk64_t ext2fs_find_inode_goal(ext2_filsys fs, ext2_ino_t ino)
 		group = group & ~((1 << (log_flex)) - 1);
 	return ext2fs_group_first_block2(fs, group);
 }
+
+/*
+ * Starting at _goal_, scan around the filesystem to find a run of free blocks
+ * that's at least _len_ blocks long.  If EXT2_NEWRANGE_EXACT_GOAL is given,
+ * then the range of blocks must start at _goal_.  If
+ * EXT2_NEWRANGE_EXACT_LENGTH is given, do not return a allocation shorter than
+ * _len_.
+ *
+ * The starting block is returned in _pblk_ and the length is returned via
+ * _plen_.
+ */
+errcode_t ext2fs_new_range(ext2_filsys fs, int flags, blk64_t goal,
+			   blk64_t len, ext2fs_block_bitmap map, blk64_t *pblk,
+			   blk64_t *plen)
+{
+	errcode_t retval;
+	blk64_t start, end, b;
+	int looped = 0;
+	blk64_t max_blocks = ext2fs_blocks_count(fs->super);
+
+	dbg_printf("%s: flags=0x%x goal=%llu len=%llu\n", __func__, flags,
+		   goal, len);
+	EXT2_CHECK_MAGIC(fs, EXT2_ET_MAGIC_EXT2FS_FILSYS);
+	if (len == 0 || (flags & ~EXT2_NEWRANGE_ALL_FLAGS))
+		return EXT2_ET_INVALID_ARGUMENT;
+	if (!map)
+		map = fs->block_map;
+	if (!map)
+		return EXT2_ET_NO_BLOCK_BITMAP;
+	if (!goal || goal >= ext2fs_blocks_count(fs->super))
+		goal = fs->super->s_first_data_block;
+
+	start = goal;
+	while (!looped || start <= goal) {
+		retval = ext2fs_find_first_zero_block_bitmap2(fs->block_map,
+						start, max_blocks - 1, &start);
+		if (retval == ENOENT) {
+			/*
+			 * If there are no free blocks beyond the starting
+			 * point, try scanning the whole filesystem, unless the
+			 * user told us only to allocate from _goal_, or if
+			 * we're already scanning the whole filesystem.
+			 */
+			if (flags & EXT2_NEWRANGE_FIXED_GOAL ||
+			    start == fs->super->s_first_data_block)
+				goto fail;
+			start = fs->super->s_first_data_block;
+			continue;
+		} else if (retval)
+			goto errout;
+
+		if (flags & EXT2_NEWRANGE_FIXED_GOAL && start != goal)
+			goto fail;
+
+		b = min(start + len - 1, max_blocks - 1);
+		retval =  ext2fs_find_first_set_block_bitmap2(fs->block_map,
+						start, b, &end);
+		if (retval == ENOENT)
+			end = b + 1;
+		else if (retval)
+			goto errout;
+
+		if (!(flags & EXT2_NEWRANGE_EXACT_LENGTH) || (end - start) >= len) {
+			*pblk = start;
+			*plen = end - start;
+			dbg_printf("%s: new_range goal=%llu--%llu "
+				   "blk=%llu--%llu %llu\n",
+				   __func__, goal, goal + len - 1,
+				   *pblk, *pblk + *plen - 1, *plen);
+
+			for (b = start; b < end;
+			     b += fs->super->s_blocks_per_group)
+				clear_block_uninit(fs,
+						ext2fs_group_of_blk2(fs, b));
+			return 0;
+		}
+
+try_again:
+		if (flags & EXT2_NEWRANGE_FIXED_GOAL)
+			goto fail;
+		start = end;
+		if (start >= max_blocks) {
+			if (looped)
+				goto fail;
+			looped = 1;
+			start = fs->super->s_first_data_block;
+		}
+	}
+
+fail:
+	retval = EXT2_ET_BLOCK_ALLOC_FAIL;
+errout:
+	return retval;
+}
diff --git a/lib/ext2fs/ext2fs.h b/lib/ext2fs/ext2fs.h
index edbb92b..a37c06b 100644
--- a/lib/ext2fs/ext2fs.h
+++ b/lib/ext2fs/ext2fs.h
@@ -688,6 +688,12 @@ extern void ext2fs_set_alloc_block_callback(ext2_filsys fs,
 							      blk64_t goal,
 							      blk64_t *ret));
 blk64_t ext2fs_find_inode_goal(ext2_filsys fs, ext2_ino_t ino);
+#define EXT2_NEWRANGE_FIXED_GOAL	(0x1)
+#define EXT2_NEWRANGE_EXACT_LENGTH	(0x2)
+#define EXT2_NEWRANGE_ALL_FLAGS		(0x3)
+errcode_t ext2fs_new_range(ext2_filsys fs, int flags, blk64_t goal,
+			   blk64_t len, ext2fs_block_bitmap map, blk64_t *pblk,
+			   blk64_t *plen);
 
 /* alloc_sb.c */
 extern int ext2fs_reserve_super_and_bgd(ext2_filsys fs,


  parent reply	other threads:[~2014-03-02  7:19 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-03-02  7:16 [PATCH 00/32] e2fsprogs patchbomb 2/14 Darrick J. Wong
2014-03-02  7:16 ` [PATCH 01/32] libext2fs: support modifying arbitrary extended attributes (v5) Darrick J. Wong
2014-03-02  7:16 ` [PATCH 02/32] debugfs: create commands to edit extended attributes Darrick J. Wong
2014-03-02  7:16 ` [PATCH 03/32] libext2fs: fix 64bit overflow in ext2fs_block_alloc_stats_range Darrick J. Wong
2014-03-02  7:17 ` [PATCH 04/32] misc: fix header complaints and resource leaks in e2fsprogs Darrick J. Wong
2014-03-02  7:17 ` [PATCH 05/32] libext2fs: fix memory leak when drastically shrinking extent tree depth Darrick J. Wong
2014-03-02  7:17 ` [PATCH 06/32] libext2fs: fix parents when modifying extents Darrick J. Wong
2014-03-02  7:17 ` [PATCH 07/32] e2fsck: fix inline_data flag errors in pass1 Darrick J. Wong
2014-03-02  7:17 ` [PATCH 08/32] e2fsck: print runs of duplicate blocks instead of all of them Darrick J. Wong
2014-03-02  7:17 ` [PATCH 09/32] e2fsck: verify checksums after checking everything else Darrick J. Wong
2014-03-02  7:17 ` [PATCH 10/32] dumpe2fs: add switch to disable checksum verification Darrick J. Wong
2014-03-02  7:17 ` [PATCH 11/32] mke2fs: set block_validity as a default mount option Darrick J. Wong
2014-03-02  7:17 ` [PATCH 12/32] libext2fs: support allocating uninit blocks in bmap2() Darrick J. Wong
2014-03-02  7:18 ` [PATCH 13/32] libext2fs: file IO routines should handle uninit blocks Darrick J. Wong
2014-03-02  7:18 ` [PATCH 14/32] resize2fs: convert fs to and from 64bit mode Darrick J. Wong
2014-03-02  7:18 ` [PATCH 15/32] resize2fs: when toggling 64bit, don't free in-use bg data clusters Darrick J. Wong
2014-03-02  7:18 ` [PATCH 16/32] resize2fs: adjust reserved_gdt_blocks when changing group descriptor size Darrick J. Wong
2014-03-02  7:18 ` [PATCH 17/32] libext2fs: have UNIX IO manager use pread/pwrite Darrick J. Wong
2014-03-02  7:18 ` [PATCH 18/32] ext2fs: add readahead method to improve scanning Darrick J. Wong
2014-03-02  7:18 ` [PATCH 19/32] libext2fs: allow clients to read-ahead metadata Darrick J. Wong
2014-03-02  7:18 ` [PATCH 20/32] e2fsck: read-ahead metadata during passes 1, 2, and 4 Darrick J. Wong
2014-03-02  7:18 ` [PATCH 21/32] libext2fs: when appending to a file, don't split an index block in equal halves Darrick J. Wong
2014-03-02  7:18 ` [PATCH 22/32] libext2fs: find inode goal when allocating blocks Darrick J. Wong
2014-03-02  7:19 ` Darrick J. Wong [this message]
2014-03-02  7:19 ` [PATCH 24/32] libext2fs: provide a function to set inode size Darrick J. Wong
2014-03-02  7:19 ` [PATCH 25/32] libext2fs: implement fallocate Darrick J. Wong
2014-03-02  7:19 ` [PATCH 27/32] fuse2fs: translate ACL structures Darrick J. Wong
2014-03-02  7:19 ` [PATCH 28/32] fuse2fs: handle 64-bit dates correctly Darrick J. Wong
2014-03-02  7:19 ` [PATCH 29/32] fuse2fs: implement fallocate Darrick J. Wong
2014-03-02  7:19 ` [PATCH 31/32] tests: enable using fuse2fs with metadata checksum test Darrick J. Wong
2014-03-02  7:20 ` [PATCH 32/32] tests: test date handling Darrick J. Wong

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=20140302071905.28217.98626.stgit@birch.djwong.org \
    --to=darrick.wong@oracle.com \
    --cc=linux-ext4@vger.kernel.org \
    --cc=tytso@mit.edu \
    /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;
as well as URLs for NNTP newsgroup(s).