|
@@ -79,23 +79,26 @@ static u32 mlx4_buddy_alloc(struct mlx4_buddy *buddy, int order)
|
|
|
|
|
|
spin_lock(&buddy->lock);
|
|
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);
|
|
spin_unlock(&buddy->lock);
|
|
return -1;
|
|
return -1;
|
|
|
|
|
|
found:
|
|
found:
|
|
clear_bit(seg, buddy->bits[o]);
|
|
clear_bit(seg, buddy->bits[o]);
|
|
|
|
+ --buddy->num_free[o];
|
|
|
|
|
|
while (o > order) {
|
|
while (o > order) {
|
|
--o;
|
|
--o;
|
|
seg <<= 1;
|
|
seg <<= 1;
|
|
set_bit(seg ^ 1, buddy->bits[o]);
|
|
set_bit(seg ^ 1, buddy->bits[o]);
|
|
|
|
+ ++buddy->num_free[o];
|
|
}
|
|
}
|
|
|
|
|
|
spin_unlock(&buddy->lock);
|
|
spin_unlock(&buddy->lock);
|
|
@@ -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])) {
|
|
while (test_bit(seg ^ 1, buddy->bits[order])) {
|
|
clear_bit(seg ^ 1, buddy->bits[order]);
|
|
clear_bit(seg ^ 1, buddy->bits[order]);
|
|
|
|
+ --buddy->num_free[order];
|
|
seg >>= 1;
|
|
seg >>= 1;
|
|
++order;
|
|
++order;
|
|
}
|
|
}
|
|
|
|
|
|
set_bit(seg, buddy->bits[order]);
|
|
set_bit(seg, buddy->bits[order]);
|
|
|
|
+ ++buddy->num_free[order];
|
|
|
|
|
|
spin_unlock(&buddy->lock);
|
|
spin_unlock(&buddy->lock);
|
|
}
|
|
}
|
|
@@ -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 *),
|
|
buddy->bits = kzalloc((buddy->max_order + 1) * sizeof (long *),
|
|
GFP_KERNEL);
|
|
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;
|
|
goto err_out;
|
|
|
|
|
|
for (i = 0; i <= buddy->max_order; ++i) {
|
|
for (i = 0; i <= buddy->max_order; ++i) {
|
|
@@ -143,6 +150,7 @@ static int mlx4_buddy_init(struct mlx4_buddy *buddy, int max_order)
|
|
}
|
|
}
|
|
|
|
|
|
set_bit(0, buddy->bits[buddy->max_order]);
|
|
set_bit(0, buddy->bits[buddy->max_order]);
|
|
|
|
+ buddy->num_free[buddy->max_order] = 1;
|
|
|
|
|
|
return 0;
|
|
return 0;
|
|
|
|
|
|
@@ -150,9 +158,10 @@ err_out_free:
|
|
for (i = 0; i <= buddy->max_order; ++i)
|
|
for (i = 0; i <= buddy->max_order; ++i)
|
|
kfree(buddy->bits[i]);
|
|
kfree(buddy->bits[i]);
|
|
|
|
|
|
|
|
+err_out:
|
|
kfree(buddy->bits);
|
|
kfree(buddy->bits);
|
|
|
|
+ kfree(buddy->num_free);
|
|
|
|
|
|
-err_out:
|
|
|
|
return -ENOMEM;
|
|
return -ENOMEM;
|
|
}
|
|
}
|
|
|
|
|
|
@@ -164,6 +173,7 @@ static void mlx4_buddy_cleanup(struct mlx4_buddy *buddy)
|
|
kfree(buddy->bits[i]);
|
|
kfree(buddy->bits[i]);
|
|
|
|
|
|
kfree(buddy->bits);
|
|
kfree(buddy->bits);
|
|
|
|
+ kfree(buddy->num_free);
|
|
}
|
|
}
|
|
|
|
|
|
static u32 mlx4_alloc_mtt_range(struct mlx4_dev *dev, int order)
|
|
static u32 mlx4_alloc_mtt_range(struct mlx4_dev *dev, int order)
|