Skip to contentSkip to conversation

ReiserFS changesets for 2.4 (performs writes more than 4k at a time)

BK Hans Reiser 5 participants 13 messages Sep 10, 2002 – Sep 12, 2002

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

This patch should only go in if 2.4.20 is 3 weeks or more away,
otherwise it should wait for the next pre1.

It passes all of our testing, but it is the kind of code that is more likely than most to have elusive lurking bugs. It cannot be tested in 2.5 first because 2.5 is too broken at this particular moment. For the lkml readers let me say that it also should not go onto any distros without three weeks of testing.;-)

It substantially reduces CPU consumption for large writes. It does so by finally ridding the code of that 4k at a time write loop that performed a balancing operation and a block allocation for each 4k written. This might be the last substantial patch from Namesys before V4.:) Chris still has some patches that are substantive though which I hope he sends in very soon...

It also contains some trivial fixes in the second of the attachments from Oleg.

Adding back mistakenly forgotten "attrs" mount option, fix a problem with displacing_large_files allocator option and fix a bug in remounting code on remount from readwarite to readwrite mode that can cause livelock if there was delayed unlinks scheduled on the filesystem.

Marcelo, since you know how long it will be until 2.4.20, you should decide if it will go in.

Hans

Hello!

two mail bodies attached.
mail1 is reiserfs_file_write stuff.
mail2 si trivial stuff.

Bye,
Oleg

Hello!

These 3 changesets introduce reiserfs_file_write() function (split into two parts: multiple unformatted pointers insertion and reiserfs_file_write implementation itself.) and export three kernel functions that are needed for this implementation (generic_osync_inode, block_commit_write, remove_suid).
This code was tested and is believed to contain no critical bugs as of now.

You can pull it from bk://thebsh.namesys.com/bk/reiser3-linux-2.4

Please apply.

Diffstats:

 do_balan.c        |  105 +++++++++++++++++++++++++++---------------------------
 inode.c           |   47 ++++++++++++++++++++----
 tail_conversion.c |    5 +-
 3 files changed, 95 insertions(+), 62 deletions(-)
 fs/reiserfs/bitmap.c           |   20
 fs/reiserfs/file.c             | 1076 ++++++++++++++++++++++++++++++++++++++++-
 fs/reiserfs/inode.c            |    4
 fs/reiserfs/super.c            |    1
 include/linux/reiserfs_fs.h    |    1
 include/linux/reiserfs_fs_sb.h |    1
 6 files changed, 1099 insertions(+), 4 deletions(-)
 kernel/ksyms.c |    3 +++
 mm/filemap.c   |    2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

Plain text patches:

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.589 -> 1.590
# fs/reiserfs/do_balan.c 1.10 -> 1.11
# fs/reiserfs/inode.c 1.35 -> 1.36
# fs/reiserfs/tail_conversion.c 1.13 -> 1.14
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/09/09 [email protected] 1.590
# Added support for unformatted pointers insertion. Implement hole-creation using this new mechanism which is much faster. # --------------------------------------------
#

fs/reiserfs/do_balan.c +53 -52
diff -Nru a/fs/reiserfs/do_balan.c b/fs/reiserfs/do_balan.c
@@ -304,8 +304,6 @@
 		    int new_item_len;
 		    int version;
 
-		    RFALSE (!is_direct_le_ih (ih),
-			    "PAP-12075: only direct inserted item can be broken. %h", ih);
 		    ret_val = leaf_shift_left (tb, tb->lnum[0]-1, -1);
 
 		    /* Calculate item length to insert to S[0] */
@@ -328,7 +326,7 @@
 		    version = ih_version (ih);
 
 		    /* Calculate key component, item length and body to insert into S[0] */
-                    set_le_ih_k_offset( ih, le_ih_k_offset( ih ) + tb->lbytes );
+                    set_le_ih_k_offset( ih, le_ih_k_offset( ih ) + tb->lbytes * (is_indirect_le_ih(ih)?tb->tb_sb->s_blocksize/UNFM_P_SIZE:1) );
 
 		    put_ih_item_len( ih, new_item_len );
 		    if ( tb->lbytes >  zeros_num ) {
@@ -437,23 +435,28 @@
 				ih_item_len( B_N_PITEM_HEAD(tb->L[0],n+item_pos-ret_val)),
 				l_n,body, zeros_num > l_n ? l_n : zeros_num
 				);
-
-			    RFALSE( l_n && 
-				    is_indirect_le_ih(B_N_PITEM_HEAD
-						      (tb->L[0],
-						       n + item_pos - ret_val)),
-				    "PAP-12110: pasting more than 1 unformatted node pointer into indirect item");
-
 			    /* 0-th item in S0 can be only of DIRECT type when l_n != 0*/
 			    {
-			      int version;
-
-			      version = ih_version (B_N_PITEM_HEAD (tbS0, 0));
-			      set_le_key_k_offset (version, B_N_PKEY (tbS0, 0), 
-						   le_key_k_offset (version, B_N_PKEY (tbS0, 0)) + l_n);
-			      version = ih_version (B_N_PITEM_HEAD(tb->CFL[0],tb->lkey[0]));
-			      set_le_key_k_offset (version, B_N_PDELIM_KEY(tb->CFL[0],tb->lkey[0]),
-						   le_key_k_offset (version, B_N_PDELIM_KEY(tb->CFL[0],tb->lkey[0])) + l_n);
+				int version;
+				int temp_l = l_n;
+				
+				RFALSE (ih_item_len (B_N_PITEM_HEAD (tbS0, 0)),
+					"PAP-12106: item length must be 0");
+				RFALSE (comp_short_le_keys (B_N_PKEY (tbS0, 0),
+							    B_N_PKEY (tb->L[0],
+									    n + item_pos - ret_val)),
+					"PAP-12107: items must be of the same file");
+				if (is_indirect_le_ih(B_N_PITEM_HEAD (tb->L[0],
+								      n + item_pos - ret_val)))	{
+				    temp_l = (l_n / UNFM_P_SIZE) * tb->tb_sb->s_blocksize;
+				}
+				/* update key of first item in S0 */
+				version = ih_version (B_N_PITEM_HEAD (tbS0, 0));
+				set_le_key_k_offset (version, B_N_PKEY (tbS0, 0), 
+						     le_key_k_offset (version, B_N_PKEY (tbS0, 0)) + temp_l);
+				/* update left delimiting key */
+				set_le_key_k_offset (version, B_N_PDELIM_KEY(tb->CFL[0],tb->lkey[0]),
+						     le_key_k_offset (version, B_N_PDELIM_KEY(tb->CFL[0],tb->lkey[0])) + temp_l);
 			    }
 
 			    /* Calculate new body, position in item and insert_size[0] */
@@ -522,7 +525,7 @@
 			    );
 		    /* if appended item is indirect item, put unformatted node into un list */
 		    if (is_indirect_le_ih (pasted))
-			set_ih_free_space (pasted, ((struct unfm_nodeinfo*)body)->unfm_freespace);
+			set_ih_free_space (pasted, 0);
 		    tb->insert_size[0] = 0;
 		    zeros_num = 0;
 		}
