Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8618e6e7 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlx5-fixes' 



Saeed Mahameed says:

====================
Mellanox 100G mlx5 fixes for 4.7-rc

The following series provides some small fixes for mlx5 driver.

Two small fixes for the mlx5e netdev, the 1st is for the blue flame
quota accounting and the 2nd is a small refactoring in shutdown flow.

Five trivial fixes for mlx5 E-Switch.
	- Allmulti mc_promisc flag was not set in a specific flow.
	- Modify VF node guid when admin mac is changed.
	- Race in vport enable flow.
	- Misc code fixes (kvfree when needed and error pointers checking).

Three in mlx5 steering area.  Correct capabilities checking and root flow table update.

Three misc fixes in mlx5 commands enum and layouts.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents e71ba91e 0ca00fc1

drivers/net/ethernet/mellanox/mlx5/core/en_main.c

+1 −4
Original line number Diff line number Diff line
@@ -3192,10 +3192,7 @@ static void mlx5e_destroy_netdev(struct mlx5_core_dev *mdev, void *vpriv) 
	flush_workqueue(priv->wq);

	if (test_bit(MLX5_INTERFACE_STATE_SHUTDOWN, &mdev->intf_state)) {

		netif_device_detach(netdev);

		mutex_lock(&priv->state_lock);

		if (test_bit(MLX5E_STATE_OPENED, &priv->state))

			mlx5e_close_locked(netdev);

		mutex_unlock(&priv->state_lock);

		mlx5e_close(netdev);

	} else {

		unregister_netdev(netdev);

	}

drivers/net/ethernet/mellanox/mlx5/core/en_tx.c

+2 −1
Original line number Diff line number Diff line
@@ -317,7 +317,8 @@ static netdev_tx_t mlx5e_sq_xmit(struct mlx5e_sq *sq, struct sk_buff *skb) 
	while ((sq->pc & wq->sz_m1) > sq->edge)

		mlx5e_send_nop(sq, false);



	sq->bf_budget = bf ? sq->bf_budget - 1 : 0;

	if (bf)

		sq->bf_budget--;



	sq->stats.packets++;

	sq->stats.bytes += num_bytes;

drivers/net/ethernet/mellanox/mlx5/core/eswitch.c

