The master function builds a HW profile, and manages all resources. Other functions query the master for function-specific capabilities. EQs, MSI-X vectors, and UARs are statically divided among all functions, while other resources are dynamically assigned later upon request.
Signed-off-by: Liran Liss <[email protected]> Signed-off-by: Yevgeny Petrilin <[email protected]> --- drivers/net/mlx4/cmd.c | 9 ++++++ drivers/net/mlx4/fw.c | 39 +++++++++++++++++++++++++ drivers/net/mlx4/fw.h | 4 ++ drivers/net/mlx4/main.c | 67 ++++++++++++++++++++++++++++++++++++++++++- drivers/net/mlx4/mlx4.h | 8 ++++- drivers/net/mlx4/profile.c | 26 ++++++++++++++-- include/linux/mlx4/cmd.h | 1 + include/linux/mlx4/device.h | 3 ++ 8 files changed, 151 insertions(+), 6 deletions(-) diff --git a/drivers/net/mlx4/cmd.c b/drivers/net/mlx4/cmd.c index ce467ca..a4722e2 100644 --- a/drivers/net/mlx4/cmd.c +++ b/drivers/net/mlx4/cmd.c @@ -40,6 +40,7 @@ #include <asm/io.h> #include "mlx4.h" +#include "fw.h" #define CMD_POLL_TOKEN 0xffff @@ -550,6 +551,14 @@ static struct mlx4_cmd_info { .wrapper = NULL }, { + .opcode = MLX4_CMD_QUERY_SLAVE_CAP, + .has_inbox = false, + .has_outbox = true, + .out_is_imm = false, + .verify = NULL, + .wrapper = mlx4_QUERY_SLAVE_CAP_wrapper + }, + { .opcode = MLX4_CMD_QUERY_ADAPTER, .has_inbox = false, .has_outbox = true, diff --git a/drivers/net/mlx4/fw.c b/drivers/net/mlx4/fw.c index c8c64bf..dc0570f 100644 --- a/drivers/net/mlx4/fw.c +++ b/drivers/net/mlx4/fw.c @@ -144,6 +144,45 @@ int mlx4_QUERY_PORT_wrapper(struct mlx4_dev *dev, int slave, struct mlx4_vhcr *v MLX4_CMD_TIME_CLASS_B); } +int mlx4_QUERY_SLAVE_CAP_wrapper(struct mlx4_dev *dev, int slave, struct mlx4_vhcr *vhcr, + struct mlx4_cmd_mailbox *inbox, + struct mlx4_cmd_mailbox *outbox) +{ + struct mlx4_caps *caps = outbox->buf; + + memcpy(caps, &dev->caps, sizeof *caps); + + /* PDs have the same range in every guest; the distinction is in the msbs, + * which contains the guest ID (vf + 1) */ + caps->pd_base = slave + 1; + + /* All other resources are allocated by the master, but we still report + * 'num' and 'reserved' capabilities as follows: + * - num remains the maximum resource index + * - 'num - reserved' is the total available objects of a resource, but + * resource indices may be less than 'reserved' + * TODO: set per-resource quotas */ + return 0; +} + +int mlx4_QUERY_SLAVE_CAP(struct mlx4_dev *dev, struct mlx4_caps *caps) +{ + struct mlx4_cmd_mailbox *mailbox; + int err; + + mailbox = mlx4_alloc_cmd_mailbox(dev); + if (IS_ERR(mailbox)) + return PTR_ERR(mailbox); + + err = mlx4_cmd_box(dev, 0, mailbox->dma, 0, 0, MLX4_CMD_QUERY_SLAVE_CAP, + MLX4_CMD_TIME_CLASS_A); + if (!err) + memcpy(caps, mailbox->buf, sizeof *caps); + + mlx4_free_cmd_mailbox(dev, mailbox); + return err; +} + int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) { struct mlx4_cmd_mailbox *mailbox; diff --git a/drivers/net/mlx4/fw.h b/drivers/net/mlx4/fw.h index 526d7f3..d066c69 100644 --- a/drivers/net/mlx4/fw.h +++ b/drivers/net/mlx4/fw.h @@ -160,6 +160,10 @@ struct mlx4_set_ib_param { }; int mlx4_QUERY_DEV_CAP(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap); +int mlx4_QUERY_SLAVE_CAP(struct mlx4_dev *dev, struct mlx4_caps *caps); +int mlx4_QUERY_SLAVE_CAP_wrapper(struct mlx4_dev *dev, int slave, struct mlx4_vhcr *vhcr, + struct mlx4_cmd_mailbox *inbox, + struct mlx4_cmd_mailbox *outbox); int mlx4_MAP_FA(struct mlx4_dev *dev, struct mlx4_icm *icm); int mlx4_UNMAP_FA(struct mlx4_dev *dev); int mlx4_RUN_FW(struct mlx4_dev *dev); diff --git a/drivers/net/mlx4/main.c b/drivers/net/mlx4/main.c index 7d21c07..99e267c 100644 --- a/drivers/net/mlx4/main.c +++ b/drivers/net/mlx4/main.c @@ -186,6 +186,7 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) dev->caps.supported_type[i] = dev_cap->supported_port_types[i]; } + dev->caps.uar_page_size = PAGE_SIZE; dev->caps.num_uars = dev_cap->uar_size / PAGE_SIZE; dev->caps.local_ca_ack_delay = dev_cap->local_ca_ack_delay; dev->caps.bf_reg_size = dev_cap->bf_reg_size; @@ -212,7 +213,9 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) dev->caps.reserved_mtts = DIV_ROUND_UP(dev_cap->reserved_mtts, dev->caps.mtts_per_seg); dev->caps.reserved_mrws = dev_cap->reserved_mrws; - dev->caps.reserved_uars = dev_cap->reserved_uars; + + /* The first 128 UARs are used for EQ doorbells */ + dev->caps.reserved_uars = max_t(int, 128, dev_cap->reserved_uars); dev->caps.reserved_pds = dev_cap->reserved_pds; dev->caps.mtt_entry_sz = dev->caps.mtts_per_seg * dev_cap->mtt_entry_sz; dev->caps.max_msg_sz = dev_cap->max_msg_sz; @@ -269,6 +272,68 @@ static int mlx4_dev_cap(struct mlx4_dev *dev, struct mlx4_dev_cap *dev_cap) return 0; } +int mlx4_slave_cap(struct mlx4_dev *dev) +{ + int err; + u32 page_size; + + err = mlx4_QUERY_SLAVE_CAP(dev, &dev->caps); + if (err) + return err; + + page_size = ~dev->caps.page_size_cap + 1; + mlx4_warn(dev, "HCA minimum page size:%d\n", page_size); + if (page_size > PAGE_SIZE) { + mlx4_err(dev, "HCA minimum page size of %d bigger than " + "kernel PAGE_SIZE of %ld, aborting.\n", + page_size, PAGE_SIZE); + return -ENODEV; + } + + /* TODO: relax this assumption */ + if (dev->caps.uar_page_size != PAGE_SIZE) { + mlx4_err(dev, "UAR size:%d != kernel PAGE_SIZE of %ld\n", + dev->caps.uar_page_size, PAGE_SIZE); + return -ENODEV; + } + + if (dev->caps.num_ports > MLX4_MAX_PORTS) { + mlx4_err(dev, "HCA has %d ports, but we only support %d, " + "aborting.\n", dev->caps.num_ports, MLX4_MAX_PORTS); + return -ENODEV; + } + + if (dev->caps.uar_page_size * (dev->caps.num_uars - + dev->caps.reserved_uars) > + pci_resource_len(dev->pdev, 2)) { + mlx4_err(dev, "HCA reported UAR region size of 0x%x bigger than " + "PCI resource 2 size of 0x%llx, aborting.\n", + dev->caps.uar_page_size * dev->caps.num_uars, + (unsigned long long) pci_resource_len(dev->pdev, 2)); + return -ENODEV; + } + + /* Adjust eq number */ + if (dev->caps.num_eqs - dev->caps.reserved_eqs > num_possible_cpus() + 1) + dev->caps.num_eqs = dev->caps.reserved_eqs + num_possible_cpus() + 1; + +#if 0 + mlx4_warn(dev, "sqp_demux:%d\n", dev->caps.sqp_demux); + mlx4_warn(dev, "num_uars:%d reserved_uars:%d uar region:0x%x bar2:0x%llx\n", + dev->caps.num_uars, dev->caps.reserved_uars, + dev->caps.uar_page_size * dev->caps.num_uars, + pci_resource_len(dev->pdev, 2)); + mlx4_warn(dev, "num_eqs:%d reserved_eqs:%d\n", dev->caps.num_eqs, + dev->caps.reserved_eqs); + mlx4_warn(dev, "num_pds:%d reserved_pds:%d slave_pd_shift:%d pd_base:%d\n", + dev->caps.num_pds, + dev->caps.reserved_pds, + dev->caps.slave_pd_shift, + dev->caps.pd_base); +#endif + return 0; +} + /* * Change the port configuration of the device. * Every user of this function must hold the port mutex. diff --git a/drivers/net/mlx4/mlx4.h b/drivers/net/mlx4/mlx4.h index 1d2971e..8ad45f3 100644 --- a/drivers/net/mlx4/mlx4.h +++ b/drivers/net/mlx4/mlx4.h @@ -70,7 +70,8 @@ enum { }; enum { - MLX4_NUM_PDS = 1 << 15 + MLX4_NUM_PDS = 1 << 15, + MLX4_SLAVE_PD_SHIFT = 17, /* the 7 msbs encode the slave id */ }; enum { @@ -115,6 +116,7 @@ enum mlx4_alloc_mode { }; enum { + MLX4_MFUNC_EQ_NUM = 4, MLX4_MFUNC_MAX_EQES = 8, MLX4_MFUNC_EQE_MASK = (MLX4_MFUNC_MAX_EQES - 1) }; @@ -138,6 +140,10 @@ extern int mlx4_debug_level; #define mlx4_warn(mdev, format, arg...) \ dev_warn(&mdev->pdev->dev, format, ## arg) +#define MLX4_MAX_NUM_PF 16 +#define MLX4_MAX_NUM_VF 64 +#define MLX4_MAX_NUM_SLAVES (MLX4_MAX_NUM_PF + MLX4_MAX_NUM_VF) + struct mlx4_bitmap { u32 last; u32 top; diff --git a/drivers/net/mlx4/profile.c b/drivers/net/mlx4/profile.c index 5caf011..6fc18e4 100644 --- a/drivers/net/mlx4/profile.c +++ b/drivers/net/mlx4/profile.c @@ -107,9 +107,19 @@ u64 mlx4_make_profile(struct mlx4_dev *dev, profile[MLX4_RES_AUXC].num = request->num_qp; profile[MLX4_RES_SRQ].num = request->num_srq; profile[MLX4_RES_CQ].num = request->num_cq; - profile[MLX4_RES_EQ].num = min_t(unsigned, dev_cap->max_eqs, - dev_cap->reserved_eqs + - num_possible_cpus() + 1); + if (mlx4_is_master(dev)) { + profile[MLX4_RES_EQ].num = dev_cap->reserved_eqs + + MLX4_MFUNC_EQ_NUM * + (dev->num_slaves + 1); + if (profile[MLX4_RES_EQ].num > dev_cap->max_eqs) { + mlx4_warn(dev, "Not enough eqs for:%ld slave functions\n", dev->num_slaves); + kfree(profile); + return -ENOMEM; + } + } else + profile[MLX4_RES_EQ].num = min_t(unsigned, dev_cap->max_eqs, + dev_cap->reserved_eqs + + num_possible_cpus() + 1); profile[MLX4_RES_DMPT].num = request->num_mpt; profile[MLX4_RES_CMPT].num = MLX4_NUM_CMPTS; profile[MLX4_RES_MTT].num = request->num_mtt; @@ -198,7 +208,13 @@ u64 mlx4_make_profile(struct mlx4_dev *dev, init_hca->log_num_cqs = profile[i].log_num; break; case MLX4_RES_EQ: - dev->caps.num_eqs = profile[i].num; + if (mlx4_is_master(dev)) { + dev->caps.num_eqs = dev_cap->reserved_eqs + + min_t(unsigned, + MLX4_MFUNC_EQ_NUM, + num_possible_cpus() + 1); + } else + dev->caps.num_eqs = profile[i].num; init_hca->eqc_base = profile[i].start; init_hca->log_num_eqs = profile[i].log_num; break; @@ -234,6 +250,8 @@ u64 mlx4_make_profile(struct mlx4_dev *dev, * of the HCA profile anyway. */ dev->caps.num_pds = MLX4_NUM_PDS; + dev->caps.slave_pd_shift = MLX4_SLAVE_PD_SHIFT; + dev->caps.pd_base = 0; kfree(profile); return total_size; diff --git a/include/linux/mlx4/cmd.h b/include/linux/mlx4/cmd.h index e6ade51..b8a2079 100644 --- a/include/linux/mlx4/cmd.h +++ b/include/linux/mlx4/cmd.h @@ -129,6 +129,7 @@ enum { MLX4_CMD_FREE_RES = 0xf01, MLX4_CMD_REPLACE_RES = 0xf02, MLX4_CMD_GET_EVENT = 0xf03, + MLX4_CMD_QUERY_SLAVE_CAP = 0xf04, /* debug commands */ MLX4_CMD_QUERY_DEBUG_MSG = 0x2a, diff --git a/include/linux/mlx4/device.h b/include/linux/mlx4/device.h index 8daca3d..efc8a90 100644 --- a/include/linux/mlx4/device.h +++ b/include/linux/mlx4/device.h @@ -192,6 +192,7 @@ struct mlx4_caps { int pkey_table_len[MLX4_MAX_PORTS + 1]; int local_ca_ack_delay; int num_uars; + int uar_page_size; int bf_reg_size; int bf_regs_per_page; int max_sq_sg; @@ -226,6 +227,8 @@ struct mlx4_caps { int num_qp_per_mgm; int num_pds; int reserved_pds; + int slave_pd_shift; + int pd_base; int mtt_entry_sz; u32 max_msg_sz; u32 page_size_cap; -- 1.6.0.2 -- To unsubscribe from this list: send the line "unsubscribe linux-rdma" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