@@ -550,15 +553,11 @@
 	    { /* new item or its part falls to R[0] */
 		if ( item_pos == n - tb->rnum[0] + 1 && tb->rbytes != -1 )
 		{ /* part of new item falls into R[0] */
-		    int old_key_comp, old_len, r_zeros_number;
+		    loff_t old_key_comp, old_len, r_zeros_number;
 		    const char * r_body;
 		    int version;
 		    loff_t offset;
 
-		    RFALSE( !is_direct_le_ih (ih),
-			    "PAP-12135: only direct item can be split. (%h)", 
-			    ih);
-
 		    leaf_shift_right(tb,tb->rnum[0]-1,-1);
 
 		    version = ih_version(ih);
@@ -567,7 +566,7 @@
 		    old_len = ih_item_len(ih);
 
 		    /* Calculate key component and item length to insert into R[0] */
-                    offset = le_ih_k_offset( ih ) + (old_len - tb->rbytes );
+                    offset = le_ih_k_offset( ih ) + (old_len - tb->rbytes )*(is_indirect_le_ih(ih)?tb->tb_sb->s_blocksize/UNFM_P_SIZE:1);
                     set_le_ih_k_offset( ih, offset );
 		    put_ih_item_len( ih, tb->rbytes);
 		    /* Insert part of the item into R[0] */
@@ -575,13 +574,13 @@
 		    bi.bi_bh = tb->R[0];
 		    bi.bi_parent = tb->FR[0];
 		    bi.bi_position = get_right_neighbor_position (tb, 0);
-		    if ( offset - old_key_comp > zeros_num ) {
+		    if ( (old_len - tb->rbytes) > zeros_num ) {
 			r_zeros_number = 0;
-			r_body = body + offset - old_key_comp - zeros_num;
+			r_body = body + (old_len - tb->rbytes) - zeros_num;
 		    }
 		    else {
 			r_body = body;
-			r_zeros_number = zeros_num - (offset - old_key_comp);
+			r_zeros_number = zeros_num - (old_len - tb->rbytes);
 			zeros_num -= r_zeros_number;
 		    }
 
@@ -692,12 +691,17 @@
 			
 			{
 			  int version;
+			  unsigned long temp_rem = n_rem;
 			  
 			  version = ih_version (B_N_PITEM_HEAD (tb->R[0],0));
+			  if (is_indirect_le_key(version,B_N_PKEY(tb->R[0],0))){
+			      temp_rem = (n_rem / UNFM_P_SIZE) * 
+			                 tb->tb_sb->s_blocksize;
+			  }
 			  set_le_key_k_offset (version, B_N_PKEY(tb->R[0],0), 
-					       le_key_k_offset (version, B_N_PKEY(tb->R[0],0)) + n_rem);
+					       le_key_k_offset (version, B_N_PKEY(tb->R[0],0)) + temp_rem);
 			  set_le_key_k_offset (version, B_N_PDELIM_KEY(tb->CFR[0],tb->rkey[0]), 
-					       le_key_k_offset (version, B_N_PDELIM_KEY(tb->CFR[0],tb->rkey[0])) + n_rem);
+					       le_key_k_offset (version, B_N_PDELIM_KEY(tb->CFR[0],tb->rkey[0])) + temp_rem);
 			}
 /*		  k_offset (B_N_PKEY(tb->R[0],0)) += n_rem;
 		  k_offset (B_N_PDELIM_KEY(tb->CFR[0],tb->rkey[0])) += n_rem;*/
@@ -721,13 +725,12 @@
 			leaf_paste_in_buffer(&bi, 0, n_shift, tb->insert_size[0] - n_rem, r_body, r_zeros_number);
 
 			if (is_indirect_le_ih (B_N_PITEM_HEAD(tb->R[0],0))) {
-
+#if 0
 			    RFALSE( n_rem,
 				    "PAP-12160: paste more than one unformatted node pointer");
-
-			    set_ih_free_space (B_N_PITEM_HEAD(tb->R[0],0), ((struct unfm_nodeinfo*)body)->unfm_freespace);
+#endif
+			    set_ih_free_space (B_N_PITEM_HEAD(tb->R[0],0), 0);
 			}
-
 			tb->insert_size[0] = n_rem;
 			if ( ! n_rem )
 			    pos_in_item ++;
@@ -766,7 +769,7 @@
 		    }
 
 		    if (is_indirect_le_ih (pasted))
-			set_ih_free_space (pasted, ((struct unfm_nodeinfo*)body)->unfm_freespace);
+			set_ih_free_space (pasted, 0);
 		    zeros_num = tb->insert_size[0] = 0;
 		}
 	    }
@@ -843,12 +846,6 @@
 		    const char * r_body;
 		    int version;
 
-		    RFALSE( !is_direct_le_ih(ih),
-			/* The items which can be inserted are:
-			   Stat_data item, direct item, indirect item and directory item which consist of only two entries "." and "..".
-			   These items must not be broken except for a direct one. */
-			    "PAP-12205: non-direct item can not be broken when inserting");
-
 		    /* Move snum[i]-1 items from S[0] to S_new[i] */
 		    leaf_move_items (LEAF_FROM_S_TO_SNEW, tb, snum[i] - 1, -1, S_new[i]);
 		    /* Remember key component and item length */
@@ -858,7 +855,7 @@
 
 		    /* Calculate key component and item length to insert into S_new[i] */
                     set_le_ih_k_offset( ih,
-                                le_ih_k_offset(ih) + (old_len - sbytes[i] ) );
+                                le_ih_k_offset(ih) + (old_len - sbytes[i] )*(is_indirect_le_ih(ih)?tb->tb_sb->s_blocksize/UNFM_P_SIZE:1) );
 
 		    put_ih_item_len( ih, sbytes[i] );
 
@@ -868,13 +865,13 @@
 		    bi.bi_parent = 0;
 		    bi.bi_position = 0;
 
-		    if ( le_ih_k_offset (ih) - old_key_comp > zeros_num ) {
+		    if ( (old_len - sbytes[i]) > zeros_num ) {
 			r_zeros_number = 0;
-			r_body = body + (le_ih_k_offset(ih) - old_key_comp) - zeros_num;
+			r_body = body + (old_len - sbytes[i]) - zeros_num;
 		    }
 		    else {
 			r_body = body;
-			r_zeros_number = zeros_num - (le_ih_k_offset (ih) - old_key_comp);
+			r_zeros_number = zeros_num - (old_len - sbytes[i]);
 			zeros_num -= r_zeros_number;
 		    }
 
@@ -995,11 +992,14 @@
 
 			    tmp = B_N_PITEM_HEAD(S_new[i],0);
 			    if (is_indirect_le_ih (tmp)) {
-				if (n_rem)
-				    reiserfs_panic (tb->tb_sb, "PAP-12230: balance_leaf: invalid action with indirect item");
-				set_ih_free_space (tmp, ((struct unfm_nodeinfo*)body)->unfm_freespace);
+				set_ih_free_space (tmp, 0);
+				set_le_ih_k_offset( tmp, le_ih_k_offset(tmp) + 
+					            (n_rem / UNFM_P_SIZE) *
+						    tb->tb_sb->s_blocksize);
+			    } else {
+				set_le_ih_k_offset( tmp, le_ih_k_offset(tmp) + 
+				                    n_rem );
 			    }
-                            set_le_ih_k_offset( tmp, le_ih_k_offset(tmp) + n_rem );
 			}
 
 			tb->insert_size[0] = n_rem;
