Commit 1e5e4acb authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'mlx5-updates-2021-04-21' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux 



Saeed Mahameed says:

====================
mlx5-updates-2021-04-21

devlink external port attribute for SF (Sub-Function) port flavour

This adds the support to instantiate Sub-Functions on external hosts
E.g when Eswitch manager is enabled on the ARM SmarNic SoC CPU, users
are now able to spawn new Sub-Functions on the Host server CPU.

Parav Pandit Says:
==================

This series introduces and uses external attribute for the SF port to
indicate that a SF port belongs to an external controller.

This is needed to generate unique phys_port_name when PF and SF numbers
are overlapping between local and external controllers.
For example two controllers 0 and 1, both of these controller have a SF.
having PF number 0, SF number 77. Here, phys_port_name has duplicate
entry which doesn't have controller number in it.

Hence, add controller number optionally when a SF port is for an
external controller. This extension is similar to existing PF and VF
eswitch ports of the external controller.

When a SF is for external controller an example view of external SF
port and config sequence:

On eswitch system:
$ devlink dev eswitch set pci/0033:01:00.0 mode switchdev

$ devlink port show
pci/0033:01:00.0/196607: type eth netdev enP51p1s0f0np0 flavour physical port 0 splittable false
pci/0033:01:00.0/131072: type eth netdev eth0 flavour pcipf controller 1 pfnum 0 external true splittable false
  function:
    hw_addr 00:00:00:00:00:00

$ devlink port add pci/0033:01:00.0 flavour pcisf pfnum 0 sfnum 77 controller 1
pci/0033:01:00.0/163840: type eth netdev eth1 flavour pcisf controller 1 pfnum 0 sfnum 77 splittable false
  function:
    hw_addr 00:00:00:00:00:00 state inactive opstate detached

phys_port_name construction:
$ cat /sys/class/net/eth1/phys_port_name
c1pf0sf77

Patch summary:
First 3 patches prepares the eswitch to handle vports in more generic
way using xarray to lookup vport from its unique vport number.
Patch-1 returns maximum eswitch ports only when eswitch is enabled
Patch-2 prepares eswitch to return eswitch max ports from a struct
Patch-3 uses xarray for vport and representor lookup
Patch-4 considers SF for an additioanl range of SF vports
Patch-5 relies on SF hw table to check SF support
Patch-6 extends SF devlink port attribute for external flag
Patch-7 stores the per controller SF allocation attributes
Patch-8 uses SF function id for filtering events
Patch-9 uses helper for allocation and free
Patch-10 splits hw table into per controller table and generic one
Patch-11 extends sf table for additional range

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

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

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 95aafe91 f1b9acd3

drivers/net/ethernet/mellanox/mlx5/core/esw/acl/egress_lgcy.c

+1 −1
Original line number Diff line number Diff line
@@ -96,7 +96,7 @@ int esw_acl_egress_lgcy_setup(struct mlx5_eswitch *esw, 
	}



	if (!vport->egress.acl) {

		vport->egress.acl = esw_acl_table_create(esw, vport->vport,

		vport->egress.acl = esw_acl_table_create(esw, vport,

							 MLX5_FLOW_NAMESPACE_ESW_EGRESS,

							 table_size);

		if (IS_ERR(vport->egress.acl)) {

drivers/net/ethernet/mellanox/mlx5/core/esw/acl/egress_ofld.c

+2 −2
Original line number Diff line number Diff line
@@ -148,7 +148,7 @@ static void esw_acl_egress_ofld_groups_destroy(struct mlx5_vport *vport) 
	esw_acl_egress_vlan_grp_destroy(vport);

}



static bool esw_acl_egress_needed(const struct mlx5_eswitch *esw, u16 vport_num)

static bool esw_acl_egress_needed(struct mlx5_eswitch *esw, u16 vport_num)

{

	return mlx5_eswitch_is_vf_vport(esw, vport_num) || mlx5_esw_is_sf_vport(esw, vport_num);

}
@@ -171,7 +171,7 @@ int esw_acl_egress_ofld_setup(struct mlx5_eswitch *esw, struct mlx5_vport *vport 
		table_size++;

	if (MLX5_CAP_GEN(esw->dev, prio_tag_required))

		table_size++;

	vport->egress.acl = esw_acl_table_create(esw, vport->vport,

	vport->egress.acl = esw_acl_table_create(esw, vport,

						 MLX5_FLOW_NAMESPACE_ESW_EGRESS, table_size);

	if (IS_ERR(vport->egress.acl)) {

		err = PTR_ERR(vport->egress.acl);

drivers/net/ethernet/mellanox/mlx5/core/esw/acl/helper.c

+4 −4
Original line number Diff line number Diff line
@@ -6,14 +6,14 @@ 
#include "helper.h"



struct mlx5_flow_table *

esw_acl_table_create(struct mlx5_eswitch *esw, u16 vport_num, int ns, int size)

esw_acl_table_create(struct mlx5_eswitch *esw, struct mlx5_vport *vport, int ns, int size)

{

	struct mlx5_flow_table_attr ft_attr = {};

	struct mlx5_core_dev *dev = esw->dev;

	struct mlx5_flow_namespace *root_ns;

	struct mlx5_flow_table *acl;

	int acl_supported;

	int vport_index;

	u16 vport_num;

	int err;



	acl_supported = (ns == MLX5_FLOW_NAMESPACE_ESW_INGRESS) ?
@@ -23,11 +23,11 @@ esw_acl_table_create(struct mlx5_eswitch *esw, u16 vport_num, int ns, int size) 
	if (!acl_supported)

		return ERR_PTR(-EOPNOTSUPP);



	vport_num = vport->vport;

	esw_debug(dev, "Create vport[%d] %s ACL table\n", vport_num,

		  ns == MLX5_FLOW_NAMESPACE_ESW_INGRESS ? "ingress" : "egress");



	vport_index = mlx5_eswitch_vport_num_to_index(esw, vport_num);

	root_ns = mlx5_get_flow_vport_acl_namespace(dev, ns, vport_index);

	root_ns = mlx5_get_flow_vport_acl_namespace(dev, ns, vport->index);

	if (!root_ns) {

		esw_warn(dev, "Failed to get E-Switch root namespace for vport (%d)\n",

			 vport_num);

drivers/net/ethernet/mellanox/mlx5/core/esw/acl/helper.h

+1 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ 


/* General acl helper functions */

struct mlx5_flow_table *

esw_acl_table_create(struct mlx5_eswitch *esw, u16 vport_num, int ns, int size);

esw_acl_table_create(struct mlx5_eswitch *esw, struct mlx5_vport *vport, int ns, int size);



/* Egress acl helper functions */

void esw_acl_egress_table_destroy(struct mlx5_vport *vport);

drivers/net/ethernet/mellanox/mlx5/core/esw/acl/ingress_lgcy.c

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ int esw_acl_ingress_lgcy_setup(struct mlx5_eswitch *esw, 
	}



	if (!vport->ingress.acl) {

		vport->ingress.acl = esw_acl_table_create(esw, vport->vport,

		vport->ingress.acl = esw_acl_table_create(esw, vport,

							  MLX5_FLOW_NAMESPACE_ESW_INGRESS,

							  table_size);

		if (IS_ERR(vport->ingress.acl)) {