Re: [PATCH] JBD slab cleanups

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

From: Mingming Cao

Date: Monday, September 17, 2007 - 3:57 pm

On Mon, 2007-09-17 at 15:01 -0700, Badari Pulavarty wrote:
quoted text> On Mon, 2007-09-17 at 12:29 -0700, Mingming Cao wrote:
> > On Fri, 2007-09-14 at 11:53 -0700, Mingming Cao wrote:
> > > jbd/jbd2: Replace slab allocations with page cache allocations
> > > 
> > > From: Christoph Lameter <clameter@sgi.com>
> > > 
> > > JBD should not pass slab pages down to the block layer.
> > > Use page allocator pages instead. This will also prepare
> > > JBD for the large blocksize patchset.
> > > 
> > 
> > Currently memory allocation for committed_data(and frozen_buffer) for
> > bufferhead is done through jbd slab management, as Christoph Hellwig
> > pointed out that this is broken as jbd should not pass slab pages down
> > to IO layer. and suggested to use get_free_pages() directly.
> > 
> > The problem with this patch, as Andreas Dilger pointed today in ext4
> > interlock call, for 1k,2k block size ext2/3/4, get_free_pages() waste
> > 1/3-1/2 page space. 
> > 
> > What was the originally intention to set up slabs for committed_data(and
> > frozen_buffer) in JBD? Why not using kmalloc?
> > 
> > Mingming
> 
> Looks good. Small suggestion is to get rid of all kmalloc() usages and
> consistently use jbd_kmalloc() or jbd2_kmalloc().
> 
> Thanks,
> Badari
> 

Here is the incremental small cleanup patch. 

Remove kamlloc usages in jbd/jbd2 and consistently use jbd_kmalloc/jbd2_malloc.


Signed-off-by: Mingming Cao <cmm@us.ibm.com>
---
 fs/jbd/journal.c  |    8 +++++---
 fs/jbd/revoke.c   |   12 ++++++------
 fs/jbd2/journal.c |    8 +++++---
 fs/jbd2/revoke.c  |   12 ++++++------
 4 files changed, 22 insertions(+), 18 deletions(-)

Index: linux-2.6.23-rc6/fs/jbd/journal.c
===================================================================
--- linux-2.6.23-rc6.orig/fs/jbd/journal.c	2007-09-17 14:32:16.000000000 -0700
+++ linux-2.6.23-rc6/fs/jbd/journal.c	2007-09-17 14:33:59.000000000 -0700
@@ -723,7 +723,8 @@ journal_t * journal_init_dev(struct bloc
 	journal->j_blocksize = blocksize;
 	n = journal->j_blocksize / sizeof(journal_block_tag_t);
 	journal->j_wbufsize = n;
-	journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL);
+	journal->j_wbuf = jbd_kmalloc(n * sizeof(struct buffer_head*),
+					GFP_KERNEL);
 	if (!journal->j_wbuf) {
 		printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n",
 			__FUNCTION__);
@@ -777,7 +778,8 @@ journal_t * journal_init_inode (struct i
 	/* journal descriptor can store up to n blocks -bzzz */
 	n = journal->j_blocksize / sizeof(journal_block_tag_t);
 	journal->j_wbufsize = n;
-	journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL);
+	journal->j_wbuf = jbd_kmalloc(n * sizeof(struct buffer_head*),
+					GFP_KERNEL);
 	if (!journal->j_wbuf) {
 		printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n",
 			__FUNCTION__);
@@ -1157,7 +1159,7 @@ void journal_destroy(journal_t *journal)
 		iput(journal->j_inode);
 	if (journal->j_revoke)
 		journal_destroy_revoke(journal);
-	kfree(journal->j_wbuf);
+	jbd_kfree(journal->j_wbuf);
 	jbd_kfree(journal);
 }
 