@@ -1045,7 +1045,7 @@
 
 		    /* if we paste to indirect item update ih_free_space */
 		    if (is_indirect_le_ih (pasted))
-			set_ih_free_space (pasted, ((struct unfm_nodeinfo*)body)->unfm_freespace);
+			set_ih_free_space (pasted, 0);
 		    zeros_num = tb->insert_size[0] = 0;
 		}
 	    }
@@ -1141,11 +1141,12 @@
 		    leaf_paste_in_buffer (&bi, item_pos, pos_in_item, tb->insert_size[0], body, zeros_num);
 
 		    if (is_indirect_le_ih (pasted)) {
-
+#if 0
 			RFALSE( tb->insert_size[0] != UNFM_P_SIZE,
 				"PAP-12280: insert_size for indirect item must be %d, not %d",
 				UNFM_P_SIZE, tb->insert_size[0]);
-			set_ih_free_space (pasted, ((struct unfm_nodeinfo*)body)->unfm_freespace);
+#endif
+			set_ih_free_space (pasted, 0);
 		    }
 		    tb->insert_size[0] = 0;
 		}
fs/reiserfs/inode.c +40 -7

76 lines not on this page · raw message

fs/reiserfs/tail_conversion.c +2 -3
diff -Nru a/fs/reiserfs/tail_conversion.c b/fs/reiserfs/tail_conversion.c
@@ -30,7 +30,7 @@
                                 key of unfm pointer to be pasted */
     int	n_blk_size,
       n_retval;	  /* returned value for reiserfs_insert_item and clones */
-    struct unfm_nodeinfo unfm_ptr;  /* Handle on an unformatted node
+    unp_t unfm_ptr;  /* Handle on an unformatted node
 				       that will be inserted in the
 				       tree. */
 
@@ -59,8 +59,7 @@
     
     p_le_ih = PATH_PITEM_HEAD (path);
 
-    unfm_ptr.unfm_nodenum = cpu_to_le32 (unbh->b_blocknr);
-    unfm_ptr.unfm_freespace = 0; // ???
+    unfm_ptr = cpu_to_le32 (unbh->b_blocknr);
     
     if ( is_statdata_le_ih (p_le_ih) )  {
 	/* Insert new indirect item. */

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:

#	           ChangeSet	1.590   -> 1.591  
#	  fs/reiserfs/file.c	1.9     -> 1.10   
#	 fs/reiserfs/inode.c	1.36    -> 1.37   

# include/linux/reiserfs_fs.h 1.22 -> 1.23
# fs/reiserfs/super.c 1.22 -> 1.23
# include/linux/reiserfs_fs_sb.h 1.12 -> 1.13
# fs/reiserfs/bitmap.c 1.16 -> 1.17
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/09/09 [email protected] 1.591
# Implemented reiserfs_file_write(), to write large amount of data at once into files on reiserfs volumes which should boost write speed somewhat and also should be somewhat more SMP friendly. # --------------------------------------------
#

fs/reiserfs/bitmap.c +19 -1
diff -Nru a/fs/reiserfs/bitmap.c b/fs/reiserfs/bitmap.c
@@ -738,7 +738,7 @@
     int rest = amount_needed;
     int nr_allocated;
 
-    while (rest > 0) {
+    while (rest > 0 && start <= finish) {
 	nr_allocated = scan_bitmap (hint->th, &start, finish, 1,
 				    rest + prealloc_size, !hint->formatted_node,
 				    hint->block);
@@ -884,7 +884,9 @@
     if ( !blocks )
 	return;
 
+    spin_lock(&sb->u.reiserfs_sb.bitmap_lock);
     sb->u.reiserfs_sb.reserved_blocks += blocks;
+    spin_unlock(&sb->u.reiserfs_sb.bitmap_lock);
 }
 
 /* Unreserve @blocks amount of blocks in fs pointed by @sb */
@@ -901,6 +903,22 @@
     if ( !blocks )
 	return;
 
+    spin_lock(&sb->u.reiserfs_sb.bitmap_lock);
     sb->u.reiserfs_sb.reserved_blocks -= blocks;
     RFALSE( sb->u.reiserfs_sb.reserved_blocks < 0, "amount of blocks reserved became zero?");
+    spin_unlock(&sb->u.reiserfs_sb.bitmap_lock);
+}
+
+/* This function estimates how much pages we will be able to write to FS
+   used for reiserfs_file_write() purposes for now. */
+int reiserfs_can_fit_pages ( struct super_block *sb /* superblock of filesystem
+						       to estimate space */ )
+{
+	unsigned long space;
+
+	spin_lock(&sb->u.reiserfs_sb.bitmap_lock);
+	space = (SB_FREE_BLOCKS(sb) - sb->u.reiserfs_sb.reserved_blocks) / ( PAGE_CACHE_SIZE/sb->s_blocksize);
+	spin_unlock(&sb->u.reiserfs_sb.bitmap_lock);
+
+	return space;
 }
fs/reiserfs/file.c +1075 -1

1,090 lines not on this page · raw message

fs/reiserfs/inode.c +2 -2
diff -Nru a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
@@ -913,7 +913,7 @@
 
 
     copy_key (INODE_PKEY (inode), &(ih->ih_key));
-    inode->i_blksize = PAGE_SIZE;
+    inode->i_blksize = PAGE_SIZE*32;
 
     INIT_LIST_HEAD(&inode->u.reiserfs_i.i_prealloc_list) ;
 
@@ -1605,7 +1605,7 @@
 
     // these do not go to on-disk stat data
     inode->i_ino = le32_to_cpu (ih.ih_key.k_objectid);
-    inode->i_blksize = PAGE_SIZE;
+    inode->i_blksize = PAGE_SIZE*32;
     inode->i_dev = sb->s_dev;
   
     // store in in-core inode the key of stat data and version all
fs/reiserfs/super.c +1 -0
diff -Nru a/fs/reiserfs/super.c b/fs/reiserfs/super.c
@@ -1261,6 +1261,7 @@
     reiserfs_proc_register( s, "oidmap", reiserfs_oidmap_in_proc );
     reiserfs_proc_register( s, "journal", reiserfs_journal_in_proc );
     init_waitqueue_head (&(s->u.reiserfs_sb.s_wait));
+    s->u.reiserfs_sb.bitmap_lock = SPIN_LOCK_UNLOCKED;
 
     printk("%s\n", reiserfs_get_version_string()) ;
     return s;
include/linux/reiserfs_fs.h +1 -0
diff -Nru a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
@@ -2007,6 +2007,7 @@
 #endif
 void reiserfs_claim_blocks_to_be_allocated( struct super_block *sb, int blocks);
 void reiserfs_release_claimed_blocks( struct super_block *sb, int blocks);
+int reiserfs_can_fit_pages(struct super_block *sb);
 
 /* hashes.c */
 __u32 keyed_hash (const signed char *msg, int len);
include/linux/reiserfs_fs_sb.h +1 -0
diff -Nru a/include/linux/reiserfs_fs_sb.h b/include/linux/reiserfs_fs_sb.h
@@ -466,6 +466,7 @@
     reiserfs_proc_info_data_t s_proc_info_data;
     struct proc_dir_entry *procdir;
     int reserved_blocks; /* amount of blocks reserved for further allocations */
+    spinlock_t bitmap_lock; /* this lock on now only used to protect reserved_blocks variable */
 };
 
 /* Definitions of reiserfs on-disk properties: */

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:

