Attachment 316363 Details for Bug 298931 – New and improved

[patch] New and improved

bz298931.patch (text/plain), 5.94 KB, created by Abhijith Das on 2008-09-10 21:52:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Abhijith Das

Created: 2008-09-10 21:52:14 UTC

Size: 5.94 KB

patch

obsolete

>diff -Nupr a/gfs-kernel/src/gfs/daemon.c b/gfs-kernel/src/gfs/daemon.c
>--- a/gfs-kernel/src/gfs/daemon.c	2008-09-08 11:11:18.000000000 -0500
>+++ b/gfs-kernel/src/gfs/daemon.c	2008-09-09 15:08:34.000000000 -0500
>@@ -26,6 +26,7 @@
> #include "recovery.h"
> #include "super.h"
> #include "unlinked.h"
>+#include "rgrp.h"
> 
> /**
>  * gfs_scand - Look for cached glocks and inodes to toss from memory
>@@ -186,7 +187,10 @@ gfs_inoded(void *data)
> 	struct gfs_sbd *sdp = (struct gfs_sbd *)data;
> 
> 	while (!kthread_should_stop()) {
>+		uint64_t inodes, metadata;
> 		gfs_unlinked_dealloc(sdp);
>+		gfs_reclaim_metadata(sdp, &inodes, &metadata, 
>+				     gfs_tune_get(sdp, gt_rgrp_free_perc));
> 		schedule_timeout_interruptible(gfs_tune_get(sdp, gt_inoded_secs) * HZ);
> 	}
> 
>diff -Nupr a/gfs-kernel/src/gfs/incore.h b/gfs-kernel/src/gfs/incore.h
>--- a/gfs-kernel/src/gfs/incore.h	2008-09-08 11:11:18.000000000 -0500
>+++ b/gfs-kernel/src/gfs/incore.h	2008-09-10 14:12:41.000000000 -0500
>@@ -216,6 +216,8 @@ struct gfs_bitmap {
> 	uint32_t bi_len;     /* The number of bitmap bytes in this bit block */
> };
> 
>+#define RD_FL_META2FREE        (0x00000001)  /* rgrpd has freeable metadata */
>+
> /*
>  *  Resource Group (Rgrp) descriptor structure.
>  *  There is one of these for each resource (block) group in the FS.
>@@ -249,6 +251,7 @@ struct gfs_rgrpd {
> 	struct list_head rd_depend;     /* Dependent inodes (MRU order) */
> 
> 	struct gfs_sbd *rd_sbd;		/* FS incore superblock (fs instance) */
>+	uint32_t rd_flags;              /* RD_FL_XXX : flags for this rgrpd */
> };
> 
> /*
>@@ -905,6 +908,7 @@ struct gfs_tune {
> 	unsigned int gt_greedy_max;
> 	unsigned int gt_rgrp_try_threshold;
> 	unsigned int gt_statfs_fast;
>+	unsigned int gt_rgrp_free_perc; /* % of total rgrps to free metadata from */
> };
> 
> /*
>diff -Nupr a/gfs-kernel/src/gfs/ioctl.c b/gfs-kernel/src/gfs/ioctl.c
>--- a/gfs-kernel/src/gfs/ioctl.c	2008-09-08 11:11:18.000000000 -0500
>+++ b/gfs-kernel/src/gfs/ioctl.c	2008-09-09 15:08:34.000000000 -0500
>@@ -485,6 +485,7 @@ gi_get_tune(struct gfs_inode *ip,
>         gfs_printf("greedy_max %u\n", gt->gt_greedy_max);
>         gfs_printf("rgrp_try_threshold %u\n", gt->gt_rgrp_try_threshold);
>         gfs_printf("statfs_fast %u\n", gt->gt_statfs_fast);
>+        gfs_printf("rgrp_free_perc %u\n", gt->gt_rgrp_free_perc);
> 
>         error = 0;
> 
>@@ -772,8 +773,10 @@ gi_set_tune(struct gfs_sbd *sdp, struct 
> 			return error;
> 		else
> 			tune_set(gt_statfs_fast, x);
>-
>-
>+	} else if (strcmp(param, "rgrp_free_perc") == 0) {
>+		if (sscanf(value, "%u", &x) > 100)
>+			return -EINVAL;
>+		tune_set(gt_rgrp_free_perc, x);
> 	} else
> 		return -EINVAL;
> 
>@@ -808,7 +811,8 @@ gi_do_reclaim(struct gfs_inode *ip,
> 
> 	error = gfs_reclaim_metadata(ip->i_sbd,
> 				     &inodes,
>-				     &metadata);
>+				     &metadata,
>+				     100);
> 	if (error)
> 		return error;
> 
>diff -Nupr a/gfs-kernel/src/gfs/rgrp.c b/gfs-kernel/src/gfs/rgrp.c
>--- a/gfs-kernel/src/gfs/rgrp.c	2008-09-08 11:11:18.000000000 -0500
>+++ b/gfs-kernel/src/gfs/rgrp.c	2008-09-10 16:43:18.000000000 -0500
>@@ -1534,6 +1534,9 @@ blkfree_internal(struct gfs_sbd *sdp, ui
> 			   bits->bi_len, buf_blk, new_state);
> 	}
> 
>+	if (new_state == GFS_BLKST_FREEMETA)
>+		rgd->rd_flags |= RD_FL_META2FREE;
>+
> 	return rgd;
> }
> 
>@@ -2022,7 +2025,8 @@ gfs_rlist_free(struct gfs_rgrp_list *rli
> int
> gfs_reclaim_metadata(struct gfs_sbd *sdp, 
> 		     uint64_t *inodes,
>-		     uint64_t *metadata)
>+		     uint64_t *metadata,
>+		     uint32_t percent)
> {
> 	struct gfs_holder ji_gh, ri_gh, rgd_gh, t_gh;
> 	struct gfs_rgrpd *rgd;
>@@ -2034,12 +2038,18 @@ gfs_reclaim_metadata(struct gfs_sbd *sdp
> 	uint32_t goal;
> 	unsigned int x;
> 	int error = 0;
>+	uint64_t rg_max = (percent * sdp->sd_rgcount)/100, rg_count = 0;
>+	/* For large filesystems, even 1% of total rgrps could be a big
>+	   number. This hard limit of 1000 rgrps-to-loop/reclaim-cycle 
>+	   will help in performance. Ignored when reclaim called from 
>+	   ioctl. i.e. percent=100 */
>+	unsigned int rg_max_hard_lt = 1000, i;
> 
>+	rg_max = percent && !rg_max ? 1 : rg_max; /* fs with #rgs < 100 */
> 	*inodes = *metadata = 0;
> 
> 	/* Acquire the jindex lock here so we don't deadlock with a
> 	   process writing the the jindex inode. :-( */
>-
> 	error = gfs_jindex_hold(sdp, &ji_gh);
> 	if (error)
> 		goto fail;
>@@ -2047,10 +2057,16 @@ gfs_reclaim_metadata(struct gfs_sbd *sdp
> 	error = gfs_rindex_hold(sdp, &ri_gh);
> 	if (error)
> 		goto fail_jindex_relse;
>+	
>+	for (rgd = gfs_rgrpd_get_first(sdp), i=0;
>+	     rgd && rg_count < rg_max;
>+	     rgd = gfs_rgrpd_get_next(rgd), i++) {
>+
>+		if (percent != 100 && i >= rg_max_hard_lt)
>+			break;
>+		if (!(rgd->rd_flags & RD_FL_META2FREE))
>+			continue;
> 
>-	for (rgd = gfs_rgrpd_get_first(sdp);
>-	     rgd;
>-	     rgd = gfs_rgrpd_get_next(rgd)) {
> 		error = gfs_glock_nq_init(rgd->rd_gl,
> 					  LM_ST_EXCLUSIVE, GL_NOCACHE,
> 					  &rgd_gh);
>@@ -2063,6 +2079,7 @@ gfs_reclaim_metadata(struct gfs_sbd *sdp
> 
> 		if (!rg->rg_freedi && !rg->rg_freemeta) {
> 			gfs_glock_dq_uninit(&rgd_gh);
>+			rgd->rd_flags &= ~RD_FL_META2FREE;
> 			continue;
> 		}
> 
>@@ -2135,6 +2152,9 @@ gfs_reclaim_metadata(struct gfs_sbd *sdp
> 
> 		gfs_glock_dq_uninit(&t_gh);
> 
>+		rgd->rd_flags &= ~RD_FL_META2FREE;
>+		rg_count++;
>+
> 		gfs_glock_dq_uninit(&rgd_gh);
> 	}
> 
>diff -Nupr a/gfs-kernel/src/gfs/rgrp.h b/gfs-kernel/src/gfs/rgrp.h
>--- a/gfs-kernel/src/gfs/rgrp.h	2008-09-08 11:11:18.000000000 -0500
>+++ b/gfs-kernel/src/gfs/rgrp.h	2008-09-09 15:08:34.000000000 -0500
>@@ -83,6 +83,7 @@ void gfs_rlist_free(struct gfs_rgrp_list
> 
> int gfs_reclaim_metadata(struct gfs_sbd *sdp,
> 			 uint64_t *inodes,
>-			 uint64_t *metadata);
>+			 uint64_t *metadata,
>+			 uint32_t percent);
> 
> #endif /* __RGRP_DOT_H__ */
>diff -Nupr a/gfs-kernel/src/gfs/super.c b/gfs-kernel/src/gfs/super.c
>--- a/gfs-kernel/src/gfs/super.c	2008-09-08 11:11:18.000000000 -0500
>+++ b/gfs-kernel/src/gfs/super.c	2008-09-09 15:08:34.000000000 -0500
>@@ -88,6 +88,7 @@ gfs_tune_init(struct gfs_tune *gt)
> 	gt->gt_greedy_max = HZ / 4;
> 	gt->gt_rgrp_try_threshold = 100;
> 	gt->gt_statfs_fast = 0;
>+	gt->gt_rgrp_free_perc = 5;
> }
> 
> /**

Actions: View | Diff

Attachments on bug 298931: 314932 | 316363 | 316624