mlx4_core: multi-function resource setup
Subsystems (5)
PATCH 14/25 mlx4_core: multi-function resource setup
Only master function needs to configure eq asynch events, and initialize resource allocators.
Signed-off-by Liran Liss <[email protected]>
--- drivers/net/mlx4/cq.c | 4 +++ drivers/net/mlx4/eq.c | 61 ++++++++++++++++++++++++------------------ drivers/net/mlx4/main.c | 45 +++++++++++++++++-------------- drivers/net/mlx4/mcg.c | 6 ++++ drivers/net/mlx4/mr.c | 6 ++++ drivers/net/mlx4/pd.c | 12 ++++++-- drivers/net/mlx4/qp.c | 33 ++++++++++++++++++++++- drivers/net/mlx4/srq.c | 4 +++ include/linux/mlx4/device.h | 1 + 9 files changed, 121 insertions(+), 51 deletions(-)
drivers/net/mlx4/cq.c +4 -0
@@ -353,6 +353,8 @@ int mlx4_init_cq_table(struct mlx4_dev *dev)spin_lock_init (&cq_table->lock);INIT_RADIX_TREE (&cq_table->tree,GFP_ATOMIC ); +if (mlx4_is_slave (dev)) +return 0 ; err =mlx4_bitmap_init (&cq_table->bitmap, dev->caps.num_cqs, dev->caps.num_cqs -1 , dev->caps.reserved_cqs,0 );
@@ -364,6 +366,8 @@ int mlx4_init_cq_table(struct mlx4_dev *dev)void mlx4_cleanup_cq_table (struct mlx4_dev *dev) { +if (mlx4_is_slave (dev)) +return ;/* Nothing to do to clean up radix_tree */ mlx4_bitmap_cleanup (&mlx4_priv (dev)->cq_table.bitmap); }
drivers/net/mlx4/eq.c +35 -26
114 lines not on this page · raw message
drivers/net/mlx4/main.c +25 -20
65 lines not on this page · raw message
drivers/net/mlx4/mcg.c +6 -0
@@ -393,6 +393,10 @@ int mlx4_init_mcg_table(struct mlx4_dev *dev)struct mlx4_priv *priv =mlx4_priv (dev);int err; +/* Nothing to do for slaves - mcg handling is para-virtualized */ +if (mlx4_is_slave (dev)) +return 0 ; + err =mlx4_bitmap_init (&priv->mcg_table.bitmap, dev->caps.num_amgms, dev->caps.num_amgms -1 ,0 ,0 );if (err)
@@ -405,5 +409,7 @@ int mlx4_init_mcg_table(struct mlx4_dev *dev)void mlx4_cleanup_mcg_table (struct mlx4_dev *dev) { +if (mlx4_is_slave (dev)) +return ;mlx4_bitmap_cleanup (&mlx4_priv (dev)->mcg_table.bitmap); }
drivers/net/mlx4/mr.c +6 -0
@@ -612,6 +612,10 @@ int mlx4_init_mr_table(struct mlx4_dev *dev)struct mlx4_mr_table *mr_table = &mlx4_priv (dev)->mr_table;int err; +/* Nothing to do for slaves - all MR handling is forwarded to the master */ +if (mlx4_is_slave (dev)) +return 0 ; + err =mlx4_bitmap_init (&mr_table->mpt_bitmap, dev->caps.num_mpts, ~0 , dev->caps.reserved_mrws,0 );if (err)
@@ -646,6 +650,8 @@ void mlx4_cleanup_mr_table(struct mlx4_dev *dev) {struct mlx4_mr_table *mr_table = &mlx4_priv (dev)->mr_table; +if (mlx4_is_slave (dev)) +return ;mlx4_buddy_cleanup (&mr_table->mtt_buddy);mlx4_bitmap_cleanup (&mr_table->mpt_bitmap); }
drivers/net/mlx4/pd.c +9 -3
@@ -96,6 +96,10 @@ EXPORT_SYMBOL_GPL(mlx4_uar_free);int mlx4_init_uar_table (struct mlx4_dev *dev) { +/* CX1: master doesn't have UARs */ +if (mlx4_is_master (dev)) +return 0 ; +if (dev->caps.num_uars <=128 ) {mlx4_err (dev,"Only %d UAR pages (need more than 128)\n" , dev->caps.num_uars);
@@ -103,12 +107,14 @@ int mlx4_init_uar_table(struct mlx4_dev *dev)return -ENODEV ; } -return mlx4_bitmap_init (&mlx4_priv (dev)->uar_table.bitmap, - dev->caps.num_uars, dev->caps.num_uars -1 , -max (128 , dev->caps.reserved_uars),0 ); +return mlx4_bitmap_init_no_mask (&mlx4_priv (dev)->uar_table.bitmap, + dev->caps.num_uars, + dev->caps.reserved_uars,0 ); }void mlx4_cleanup_uar_table (struct mlx4_dev *dev) { +if (mlx4_is_master (dev)) +return ;mlx4_bitmap_cleanup (&mlx4_priv (dev)->uar_table.bitmap); }
drivers/net/mlx4/qp.c +31 -2
@@ -406,6 +406,23 @@ int mlx4_init_qp_table(struct mlx4_dev *dev)spin_lock_init (&qp_table->lock);INIT_RADIX_TREE (&dev->qp_table_tree,GFP_ATOMIC ); +if (mlx4_is_slave (dev)) { +/* For each slave, just allocate a normal 8-byte alligned special-QP +* range intead of mlx4_init_qp_table() reservation */ + err =mlx4_qp_reserve_range (dev,8 ,8 , &dev->caps.sqp_start); +if (err) { +mlx4_err (dev,"Failed to allocate special QP range\n" ); +return err; + } + + err =mlx4_CONF_SPECIAL_QP (dev, dev->caps.sqp_start); +if (err) { +mlx4_err (dev,"Failed to configure special QP range\n" ); +mlx4_qp_release_range (dev, dev->caps.sqp_start,8 ); +return err; + } +return 0 ; + }/* * We reserve 2 extra QPs per port for the special QPs. The
@@ -415,6 +432,10 @@ int mlx4_init_qp_table(struct mlx4_dev *dev) dev->caps.sqp_start =ALIGN (dev->caps.reserved_qps_cnt[MLX4_QP_REGION_FW ],8 ); +/* If multi-function is enabled, we reserve an additional QP for qp0/1 tunneling. +* CX1: slave0 manages tunnel QP */ + dev->caps.tunnel_qpn =mlx4_is_master (dev) ? dev->caps.sqp_start +8 :0 ; + {int sort[MLX4_NUM_QP_REGION ];int i, j, tmp;
@@ -444,17 +465,25 @@ int mlx4_init_qp_table(struct mlx4_dev *dev) } err =mlx4_bitmap_init (&qp_table->bitmap, dev->caps.num_qps, - (1 <<23 ) -1 , dev->caps.sqp_start +8 , - reserved_from_top); + (1 <<23 ) -1 , dev->caps.sqp_start +8 + +2 * !!dev->caps.tunnel_qpn, reserved_from_top);if (err)return err; +/* CX1: master has no QPs */ +if (mlx4_is_master (dev)) +return 0 ; +return mlx4_CONF_SPECIAL_QP (dev, dev->caps.sqp_start); }void mlx4_cleanup_qp_table (struct mlx4_dev *dev) {mlx4_CONF_SPECIAL_QP (dev,0 ); +if (mlx4_is_slave (dev)) { +mlx4_qp_release_range (dev, dev->caps.sqp_start,8 ); +return ; + }mlx4_bitmap_cleanup (&mlx4_priv (dev)->qp_table.bitmap); }
drivers/net/mlx4/srq.c +4 -0
@@ -287,6 +287,8 @@ int mlx4_init_srq_table(struct mlx4_dev *dev)spin_lock_init (&srq_table->lock);INIT_RADIX_TREE (&srq_table->tree,GFP_ATOMIC ); +if (mlx4_is_slave (dev)) +return 0 ; err =mlx4_bitmap_init (&srq_table->bitmap, dev->caps.num_srqs, dev->caps.num_srqs -1 , dev->caps.reserved_srqs,0 );
@@ -298,5 +300,7 @@ int mlx4_init_srq_table(struct mlx4_dev *dev)void mlx4_cleanup_srq_table (struct mlx4_dev *dev) { +if (mlx4_is_slave (dev)) +return ;mlx4_bitmap_cleanup (&mlx4_priv (dev)->srq_table.bitmap); }
include/linux/mlx4/device.h +1 -0
@@ -204,6 +204,7 @@ struct mlx4_caps {int max_qp_init_rdma;int max_qp_dest_rdma;int sqp_start; +int tunnel_qpn;int num_srqs;int max_srq_wqes;int max_srq_sge;
Signature · 1 line
1.6.1.3