#	           ChangeSet	1.591   -> 1.592  
#	      kernel/ksyms.c	1.60    -> 1.61   
#	        mm/filemap.c	1.68    -> 1.69   

#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/09/09 [email protected] 1.592

# export generic_osync_inode,block_commit_write, remove_suid
# --------------------------------------------
#
diff -Nru a/kernel/ksyms.c b/kernel/ksyms.c
--- a/kernel/ksyms.c	Mon Sep  9 09:28:49 2002
+++ b/kernel/ksyms.c	Mon Sep  9 09:28:49 2002
@@ -215,6 +215,7 @@
 EXPORT_SYMBOL(generic_cont_expand);
 EXPORT_SYMBOL(cont_prepare_write);
 EXPORT_SYMBOL(generic_commit_write);
+EXPORT_SYMBOL(block_commit_write);
 EXPORT_SYMBOL(block_truncate_page);
 EXPORT_SYMBOL(generic_block_bmap);
 EXPORT_SYMBOL(generic_file_read);
@@ -531,6 +532,8 @@
 EXPORT_SYMBOL(is_bad_inode);
 EXPORT_SYMBOL(event);
 EXPORT_SYMBOL(brw_page);
+EXPORT_SYMBOL(generic_osync_inode);
+EXPORT_SYMBOL(remove_suid);

#ifdef CONFIG_UID16
EXPORT_SYMBOL(overflowuid);

mm/filemap.c +1 -1
diff -Nru a/mm/filemap.c b/mm/filemap.c
@@ -2906,7 +2906,7 @@
 	return page;
 }
 
-inline void remove_suid(struct inode *inode)
+void remove_suid(struct inode *inode)
 {
 	unsigned int mode;
 

Hello!

These 3 changesets are trivial changes to reiserfs:
adding back mistakenly forgotten "attrs" mount option, fix a problem with displacing_large_files allocator option and fix a bug in remounting code on remount from readwarite to readwrite mode that can cause livelock if there was delayed unlinks scheduled on the filesystem.

You can pull these from: bk://thebsh.namesys.com/bk/reiser3-linux-2.4

Please apply.

Diffstats:

 super.c |    1 +
 1 files changed, 1 insertion(+)
 fs/reiserfs/inode.c         |    2 +-
 include/linux/reiserfs_fs.h |    3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)
 super.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletion(-)

Plain text patches:

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.589 -> 1.590
# fs/reiserfs/super.c 1.22 -> 1.23
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/09/09 [email protected] 1.590
# reiserfs: Mistakenly forgotten inode attributes option was added back. # --------------------------------------------
#

fs/reiserfs/super.c +1 -0
diff -Nru a/fs/reiserfs/super.c b/fs/reiserfs/super.c
@@ -569,6 +569,7 @@
 		{"hash", 'h', hash, FORCE_HASH_DETECT},
 		
 		{"resize", 'r', 0, -1},
+		{"attrs", 0, 0, REISERFS_ATTRS},
 		{NULL, 0, 0, 0}
     };
 	

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
# ChangeSet 1.590 -> 1.591
# fs/reiserfs/inode.c 1.35 -> 1.36
# include/linux/reiserfs_fs.h 1.22 -> 1.23
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/09/09 [email protected] 1.591
# reiserfs: Take into account file information even when not doing preallocation. Files a bug with displacing_large_files option # --------------------------------------------
#

fs/reiserfs/inode.c +1 -1
diff -Nru a/fs/reiserfs/inode.c b/fs/reiserfs/inode.c
@@ -511,7 +511,7 @@
         return reiserfs_new_unf_blocknrs2(th, inode, allocated_block_nr, path, block);
     }
 #endif
-    return reiserfs_new_unf_blocknrs (th, allocated_block_nr, path, block);
+    return reiserfs_new_unf_blocknrs (th, inode, allocated_block_nr, path, block);
 }
 
 static int reiserfs_get_block (struct inode * inode, long block,
include/linux/reiserfs_fs.h +2 -1
diff -Nru a/include/linux/reiserfs_fs.h b/include/linux/reiserfs_fs.h
@@ -1970,13 +1970,14 @@
 }
 
 extern inline int reiserfs_new_unf_blocknrs (struct reiserfs_transaction_handle *th,
+					     struct inode *inode,
 					     b_blocknr_t *new_blocknrs,
 					     struct path * path, long block)
 {
     reiserfs_blocknr_hint_t hint = {
 	th: th,
 	path: path,
-	inode: NULL,
+	inode: inode,
 	block: block,
 	formatted_node: 0,
 	preallocate: 0

# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher. # This patch includes the following deltas:
# ChangeSet 1.592 -> 1.593
# fs/reiserfs/super.c 1.23 -> 1.24
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 02/09/10 [email protected] 1.593
# reiserfs: Fix a problem with delayed unlinks and remounting RW filesystem RW. # --------------------------------------------
#

fs/reiserfs/super.c +5 -1
diff -Nru a/fs/reiserfs/super.c b/fs/reiserfs/super.c
@@ -664,7 +664,7 @@
   }
 
   if (*mount_flags & MS_RDONLY) {
-    /* remount rean-only */
+    /* remount read-only */
     if (s->s_flags & MS_RDONLY)
       /* it is read-only already */
       return 0;
@@ -680,6 +680,10 @@
     journal_mark_dirty(&th, s, SB_BUFFER_WITH_SB (s));
     s->s_dirt = 0;
   } else {
+    /* remount read-write */
+    if (!(s->s_flags & MS_RDONLY))
+	return 0; /* We are read-write already */
+
     s->u.reiserfs_sb.s_mount_state = sb_state(rs) ;
     s->s_flags &= ~MS_RDONLY ; /* now it is safe to call journal_begin */
     journal_begin(&th, s, 10) ;
#1 lore raw
Quoted 3 lines · Hans Reiser

It passes all of our testing, but it is the kind of code that is more likely than most to have elusive lurking bugs. It cannot be tested in 2.5 first because 2.5 is too broken at this particular moment.

What in particular holds you back from testing this in 2.5 ? This seems quite dubious for inclusion first in what it supposed to be the stable series.

Dave

Signature · 2 lines
| Dave Jones.        http://www.codemonkey.org.uk
| SuSE Labs
#2 lore raw

Hello!

Quoted 4 lines · Dave Jones
Quoted 3 lines

It passes all of our testing, but it is the kind of code that is more likely than most to have elusive lurking bugs. It cannot be tested in 2.5 first because 2.5 is too broken at this particular moment.

What in particular holds you back from testing this in 2.5 ?

I cannot boot into 2.5.34, that's it. ;)

Quoted 2 lines

This seems quite dubious for inclusion first in what it supposed to be the stable series.

I believe that code itself is pretty stable now ;) Also it got some testing outside of NAMESYS already.

Bye,
Oleg

#4 lore raw
In reply to Hans Reiser
Quoted 8 lines · Hans Reiser

This patch should only go in if 2.4.20 is 3 weeks or more away,
otherwise it should wait for the next pre1.

It passes all of our testing, but it is the kind of code that is more likely than most to have elusive lurking bugs. It cannot be tested in 2.5 first because 2.5 is too broken at this particular moment. For the lkml readers let me say that it also should not go onto any distros without three weeks of testing.;-)

