+++ /dev/null
-
-Instead of allocating inode records in chunks and keeping a freelist of them
-which gets released to the system memory allocator in one go use plain malloc
-and free for them. The freelist just means adding a global lock instead
-of relying on malloc and free which could be implemented lockless. In
-addition smart allocators like tcmalloc have far less overhead than our
-chunk and linked list.
-
-Signed-off-by: Christoph Hellwig <hch@lst.de>
-
-Index: xfsprogs-dev/repair/incore_ext.c
-===================================================================
---- xfsprogs-dev.orig/repair/incore_ext.c 2011-11-10 14:01:04.905470023 +0000
-+++ xfsprogs-dev/repair/incore_ext.c 2011-11-14 10:14:57.696692843 +0000
-@@ -26,20 +26,6 @@
- #include "err_protos.h"
- #include "avl64.h"
- #include "threads.h"
--#define ALLOC_NUM_EXTS 100
--
--/*
-- * paranoia -- account for any weird padding, 64/32-bit alignment, etc.
-- */
--typedef struct extent_alloc_rec {
-- struct list_head list;
-- extent_tree_node_t extents[ALLOC_NUM_EXTS];
--} extent_alloc_rec_t;
--
--typedef struct rt_extent_alloc_rec {
-- struct list_head list;
-- rt_extent_tree_node_t extents[ALLOC_NUM_EXTS];
--} rt_extent_alloc_rec_t;
-
- /*
- * note: there are 4 sets of incore things handled here:
-@@ -57,21 +43,9 @@
- * phase 5. The uncertain inode list goes away at the end of
- * phase 3. The inode tree and bno/bnct trees go away after phase 5.
- */
--typedef struct ext_flist_s {
-- extent_tree_node_t *list;
-- int cnt;
--} ext_flist_t;
--
--static ext_flist_t ext_flist;
--
--typedef struct rt_ext_flist_s {
-- rt_extent_tree_node_t *list;
-- int cnt;
--} rt_ext_flist_t;
--
--static rt_ext_flist_t rt_ext_flist;
-
- static avl64tree_desc_t *rt_ext_tree_ptr; /* dup extent tree for rt */
-+static pthread_mutex_t rt_ext_tree_lock;
-
- static struct btree_root **dup_extent_trees; /* per ag dup extent trees */
- static pthread_mutex_t *dup_extent_tree_locks;
-@@ -89,19 +63,6 @@
- */
-
- /*
-- * list of allocated "blocks" for easy freeing later
-- */
--static struct list_head ba_list;
--static struct list_head rt_ba_list;
--
--/*
-- * locks.
-- */
--static pthread_mutex_t ext_flist_lock;
--static pthread_mutex_t rt_ext_tree_lock;
--static pthread_mutex_t rt_ext_flist_lock;
--
--/*
- * duplicate extent tree functions
- */
-
-@@ -167,60 +128,26 @@
- mk_extent_tree_nodes(xfs_agblock_t new_startblock,
- xfs_extlen_t new_blockcount, extent_state_t new_state)
- {
-- int i;
- extent_tree_node_t *new;
-- extent_alloc_rec_t *rec;
--
-- pthread_mutex_lock(&ext_flist_lock);
-- if (ext_flist.cnt == 0) {
-- ASSERT(ext_flist.list == NULL);
--
-- if ((rec = malloc(sizeof(extent_alloc_rec_t))) == NULL)
-- do_error(
-- _("couldn't allocate new extent descriptors.\n"));
--
-- list_add(&rec->list, &ba_list);
--
-- new = &rec->extents[0];
-
-- for (i = 0; i < ALLOC_NUM_EXTS; i++) {
-- new->avl_node.avl_nextino = (avlnode_t *)
-- ext_flist.list;
-- ext_flist.list = new;
-- ext_flist.cnt++;
-- new++;
-- }
-- }
--
-- ASSERT(ext_flist.list != NULL);
-+ new = malloc(sizeof(*new));
-+ if (!new)
-+ do_error(_("couldn't allocate new extent descriptor.\n"));
-
-- new = ext_flist.list;
-- ext_flist.list = (extent_tree_node_t *) new->avl_node.avl_nextino;
-- ext_flist.cnt--;
- new->avl_node.avl_nextino = NULL;
-- pthread_mutex_unlock(&ext_flist_lock);
--
-- /* initialize node */
--
- new->ex_startblock = new_startblock;
- new->ex_blockcount = new_blockcount;
- new->ex_state = new_state;
- new->next = NULL;
- new->last = NULL;
-
-- return(new);
-+ return new;
- }
-
- void
- release_extent_tree_node(extent_tree_node_t *node)
- {
-- pthread_mutex_lock(&ext_flist_lock);
-- node->avl_node.avl_nextino = (avlnode_t *) ext_flist.list;
-- ext_flist.list = node;
-- ext_flist.cnt++;
-- pthread_mutex_unlock(&ext_flist_lock);
--
-- return;
-+ free(node);
- }
-
- /*
-@@ -630,57 +557,24 @@
- mk_rt_extent_tree_nodes(xfs_drtbno_t new_startblock,
- xfs_extlen_t new_blockcount, extent_state_t new_state)
- {
-- int i;
- rt_extent_tree_node_t *new;
-- rt_extent_alloc_rec_t *rec;
-
-- pthread_mutex_lock(&rt_ext_flist_lock);
-- if (rt_ext_flist.cnt == 0) {
-- ASSERT(rt_ext_flist.list == NULL);
--
-- if ((rec = malloc(sizeof(rt_extent_alloc_rec_t))) == NULL)
-- do_error(
-- _("couldn't allocate new extent descriptors.\n"));
-+ new = malloc(sizeof(*new));
-+ if (!new)
-+ do_error(_("couldn't allocate new extent descriptor.\n"));
-
-- list_add(&rec->list, &rt_ba_list);
--
-- new = &rec->extents[0];
--
-- for (i = 0; i < ALLOC_NUM_EXTS; i++) {
-- new->avl_node.avl_nextino = (avlnode_t *)
-- rt_ext_flist.list;
-- rt_ext_flist.list = new;
-- rt_ext_flist.cnt++;
-- new++;
-- }
-- }
--
-- ASSERT(rt_ext_flist.list != NULL);
--
-- new = rt_ext_flist.list;
-- rt_ext_flist.list = (rt_extent_tree_node_t *) new->avl_node.avl_nextino;
-- rt_ext_flist.cnt--;
- new->avl_node.avl_nextino = NULL;
-- pthread_mutex_unlock(&rt_ext_flist_lock);
--
-- /* initialize node */
--
- new->rt_startblock = new_startblock;
- new->rt_blockcount = new_blockcount;
- new->rt_state = new_state;
--
-- return(new);
-+ return new;
- }
-
- #if 0
- void
- release_rt_extent_tree_node(rt_extent_tree_node_t *node)
- {
-- node->avl_node.avl_nextino = (avlnode_t *) rt_ext_flist.list;
-- rt_ext_flist.list = node;
-- rt_ext_flist.cnt++;
--
-- return;
-+ free(node);
- }
-
- void
-@@ -719,18 +613,9 @@
- void
- free_rt_dup_extent_tree(xfs_mount_t *mp)
- {
-- rt_extent_alloc_rec_t *cur, *tmp;
--
- ASSERT(mp->m_sb.sb_rblocks != 0);
--
-- list_for_each_entry_safe(cur, tmp, &rt_ba_list, list)
-- free(cur);
--
- free(rt_ext_tree_ptr);
--
- rt_ext_tree_ptr = NULL;
--
-- return;
- }
-
- /*
-@@ -862,11 +747,7 @@
- int i;
- xfs_agnumber_t agcount = mp->m_sb.sb_agcount;
-
-- list_head_init(&ba_list);
-- list_head_init(&rt_ba_list);
-- pthread_mutex_init(&ext_flist_lock, NULL);
- pthread_mutex_init(&rt_ext_tree_lock, NULL);
-- pthread_mutex_init(&rt_ext_flist_lock, NULL);
-
- dup_extent_trees = calloc(agcount, sizeof(struct btree_root *));
- if (!dup_extent_trees)
-@@ -908,11 +789,6 @@
- do_error(_("couldn't malloc dup rt extent tree descriptor\n"));
-
- avl64_init_tree(rt_ext_tree_ptr, &avl64_extent_tree_ops);
--
-- ext_flist.cnt = 0;
-- ext_flist.list = NULL;
--
-- return;
- }
-
- /*
-@@ -921,12 +797,8 @@
- void
- incore_ext_teardown(xfs_mount_t *mp)
- {
-- extent_alloc_rec_t *cur, *tmp;
- xfs_agnumber_t i;
-
-- list_for_each_entry_safe(cur, tmp, &ba_list, list)
-- free(cur);
--
- for (i = 0; i < mp->m_sb.sb_agcount; i++) {
- btree_destroy(dup_extent_trees[i]);
- free(extent_bno_ptrs[i]);
-
+++ /dev/null
-
-Instead of allocating inode records in chunks and keeping a freelist of them
-which never gets released to the system memory allocator use plain malloc
-and free for them. The freelist just means adding a global lock instead
-of relying on malloc and free which could be implemented lockless, and the
-freelist is almost completely worthless as we are done allocating new
-inode records once we start freeing them in major quantities.
-
-Signed-off-by: Christoph Hellwig <hch@lst.de>
-
-Index: xfsprogs-dev/repair/incore_ino.c
-===================================================================
---- xfsprogs-dev.orig/repair/incore_ino.c 2011-11-09 18:52:15.041861085 +0000
-+++ xfsprogs-dev/repair/incore_ino.c 2011-11-09 19:36:39.389806408 +0000
-@@ -25,7 +25,6 @@
- #include "threads.h"
- #include "err_protos.h"
-
--static pthread_mutex_t ino_flist_lock;
- extern avlnode_t *avl_firstino(avlnode_t *root);
-
- /*
-@@ -38,18 +37,6 @@
- */
- static avltree_desc_t **inode_uncertain_tree_ptrs;
-
--#define ALLOC_NUM_INOS 100
--
--/* free lists -- inode nodes and extent nodes */
--
--typedef struct ino_flist_s {
-- ino_tree_node_t *list;
-- ino_tree_node_t *last;
-- long long cnt;
--} ino_flist_t;
--
--static ino_flist_t ino_flist; /* free list must be initialized before use */
--
- /* memory optimised nlink counting for all inodes */
-
- static void nlink_grow_8_to_16(ino_tree_node_t *irec);
-@@ -238,102 +225,63 @@
- }
-
- /*
-- * next is the uncertain inode list -- a sorted (in ascending order)
-+ * Next is the uncertain inode list -- a sorted (in ascending order)
- * list of inode records sorted on the starting inode number. There
- * is one list per ag.
- */
-
- /*
-- * common code for creating inode records for use by trees and lists.
-+ * Common code for creating inode records for use by trees and lists.
- * called only from add_inodes and add_inodes_uncertain
- *
- * IMPORTANT: all inodes (inode records) start off as free and
- * unconfirmed.
- */
--/* ARGSUSED */
--static ino_tree_node_t *
--mk_ino_tree_nodes(
-+static struct ino_tree_node *
-+alloc_ino_node(
- xfs_agino_t starting_ino)
- {
-- int i;
-- ino_tree_node_t *ino_rec;
-- avlnode_t *node;
--
-- pthread_mutex_lock(&ino_flist_lock);
-- if (ino_flist.cnt == 0) {
-- ASSERT(ino_flist.list == NULL);
--
-- if ((ino_rec = malloc(sizeof(ino_tree_node_t[ALLOC_NUM_INOS])))
-- == NULL)
-- do_error(_("inode map malloc failed\n"));
--
-- for (i = 0; i < ALLOC_NUM_INOS; i++) {
-- ino_rec->avl_node.avl_nextino =
-- (avlnode_t *) ino_flist.list;
-- ino_flist.list = ino_rec;
-- ino_flist.cnt++;
-- ino_rec++;
-- }
-- }
-+ struct ino_tree_node *irec;
-
-- ASSERT(ino_flist.list != NULL);
--
-- ino_rec = ino_flist.list;
-- ino_flist.list = (ino_tree_node_t *) ino_rec->avl_node.avl_nextino;
-- ino_flist.cnt--;
-- node = &ino_rec->avl_node;
-- node->avl_nextino = node->avl_forw = node->avl_back = NULL;
-- pthread_mutex_unlock(&ino_flist_lock);
--
-- /* initialize node */
--
-- ino_rec->ino_startnum = 0;
-- ino_rec->ino_confirmed = 0;
-- ino_rec->ino_isa_dir = 0;
-- ino_rec->ir_free = (xfs_inofree_t) - 1;
-- ino_rec->ino_un.ex_data = NULL;
-- ino_rec->nlinkops = &nlinkops[0];
-- ino_rec->disk_nlinks = calloc(1, nlinkops[0].nlink_size);
-- if (ino_rec->disk_nlinks == NULL)
-+ irec = malloc(sizeof(*irec));
-+ if (!irec)
-+ do_error(_("inode map malloc failed\n"));
-+
-+ irec->avl_node.avl_nextino = NULL;
-+ irec->avl_node.avl_forw = NULL;
-+ irec->avl_node.avl_back = NULL;
-+
-+ irec->ino_startnum = starting_ino;
-+ irec->ino_confirmed = 0;
-+ irec->ino_isa_dir = 0;
-+ irec->ir_free = (xfs_inofree_t) - 1;
-+ irec->ino_un.ex_data = NULL;
-+ irec->nlinkops = &nlinkops[0];
-+ irec->disk_nlinks = calloc(1, nlinkops[0].nlink_size);
-+ if (!irec->disk_nlinks)
- do_error(_("could not allocate nlink array\n"));
--
-- return(ino_rec);
-+ return irec;
- }
-
--/*
-- * return inode record to free list, will be initialized when
-- * it gets pulled off list
-- */
- static void
--free_ino_tree_node(ino_tree_node_t *ino_rec)
-+free_ino_tree_node(
-+ struct ino_tree_node *irec)
- {
-- ino_rec->avl_node.avl_nextino = NULL;
-- ino_rec->avl_node.avl_forw = NULL;
-- ino_rec->avl_node.avl_back = NULL;
--
-- pthread_mutex_lock(&ino_flist_lock);
-- if (ino_flist.list != NULL) {
-- ASSERT(ino_flist.cnt > 0);
-- ino_rec->avl_node.avl_nextino = (avlnode_t *) ino_flist.list;
-- } else {
-- ASSERT(ino_flist.cnt == 0);
-- ino_rec->avl_node.avl_nextino = NULL;
-- }
-+ irec->avl_node.avl_nextino = NULL;
-+ irec->avl_node.avl_forw = NULL;
-+ irec->avl_node.avl_back = NULL;
-
-- ino_flist.list = ino_rec;
-- ino_flist.cnt++;
--
-- free(ino_rec->disk_nlinks);
--
-- if (ino_rec->ino_un.ex_data != NULL) {
-+ free(irec->disk_nlinks);
-+ if (irec->ino_un.ex_data != NULL) {
- if (full_ino_ex_data) {
-- free(ino_rec->ino_un.ex_data->parents);
-- free(ino_rec->ino_un.ex_data->counted_nlinks);
-+ free(irec->ino_un.ex_data->parents);
-+ free(irec->ino_un.ex_data->counted_nlinks);
- }
-- free(ino_rec->ino_un.ex_data);
-+ free(irec->ino_un.ex_data);
-
- }
-- pthread_mutex_unlock(&ino_flist_lock);
-+
-+ free(irec);
- }
-
- /*
-@@ -379,17 +327,15 @@
- * check to see if record containing inode is already in the tree.
- * if not, add it
- */
-- if ((ino_rec = (ino_tree_node_t *)
-- avl_findrange(inode_uncertain_tree_ptrs[agno],
-- s_ino)) == NULL) {
-- ino_rec = mk_ino_tree_nodes(s_ino);
-- ino_rec->ino_startnum = s_ino;
--
-- if (avl_insert(inode_uncertain_tree_ptrs[agno],
-- (avlnode_t *) ino_rec) == NULL) {
-- do_error(_("add_aginode_uncertain - "
-- "duplicate inode range\n"));
-- }
-+ ino_rec = (ino_tree_node_t *)
-+ avl_findrange(inode_uncertain_tree_ptrs[agno], s_ino);
-+ if (!ino_rec) {
-+ ino_rec = alloc_ino_node(s_ino);
-+
-+ if (!avl_insert(inode_uncertain_tree_ptrs[agno],
-+ &ino_rec->avl_node))
-+ do_error(
-+ _("add_aginode_uncertain - duplicate inode range\n"));
- }
-
- if (free)
-@@ -454,43 +400,38 @@
-
-
- /*
-- * next comes the inode trees. One per ag. AVL trees
-- * of inode records, each inode record tracking 64 inodes
-+ * Next comes the inode trees. One per AG, AVL trees of inode records, each
-+ * inode record tracking 64 inodes
- */
-+
- /*
-- * set up an inode tree record for a group of inodes that will
-- * include the requested inode.
-- *
-- * does NOT error-check for duplicate records. Caller is
-- * responsible for checking that.
-+ * Set up an inode tree record for a group of inodes that will include the
-+ * requested inode.
- *
-- * ino must be the start of an XFS_INODES_PER_CHUNK (64) inode chunk
-+ * This does NOT do error-check for duplicate records. The caller is
-+ * responsible for checking that. Ino must be the start of an
-+ * XFS_INODES_PER_CHUNK (64) inode chunk
- *
-- * Each inode resides in a 64-inode chunk which can be part
-- * one or more chunks (MAX(64, inodes-per-block). The fs allocates
-- * in chunks (as opposed to 1 chunk) when a block can hold more than
-- * one chunk (inodes per block > 64). Allocating in one chunk pieces
-- * causes us problems when it takes more than one fs block to contain
-- * an inode chunk because the chunks can start on *any* block boundary.
-- * So we assume that the caller has a clue because at this level, we
-- * don't.
-- */
--static ino_tree_node_t *
--add_inode(struct xfs_mount *mp, xfs_agnumber_t agno, xfs_agino_t ino)
-+ * Each inode resides in a 64-inode chunk which can be part one or more chunks
-+ * (MAX(64, inodes-per-block). The fs allocates in chunks (as opposed to 1
-+ * chunk) when a block can hold more than one chunk (inodes per block > 64).
-+ * Allocating in one chunk pieces causes us problems when it takes more than
-+ * one fs block to contain an inode chunk because the chunks can start on
-+ * *any* block boundary. So we assume that the caller has a clue because at
-+ * this level, we don't.
-+ */
-+static struct ino_tree_node *
-+add_inode(
-+ struct xfs_mount *mp,
-+ xfs_agnumber_t agno,
-+ xfs_agino_t agino)
- {
-- ino_tree_node_t *ino_rec;
--
-- /* no record exists, make some and put them into the tree */
--
-- ino_rec = mk_ino_tree_nodes(ino);
-- ino_rec->ino_startnum = ino;
-+ struct ino_tree_node *irec;
-
-- if (avl_insert(inode_tree_ptrs[agno],
-- (avlnode_t *) ino_rec) == NULL) {
-+ irec = alloc_ino_node(agino);
-+ if (!avl_insert(inode_tree_ptrs[agno], &irec->avl_node))
- do_warn(_("add_inode - duplicate inode range\n"));
-- }
--
-- return(ino_rec);
-+ return irec;
- }
-
- /*
-@@ -816,7 +757,6 @@
- int i;
- int agcount = mp->m_sb.sb_agcount;
-
-- pthread_mutex_init(&ino_flist_lock, NULL);
- if ((inode_tree_ptrs = malloc(agcount *
- sizeof(avltree_desc_t *))) == NULL)
- do_error(_("couldn't malloc inode tree descriptor table\n"));
-@@ -839,9 +779,6 @@
- avl_init_tree(inode_uncertain_tree_ptrs[i], &avl_ino_tree_ops);
- }
-
-- ino_flist.cnt = 0;
-- ino_flist.list = NULL;
--
- if ((last_rec = malloc(sizeof(ino_tree_node_t *) * agcount)) == NULL)
- do_error(_("couldn't malloc uncertain inode cache area\n"));
-
-
projects / packages / xfsprogs.git / commitdiff