Skip to contentSkip to conversation

fix cluster leakage in ocfs2_defrag_extent

PATCH In review Larry Chen 2 participants 4 messages Sep 4, 2018 OCFS2

lore
Share & tools
lore

Larry Chen

author
#0 lore raw

cover fix cluster leakage in ocfs2_defrag_extent

ocfs2_defrag_extent might leak clusters allocated.
When file system has no enough space, the number of claimed clusters might less than the caller wants. If that happens, the original code might directly commit trans without returning clusters.

This patch refered a lot to ocfs2_add_clusters_in_btree.

Larry Chen (2):
add declaration of ocfs2_free_local_alloc_bits
fix clusters leak in ocfs2_defrag_extent

 fs/ocfs2/alloc.h        |  6 ++++++
 fs/ocfs2/move_extents.c | 16 ++++++++++++++++
 2 files changed, 22 insertions(+)
Signature · 1 line
2.13.7
author
#1 lore raw

PATCH 1/2 add declaration of ocfs2_free_local_alloc_bits

---
 fs/ocfs2/alloc.h | 6 ++++++
 1 file changed, 6 insertions(+)
fs/ocfs2/alloc.h +6 -0
index 250bcacdf9e9..5770503b0e36 100644
@@ -323,4 +323,10 @@ int ocfs2_find_cpos_for_left_leaf(struct super_block *sb,
 int ocfs2_find_subtree_root(struct ocfs2_extent_tree *et,
 			    struct ocfs2_path *left,
 			    struct ocfs2_path *right);
+
+int ocfs2_free_local_alloc_bits(struct ocfs2_super *osb,
+				handle_t *handle,
+				struct ocfs2_alloc_context *ac,
+				u32 bit_off,
+				u32 num_bits);
 #endif /* OCFS2_ALLOC_H */
Signature · 1 line
2.13.7
#2 lore raw

Re: [PATCH 1/2] add declaration of ocfs2_free_local_alloc_bits

Quoted 10 lines · On Tue, 4 Sep 2018 12:16:20 +0800 Larry Chen <[email protected]> wrote:
---
 fs/ocfs2/alloc.h | 6 ++++++
 1 file changed, 6 insertions(+)
fs/ocfs2/alloc.h +0 -0
index 250bcacdf9e9..5770503b0e36 100644

fs/ocfs2/alloc.h int ocfs2_find_cpos_for_left_leaf(struct super_block *sb, · line 332

Quoted 10 lines
fs/ocfs2/alloc.h +6 -0
@@ -323,4 +323,10 @@ int ocfs2_find_cpos_for_left_leaf(struct super_block *sb,
 int ocfs2_find_subtree_root(struct ocfs2_extent_tree *et,
 			    struct ocfs2_path *left,
 			    struct ocfs2_path *right);
+
+int ocfs2_free_local_alloc_bits(struct ocfs2_super *osb,
+				handle_t *handle,
+				struct ocfs2_alloc_context *ac,
+				u32 bit_off,
+				u32 num_bits);
 #endif /* OCFS2_ALLOC_H */

It's already declared in fs/ocfs2/localalloc.h - why not include that?

I did this with the other patch and all seems well:

From: Andrew Morton <[email protected]>
Subject: fix-clusters-leak-in-ocfs2_defrag_extent-fix

include localalloc.h, reduce scope of data_ac

---

 fs/ocfs2/move_extents.c |    5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)
fs/ocfs2/move_extents.c renamed from fs/ocfs2/move_extents.c~fix-clusters-leak-in-ocfs2_defrag_extent-fix +3 -2
@@ -25,6 +25,7 @@
 #include "ocfs2_ioctl.h"
 
 #include "alloc.h"
+#include "localalloc.h"
 #include "aops.h"
 #include "dlmglue.h"
 #include "extent_map.h"
@@ -227,7 +228,6 @@ static int ocfs2_defrag_extent(struct oc
 	u32 new_phys_cpos, new_len;
 	u64 phys_blkno = ocfs2_clusters_to_blocks(inode->i_sb, phys_cpos);
 	int need_free = 0;
-	struct ocfs2_alloc_context *data_ac;
 
 	if ((ext_flags & OCFS2_EXT_REFCOUNTED) && *len) {
 		BUG_ON(!ocfs2_is_refcount_inode(inode));
@@ -345,7 +345,8 @@ static int ocfs2_defrag_extent(struct oc
 
 out_commit:
 	if (need_free && context->data_ac) {
-		data_ac = context->data_ac;
+		struct ocfs2_alloc_context *data_ac = context->data_ac;
+
 		if (context->data_ac->ac_which == OCFS2_AC_USE_LOCAL)
 			ocfs2_free_local_alloc_bits(osb, handle, data_ac,
 					new_phys_cpos, new_len);

_

author
#3 lore raw

PATCH 2/2 fix clusters leak in ocfs2_defrag_extent

In reply to Larry Chen
---
 fs/ocfs2/move_extents.c | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
fs/ocfs2/move_extents.c +16 -0
index d85dc8a02bd6..4f2ad054b419 100644
@@ -226,6 +226,8 @@ static int ocfs2_defrag_extent(struct ocfs2_move_extents_context *context,
 	struct ocfs2_refcount_tree *ref_tree = NULL;
 	u32 new_phys_cpos, new_len;
 	u64 phys_blkno = ocfs2_clusters_to_blocks(inode->i_sb, phys_cpos);
+	int need_free = 0;
+	struct ocfs2_alloc_context *data_ac;
 
 	if ((ext_flags & OCFS2_EXT_REFCOUNTED) && *len) {
 		BUG_ON(!ocfs2_is_refcount_inode(inode));
@@ -317,6 +319,7 @@ static int ocfs2_defrag_extent(struct ocfs2_move_extents_context *context,
 		if (!partial) {
 			context->range->me_flags &= ~OCFS2_MOVE_EXT_FL_COMPLETE;
 			ret = -ENOSPC;
+			need_free = 1;
 			goto out_commit;
 		}
 	}
@@ -341,6 +344,19 @@ static int ocfs2_defrag_extent(struct ocfs2_move_extents_context *context,
 		mlog_errno(ret);
 
 out_commit:
+	if (need_free && context->data_ac) {
+		data_ac = context->data_ac;
+		if (context->data_ac->ac_which == OCFS2_AC_USE_LOCAL)
+			ocfs2_free_local_alloc_bits(osb, handle, data_ac,
+					new_phys_cpos, new_len);
+		else
+			ocfs2_free_clusters(handle,
+					data_ac->ac_inode,
+					data_ac->ac_bh,
+					ocfs2_clusters_to_blocks(osb->sb, new_phys_cpos),
+					new_len);
+	}
+
 	ocfs2_commit_trans(osb, handle);
 
 out_unlock_mutex:
Signature · 1 line
2.13.7