So lets wait for 2.4.21pre for this one.

We already have enough stuff to be tested on 2.4.20-pre for reiserfs.

#5 lore raw

Hello!

Quoted 9 lines · Marcelo Tosatti
Quoted 7 lines

This patch should only go in if 2.4.20 is 3 weeks or more away,
otherwise it should wait for the next pre1.
It passes all of our testing, but it is the kind of code that is more likely than most to have elusive lurking bugs. It cannot be tested in 2.5 first because 2.5 is too broken at this particular moment. For the lkml readers let me say that it also should not go onto any distros without three weeks of testing.;-)

So lets wait for 2.4.21pre for this one.
We already have enough stuff to be tested on 2.4.20-pre for reiserfs.

Please pick up at least the fixes from bk://thebsh.namesys.com/bk/reiser3-linux-2.4
I am removed everything related to reiserfs_file_write from there now, so you can just do a pull.

Thank you.

Bye,
Oleg

#6 lore raw
Quoted 10 lines · Oleg Drokin

Hello!

Quoted 7 lines · Marcelo Tosatti
Quoted 7 lines

This patch should only go in if 2.4.20 is 3 weeks or more away,
otherwise it should wait for the next pre1.
It passes all of our testing, but it is the kind of code that is more likely than most to have elusive lurking bugs. It cannot be tested in 2.5 first because 2.5 is too broken at this particular moment. For the lkml readers let me say that it also should not go onto any distros without three weeks of testing.;-)

Quoted 7 lines
Quoted 2 lines

So lets wait for 2.4.21pre for this one.
We already have enough stuff to be tested on 2.4.20-pre for reiserfs.

Please pick up at least the fixes from bk://thebsh.namesys.com/bk/reiser3-linux-2.4
I am removed everything related to reiserfs_file_write from there now, so you can just do a pull.

Huh, now that I released -pre6 _with_ this stuff by accident its too late. Silly me.

Can you make me a tree which backouts the big write code please?

Will be releasing a -pre7 shortly due to that.

#7 lore raw
Quoted 29 lines · Marcelo Tosatti
Quoted 14 lines · Oleg Drokin

Hello!

Quoted 9 lines · Marcelo Tosatti
Quoted 9 lines

This patch should only go in if 2.4.20 is 3 weeks or more away,
otherwise it should wait for the next pre1.
It passes all of our testing, but it is the kind of code that is more likely than most to have elusive lurking bugs. It cannot be tested in 2.5 first because 2.5 is too broken at this particular moment. For the lkml readers let me say that it also should not go onto any distros without three weeks of testing.;-)

Quoted 10 lines
Quoted 4 lines

So lets wait for 2.4.21pre for this one.
We already have enough stuff to be tested on 2.4.20-pre for reiserfs.

Please pick up at least the fixes from bk://thebsh.namesys.com/bk/reiser3-linux-2.4
I am removed everything related to reiserfs_file_write from there now, so you can just do a pull.

Quoted 11 lines

Huh, now that I released -pre6 _with_ this stuff by accident its too late. Silly me.

Can you make me a tree which backouts the big write code please?

Will be releasing a -pre7 shortly due to that.

We'll send it to you. Oleg has gone home and trying his cell phone does not reach him, but hopefully he will read his email before bedtime.

It is not the end of the world though if this goes in.... Oleg sent it out for testing, a user hit a bug, and then he fixed the bug and it worked for the user. It passed testing by Oleg and Elena and some unknown number of users on our mailing list. If you are going to release in less than 10 days, then it needs to be yanked back out though. If you want to yank it back out anyway, I also understand.

For now we will assume you want it out, and we'll send you the reverse for it.

Hans

#3 lore raw
In reply to Dave Jones
Quoted 6 lines · Dave Jones
Quoted 1 line · Hans Reiser

It passes all of our testing, but it is the kind of code that is more likely than most to have elusive lurking bugs. It cannot be tested in 2.5 first because 2.5 is too broken at this particular moment.

What in particular holds you back from testing this in 2.5 ?

Oleg answered this.

Quoted 7 lines

This seems quite dubious for inclusion first in what it supposed to be the stable series.

Dave

It is a performance tweak, not a new feature. 2.5 is for things like reiser4. Also, remember that we do perform internal testing, and we also tested this on our mailing list, which makes our tweaks much more stable than most of the tweaks that go into 2.5 first. It is strange, but Namesys seems to have much more of a release management infrastructure than most code submitters (I think that means merely that we have one;-), since there are two persons that test every patch, and that makes us oddly unusual). However, waiting for 2.4.21pre1 is also quite reasonable since the number of lines of new code is significant, and reiserfs is used on mission critical servers. A lot depends on just how soon 2.4.20 is planned to come out, and only Marcelo knows that.

Hans

#8 lore raw
In reply to Marcelo Tosatti

Hello!

Quoted 4 lines · Marcelo Tosatti

Huh, now that I released -pre6 _with_ this stuff by accident its too late. Silly me.
Can you make me a tree which backouts the big write code please?

Can you execute bk cset -x1.594,1.595,1.596
And that will remove our code for now.

Actually you can only do bk cset -x1.594,1.595
So that while our code is gone, stuff that exports VFS functions will stay.

Is this enough for your purposes? (I hope it is).

Quoted 1 line

Will be releasing a -pre7 shortly due to that.

That's your decision of course.

Bye,
Oleg

#9 lore raw
In reply to Marcelo Tosatti
Quoted 7 lines · On Tue, 10 Sep 2002 15:16:51 -0300 (BRT) Marcelo Tosatti…

Huh, now that I released -pre6 _with_ this stuff by accident its too late. Silly me.

Can you make me a tree which backouts the big write code please?

Will be releasing a -pre7 shortly due to that.

Although some changes are going to be removed in -pre7, i've run tiobench to test the changes. Kernel versions are plain -pre4 and -pre6

Unit information
================
File size = megabytes

Blk Size  = bytes
Rate      = megabytes per second
CPU%      = percentage of CPU used during the test
Latency   = milliseconds
Lat%      = percent of requests that took longer than X seconds
CPU Eff   = Rate divided by CPU% - throughput per cpu load

