Skip to contentSkip to conversation

Remove needless lock and list in vmap

PATCH In review MinChan Kim 2 participants 4 messages Jan 7, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 Remove needless lock and list in vmap

Anyone don't use vmap's dirty_list.
I am not sure this is thing Nick's future work on purpose. If it is a dummy, we can remove dirty list and related codes to handle list and locking.

Also, In free_vmap_block, we don't have to check empty free_list. That's becuase before calling free_vmap_block, vb_free always checks empty of vb->free_list.

Now except vb_free, Anywhere don't call free_vmap_block. so, we can remove that check and locking.

If it is nick's intention to work in future, please, ignore this patch.

---
 mm/vmalloc.c |   19 ++-----------------
 1 files changed, 2 insertions(+), 17 deletions(-)
mm/vmalloc.c +2 -17
index 1ddb77b..1f79883 100644
@@ -629,10 +629,7 @@ struct vmap_block {
 	DECLARE_BITMAP(alloc_map, VMAP_BBMAP_BITS);
 	DECLARE_BITMAP(dirty_map, VMAP_BBMAP_BITS);
 	union {
-		struct {
-			struct list_head free_list;
-			struct list_head dirty_list;
-		};
+		struct list_head free_list;
 		struct rcu_head rcu_head;
 	};
 };
@@ -699,7 +696,6 @@ static struct vmap_block *new_vmap_block(gfp_t gfp_mask)
 	bitmap_zero(vb->alloc_map, VMAP_BBMAP_BITS);
 	bitmap_zero(vb->dirty_map, VMAP_BBMAP_BITS);
 	INIT_LIST_HEAD(&vb->free_list);
-	INIT_LIST_HEAD(&vb->dirty_list);
 
 	vb_idx = addr_to_vb_idx(va->va_start);
 	spin_lock(&vmap_block_tree_lock);
@@ -730,13 +726,6 @@ static void free_vmap_block(struct vmap_block *vb)
 	struct vmap_block *tmp;
 	unsigned long vb_idx;
 
-	spin_lock(&vb->vbq->lock);
-	if (!list_empty(&vb->free_list))
-		list_del(&vb->free_list);
-	if (!list_empty(&vb->dirty_list))
-		list_del(&vb->dirty_list);
-	spin_unlock(&vb->vbq->lock);
-
 	vb_idx = addr_to_vb_idx(vb->va->va_start);
 	spin_lock(&vmap_block_tree_lock);
 	tmp = radix_tree_delete(&vmap_block_tree, vb_idx);
@@ -820,11 +809,7 @@ static void vb_free(const void *addr, unsigned long size)
 
 	spin_lock(&vb->lock);
 	bitmap_allocate_region(vb->dirty_map, offset >> PAGE_SHIFT, order);
