index e382a3ca759e..d4a471a76d82 100644

Changelog:
v1 -> v2:
* Dropped "IB/mlx5: Use correct mdev for vport queries in ib_virt"
v0 -> v1:
* Rebased to latest rdma/for-next
* Enriched commit messages.

Thanks

-------------------------------------

This feature allows RDMA resources (pd, mr, cq, qp, etc) to be used with both physical ports of capable mlx5 devices. When enabled a single IB device with two ports will be registered instead of two single port devices.

There are still two PCI devices underlying the two port device, the capabilities indicate which device is the "master" device and which is the slave.

When the add callback function is called for a slave device a list of IB devices is searched for matching master device, indicated by the capabilities and the system_image_guid. If a match is found the slave is bound to the master device, otherwise it's placed on a list, in case it's master becomes available in the future. When a master device is added it searches the list of available slaves for a matching slave device. If a match is found it binds the slave as its 2nd port. If no match as found the device still appears as a dual port device, with the 2nd port down. RDMA resources can still created that use the yet unavailable 2nd port.

Commands related to IB resources are all routed through the master mlx5_core device. Port specific commands, like those for hardware counters are routed to their respective port mlx5_core device. Since devices can appear and disappear asynchronously a reference count on the underlying mlx5_core device is maintained. Getting and putting this reference is only necessary for commands destined to a specific port, the master core device can be used freely, as it will exist while the IB device exists.

SR-IOV devices follow the same pattern as the physical ones. VFs of a master port can bind VFs of slave ports, if available, and operate as dual port devices.

Examples of devices passed to a VM:
(master) - One net device, one IB device that has two ports. The slave
port will always be down.
(slave) - One net device, no IB devices.
(slave, slave) - Two net devices and no IB devices.
(master, master) - Two net devices, two IB devices, each with two ports.
The slave port of each device will always be down.
(master, slave) - Two net devices, one IB device, with two ports. Both
ports can be used.

There are no changes to the existing design for net devices.

The feature is disabled by default and it is enabled in firmware with mlxconfig.

Thanks
---------------------------------------

Daniel Jurgens (13):
net/mlx5: Fix race for multiple RoCE enable net/mlx5: Set software owner ID during init HCA IB/core: Change roce_rescan_device to return void IB/mlx5: Reduce the use of num_port capability IB/mlx5: Make netdev notifications multiport capable {net,IB}/mlx5: Manage port association for multiport RoCE IB/mlx5: Move IB event processing onto a workqueue IB/mlx5: Implement dual port functionality in query routines IB/mlx5: Update counter implementation for dual port RoCE {net,IB}/mlx5: Change set_roce_gid to take a port number IB/mlx5: Route MADs for dual port RoCE
IB/mlx5: Don't advertise RAW QP support in dual port mode net/mlx5: Set num_vhca_ports capability

Parav Pandit (1):
IB/mlx5: Change debugfs to have per port contents

 drivers/infiniband/core/cache.c                    |   7 +-
 drivers/infiniband/core/core_priv.h                |   1 -
 drivers/infiniband/core/roce_gid_mgmt.c            |  13 +-
 drivers/infiniband/hw/mlx5/cong.c                  |  83 ++-
 drivers/infiniband/hw/mlx5/mad.c                   |  23 +-
 drivers/infiniband/hw/mlx5/main.c                  | 785 +++++++++++++++++----
 drivers/infiniband/hw/mlx5/mlx5_ib.h               |  52 +-
 drivers/infiniband/hw/mlx5/qp.c                    |   8 +-
 .../net/ethernet/mellanox/mlx5/core/fpga/conn.c    |  11 +-
 drivers/net/ethernet/mellanox/mlx5/core/fw.c       |  10 +-
 .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c  |   2 +-
 drivers/net/ethernet/mellanox/mlx5/core/lib/gid.c  |   5 +-
 drivers/net/ethernet/mellanox/mlx5/core/main.c     |  12 +-
 .../net/ethernet/mellanox/mlx5/core/mlx5_core.h    |   2 +-
 drivers/net/ethernet/mellanox/mlx5/core/vport.c    |  91 ++-
 include/linux/mlx5/device.h                        |   5 +
 include/linux/mlx5/driver.h                        |  29 +-
 include/linux/mlx5/mlx5_ifc.h                      |  32 +-
 include/linux/mlx5/vport.h                         |   4 +
 include/rdma/ib_verbs.h                            |   8 +
 20 files changed, 976 insertions(+), 207 deletions(-)

--
2.15.1

--
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