Sequential Reads

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre4                   200   4096    1   11.78 28.50%     0.328      146.54   0.00000  0.00000    41
2.4.20-pre4                   200   4096    2   10.30 23.02%     0.709     1349.77   0.00000  0.00000    45
2.4.20-pre4                   200   4096    4    9.14 22.06%     1.585     1309.01   0.00000  0.00000    41
2.4.20-pre4                   200   4096    8    8.92 21.84%     2.751     1472.06   0.00000  0.00000    41

Random Reads

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre4                   200   4096    1    0.53 2.389%     7.307       20.08   0.00000  0.00000    22
2.4.20-pre4                   200   4096    2    0.55 2.201%    14.157       39.98   0.00000  0.00000    25
2.4.20-pre4                   200   4096    4    0.55 2.766%    27.646       80.48   0.00000  0.00000    20
2.4.20-pre4                   200   4096    8    0.60 2.527%    49.805      159.53   0.00000  0.00000    24

Sequential Writes

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre4                   200   4096    1   10.76 80.14%     0.348     1100.04   0.00000  0.00000    13
2.4.20-pre4                   200   4096    2   11.63 87.26%     0.637      294.75   0.00000  0.00000    13
2.4.20-pre4                   200   4096    4   11.42 85.24%     1.258      424.02   0.00000  0.00000    13
2.4.20-pre4                   200   4096    8   11.49 84.29%     2.514      745.41   0.00000  0.00000    14

Random Writes

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre4                   200   4096    1    1.13 3.620%     0.131        1.94   0.00000  0.00000    31
2.4.20-pre4                   200   4096    2    1.18 3.770%     0.254       22.61   0.00000  0.00000    31
2.4.20-pre4                   200   4096    4    1.14 4.002%     0.483       42.89   0.00000  0.00000    28
2.4.20-pre4                   200   4096    8    1.19 4.048%     0.930       83.60   0.00000  0.00000    29

root@diego:/home/diego/kernel/tiobench/tiobench-0.3.3#

Unit information
================
File size = megabytes

Blk Size  = bytes
Rate      = megabytes per second
CPU%      = percentage of CPU used during the test
Latency   = milliseconds
Lat%      = percent of requests that took longer than X seconds
CPU Eff   = Rate divided by CPU% - throughput per cpu load

Sequential Reads

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre6                   200   4096    1   12.16 29.78%     0.317      135.42   0.00000  0.00000    41
2.4.20-pre6                   200   4096    2   10.20 23.96%     0.697     1226.99   0.00000  0.00000    43
2.4.20-pre6                   200   4096    4    9.49 23.14%     1.409     1197.27   0.00000  0.00000    41
2.4.20-pre6                   200   4096    8    8.36 21.69%     2.970     5532.30   0.00391  0.00000    39

Random Reads

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre6                   200   4096    1    0.55 2.037%     7.106       30.01   0.00000  0.00000    27
2.4.20-pre6                   200   4096    2    0.54 2.118%    14.170       40.09   0.00000  0.00000    26
2.4.20-pre6                   200   4096    4    0.56 2.308%    27.007       79.38   0.00000  0.00000    24
2.4.20-pre6                   200   4096    8    0.58 2.593%    51.235      321.18   0.00000  0.00000    22

Sequential Writes

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre6                   200   4096    1   12.01 87.73%     0.311      280.04   0.00000  0.00000    14
2.4.20-pre6                   200   4096    2   11.36 83.79%     0.645      509.40   0.00000  0.00000    14
2.4.20-pre6                   200   4096    4   11.58 85.63%     1.261      528.34   0.00000  0.00000    14
2.4.20-pre6                   200   4096    8    9.67 69.58%     2.986     2158.01   0.00195  0.00000    14

Random Writes

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre6                   200   4096    1    1.19 4.191%     0.130        0.76   0.00000  0.00000    28
2.4.20-pre6                   200   4096    2    1.16 4.067%     0.255       23.82   0.00000  0.00000    28
2.4.20-pre6                   200   4096    4    1.23 4.159%     0.495       42.33   0.00000  0.00000    29
2.4.20-pre6                   200   4096    8    1.21 4.432%     1.270      228.09   0.00000  0.00000    27

root@diego:/home/diego/kernel/tiobench/tiobench-0.3.3#

Diego Calleja

#10 lore raw

Thanks for benchmarks. It suggests that the new code doesn't scale to lots of threads as well as the old, but performs much better for single threads. Maybe Oleg can comment on why that might be --- I have no idea.

On the whole it looks like a win, but why more threads perform worse in some cases probably is worth trying to understand. Maybe we should have a seminar on exactly what tiobench is doing and how it interacts with this code.

Hans

Quoted 119 lines · Arador
Quoted 8 lines · On Tue, 10 Sep 2002 15:16:51 -0300 (BRT) Marcelo Tosatti…

Huh, now that I released -pre6 _with_ this stuff by accident its too late. Silly me.

Can you make me a tree which backouts the big write code please?

Will be releasing a -pre7 shortly due to that.

Although some changes are going to be removed in -pre7, i've run tiobench to test the changes. Kernel versions are plain -pre4 and -pre6

Unit information
================
File size = megabytes

Blk Size  = bytes
Rate      = megabytes per second
CPU%      = percentage of CPU used during the test
Latency   = milliseconds
Lat%      = percent of requests that took longer than X seconds
CPU Eff   = Rate divided by CPU% - throughput per cpu load

Sequential Reads
File Blk Num Avg Maximum Lat% Lat% CPU
Identifier Size Size Thr Rate (CPU%) Latency Latency >2s >10s Eff
---------------------------- ------ ----- --- ------ ------ --------- ----------- -------- -------- -----

2.4.20-pre4                   200   4096    1   11.78 28.50%     0.328      146.54   0.00000  0.00000    41
2.4.20-pre4                   200   4096    2   10.30 23.02%     0.709     1349.77   0.00000  0.00000    45
2.4.20-pre4                   200   4096    4    9.14 22.06%     1.585     1309.01   0.00000  0.00000    41
2.4.20-pre4                   200   4096    8    8.92 21.84%     2.751     1472.06   0.00000  0.00000    41

Random Reads
File Blk Num Avg Maximum Lat% Lat% CPU
Identifier Size Size Thr Rate (CPU%) Latency Latency >2s >10s Eff
---------------------------- ------ ----- --- ------ ------ --------- ----------- -------- -------- -----

2.4.20-pre4                   200   4096    1    0.53 2.389%     7.307       20.08   0.00000  0.00000    22
2.4.20-pre4                   200   4096    2    0.55 2.201%    14.157       39.98   0.00000  0.00000    25
2.4.20-pre4                   200   4096    4    0.55 2.766%    27.646       80.48   0.00000  0.00000    20
2.4.20-pre4                   200   4096    8    0.60 2.527%    49.805      159.53   0.00000  0.00000    24

Sequential Writes
File Blk Num Avg Maximum Lat% Lat% CPU
Identifier Size Size Thr Rate (CPU%) Latency Latency >2s >10s Eff
---------------------------- ------ ----- --- ------ ------ --------- ----------- -------- -------- -----

