Commit 2fbe8d1e authored by Sunil Mushran's avatar Sunil Mushran Committed by Mark Fasheh
Browse files

ocfs2: Local alloc window size changeable via mount option 



Local alloc is a performance optimization in ocfs2 in which a node
takes a window of bits from the global bitmap and then uses that for
all small local allocations. This window size is fixed to 8MB currently.
This patch allows users to specify the window size in MB including
disabling it by passing in 0. If the number specified is too large,
the fs will use the default value of 8MB.

mount -o localalloc=X /dev/sdX /mntpoint

Signed-off-by: default avatarSunil Mushran <sunil.mushran@oracle.com>
Signed-off-by: default avatarMark Fasheh <mark.fasheh@oracle.com>
parent d147b3d6

Documentation/filesystems/ocfs2.txt

+3 −0
Original line number Diff line number Diff line
@@ -72,3 +72,6 @@ commit=nrsec (*) Ocfs2 can be told to sync all its data and metadata 
			it at the default (5 seconds).

			Setting it to very large values will improve

			performance.

localalloc=8(*)		Allows custom localalloc size in MB. If the value is too

			large, the fs will silently revert it to the default.

			Localalloc is not enabled for local mounts.

fs/ocfs2/localalloc.c

+30 −12
Original line number Diff line number Diff line
@@ -75,18 +75,12 @@ static int ocfs2_local_alloc_new_window(struct ocfs2_super *osb, 
static int ocfs2_local_alloc_slide_window(struct ocfs2_super *osb,

					  struct inode *local_alloc_inode);



/*

 * Determine how large our local alloc window should be, in bits.

 *

 * These values (and the behavior in ocfs2_alloc_should_use_local) have

 * been chosen so that most allocations, including new block groups go

 * through local alloc.

 */

static inline int ocfs2_local_alloc_window_bits(struct ocfs2_super *osb)

{

	BUG_ON(osb->s_clustersize_bits < 12);

	BUG_ON(osb->s_clustersize_bits > 20);



	return 2048 >> (osb->s_clustersize_bits - 12);

	/* Size local alloc windows by the megabyte */

	return osb->local_alloc_size << (20 - osb->s_clustersize_bits);

}



/*
@@ -96,18 +90,23 @@ static inline int ocfs2_local_alloc_window_bits(struct ocfs2_super *osb) 
int ocfs2_alloc_should_use_local(struct ocfs2_super *osb, u64 bits)

{

	int la_bits = ocfs2_local_alloc_window_bits(osb);

	int ret = 0;



	if (osb->local_alloc_state != OCFS2_LA_ENABLED)

		return 0;

		goto bail;



	/* la_bits should be at least twice the size (in clusters) of

	 * a new block group. We want to be sure block group

	 * allocations go through the local alloc, so allow an

	 * allocation to take up to half the bitmap. */

	if (bits > (la_bits / 2))

		return 0;

		goto bail;



	return 1;

	ret = 1;

bail:

	mlog(0, "state=%d, bits=%llu, la_bits=%d, ret=%d\n",

	     osb->local_alloc_state, (unsigned long long)bits, la_bits, ret);

	return ret;

}



int ocfs2_load_local_alloc(struct ocfs2_super *osb)
@@ -121,6 +120,19 @@ int ocfs2_load_local_alloc(struct ocfs2_super *osb) 


	mlog_entry_void();



	if (ocfs2_mount_local(osb))

		goto bail;



	if (osb->local_alloc_size == 0)

		goto bail;



	if (ocfs2_local_alloc_window_bits(osb) >= osb->bitmap_cpg) {

		mlog(ML_NOTICE, "Requested local alloc window %d is larger "

		     "than max possible %u. Using defaults.\n",

		     ocfs2_local_alloc_window_bits(osb), (osb->bitmap_cpg - 1));

		osb->local_alloc_size = OCFS2_DEFAULT_LOCAL_ALLOC_SIZE;

	}



	/* read the alloc off disk */

	inode = ocfs2_get_system_file_inode(osb, LOCAL_ALLOC_SYSTEM_INODE,

					    osb->slot_num);
@@ -181,6 +193,9 @@ bail: 
	if (inode)

		iput(inode);



	mlog(0, "Local alloc window bits = %d\n",

	     ocfs2_local_alloc_window_bits(osb));



	mlog_exit(status);

	return status;

}
@@ -521,6 +536,9 @@ bail: 
		iput(local_alloc_inode);

	}



	mlog(0, "bits=%d, slot=%d, ret=%d\n", bits_wanted, osb->slot_num,

	     status);



	mlog_exit(status);

	return status;

}

fs/ocfs2/ocfs2.h

+1 −0
Original line number Diff line number Diff line
@@ -231,6 +231,7 @@ struct ocfs2_super 
	struct ocfs2_journal *journal;

	unsigned long osb_commit_interval;



	int local_alloc_size;

	enum ocfs2_local_alloc_state local_alloc_state;

	struct buffer_head *local_alloc_bh;

	u64 la_last_gd;

fs/ocfs2/ocfs2_fs.h

+8 −0
Original line number Diff line number Diff line
@@ -270,6 +270,14 @@ struct ocfs2_new_group_input { 
/* Journal limits (in bytes) */

#define OCFS2_MIN_JOURNAL_SIZE		(4 * 1024 * 1024)



/*

 * Default local alloc size (in megabytes)

 *

 * The value chosen should be such that most allocations, including new

 * block groups, use local alloc.

 */

#define OCFS2_DEFAULT_LOCAL_ALLOC_SIZE	8



struct ocfs2_system_inode_info {

	char	*si_name;

	int	si_iflags;

fs/ocfs2/suballoc.c

+3 −2
Original line number Diff line number Diff line
@@ -1516,8 +1516,9 @@ int __ocfs2_claim_clusters(struct ocfs2_super *osb, 
		if (min_clusters > (osb->bitmap_cpg - 1)) {

			/* The only paths asking for contiguousness

			 * should know about this already. */

			mlog(ML_ERROR, "minimum allocation requested exceeds "

				       "group bitmap size!");

			mlog(ML_ERROR, "minimum allocation requested %u exceeds "

			     "group bitmap size %u!\n", min_clusters,

			     osb->bitmap_cpg);

			status = -ENOSPC;

			goto bail;

		}

CRA Git | Maintained and supported by SUSTech CRA and CCSE