On 08/17/2014 11:52 PM, Ivan Shapovalov wrote:
It works in an iterative way, grabbing some fixed amount of space and allocating
blocks until grabbed space is exhausted or partition's end is reached.
Blocks are scheduled for discard by allocating them and immediately adding them
to the atom's delete set, which is read and processed at atom commit time.
After reaching the allocation stop condition, the atom is force-committed and,
if the allocation has been stopped due to grabbed space exhaustion (not due to
reaching end of partition), another iteration happens.
Signed-off-by: Ivan Shapovalov <intelfx100@xxxxxxxxx>
---
fs/reiser4/plugin/file_ops.c | 41 +++++++++++++-
fs/reiser4/super_ops.c | 127 +++++++++++++++++++++++++++++++++++++++++++
2 files changed, 165 insertions(+), 3 deletions(-)
diff --git a/fs/reiser4/plugin/file_ops.c b/fs/reiser4/plugin/file_ops.c
index 65e2b02..7686406 100644
--- a/fs/reiser4/plugin/file_ops.c
+++ b/fs/reiser4/plugin/file_ops.c
@@ -8,6 +8,9 @@
#include "../inode.h"
#include "object.h"
+#include <linux/fs.h>
+#include <linux/blkdev.h>
+
/* file operations */
/* implementation of vfs's llseek method of struct file_operations for
@@ -20,6 +23,9 @@ loff_t reiser4_llseek_dir_common(struct file *, loff_t, int origin);
*/
int reiser4_iterate_common(struct file *, struct dir_context *);
+/* this function is implemented in super_ops.c */
+int reiser4_trim_fs(struct super_block *super, struct fstrim_range* range);
+
/**
* reiser4_release_dir_common - release of struct file_operations
* @inode: inode of released file
@@ -121,9 +127,38 @@ long reiser4_ioctl_dir_common(struct file *file, unsigned int cmd, unsigned long
return PTR_ERR(ctx);
switch (cmd) {
- case FITRIM:
- warning("intelfx-62", "FITRIM ioctl not implemented");
- /* fall-through to -ENOSYS */
+ case FITRIM: {
+ struct request_queue *q = bdev_get_queue(super->s_bdev);
+ struct fstrim_range range;
+
+ if (!capable(CAP_SYS_ADMIN)) {
+ ret = RETERR(-EPERM);
+ break;
+ }
+
+ if (!blk_queue_discard(q)) {
+ ret = RETERR(-EOPNOTSUPP);
+ break;
+ }
+
+ if (copy_from_user(&range, (struct fstrim_range __user *)arg,
+ sizeof(range))) {
+ ret = RETERR(-EFAULT);
+ break;
+ }
+
+ range.minlen = max((unsigned int)range.minlen,
+ q->limits.discard_granularity);
+
+ ret = reiser4_trim_fs(super, &range);
+
+ if (copy_to_user((struct fstrim_range __user *)arg, &range,
+ sizeof(range))) {
+ ret = RETERR(-EFAULT);
+ }
+
+ break;
+ }
default:
ret = RETERR(-ENOSYS);
diff --git a/fs/reiser4/super_ops.c b/fs/reiser4/super_ops.c
index bcd7fd6..d232f30 100644
--- a/fs/reiser4/super_ops.c
+++ b/fs/reiser4/super_ops.c
@@ -471,6 +471,133 @@ static int reiser4_show_options(struct seq_file *m, struct dentry *dentry)
return 0;
}
+/**
+ * reiser4_trim_fs - discards all free space in a filesystem
+ * @super: the superblock of filesystem to discard
+ * @range: parameters for discarding
+ *
+ * Called from @reiser4_ioctl_dir_common().
+ */
+int reiser4_trim_fs(struct super_block *super, struct fstrim_range* range)
+{
+ reiser4_blocknr_hint hint;
+ reiser4_block_nr start, end, len, minlen, discarded_count = 0;
+ reiser4_context *ctx;
+ txn_atom *atom;
+ int ret, finished = 0;
+
+ reiser4_blocknr_hint_init(&hint);
+ ctx = get_current_context();
+
+ /*
+ * Configure the hint for block allocator.
+ * We will allocate in forward direction only.
+ */
+ hint.blk = range->start >> super->s_blocksize_bits;
+ hint.max_dist = range->len >> super->s_blocksize_bits;
+ hint.block_stage = BLOCK_GRABBED;
+ hint.forward = 1;
+
+ end = hint.blk + hint.max_dist;
+ minlen = range->minlen >> super->s_blocksize_bits;
+
+ /*
+ * We will perform the process in iterations in order not to starve
+ * the rest of the system of disk space.
+ * Each iteration we will grab some space (using the BA_SOME_SPACE
+ * flag, which currently grabs 25% of free disk space), create an empty
+ * atom and sequentially allocate extents of disk space while we can
+ * afford it (i. e. while we haven't reached the end of partition AND
+ * while we haven't exhausted the grabbed space).
+ */
+ do {
+ /*
+ * Grab some sane amount of space.
+ * We will allocate blocks until end of the partition or until
+ * the grabbed space is exhausted.
+ */
+ ret = reiser4_grab_reserved(super, 0, BA_CAN_COMMIT | BA_SOME_SPACE);
reiser4_grab_reserved() grabs space from the reserved area (5%).
This is needed to make sure that unlink(), truncate(), etc. won't
fail, if there is no free space on disk. I don't think that FITRIM
ioctl needs this reserved area.
If BA_SOME_SPACE is set, then you lock a superblock, and grab 25% of
the current free space. It means that your grab will always succeed,
so that BA_CAN_COMMIT flag is also not needed.
+ if (ret != 0)
+ goto out;
+ if (ctx->grabbed_blocks == 0)
+ goto out;
+
+ /*
+ * We will not capture anything, so we need an empty atom.
+ */
+ ret = reiser4_create_atom();
+ if (ret != 0)
+ goto out;
+
+ while (ctx->grabbed_blocks != 0) {
+ /*
+ * Allocate no more than is grabbed.
+ * FIXME: use minlen.
+ */
+ len = ctx->grabbed_blocks;
+ ret = reiser4_alloc_blocks(&hint, &start, &len, 0 /* flags */);
+ if (ret == -ENOSPC)
+ break;
+ if (ret != 0)
+ goto out;
+
+ /*
+ * Update the hint in order for the next scan to start
+ * right after the newly allocated extent.
+ */
+ hint.blk = start + len;
+ hint.max_dist = end - hint.blk;
+
+ /*
+ * Mark the newly allocated extent for deallocation.
+ * Discard happens on deallocation.
+ */
+ ret = reiser4_dealloc_blocks(&start, &len, BLOCK_NOT_COUNTED, BA_DEFER);
+ if (ret != 0)
+ goto out;
+
+ /*
+ * FIXME: get the actual discarded block count,
+ * accounting for speculative discard of extent heads and tails.
+ *
+ * PRIORITY: LOW because we have already allocated all
+ * possible space, so allocations of heads/tails will
+ * fail unless there is a concurrent process reclaiming
+ * space.
+ */
+ discarded_count += len;
+ }
+
+ assert("intelfx-64", (ret == 0) || (ret == -ENOSPC));
+
+ if (ret == -ENOSPC) {
+ ret = 0;
+ finished = 1;
+ }
+
+ /*
+ * Extents marked for deallocation are discarded here, as part
+ * of committing current atom.
+ */
+ atom = get_current_atom_locked();
+ spin_lock_txnh(ctx->trans);
+ force_commit_atom(ctx->trans);
+ all_grabbed2free();
+ grab_space_enable();
+ } while (!finished);
+
+out:
+ reiser4_release_reserved(super);
+ reiser4_blocknr_hint_done(&hint);
+
+ /*
+ * Update the statistics.
+ */
+ range->len = discarded_count << super->s_blocksize_bits;
+
+ return ret;
+}
+
struct super_operations reiser4_super_operations = {
.alloc_inode = reiser4_alloc_inode,
.destroy_inode = reiser4_destroy_inode,
--
To unsubscribe from this list: send the line "unsubscribe reiserfs-devel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