2.4.20-pre4                   200   4096    1   10.76 80.14%     0.348     1100.04   0.00000  0.00000    13
2.4.20-pre4                   200   4096    2   11.63 87.26%     0.637      294.75   0.00000  0.00000    13
2.4.20-pre4                   200   4096    4   11.42 85.24%     1.258      424.02   0.00000  0.00000    13
2.4.20-pre4                   200   4096    8   11.49 84.29%     2.514      745.41   0.00000  0.00000    14

Random Writes
File Blk Num Avg Maximum Lat% Lat% CPU
Identifier Size Size Thr Rate (CPU%) Latency Latency >2s >10s Eff
---------------------------- ------ ----- --- ------ ------ --------- ----------- -------- -------- -----

2.4.20-pre4                   200   4096    1    1.13 3.620%     0.131        1.94   0.00000  0.00000    31
2.4.20-pre4                   200   4096    2    1.18 3.770%     0.254       22.61   0.00000  0.00000    31
2.4.20-pre4                   200   4096    4    1.14 4.002%     0.483       42.89   0.00000  0.00000    28
2.4.20-pre4                   200   4096    8    1.19 4.048%     0.930       83.60   0.00000  0.00000    29

root@diego:/home/diego/kernel/tiobench/tiobench-0.3.3#

Unit information
================
File size = megabytes

Blk Size  = bytes
Rate      = megabytes per second
CPU%      = percentage of CPU used during the test
Latency   = milliseconds
Lat%      = percent of requests that took longer than X seconds
CPU Eff   = Rate divided by CPU% - throughput per cpu load

Sequential Reads
File Blk Num Avg Maximum Lat% Lat% CPU
Identifier Size Size Thr Rate (CPU%) Latency Latency >2s >10s Eff
---------------------------- ------ ----- --- ------ ------ --------- ----------- -------- -------- -----

2.4.20-pre6                   200   4096    1   12.16 29.78%     0.317      135.42   0.00000  0.00000    41
2.4.20-pre6                   200   4096    2   10.20 23.96%     0.697     1226.99   0.00000  0.00000    43
2.4.20-pre6                   200   4096    4    9.49 23.14%     1.409     1197.27   0.00000  0.00000    41
2.4.20-pre6                   200   4096    8    8.36 21.69%     2.970     5532.30   0.00391  0.00000    39

Random Reads
File Blk Num Avg Maximum Lat% Lat% CPU
Identifier Size Size Thr Rate (CPU%) Latency Latency >2s >10s Eff
---------------------------- ------ ----- --- ------ ------ --------- ----------- -------- -------- -----

2.4.20-pre6                   200   4096    1    0.55 2.037%     7.106       30.01   0.00000  0.00000    27
2.4.20-pre6                   200   4096    2    0.54 2.118%    14.170       40.09   0.00000  0.00000    26
2.4.20-pre6                   200   4096    4    0.56 2.308%    27.007       79.38   0.00000  0.00000    24
2.4.20-pre6                   200   4096    8    0.58 2.593%    51.235      321.18   0.00000  0.00000    22

Sequential Writes
File Blk Num Avg Maximum Lat% Lat% CPU
Identifier Size Size Thr Rate (CPU%) Latency Latency >2s >10s Eff
---------------------------- ------ ----- --- ------ ------ --------- ----------- -------- -------- -----

2.4.20-pre6                   200   4096    1   12.01 87.73%     0.311      280.04   0.00000  0.00000    14
2.4.20-pre6                   200   4096    2   11.36 83.79%     0.645      509.40   0.00000  0.00000    14
2.4.20-pre6                   200   4096    4   11.58 85.63%     1.261      528.34   0.00000  0.00000    14
2.4.20-pre6                   200   4096    8    9.67 69.58%     2.986     2158.01   0.00195  0.00000    14

Random Writes
File Blk Num Avg Maximum Lat% Lat% CPU
Identifier Size Size Thr Rate (CPU%) Latency Latency >2s >10s Eff
---------------------------- ------ ----- --- ------ ------ --------- ----------- -------- -------- -----

2.4.20-pre6                   200   4096    1    1.19 4.191%     0.130        0.76   0.00000  0.00000    28
2.4.20-pre6                   200   4096    2    1.16 4.067%     0.255       23.82   0.00000  0.00000    28
2.4.20-pre6                   200   4096    4    1.23 4.159%     0.495       42.33   0.00000  0.00000    29
2.4.20-pre6                   200   4096    8    1.21 4.432%     1.270      228.09   0.00000  0.00000    27

root@diego:/home/diego/kernel/tiobench/tiobench-0.3.3#

Diego Calleja

#11 lore raw
In reply to Arador

Hello!

Quoted 6 lines · Arador
Quoted 4 lines

Huh, now that I released -pre6 _with_ this stuff by accident its too late. Silly me.
Can you make me a tree which backouts the big write code please? Will be releasing a -pre7 shortly due to that.

Although some changes are going to be removed in -pre7, i've run tiobench to test the changes. Kernel versions are plain -pre4 and -pre6

What kind of hardware were these tests on?

Can you please conduct one more test with line 212 in fs/reiserfs/file.c changed:
hint.preallocate = 0;
change 0 there to 1

Thank you.

Bye,
Oleg

#12 lore raw
Quoted 2 lines · On Thu, 12 Sep 2002 11:10:29 +0400 Oleg Drokin <[email protected]> escribió:

What kind of hardware were these tests on?

The sis ide chipset can do multiword dma 2, (16 mb/s i think) A seagate barracuda 40 GB 7200 rpm UDMA 100
32 mb ram and a cyrix 6x86 MX 233+ (200 mhz)

Quoted 5 lines

Can you please conduct one more test with line 212 in fs/reiserfs/file.c changed:
hint.preallocate = 0;
change 0 there to 1

Sure ;)

I've run two tests per kernel version, (-pre5 and -pre6 + that tweak) I can do more tests if you want ;)

Unit information
================
File size = megabytes

Blk Size  = bytes
Rate      = megabytes per second
CPU%      = percentage of CPU used during the test
Latency   = milliseconds
Lat%      = percent of requests that took longer than X seconds
CPU Eff   = Rate divided by CPU% - throughput per cpu load

The two 2.4.20-pre5 benchs

================================================= 2.4.20-pre5 =====================================================

Sequential Reads

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre5                   200   4096    1   12.12 26.54%     0.319      187.11   0.00000  0.00000    46
2.4.20-pre5                   200   4096    2   10.46 27.03%     0.735     1425.90   0.00000  0.00000    39
2.4.20-pre5                   200   4096    4    9.77 21.92%     1.361     1201.57   0.00000  0.00000    45
2.4.20-pre5                   200   4096    8    8.84 20.69%     2.750     2648.61   0.00195  0.00000    43

Random Reads

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre5                   200   4096    1    0.54 2.590%     7.219       20.03   0.00000  0.00000    21
2.4.20-pre5                   200   4096    2    0.56 2.395%    13.948       39.78   0.00000  0.00000    23
2.4.20-pre5                   200   4096    4    0.54 2.494%    27.794      100.76   0.00000  0.00000    22
2.4.20-pre5                   200   4096    8    0.60 2.809%    50.116      160.74   0.00000  0.00000    21