Index: linux-2.6.23-rc6/fs/jbd/revoke.c
===================================================================
--- linux-2.6.23-rc6.orig/fs/jbd/revoke.c	2007-09-17 14:32:22.000000000 -0700
+++ linux-2.6.23-rc6/fs/jbd/revoke.c	2007-09-17 14:35:13.000000000 -0700
@@ -219,7 +219,7 @@ int journal_init_revoke(journal_t *journ
 	journal->j_revoke->hash_shift = shift;
 
 	journal->j_revoke->hash_table =
-		kmalloc(hash_size * sizeof(struct list_head), GFP_KERNEL);
+		jbd_kmalloc(hash_size * sizeof(struct list_head), GFP_KERNEL);
 	if (!journal->j_revoke->hash_table) {
 		kmem_cache_free(revoke_table_cache, journal->j_revoke_table[0]);
 		journal->j_revoke = NULL;
@@ -231,7 +231,7 @@ int journal_init_revoke(journal_t *journ
 
 	journal->j_revoke_table[1] = kmem_cache_alloc(revoke_table_cache, GFP_KERNEL);
 	if (!journal->j_revoke_table[1]) {
-		kfree(journal->j_revoke_table[0]->hash_table);
+		jbd_kfree(journal->j_revoke_table[0]->hash_table);
 		kmem_cache_free(revoke_table_cache, journal->j_revoke_table[0]);
 		return -ENOMEM;
 	}
@@ -246,9 +246,9 @@ int journal_init_revoke(journal_t *journ
 	journal->j_revoke->hash_shift = shift;
 
 	journal->j_revoke->hash_table =
-		kmalloc(hash_size * sizeof(struct list_head), GFP_KERNEL);
+		jbd_kmalloc(hash_size * sizeof(struct list_head), GFP_KERNEL);
 	if (!journal->j_revoke->hash_table) {
-		kfree(journal->j_revoke_table[0]->hash_table);
+		jbd_kfree(journal->j_revoke_table[0]->hash_table);
 		kmem_cache_free(revoke_table_cache, journal->j_revoke_table[0]);
 		kmem_cache_free(revoke_table_cache, journal->j_revoke_table[1]);
 		journal->j_revoke = NULL;
@@ -280,7 +280,7 @@ void journal_destroy_revoke(journal_t *j
 		J_ASSERT (list_empty(hash_list));
 	}
 
-	kfree(table->hash_table);
+	jbd_kfree(table->hash_table);
 	kmem_cache_free(revoke_table_cache, table);
 	journal->j_revoke = NULL;
 
@@ -293,7 +293,7 @@ void journal_destroy_revoke(journal_t *j
 		J_ASSERT (list_empty(hash_list));
 	}
 
-	kfree(table->hash_table);
+	jbd_kfree(table->hash_table);
 	kmem_cache_free(revoke_table_cache, table);
 	journal->j_revoke = NULL;
 }
Index: linux-2.6.23-rc6/fs/jbd2/journal.c
===================================================================
--- linux-2.6.23-rc6.orig/fs/jbd2/journal.c	2007-09-17 14:32:39.000000000 -0700
+++ linux-2.6.23-rc6/fs/jbd2/journal.c	2007-09-17 14:53:15.000000000 -0700
@@ -724,7 +724,8 @@ journal_t * jbd2_journal_init_dev(struct
 	journal->j_blocksize = blocksize;
 	n = journal->j_blocksize / sizeof(journal_block_tag_t);
 	journal->j_wbufsize = n;
-	journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL);
+	journal->j_wbuf = jbd2_kmalloc(n * sizeof(struct buffer_head*),
+					GFP_KERNEL);
 	if (!journal->j_wbuf) {
 		printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n",
 			__FUNCTION__);
@@ -778,7 +779,8 @@ journal_t * jbd2_journal_init_inode (str
 	/* journal descriptor can store up to n blocks -bzzz */
 	n = journal->j_blocksize / sizeof(journal_block_tag_t);
 	journal->j_wbufsize = n;
-	journal->j_wbuf = kmalloc(n * sizeof(struct buffer_head*), GFP_KERNEL);
+	journal->j_wbuf = jbd2_kmalloc(n * sizeof(struct buffer_head*),
+					GFP_KERNEL);
 	if (!journal->j_wbuf) {
 		printk(KERN_ERR "%s: Cant allocate bhs for commit thread\n",
 			__FUNCTION__);
@@ -1158,7 +1160,7 @@ void jbd2_journal_destroy(journal_t *jou
 		iput(journal->j_inode);
 	if (journal->j_revoke)
 		jbd2_journal_destroy_revoke(journal);
-	kfree(journal->j_wbuf);
+	jbd2_kfree(journal->j_wbuf);
 	jbd2_kfree(journal);
 }
 
Index: linux-2.6.23-rc6/fs/jbd2/revoke.c
===================================================================
--- linux-2.6.23-rc6.orig/fs/jbd2/revoke.c	2007-09-17 14:32:34.000000000 -0700
+++ linux-2.6.23-rc6/fs/jbd2/revoke.c	2007-09-17 14:55:35.000000000 -0700
@@ -220,7 +220,7 @@ int jbd2_journal_init_revoke(journal_t *
 	journal->j_revoke->hash_shift = shift;
 
 	journal->j_revoke->hash_table =
-		kmalloc(hash_size * sizeof(struct list_head), GFP_KERNEL);
+		jbd2_kmalloc(hash_size * sizeof(struct list_head), GFP_KERNEL);
 	if (!journal->j_revoke->hash_table) {
 		kmem_cache_free(jbd2_revoke_table_cache, journal->j_revoke_table[0]);
 		journal->j_revoke = NULL;
@@ -232,7 +232,7 @@ int jbd2_journal_init_revoke(journal_t *
 
 	journal->j_revoke_table[1] = kmem_cache_alloc(jbd2_revoke_table_cache, GFP_KERNEL);
 	if (!journal->j_revoke_table[1]) {
-		kfree(journal->j_revoke_table[0]->hash_table);
+		jbd2_kfree(journal->j_revoke_table[0]->hash_table);
 		kmem_cache_free(jbd2_revoke_table_cache, journal->j_revoke_table[0]);
 		return -ENOMEM;
 	}
@@ -247,9 +247,9 @@ int jbd2_journal_init_revoke(journal_t *
 	journal->j_revoke->hash_shift = shift;
 
 	journal->j_revoke->hash_table =
-		kmalloc(hash_size * sizeof(struct list_head), GFP_KERNEL);
+		jbd2_kmalloc(hash_size * sizeof(struct list_head), GFP_KERNEL);
 	if (!journal->j_revoke->hash_table) {
-		kfree(journal->j_revoke_table[0]->hash_table);
+		jbd2_kfree(journal->j_revoke_table[0]->hash_table);
 		kmem_cache_free(jbd2_revoke_table_cache, journal->j_revoke_table[0]);
 		kmem_cache_free(jbd2_revoke_table_cache, journal->j_revoke_table[1]);
 		journal->j_revoke = NULL;
@@ -281,7 +281,7 @@ void jbd2_journal_destroy_revoke(journal
 		J_ASSERT (list_empty(hash_list));
 	}
 
-	kfree(table->hash_table);
+	jbd2_kfree(table->hash_table);
 	kmem_cache_free(jbd2_revoke_table_cache, table);
 	journal->j_revoke = NULL;
 
@@ -294,7 +294,7 @@ void jbd2_journal_destroy_revoke(journal
 		J_ASSERT (list_empty(hash_list));
 	}
 
-	kfree(table->hash_table);
+	jbd2_kfree(table->hash_table);
 	kmem_cache_free(jbd2_revoke_table_cache, table);
 	journal->j_revoke = NULL;
 }





-
unsubscribe noticeTo unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Previous message: [thread] [date] [author]
Next message: [thread] [date] [author]

Messages in current thread:

[31/36] Large Blocksize: Core piece, clameter, (Tue Aug 28, 12:06 pm)

Re: [31/36] Large Blocksize: Core piece, Mingming Cao, (Wed Aug 29, 5:11 pm)

Re: [31/36] Large Blocksize: Core piece, Christoph Lameter, (Wed Aug 29, 5:12 pm)

[RFC 1/4] Large Blocksize support for Ext2/3/4, Mingming Cao, (Wed Aug 29, 5:47 pm)

[RFC 2/4]ext2: fix rec_len overflow with 64KB block size, Mingming Cao, (Wed Aug 29, 5:47 pm)

[RFC 3/4] ext3: fix rec_len overflow with 64KB block size, Mingming Cao, (Wed Aug 29, 5:48 pm)

[RFC 4/4]ext4: fix rec_len overflow with 64KB block size, Mingming Cao, (Wed Aug 29, 5:48 pm)

Re: [RFC 1/4] Large Blocksize support for Ext2/3/4, Christoph Lameter, (Wed Aug 29, 5:59 pm)

Re: [RFC 1/4] Large Blocksize support for Ext2/3/4, Mingming Cao, (Fri Aug 31, 5:01 pm)

[RFC 1/2] JBD: slab management support for large block(>8k), Mingming Cao, (Fri Aug 31, 5:12 pm)

[RFC 2/2] JBD: blocks reservation fix for large block support, Mingming Cao, (Fri Aug 31, 5:12 pm)

Re: [RFC 1/2] JBD: slab management support for large block ..., Christoph Hellwig, (Sat Sep 1, 11:39 am)

Re: [RFC 1/2] JBD: slab management support for large block ..., Christoph Lameter, (Sun Sep 2, 4:40 am)

Re: [RFC 1/2] JBD: slab management support for large block ..., Christoph Hellwig, (Sun Sep 2, 8:28 am)

Re: [RFC 1/2] JBD: slab management support for large block ..., Christoph Lameter, (Mon Sep 3, 12:55 am)

Re: [RFC 1/2] JBD: slab management support for large block ..., Christoph Hellwig, (Mon Sep 3, 6:40 am)

Re: [RFC 1/2] JBD: slab management support for large block ..., Christoph Lameter, (Mon Sep 3, 12:31 pm)

Re: [RFC 1/2] JBD: slab management support for large block ..., Christoph Hellwig, (Mon Sep 3, 12:33 pm)

[PATCH] JBD slab cleanups, Mingming Cao, (Fri Sep 14, 11:53 am)

Re: [PATCH] JBD slab cleanups, Christoph Lameter, (Fri Sep 14, 11:58 am)

Re: [PATCH] JBD slab cleanups, Mingming Cao, (Mon Sep 17, 12:29 pm)

Re: [PATCH] JBD slab cleanups, Christoph Hellwig, (Mon Sep 17, 12:34 pm)

Re: [PATCH] JBD slab cleanups, Badari Pulavarty, (Mon Sep 17, 3:01 pm)

Re: [PATCH] JBD slab cleanups, Mingming Cao, (Mon Sep 17, 3:57 pm)

Re: [PATCH] JBD slab cleanups, Christoph Hellwig, (Tue Sep 18, 2:04 am)

Re: [PATCH] JBD slab cleanups, Mingming Cao, (Tue Sep 18, 9:35 am)

Re: [PATCH] JBD slab cleanups, Dave Kleikamp, (Tue Sep 18, 11:04 am)

Re: [PATCH] JBD slab cleanups, Mingming Cao, (Tue Sep 18, 6:00 pm)

Re: [PATCH] JBD slab cleanups, Andrew Morton, (Tue Sep 18, 7:19 pm)

Re: [PATCH] JBD slab cleanups, Mingming Cao, (Wed Sep 19, 12:15 pm)

[PATCH] JBD: use GFP_NOFS in kmalloc, Mingming Cao, (Wed Sep 19, 12:22 pm)

Re: [PATCH] JBD slab cleanups, Dave Kleikamp, (Wed Sep 19, 12:26 pm)

Re: [PATCH] JBD slab cleanups, Dave Kleikamp, (Wed Sep 19, 12:28 pm)

Re: [PATCH] JBD slab cleanups, Andreas Dilger, (Wed Sep 19, 12:48 pm)

Re: [PATCH] JBD slab cleanups, Mingming Cao, (Wed Sep 19, 1:47 pm)

Re: [PATCH] JBD: use GFP_NOFS in kmalloc, Andrew Morton, (Wed Sep 19, 2:34 pm)

Re: [PATCH] JBD: use GFP_NOFS in kmalloc, Mingming Cao, (Wed Sep 19, 2:55 pm)

Re: [PATCH] JBD slab cleanups, Mingming Cao, (Wed Sep 19, 3:03 pm)

Re: [PATCH] JBD: use GFP_NOFS in kmalloc, Andreas Dilger, (Wed Sep 19, 9:25 pm)

[PATCH] JBD/ext34 cleanups: convert to kzalloc, Mingming Cao, (Fri Sep 21, 4:13 pm)

[PATCH] JBD2/ext4 naming cleanup, Mingming Cao, (Fri Sep 21, 4:32 pm)

Re: [PATCH] JBD/ext34 cleanups: convert to kzalloc, Andrew Morton, (Wed Sep 26, 12:54 pm)

Re: [PATCH] JBD/ext34 cleanups: convert to kzalloc, Mingming Cao, (Wed Sep 26, 2:05 pm)

[PATCH 1/2] ext4: Support large blocksize up to PAGESIZE, Mingming Cao, (Mon Oct 1, 5:34 pm)

[PATCH 2/2] ext4: Avoid rec_len overflow with 64KB block size, Mingming Cao, (Mon Oct 1, 5:35 pm)

[PATCH 1/2] ext2: Support large blocksize up to PAGESIZE, Mingming Cao, (Mon Oct 1, 5:35 pm)

[PATCH 2/2] ext2: Avoid rec_len overflow with 64KB block size, Mingming Cao, (Mon Oct 1, 5:35 pm)

[PATCH 1/2] ext3: Support large blocksize up to PAGESIZE, Mingming Cao, (Mon Oct 1, 5:36 pm)

[PATCH 2/2] ext3: Avoid rec_len overflow with 64KB block size, Mingming Cao, (Mon Oct 1, 5:36 pm)

Re: [PATCH 2/2] ext2: Avoid rec_len overflow with 64KB blo ..., Andrew Morton, (Thu Oct 4, 1:12 pm)

Re: [PATCH 2/2] ext2: Avoid rec_len overflow with 64KB blo ..., Andreas Dilger, (Thu Oct 4, 3:40 pm)

Re: [PATCH 2/2] ext2: Avoid rec_len overflow with 64KB blo ..., Andrew Morton, (Thu Oct 4, 4:11 pm)

Re: [PATCH 2/2] ext2: Avoid rec_len overflow with 64KB blo ..., Jan Kara, (Mon Oct 8, 6:02 am)

Re: [PATCH 2/2] ext2: Avoid rec_len overflow with 64KB blo ..., Andrew Morton, (Thu Oct 11, 3:14 am)

Re: [PATCH 2/2] ext2: Avoid rec_len overflow with 64KB blo ..., Jan Kara, (Thu Oct 11, 3:30 am)

Re: [PATCH 2/2] ext2: Avoid rec_len overflow with 64KB blo ..., Jan Kara, (Thu Oct 11, 4:18 am)

Re: [PATCH 2/2] ext2: Avoid rec_len overflow with 64KB blo ..., Andrew Morton, (Wed Oct 17, 9:07 pm)

Re: [PATCH 2/2] ext2: Avoid rec_len overflow with 64KB blo ..., Andrew Morton, (Wed Oct 17, 9:09 pm)

Re: [PATCH 2/2] ext2: Avoid rec_len overflow with 64KB blo ..., Christoph Lameter, (Thu Oct 18, 2:03 am)

Re: [PATCH 2/2] ext2: Avoid rec_len overflow with 64KB blo ..., Andrew Morton, (Thu Oct 18, 2:11 am)

Re: [PATCH 2/2] ext2: Avoid rec_len overflow with 64KB blo ..., Mingming Cao, (Thu Oct 18, 7:05 pm)


linux-kernel:
Greg KH	Og dreams of kernels
Jens Axboe	[PATCH 31/33] Fusion: sg chaining support
Arnd Bergmann	Re: finding your own dead "CONFIG_" variables
Mark Brown	[PATCH 2/2] Subject: natsemi: Allow users to disable workaround for DspCfg reset
Tony Breeds	[LGUEST] Look in object dir for .config
git:
Brian Downing	Re: Git in a Nutshell guide
John Benes	Re: master has some toys
Matthias Lederhofer	[PATCH 4/7] introduce GIT_WORK_TREE to specify the work tree
Alexander Sulfrian	[RFC/PATCH] RE: git calls SSH_ASKPASS even if DISPLAY is not set
Junio C Hamano	Re: Rss produced by git is not valid xml?
git-commits-head:
Linux Kernel Mailing List	iSeries: fix section mismatch in iseries_veth
Linux Kernel Mailing List	ixbge: remove TX lock and redo TX accounting.
Linux Kernel Mailing List	ixgbe: fix several counter register errata
Linux Kernel Mailing List	b43: fix build with CONFIG_SSB_PCIHOST=n
Linux Kernel Mailing List	9p: block-based virtio client
linux-netdev:
Michael Breuer	Re: [PATCH] af_packet: Don't use skb after dev_queue_xmit()
Michael Breuer	Re: [PATCH] af_packet: Don't use skb after dev_queue_xmit()
David Daney	[PATCH 5/7] Staging: Octeon Ethernet: Convert to NAPI.
Wolfgang Grandegger	[PATCH net-next v4 1/3] can: mscan: fix improper return if dlc < 8 in start_xmi...
Amit Kumar Salecha	[PATCHv3 NEXT 2/2] NET: Add Qlogic ethernet driver for CNA devices
openbsd-misc:
Theo de Raadt	Re: Old IPSEC bug
Tomáš Bodžár	Problem with vpnc connection - check group password !
Insan Praja SW	Mandoc Compiling Error
Carl Roberso	Re: Cannot change MTU of carp interface?
Richard Daemon	Re: booting openbsd on eee without cd-rom