-	if (!vb->dirty) {
-		spin_lock(&vb->vbq->lock);
-		list_add(&vb->dirty_list, &vb->vbq->dirty);
-		spin_unlock(&vb->vbq->lock);
-	}
+
 	vb->dirty += 1UL << order;
 	if (vb->dirty == VMAP_BBMAP_BITS) {
 		BUG_ON(vb->free || !list_empty(&vb->free_list));
Signature · 7 lines
1.5.4.3

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to [email protected].  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
#1 lore raw
Quoted 5 lines · MinChan Kim

Anyone don't use vmap's dirty_list.
I am not sure this is thing Nick's future work on purpose. If it is a dummy, we can remove dirty list and related codes to handle list and locking.

Quoted 8 lines

Also, In free_vmap_block, we don't have to check empty free_list. That's becuase before calling free_vmap_block, vb_free always checks empty of vb->free_list.

Now except vb_free, Anywhere don't call free_vmap_block. so, we can remove that check and locking.

If it is nick's intention to work in future, please, ignore this patch.

It was going to be an attempt to optimise flushing a bit, but I never finished writing the code. Either way, it doesn't belong upstream until time as it is needed, so your patch is good.

Can you just put a BUG_ON(!list_empty(&vb->free_list)); in free_vmap_block? Then add Acked-by: Nick Piggin <[email protected]>

Thanks,
Nick

Quoted 59 lines
---
 mm/vmalloc.c |   19 ++-----------------
 1 files changed, 2 insertions(+), 17 deletions(-)
mm/vmalloc.c +2 -17
index 1ddb77b..1f79883 100644
@@ -629,10 +629,7 @@ struct vmap_block {
 	DECLARE_BITMAP(alloc_map, VMAP_BBMAP_BITS);
 	DECLARE_BITMAP(dirty_map, VMAP_BBMAP_BITS);
 	union {
-		struct {
-			struct list_head free_list;
-			struct list_head dirty_list;
-		};
+		struct list_head free_list;
 		struct rcu_head rcu_head;
 	};
 };
@@ -699,7 +696,6 @@ static struct vmap_block *new_vmap_block(gfp_t gfp_mask)
 	bitmap_zero(vb->alloc_map, VMAP_BBMAP_BITS);
 	bitmap_zero(vb->dirty_map, VMAP_BBMAP_BITS);
 	INIT_LIST_HEAD(&vb->free_list);
-	INIT_LIST_HEAD(&vb->dirty_list);
 
 	vb_idx = addr_to_vb_idx(va->va_start);
 	spin_lock(&vmap_block_tree_lock);
@@ -730,13 +726,6 @@ static void free_vmap_block(struct vmap_block *vb)
 	struct vmap_block *tmp;
 	unsigned long vb_idx;
 
-	spin_lock(&vb->vbq->lock);
-	if (!list_empty(&vb->free_list))
-		list_del(&vb->free_list);
-	if (!list_empty(&vb->dirty_list))
-		list_del(&vb->dirty_list);
-	spin_unlock(&vb->vbq->lock);
-
 	vb_idx = addr_to_vb_idx(vb->va->va_start);
 	spin_lock(&vmap_block_tree_lock);
 	tmp = radix_tree_delete(&vmap_block_tree, vb_idx);
@@ -820,11 +809,7 @@ static void vb_free(const void *addr, unsigned long size)
 
 	spin_lock(&vb->lock);
 	bitmap_allocate_region(vb->dirty_map, offset >> PAGE_SHIFT, order);
-	if (!vb->dirty) {
-		spin_lock(&vb->vbq->lock);
-		list_add(&vb->dirty_list, &vb->vbq->dirty);
-		spin_unlock(&vb->vbq->lock);
-	}
+
 	vb->dirty += 1UL << order;
 	if (vb->dirty == VMAP_BBMAP_BITS) {
 		BUG_ON(vb->free || !list_empty(&vb->free_list));
Signature · 1 line
1.5.4.3

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>

author Acked-by Nick Piggin
#2 lore raw
Quoted 10 lines · * Nick Piggin ([email protected]) wrote:
Quoted 9 lines · MinChan Kim

Anyone don't use vmap's dirty_list.
I am not sure this is thing Nick's future work on purpose. If it is a dummy, we can remove dirty list and related codes to handle list and locking.

Also, In free_vmap_block, we don't have to check empty free_list. That's becuase before calling free_vmap_block, vb_free always checks empty of vb->free_list.

Quoted 8 lines
Quoted 4 lines

Now except vb_free, Anywhere don't call free_vmap_block. so, we can remove that check and locking.

If it is nick's intention to work in future, please, ignore this patch.

It was going to be an attempt to optimise flushing a bit, but I never finished writing the code. Either way, it doesn't belong upstream until time as it is needed, so your patch is good.

Thanks for your kind words.

Quoted 2 lines

Can you just put a BUG_ON(!list_empty(&vb->free_list)); in free_vmap_block? Then add Acked-by: Nick Piggin <[email protected]>

I added BUG_ON.

Quoted 3 lines

Thanks,
Nick

This is improvement patch.

===

Subject: [PATCH] Remove needless lock and list in vmap

Now, Anyone don't use vmap's dirty_list.
It's for optimizing flushing. but Nick didn't write the code yet. so, we don't need it until time as it is needed.

This patch removes vmap_block's dirty_list and codes related to it.

---
 mm/vmalloc.c |   19 +++----------------
 1 files changed, 3 insertions(+), 16 deletions(-)
mm/vmalloc.c +3 -16
index 1ddb77b..a7e1c2e 100644
@@ -629,10 +629,7 @@ struct vmap_block {
 	DECLARE_BITMAP(alloc_map, VMAP_BBMAP_BITS);
 	DECLARE_BITMAP(dirty_map, VMAP_BBMAP_BITS);
 	union {
-		struct {
-			struct list_head free_list;
-			struct list_head dirty_list;
-		};
+		struct list_head free_list;
 		struct rcu_head rcu_head;
 	};
 };
@@ -699,7 +696,6 @@ static struct vmap_block *new_vmap_block(gfp_t gfp_mask)
 	bitmap_zero(vb->alloc_map, VMAP_BBMAP_BITS);
 	bitmap_zero(vb->dirty_map, VMAP_BBMAP_BITS);
 	INIT_LIST_HEAD(&vb->free_list);
-	INIT_LIST_HEAD(&vb->dirty_list);
 
 	vb_idx = addr_to_vb_idx(va->va_start);
 	spin_lock(&vmap_block_tree_lock);
@@ -730,12 +726,7 @@ static void free_vmap_block(struct vmap_block *vb)
 	struct vmap_block *tmp;
 	unsigned long vb_idx;
 
-	spin_lock(&vb->vbq->lock);
-	if (!list_empty(&vb->free_list))
-		list_del(&vb->free_list);
-	if (!list_empty(&vb->dirty_list))
-		list_del(&vb->dirty_list);
-	spin_unlock(&vb->vbq->lock);
+	BUG_ON(!list_empty(&vb->free_list));
 
 	vb_idx = addr_to_vb_idx(vb->va->va_start);
 	spin_lock(&vmap_block_tree_lock);
@@ -820,11 +811,7 @@ static void vb_free(const void *addr, unsigned long size)
 
 	spin_lock(&vb->lock);
 	bitmap_allocate_region(vb->dirty_map, offset >> PAGE_SHIFT, order);
-	if (!vb->dirty) {
-		spin_lock(&vb->vbq->lock);
-		list_add(&vb->dirty_list, &vb->vbq->dirty);
-		spin_unlock(&vb->vbq->lock);
-	}
+
 	vb->dirty += 1UL << order;
 	if (vb->dirty == VMAP_BBMAP_BITS) {
 		BUG_ON(vb->free || !list_empty(&vb->free_list));
Signature · 7 lines
1.5.4.3

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to [email protected].  For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>
#3 lore raw
In reply to MinChan Kim
Quoted 5 lines · MinChan Kim

Anyone don't use vmap's dirty_list.
I am not sure this is thing Nick's future work on purpose. If it is a dummy, we can remove dirty list and related codes to handle list and locking.

Quoted 8 lines

Also, In free_vmap_block, we don't have to check empty free_list. That's becuase before calling free_vmap_block, vb_free always checks empty of vb->free_list.

Now except vb_free, Anywhere don't call free_vmap_block. so, we can remove that check and locking.

If it is nick's intention to work in future, please, ignore this patch.

I should add, it isn't really required for -stable.

Quoted 59 lines
---
 mm/vmalloc.c |   19 ++-----------------
 1 files changed, 2 insertions(+), 17 deletions(-)
mm/vmalloc.c +2 -17
index 1ddb77b..1f79883 100644
@@ -629,10 +629,7 @@ struct vmap_block {
 	DECLARE_BITMAP(alloc_map, VMAP_BBMAP_BITS);
 	DECLARE_BITMAP(dirty_map, VMAP_BBMAP_BITS);
 	union {
-		struct {
-			struct list_head free_list;
-			struct list_head dirty_list;
-		};
+		struct list_head free_list;
 		struct rcu_head rcu_head;
 	};
 };
@@ -699,7 +696,6 @@ static struct vmap_block *new_vmap_block(gfp_t gfp_mask)
 	bitmap_zero(vb->alloc_map, VMAP_BBMAP_BITS);
 	bitmap_zero(vb->dirty_map, VMAP_BBMAP_BITS);
 	INIT_LIST_HEAD(&vb->free_list);
-	INIT_LIST_HEAD(&vb->dirty_list);
 
 	vb_idx = addr_to_vb_idx(va->va_start);
 	spin_lock(&vmap_block_tree_lock);
@@ -730,13 +726,6 @@ static void free_vmap_block(struct vmap_block *vb)
 	struct vmap_block *tmp;
 	unsigned long vb_idx;
 
-	spin_lock(&vb->vbq->lock);
-	if (!list_empty(&vb->free_list))
-		list_del(&vb->free_list);
-	if (!list_empty(&vb->dirty_list))
-		list_del(&vb->dirty_list);
-	spin_unlock(&vb->vbq->lock);
-
 	vb_idx = addr_to_vb_idx(vb->va->va_start);
 	spin_lock(&vmap_block_tree_lock);
 	tmp = radix_tree_delete(&vmap_block_tree, vb_idx);
@@ -820,11 +809,7 @@ static void vb_free(const void *addr, unsigned long size)
 
 	spin_lock(&vb->lock);
 	bitmap_allocate_region(vb->dirty_map, offset >> PAGE_SHIFT, order);
-	if (!vb->dirty) {
-		spin_lock(&vb->vbq->lock);
-		list_add(&vb->dirty_list, &vb->vbq->dirty);
-		spin_unlock(&vb->vbq->lock);
-	}
+
 	vb->dirty += 1UL << order;
 	if (vb->dirty == VMAP_BBMAP_BITS) {
 		BUG_ON(vb->free || !list_empty(&vb->free_list));
Signature · 1 line
1.5.4.3

--
To unsubscribe, send a message with 'unsubscribe linux-mm' in the body to [email protected]. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Don't email: <a href=mailto:"[email protected]"> [email protected] </a>