Sequential Writes

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre5                   200   4096    1   11.86 87.89%     0.314      265.36   0.00000  0.00000    13
2.4.20-pre5                   200   4096    2   11.91 88.60%     0.616      504.35   0.00000  0.00000    13
2.4.20-pre5                   200   4096    4   12.06 89.30%     1.224      280.16   0.00000  0.00000    14
2.4.20-pre5                   200   4096    8   11.84 88.50%     2.466      432.46   0.00000  0.00000    13

Random Writes

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre5                   200   4096    1    1.14 4.236%     0.244      429.52   0.00000  0.00000    27
2.4.20-pre5                   200   4096    2    1.13 4.060%     0.255       24.09   0.00000  0.00000    28
2.4.20-pre5                   200   4096    4    1.15 3.668%     0.476       49.99   0.00000  0.00000    31
2.4.20-pre5                   200   4096    8    1.16 4.098%     0.935       81.35   0.00000  0.00000    28

----------> The second becnh for -pre5....

Sequential Reads

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre5                   200   4096    1   12.22 29.07%     0.316       28.21   0.00000  0.00000    42
2.4.20-pre5                   200   4096    2   10.86 25.96%     0.700     1049.20   0.00000  0.00000    42
2.4.20-pre5                   200   4096    4   10.00 24.79%     1.463     1144.01   0.00000  0.00000    40
2.4.20-pre5                   200   4096    8    8.70 20.44%     2.992     2106.78   0.00195  0.00000    43

Random Reads

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre5                   200   4096    1    0.55 3.295%     7.026       20.05   0.00000  0.00000    17
2.4.20-pre5                   200   4096    2    0.55 2.327%    13.977       40.04   0.00000  0.00000    24
2.4.20-pre5                   200   4096    4    0.54 3.095%    28.571       90.03   0.00000  0.00000    17
2.4.20-pre5                   200   4096    8    0.61 2.610%    48.261      150.45   0.00000  0.00000    23

Sequential Writes

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre5                   200   4096    1   11.96 85.87%     0.313      340.07   0.00000  0.00000    14
2.4.20-pre5                   200   4096    2   12.13 86.45%     0.612      279.22   0.00000  0.00000    14
2.4.20-pre5                   200   4096    4   11.61 85.42%     1.229      356.53   0.00000  0.00000    14
2.4.20-pre5                   200   4096    8   11.97 87.52%     2.421      616.12   0.00000  0.00000    14

Random Writes

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre5                   200   4096    1    1.18 3.463%     0.128        0.87   0.00000  0.00000    34
2.4.20-pre5                   200   4096    2    1.15 3.755%     0.244       22.89   0.00000  0.00000    31
2.4.20-pre5                   200   4096    4    1.15 3.976%     0.456       44.42   0.00000  0.00000    29
2.4.20-pre5                   200   4096    8    1.16 3.771%     0.879      102.81   0.00000  0.00000    31

========================================= 2.4.20-pre6 + tweak ==================================================

------>First for -pre6 ...

Sequential Reads

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre6                   200   4096    1   12.21 27.22%     0.315       20.37   0.00000  0.00000    45
2.4.20-pre6                   200   4096    2   10.13 26.12%     0.682     1241.05   0.00000  0.00000    39
2.4.20-pre6                   200   4096    4    9.42 21.67%     1.382     1048.15   0.00000  0.00000    43
2.4.20-pre6                   200   4096    8    8.90 20.78%     2.882     2709.68   0.00195  0.00000    43

Random Reads

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre6                   200   4096    1    0.53 2.076%     7.328       20.65   0.00000  0.00000    26
2.4.20-pre6                   200   4096    2    0.54 1.915%    14.206       40.18   0.00000  0.00000    28
2.4.20-pre6                   200   4096    4    0.56 2.215%    27.334       90.00   0.00000  0.00000    25
2.4.20-pre6                   200   4096    8    0.60 2.931%    49.111      259.38   0.00000  0.00000    21

Sequential Writes

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre6                   200   4096    1   11.76 85.21%     0.314      433.33   0.00000  0.00000    14
2.4.20-pre6                   200   4096    2   11.56 84.14%     0.627      408.37   0.00000  0.00000    14
2.4.20-pre6                   200   4096    4   11.48 84.32%     1.236      393.79   0.00000  0.00000    14
2.4.20-pre6                   200   4096    8    8.91 62.13%     3.179     2189.47   0.00195  0.00000    14

Random Writes

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre6                   200   4096    1    1.16 3.851%     0.131        5.96   0.00000  0.00000    30
2.4.20-pre6                   200   4096    2    1.13 4.196%     0.251       24.96   0.00000  0.00000    27
2.4.20-pre6                   200   4096    4    1.11 3.540%     0.464       52.49   0.00000  0.00000    31
2.4.20-pre6                   200   4096    8    1.14 4.026%     0.936       94.44   0.00000  0.00000    28

------> and second......

Sequential Reads

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre6                   200   4096    1   11.87 27.17%     0.325      169.14   0.00000  0.00000    44
2.4.20-pre6                   200   4096    2   10.14 24.79%     0.742      900.01   0.00000  0.00000    41
2.4.20-pre6                   200   4096    4    9.23 22.37%     1.512     1294.06   0.00000  0.00000    41
2.4.20-pre6                   200   4096    8    8.79 21.30%     2.723     3030.53   0.00195  0.00000    41

Random Reads

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre6                   200   4096    1    0.54 2.525%     7.206       20.13   0.00000  0.00000    21
2.4.20-pre6                   200   4096    2    0.53 2.166%    14.600       39.85   0.00000  0.00000    24
2.4.20-pre6                   200   4096    4    0.56 2.135%    27.360       79.95   0.00000  0.00000    26
2.4.20-pre6                   200   4096    8    0.60 2.672%    50.614      231.03   0.00000  0.00000    22

Sequential Writes

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre6                   200   4096    1   10.87 75.62%     0.340      981.54   0.00000  0.00000    14
2.4.20-pre6                   200   4096    2   10.87 75.41%     0.675     1233.92   0.00000  0.00000    14
2.4.20-pre6                   200   4096    4   10.40 73.56%     1.335     1160.16   0.00000  0.00000    14
2.4.20-pre6                   200   4096    8    8.73 63.34%     3.192     1543.25   0.00000  0.00000    14

Random Writes

                              File  Blk   Num                   Avg      Maximum      Lat%     Lat%    CPU
Identifier                    Size  Size  Thr   Rate  (CPU%)  Latency    Latency      >2s      >10s    Eff
---------------------------- ------ ----- ---  ------ ------ --------- -----------  -------- -------- -----
2.4.20-pre6                   200   4096    1    1.13 3.962%     0.130        0.67   0.00000  0.00000    28
2.4.20-pre6                   200   4096    2    1.14 3.660%     0.249       29.81   0.00000  0.00000    31
2.4.20-pre6                   200   4096    4    1.15 4.184%     0.469       43.59   0.00000  0.00000    27
2.4.20-pre6                   200   4096    8    1.13 3.973%     0.887       84.27   0.00000  0.00000    28

Diego Calleja