Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee2411a8 authored by Steven Whitehouse's avatar Steven Whitehouse
Browse files

GFS2: Clean up quota slot allocation 



Quota slot allocation has historically used a vector of pages
and a set of homegrown find/test/set/clear bit functions. Since
the size of the bitmap is likely to be based on the default
qc file size, thats a couple of pages at most. So we ought
to be able to allocate that as a single chunk, with a vmalloc
fallback, just in case of memory fragmentation.

We are then able to use the kernel's own find/test/set/clear
bit functions, rather than rolling our own.

Signed-off-by: default avatarSteven Whitehouse <swhiteho@redhat.com>
Cc: Abhijith Das <adas@redhat.com>
parent 8ad151c2

fs/gfs2/incore.h

+1 −2
Original line number Original line Diff line number Diff line
@@ -733,8 +733,7 @@ struct gfs2_sbd { 
	spinlock_t sd_trunc_lock;

	spinlock_t sd_trunc_lock;





	unsigned int sd_quota_slots;

	unsigned int sd_quota_slots;

	unsigned int sd_quota_chunks;

	unsigned long *sd_quota_bitmap;

	unsigned char **sd_quota_bitmap;





	u64 sd_quota_sync_gen;

	u64 sd_quota_sync_gen;

fs/gfs2/quota.c

+29 −71
Original line number Original line Diff line number Diff line
@@ -315,50 +315,30 @@ static void qd_put(struct gfs2_quota_data *qd) 




static int slot_get(struct gfs2_quota_data *qd)

static int slot_get(struct gfs2_quota_data *qd)

{

{

	struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd;

	struct gfs2_sbd *sdp = qd->qd_sbd;

	unsigned int c, o = 0, b;

	unsigned int bit;

	unsigned char byte = 0;

	int error = 0;





	spin_lock(&qd_lock);

	spin_lock(&qd_lock);

	if (qd->qd_slot_count != 0)

		goto out;





	if (qd->qd_slot_count++) {

	error = -ENOSPC;

		spin_unlock(&qd_lock);

	bit = find_first_zero_bit(sdp->sd_quota_bitmap, sdp->sd_quota_slots);

		return 0;

	if (bit < sdp->sd_quota_slots) {

	}

		set_bit(bit, sdp->sd_quota_bitmap);



		qd->qd_slot = bit;

	for (c = 0; c < sdp->sd_quota_chunks; c++)

out:

		for (o = 0; o < PAGE_SIZE; o++) {

		qd->qd_slot_count++;

			byte = sdp->sd_quota_bitmap[c][o];

			if (byte != 0xFF)

				goto found;

	}

	}



	goto fail;



found:

	for (b = 0; b < 8; b++)

		if (!(byte & (1 << b)))

			break;

	qd->qd_slot = c * (8 * PAGE_SIZE) + o * 8 + b;



	if (qd->qd_slot >= sdp->sd_quota_slots)

		goto fail;



	sdp->sd_quota_bitmap[c][o] |= 1 << b;



	spin_unlock(&qd_lock);

	spin_unlock(&qd_lock);





	return 0;

	return error;



fail:

	qd->qd_slot_count--;

	spin_unlock(&qd_lock);

	return -ENOSPC;

}

}





static void slot_hold(struct gfs2_quota_data *qd)

static void slot_hold(struct gfs2_quota_data *qd)

{

{

	struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd;

	struct gfs2_sbd *sdp = qd->qd_sbd;





	spin_lock(&qd_lock);

	spin_lock(&qd_lock);

	gfs2_assert(sdp, qd->qd_slot_count);

	gfs2_assert(sdp, qd->qd_slot_count);
@@ -366,34 +346,14 @@ static void slot_hold(struct gfs2_quota_data *qd) 
	spin_unlock(&qd_lock);

	spin_unlock(&qd_lock);

}

}





static void gfs2_icbit_munge(struct gfs2_sbd *sdp, unsigned char **bitmap,

			     unsigned int bit, int new_value)

{

	unsigned int c, o, b = bit;

	int old_value;



	c = b / (8 * PAGE_SIZE);

	b %= 8 * PAGE_SIZE;

	o = b / 8;

	b %= 8;



	old_value = (bitmap[c][o] & (1 << b));

	gfs2_assert_withdraw(sdp, !old_value != !new_value);



	if (new_value)

		bitmap[c][o] |= 1 << b;

	else

		bitmap[c][o] &= ~(1 << b);

}



static void slot_put(struct gfs2_quota_data *qd)

static void slot_put(struct gfs2_quota_data *qd)

{

{

	struct gfs2_sbd *sdp = qd->qd_gl->gl_sbd;

	struct gfs2_sbd *sdp = qd->qd_sbd;





	spin_lock(&qd_lock);

	spin_lock(&qd_lock);

	gfs2_assert(sdp, qd->qd_slot_count);

	gfs2_assert(sdp, qd->qd_slot_count);

	if (!--qd->qd_slot_count) {

	if (!--qd->qd_slot_count) {

		gfs2_icbit_munge(sdp, sdp->sd_quota_bitmap, qd->qd_slot, 0);

		BUG_ON(!test_and_clear_bit(qd->qd_slot, sdp->sd_quota_bitmap));

		qd->qd_slot = -1;

		qd->qd_slot = -1;

	}

	}

	spin_unlock(&qd_lock);

	spin_unlock(&qd_lock);
@@ -1269,6 +1229,7 @@ int gfs2_quota_init(struct gfs2_sbd *sdp) 
	unsigned int x, slot = 0;

	unsigned int x, slot = 0;

	unsigned int found = 0;

	unsigned int found = 0;

	unsigned int hash;

	unsigned int hash;

	unsigned int bm_size;

	u64 dblock;

	u64 dblock;

	u32 extlen = 0;

	u32 extlen = 0;

	int error;

	int error;
@@ -1277,20 +1238,16 @@ int gfs2_quota_init(struct gfs2_sbd *sdp) 
		return -EIO;

		return -EIO;





	sdp->sd_quota_slots = blocks * sdp->sd_qc_per_block;

	sdp->sd_quota_slots = blocks * sdp->sd_qc_per_block;

	sdp->sd_quota_chunks = DIV_ROUND_UP(sdp->sd_quota_slots, 8 * PAGE_SIZE);

	bm_size = DIV_ROUND_UP(sdp->sd_quota_slots, 8 * sizeof(unsigned long));



	bm_size *= sizeof(unsigned long);

	error = -ENOMEM;

	error = -ENOMEM;



	sdp->sd_quota_bitmap = kmalloc(bm_size, GFP_NOFS|__GFP_NOWARN);

	sdp->sd_quota_bitmap = kcalloc(sdp->sd_quota_chunks,

	if (sdp->sd_quota_bitmap == NULL)

				       sizeof(unsigned char *), GFP_NOFS);

		sdp->sd_quota_bitmap = __vmalloc(bm_size, GFP_NOFS, PAGE_KERNEL);

	if (!sdp->sd_quota_bitmap)

	if (!sdp->sd_quota_bitmap)

		return error;

		return error;





	for (x = 0; x < sdp->sd_quota_chunks; x++) {

	memset(sdp->sd_quota_bitmap, 0, bm_size);

		sdp->sd_quota_bitmap[x] = kzalloc(PAGE_SIZE, GFP_NOFS);

		if (!sdp->sd_quota_bitmap[x])

			goto fail;

	}





	for (x = 0; x < blocks; x++) {

	for (x = 0; x < blocks; x++) {

		struct buffer_head *bh;

		struct buffer_head *bh;
@@ -1339,7 +1296,7 @@ int gfs2_quota_init(struct gfs2_sbd *sdp) 
			qd->qd_slot_count = 1;

			qd->qd_slot_count = 1;





			spin_lock(&qd_lock);

			spin_lock(&qd_lock);

			gfs2_icbit_munge(sdp, sdp->sd_quota_bitmap, slot, 1);

			BUG_ON(test_and_set_bit(slot, sdp->sd_quota_bitmap));

			list_add(&qd->qd_list, &sdp->sd_quota_list);

			list_add(&qd->qd_list, &sdp->sd_quota_list);

			atomic_inc(&sdp->sd_quota_count);

			atomic_inc(&sdp->sd_quota_count);

			spin_unlock(&qd_lock);

			spin_unlock(&qd_lock);
@@ -1370,7 +1327,6 @@ void gfs2_quota_cleanup(struct gfs2_sbd *sdp) 
{

{

	struct list_head *head = &sdp->sd_quota_list;

	struct list_head *head = &sdp->sd_quota_list;

	struct gfs2_quota_data *qd;

	struct gfs2_quota_data *qd;

	unsigned int x;





	spin_lock(&qd_lock);

	spin_lock(&qd_lock);

	while (!list_empty(head)) {

	while (!list_empty(head)) {
@@ -1401,9 +1357,11 @@ void gfs2_quota_cleanup(struct gfs2_sbd *sdp) 
	gfs2_assert_warn(sdp, !atomic_read(&sdp->sd_quota_count));

	gfs2_assert_warn(sdp, !atomic_read(&sdp->sd_quota_count));





	if (sdp->sd_quota_bitmap) {

	if (sdp->sd_quota_bitmap) {

		for (x = 0; x < sdp->sd_quota_chunks; x++)

		if (is_vmalloc_addr(sdp->sd_quota_bitmap))

			kfree(sdp->sd_quota_bitmap[x]);

			vfree(sdp->sd_quota_bitmap);

		else

			kfree(sdp->sd_quota_bitmap);

			kfree(sdp->sd_quota_bitmap);

		sdp->sd_quota_bitmap = NULL;

	}

	}

}

}