+43 −26
Original line number Diff line number Diff line
@@ -383,7 +383,7 @@ __esw_fdb_set_vport_rule(struct mlx5_eswitch *esw, u32 vport, bool rx_rule, 
				   match_v,

				   MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,

				   0, &dest);

	if (IS_ERR_OR_NULL(flow_rule)) {

	if (IS_ERR(flow_rule)) {

		pr_warn(

			"FDB: Failed to add flow rule: dmac_v(%pM) dmac_c(%pM) -> vport(%d), err(%ld)\n",

			 dmac_v, dmac_c, vport, PTR_ERR(flow_rule));
@@ -457,7 +457,7 @@ static int esw_create_fdb_table(struct mlx5_eswitch *esw, int nvports) 


	table_size = BIT(MLX5_CAP_ESW_FLOWTABLE_FDB(dev, log_max_ft_size));

	fdb = mlx5_create_flow_table(root_ns, 0, table_size, 0);

	if (IS_ERR_OR_NULL(fdb)) {

	if (IS_ERR(fdb)) {

		err = PTR_ERR(fdb);

		esw_warn(dev, "Failed to create FDB Table err %d\n", err);

		goto out;
@@ -474,7 +474,7 @@ static int esw_create_fdb_table(struct mlx5_eswitch *esw, int nvports) 
	MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, table_size - 3);

	eth_broadcast_addr(dmac);

	g = mlx5_create_flow_group(fdb, flow_group_in);

	if (IS_ERR_OR_NULL(g)) {

	if (IS_ERR(g)) {

		err = PTR_ERR(g);

		esw_warn(dev, "Failed to create flow group err(%d)\n", err);

		goto out;
@@ -489,7 +489,7 @@ static int esw_create_fdb_table(struct mlx5_eswitch *esw, int nvports) 
	eth_zero_addr(dmac);

	dmac[0] = 0x01;

	g = mlx5_create_flow_group(fdb, flow_group_in);

	if (IS_ERR_OR_NULL(g)) {

	if (IS_ERR(g)) {

		err = PTR_ERR(g);

		esw_warn(dev, "Failed to create allmulti flow group err(%d)\n", err);

		goto out;
@@ -506,7 +506,7 @@ static int esw_create_fdb_table(struct mlx5_eswitch *esw, int nvports) 
	MLX5_SET(create_flow_group_in, flow_group_in, start_flow_index, table_size - 1);

	MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, table_size - 1);

	g = mlx5_create_flow_group(fdb, flow_group_in);

	if (IS_ERR_OR_NULL(g)) {

	if (IS_ERR(g)) {

		err = PTR_ERR(g);

		esw_warn(dev, "Failed to create promisc flow group err(%d)\n", err);

		goto out;
@@ -529,7 +529,7 @@ static int esw_create_fdb_table(struct mlx5_eswitch *esw, int nvports) 
		}

	}



	kfree(flow_group_in);

	kvfree(flow_group_in);

	return err;

}
@@ -651,6 +651,7 @@ static void update_allmulti_vports(struct mlx5_eswitch *esw, 
					esw_fdb_set_vport_rule(esw,

							       mac,

							       vport_idx);

			iter_vaddr->mc_promisc = true;

			break;

		case MLX5_ACTION_DEL:

			if (!iter_vaddr)
@@ -1060,7 +1061,7 @@ static void esw_vport_enable_egress_acl(struct mlx5_eswitch *esw, 
		return;



	acl = mlx5_create_vport_flow_table(root_ns, 0, table_size, 0, vport->vport);

	if (IS_ERR_OR_NULL(acl)) {

	if (IS_ERR(acl)) {

		err = PTR_ERR(acl);

		esw_warn(dev, "Failed to create E-Switch vport[%d] egress flow Table, err(%d)\n",

			 vport->vport, err);
@@ -1075,7 +1076,7 @@ static void esw_vport_enable_egress_acl(struct mlx5_eswitch *esw, 
	MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 0);



	vlan_grp = mlx5_create_flow_group(acl, flow_group_in);

	if (IS_ERR_OR_NULL(vlan_grp)) {

	if (IS_ERR(vlan_grp)) {

		err = PTR_ERR(vlan_grp);

		esw_warn(dev, "Failed to create E-Switch vport[%d] egress allowed vlans flow group, err(%d)\n",

			 vport->vport, err);
@@ -1086,7 +1087,7 @@ static void esw_vport_enable_egress_acl(struct mlx5_eswitch *esw, 
	MLX5_SET(create_flow_group_in, flow_group_in, start_flow_index, 1);

	MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 1);

	drop_grp = mlx5_create_flow_group(acl, flow_group_in);

	if (IS_ERR_OR_NULL(drop_grp)) {

	if (IS_ERR(drop_grp)) {

		err = PTR_ERR(drop_grp);

		esw_warn(dev, "Failed to create E-Switch vport[%d] egress drop flow group, err(%d)\n",

			 vport->vport, err);
@@ -1097,7 +1098,7 @@ static void esw_vport_enable_egress_acl(struct mlx5_eswitch *esw, 
	vport->egress.drop_grp = drop_grp;

	vport->egress.allowed_vlans_grp = vlan_grp;

out:

	kfree(flow_group_in);

	kvfree(flow_group_in);

	if (err && !IS_ERR_OR_NULL(vlan_grp))

		mlx5_destroy_flow_group(vlan_grp);

	if (err && !IS_ERR_OR_NULL(acl))
@@ -1174,7 +1175,7 @@ static void esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw, 
		return;



	acl = mlx5_create_vport_flow_table(root_ns, 0, table_size, 0, vport->vport);

	if (IS_ERR_OR_NULL(acl)) {

	if (IS_ERR(acl)) {

		err = PTR_ERR(acl);

		esw_warn(dev, "Failed to create E-Switch vport[%d] ingress flow Table, err(%d)\n",

			 vport->vport, err);
@@ -1192,7 +1193,7 @@ static void esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw, 
	MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 0);



	g = mlx5_create_flow_group(acl, flow_group_in);

	if (IS_ERR_OR_NULL(g)) {

	if (IS_ERR(g)) {

		err = PTR_ERR(g);

		esw_warn(dev, "Failed to create E-Switch vport[%d] ingress untagged spoofchk flow group, err(%d)\n",

			 vport->vport, err);
@@ -1207,7 +1208,7 @@ static void esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw, 
	MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 1);



	g = mlx5_create_flow_group(acl, flow_group_in);

	if (IS_ERR_OR_NULL(g)) {

	if (IS_ERR(g)) {

		err = PTR_ERR(g);

		esw_warn(dev, "Failed to create E-Switch vport[%d] ingress untagged flow group, err(%d)\n",

			 vport->vport, err);
@@ -1223,7 +1224,7 @@ static void esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw, 
	MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 2);



	g = mlx5_create_flow_group(acl, flow_group_in);

	if (IS_ERR_OR_NULL(g)) {

	if (IS_ERR(g)) {

		err = PTR_ERR(g);

		esw_warn(dev, "Failed to create E-Switch vport[%d] ingress spoofchk flow group, err(%d)\n",

			 vport->vport, err);
@@ -1236,7 +1237,7 @@ static void esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw, 
	MLX5_SET(create_flow_group_in, flow_group_in, end_flow_index, 3);



	g = mlx5_create_flow_group(acl, flow_group_in);

	if (IS_ERR_OR_NULL(g)) {

	if (IS_ERR(g)) {

		err = PTR_ERR(g);

		esw_warn(dev, "Failed to create E-Switch vport[%d] ingress drop flow group, err(%d)\n",

			 vport->vport, err);
@@ -1259,7 +1260,7 @@ static void esw_vport_enable_ingress_acl(struct mlx5_eswitch *esw, 
			mlx5_destroy_flow_table(vport->ingress.acl);

	}



	kfree(flow_group_in);

	kvfree(flow_group_in);

}



static void esw_vport_cleanup_ingress_rules(struct mlx5_eswitch *esw,
@@ -1363,7 +1364,7 @@ static int esw_vport_ingress_config(struct mlx5_eswitch *esw, 
				   match_v,

				   MLX5_FLOW_CONTEXT_ACTION_ALLOW,

				   0, NULL);

	if (IS_ERR_OR_NULL(vport->ingress.allow_rule)) {

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

		err = PTR_ERR(vport->ingress.allow_rule);

		pr_warn("vport[%d] configure ingress allow rule, err(%d)\n",

			vport->vport, err);
@@ -1380,7 +1381,7 @@ static int esw_vport_ingress_config(struct mlx5_eswitch *esw, 
				   match_v,

				   MLX5_FLOW_CONTEXT_ACTION_DROP,

				   0, NULL);

	if (IS_ERR_OR_NULL(vport->ingress.drop_rule)) {

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

		err = PTR_ERR(vport->ingress.drop_rule);

		pr_warn("vport[%d] configure ingress drop rule, err(%d)\n",

			vport->vport, err);
@@ -1439,7 +1440,7 @@ static int esw_vport_egress_config(struct mlx5_eswitch *esw, 
				   match_v,

				   MLX5_FLOW_CONTEXT_ACTION_ALLOW,

				   0, NULL);

	if (IS_ERR_OR_NULL(vport->egress.allowed_vlan)) {

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

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

		pr_warn("vport[%d] configure egress allowed vlan rule failed, err(%d)\n",

			vport->vport, err);
@@ -1457,7 +1458,7 @@ static int esw_vport_egress_config(struct mlx5_eswitch *esw, 
				   match_v,

				   MLX5_FLOW_CONTEXT_ACTION_DROP,

				   0, NULL);

	if (IS_ERR_OR_NULL(vport->egress.drop_rule)) {

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

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

		pr_warn("vport[%d] configure egress drop rule failed, err(%d)\n",

			vport->vport, err);
@@ -1491,14 +1492,11 @@ static void esw_enable_vport(struct mlx5_eswitch *esw, int vport_num, 


	/* Sync with current vport context */

	vport->enabled_events = enable_events;

	esw_vport_change_handle_locked(vport);



	vport->enabled = true;



	/* only PF is trusted by default */

	vport->trusted = (vport_num) ? false : true;



	arm_vport_context_events_cmd(esw->dev, vport_num, enable_events);

	esw_vport_change_handle_locked(vport);



	esw->enabled_vports++;

	esw_debug(esw->dev, "Enabled VPORT(%d)\n", vport_num);
@@ -1728,11 +1726,24 @@ void mlx5_eswitch_vport_event(struct mlx5_eswitch *esw, struct mlx5_eqe *eqe) 
	(esw && MLX5_CAP_GEN(esw->dev, vport_group_manager) && mlx5_core_is_pf(esw->dev))

#define LEGAL_VPORT(esw, vport) (vport >= 0 && vport < esw->total_vports)



static void node_guid_gen_from_mac(u64 *node_guid, u8 mac[ETH_ALEN])

{

	((u8 *)node_guid)[7] = mac[0];

	((u8 *)node_guid)[6] = mac[1];

	((u8 *)node_guid)[5] = mac[2];

	((u8 *)node_guid)[4] = 0xff;

	((u8 *)node_guid)[3] = 0xfe;

	((u8 *)node_guid)[2] = mac[3];

	((u8 *)node_guid)[1] = mac[4];

	((u8 *)node_guid)[0] = mac[5];

}



int mlx5_eswitch_set_vport_mac(struct mlx5_eswitch *esw,

			       int vport, u8 mac[ETH_ALEN])

{

	int err = 0;

	struct mlx5_vport *evport;

	u64 node_guid;

	int err = 0;



	if (!ESW_ALLOWED(esw))

		return -EPERM;
@@ -1756,11 +1767,17 @@ int mlx5_eswitch_set_vport_mac(struct mlx5_eswitch *esw, 
		return err;

	}



	node_guid_gen_from_mac(&node_guid, mac);

	err = mlx5_modify_nic_vport_node_guid(esw->dev, vport, node_guid);

	if (err)

		mlx5_core_warn(esw->dev,

			       "Failed to set vport %d node guid, err = %d. RDMA_CM will not function properly for this VF.\n",

			       vport, err);



	mutex_lock(&esw->state_lock);

	if (evport->enabled)

		err = esw_vport_ingress_config(esw, evport);

	mutex_unlock(&esw->state_lock);



	return err;

}

drivers/net/ethernet/mellanox/mlx5/core/fs_core.c

+25 −15
Original line number Diff line number Diff line
@@ -1292,8 +1292,8 @@ static int update_root_ft_destroy(struct mlx5_flow_table *ft) 
				       ft->id);

			return err;

		}

		root->root_ft = new_root_ft;

	}

	root->root_ft = new_root_ft;

	return 0;

}
@@ -1767,6 +1767,9 @@ static void cleanup_root_ns(struct mlx5_core_dev *dev) 


void mlx5_cleanup_fs(struct mlx5_core_dev *dev)

{

	if (MLX5_CAP_GEN(dev, port_type) != MLX5_CAP_PORT_TYPE_ETH)

		return;



	cleanup_root_ns(dev);

	cleanup_single_prio_root_ns(dev, dev->priv.fdb_root_ns);

	cleanup_single_prio_root_ns(dev, dev->priv.esw_egress_root_ns);
@@ -1828,16 +1831,22 @@ int mlx5_init_fs(struct mlx5_core_dev *dev) 
{

	int err = 0;



	if (MLX5_CAP_GEN(dev, port_type) != MLX5_CAP_PORT_TYPE_ETH)

		return 0;



	err = mlx5_init_fc_stats(dev);

	if (err)

		return err;



	if (MLX5_CAP_GEN(dev, nic_flow_table)) {

	if (MLX5_CAP_GEN(dev, nic_flow_table) &&

	    MLX5_CAP_FLOWTABLE_NIC_RX(dev, ft_support)) {

		err = init_root_ns(dev);

		if (err)

			goto err;

	}



	if (MLX5_CAP_GEN(dev, eswitch_flow_table)) {

		if (MLX5_CAP_ESW_FLOWTABLE_FDB(dev, ft_support)) {

			err = init_fdb_root_ns(dev);

			if (err)

				goto err;
@@ -1852,6 +1861,7 @@ int mlx5_init_fs(struct mlx5_core_dev *dev) 
			if (err)

				goto err;

		}

	}



	return 0;

err:

drivers/net/ethernet/mellanox/mlx5/core/qp.c

+1 −1
Original line number Diff line number Diff line
@@ -418,7 +418,7 @@ int mlx5_core_xrcd_alloc(struct mlx5_core_dev *dev, u32 *xrcdn) 
	if (out.hdr.status)

		err = mlx5_cmd_status_to_err(&out.hdr);

	else

		*xrcdn = be32_to_cpu(out.xrcdn);

		*xrcdn = be32_to_cpu(out.xrcdn) & 0xffffff;



	return err;

}