Skip to content

Commit

Permalink
mlx4_core: Keep free count for MTT buddy allocator
Browse files Browse the repository at this point in the history
MTT entries are allocated with a buddy allocator, which just keeps
bitmaps for each level of the buddy table.  However, all free space
starts out at the highest order, and small allocations start scanning
from the lowest order.  When the lowest order tables have no free
space, this can lead to scanning potentially millions of bits before
finding a free entry at a higher order.

We can avoid this by just keeping a count of how many free entries
each order has, and skipping the bitmap scan when an order is
completely empty.  This provides a nice performance boost for a
negligible increase in memory usage.

Signed-off-by: Roland Dreier <rolandd@cisco.com>
  • Loading branch information
Roland Dreier committed Jul 22, 2008
1 parent 899698d commit e4044cf
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 8 deletions.
1 change: 1 addition & 0 deletions drivers/net/mlx4/mlx4.h
Original file line number Diff line number Diff line change
Expand Up @@ -118,6 +118,7 @@ struct mlx4_bitmap {

struct mlx4_buddy {
unsigned long **bits;
unsigned int *num_free;
int max_order;
spinlock_t lock;
};
Expand Down
26 changes: 18 additions & 8 deletions drivers/net/mlx4/mr.c
Original file line number Diff line number Diff line change
Expand Up @@ -79,23 +79,26 @@ static u32 mlx4_buddy_alloc(struct mlx4_buddy *buddy, int order)

spin_lock(&buddy->lock);

for (o = order; o <= buddy->max_order; ++o) {
m = 1 << (buddy->max_order - o);
seg = find_first_bit(buddy->bits[o], m);
if (seg < m)
goto found;
}
for (o = order; o <= buddy->max_order; ++o)
if (buddy->num_free[o]) {
m = 1 << (buddy->max_order - o);
seg = find_first_bit(buddy->bits[o], m);
if (seg < m)
goto found;
}

spin_unlock(&buddy->lock);
return -1;

found:
clear_bit(seg, buddy->bits[o]);
--buddy->num_free[o];

while (o > order) {
--o;
seg <<= 1;
set_bit(seg ^ 1, buddy->bits[o]);
++buddy->num_free[o];
}

spin_unlock(&buddy->lock);
Expand All @@ -113,11 +116,13 @@ static void mlx4_buddy_free(struct mlx4_buddy *buddy, u32 seg, int order)

while (test_bit(seg ^ 1, buddy->bits[order])) {
clear_bit(seg ^ 1, buddy->bits[order]);
--buddy->num_free[order];
seg >>= 1;
++order;
}

set_bit(seg, buddy->bits[order]);
++buddy->num_free[order];

spin_unlock(&buddy->lock);
}
Expand All @@ -131,7 +136,9 @@ static int mlx4_buddy_init(struct mlx4_buddy *buddy, int max_order)

buddy->bits = kzalloc((buddy->max_order + 1) * sizeof (long *),
GFP_KERNEL);
if (!buddy->bits)
buddy->num_free = kzalloc((buddy->max_order + 1) * sizeof (int *),
GFP_KERNEL);
if (!buddy->bits || !buddy->num_free)
goto err_out;

for (i = 0; i <= buddy->max_order; ++i) {
Expand All @@ -143,16 +150,18 @@ static int mlx4_buddy_init(struct mlx4_buddy *buddy, int max_order)
}

set_bit(0, buddy->bits[buddy->max_order]);
buddy->num_free[buddy->max_order] = 1;

return 0;

err_out_free:
for (i = 0; i <= buddy->max_order; ++i)
kfree(buddy->bits[i]);

err_out:
kfree(buddy->bits);
kfree(buddy->num_free);

err_out:
return -ENOMEM;
}

Expand All @@ -164,6 +173,7 @@ static void mlx4_buddy_cleanup(struct mlx4_buddy *buddy)
kfree(buddy->bits[i]);

kfree(buddy->bits);
kfree(buddy->num_free);
}

static u32 mlx4_alloc_mtt_range(struct mlx4_dev *dev, int order)
Expand Down

0 comments on commit e4044cf

Please sign in to comment.