Commit 3694e41e authored by Jason Gunthorpe's avatar Jason Gunthorpe
Browse files

Merge branch 'ib-guids' into rdma.git for-next 

Danit Goldberg says:

====================
This series extends RTNETLINK to provide IB port and node GUIDs, which
were configured for Infiniband VFs.

The functionality to set VF GUIDs already existed for a long time, and
here we are adding the missing "get" so that netlink will be symmetric and
various cloud orchestration tools will be able to manage such VFs more
naturally.

The iproute2 was extended too to present those GUIDs.

- ip link show <device>

For example:
- ip link set ib4 vf 0 node_guid 22:44:33:00:33:11:00:33
- ip link set ib4 vf 0 port_guid 10:21:33:12:00:11:22:10
- ip link show ib4
    ib4: <BROADCAST,MULTICAST> mtu 4092 qdisc noop state DOWN mode DEFAULT group default qlen 256
    link/infiniband 00:00:0a:2d:fe:80:00:00:00:00:00:00:ec:0d:9a:03:00:44:36:8d brd 00:ff:ff:ff:ff:12:40:1b:ff:ff:00:00:00:00:00:00:ff:ff:ff:ff
    vf 0     link/infiniband 00:00:0a:2d:fe:80:00:00:00:00:00:00:ec:0d:9a:03:00:44:36:8d brd 00:ff:ff:ff:ff:12:40:1b:ff:ff:00:00:00:00:00:00:ff:ff:ff:ff,
    spoof checking off, NODE_GUID 22:44:33:00:33:11:00:33, PORT_GUID 10:21:33:12:00:11:22:10, link-state disable, trust off, query_rss off
====================

Based on the mlx5-next branch from
git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux

 for
dependencies

* branch 'ib-guids': (35 commits)
  IB/mlx5: Implement callbacks for getting VFs GUID attributes
  IB/ipoib: Add ndo operation for getting VFs GUID attributes
  IB/core: Add interfaces to get VF node and port GUIDs
  net/core: Add support for getting VF GUIDs

  net/mlx5: Add new chain for netfilter flow table offload
  net/mlx5: Refactor creating fast path prio chains
  net/mlx5: Accumulate levels for chains prio namespaces
  net/mlx5: Define fdb tc levels per prio
  net/mlx5: Rename FDB_* tc related defines to FDB_TC_* defines
  net/mlx5: Simplify fdb chain and prio eswitch defines
  IB/mlx5: Load profile according to RoCE enablement state
  IB/mlx5: Rename profile and init methods
  net/mlx5: Handle "enable_roce" devlink param
  net/mlx5: Document flow_steering_mode devlink param
  devlink: Add new "enable_roce" generic device param
  net/mlx5: fix spelling mistake "metdata" -> "metadata"
  net/mlx5: fix kvfree of uninitialized pointer spec
  IB/mlx5: Introduce and use mlx5_core_is_vf()
  net/mlx5: E-switch, Enable metadata on own vport
  net/mlx5: Refactor ingress acl configuration
  ...

Signed-off-by: default avatarJason Gunthorpe <jgg@mellanox.com>
parents a25984f3 9c0015ef

Documentation/networking/device_drivers/mellanox/mlx5.rst

+21 −0
Original line number Diff line number Diff line
@@ -154,6 +154,27 @@ User command examples: 
      values:

         cmode runtime value smfs



enable_roce: RoCE enablement state

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

RoCE enablement state controls driver support for RoCE traffic.

When RoCE is disabled, there is no gid table, only raw ethernet QPs are supported and traffic on the well known UDP RoCE port is handled as raw ethernet traffic.



To change RoCE enablement state a user must change the driverinit cmode value and run devlink reload.



User command examples:



- Disable RoCE::



    $ devlink dev param set pci/0000:06:00.0 name enable_roce value false cmode driverinit

    $ devlink dev reload pci/0000:06:00.0



- Read RoCE enablement state::



    $ devlink dev param show pci/0000:06:00.0 name enable_roce

      pci/0000:06:00.0:

      name enable_roce type generic

      values:

         cmode driverinit value true



Devlink health reporters

========================

Documentation/networking/devlink-params-mlx5.txt

0 → 100644
+17 −0
Original line number Diff line number Diff line 
flow_steering_mode	[DEVICE, DRIVER-SPECIFIC]

			Controls the flow steering mode of the driver.

			Two modes are supported:

			1. 'dmfs' - Device managed flow steering.

			2. 'smfs  - Software/Driver managed flow steering.

			In DMFS mode, the HW steering entities are created and

			managed through the Firmware.

			In SMFS mode, the HW steering entities are created and

			managed though by the driver directly into Hardware

			without firmware intervention.

			Type: String

			Configuration mode: runtime



enable_roce		[DEVICE, GENERIC]

			Enable handling of RoCE traffic in the device.

			Defaultly enabled.

			Configuration mode: driverinit

Documentation/networking/devlink-params.txt

+4 −0
Original line number Diff line number Diff line
@@ -65,3 +65,7 @@ reset_dev_on_drv_probe [DEVICE, GENERIC] 
			  Reset only if device firmware can be found in the

			  filesystem.

			Type: u8



enable_roce		[DEVICE, GENERIC]

			Enable handling of RoCE traffic in the device.

			Type: Boolean

drivers/infiniband/core/device.c

+1 −0
Original line number Diff line number Diff line
@@ -2631,6 +2631,7 @@ void ib_set_device_ops(struct ib_device *dev, const struct ib_device_ops *ops) 
	SET_DEVICE_OP(dev_ops, get_port_immutable);

	SET_DEVICE_OP(dev_ops, get_vector_affinity);

	SET_DEVICE_OP(dev_ops, get_vf_config);

	SET_DEVICE_OP(dev_ops, get_vf_guid);

	SET_DEVICE_OP(dev_ops, get_vf_stats);

	SET_DEVICE_OP(dev_ops, init_port);

	SET_DEVICE_OP(dev_ops, invalidate_range);

drivers/infiniband/core/verbs.c

+10 −0
Original line number Diff line number Diff line
@@ -2460,6 +2460,16 @@ int ib_set_vf_guid(struct ib_device *device, int vf, u8 port, u64 guid, 
}

EXPORT_SYMBOL(ib_set_vf_guid);



int ib_get_vf_guid(struct ib_device *device, int vf, u8 port,

		   struct ifla_vf_guid *node_guid,

		   struct ifla_vf_guid *port_guid)

{

	if (!device->ops.get_vf_guid)

		return -EOPNOTSUPP;



	return device->ops.get_vf_guid(device, vf, port, node_guid, port_guid);

}

EXPORT_SYMBOL(ib_get_vf_guid);

/**

 * ib_map_mr_sg_pi() - Map the dma mapped SG lists for PI (protection

 *     information) and set an appropriate memory region for registration.

CRA Git | Maintained and supported by SUSTech CRA and CCSE