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

Commit 6a0c9f68 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'mlx5-fixes' 



Saeed Mahameed says:

====================
Mellanox 100G mlx5 fixes 2016-11-04

This series contains six hot fixes of the mlx5 core and mlx5e driver.

Huy fixed an invalid pointer dereference on initialization flow for when
the selected mlx5 load profile is out of range.

Or provided three eswitch offloads related fixes
 - Prevent changing NS of a VF representor.
 - Handle matching on vlan priority for offloaded TC rules
 - Set the actions for offloaded rules properly

On my part I here addressed the error flow related issues in
mlx5e_open_channel reported by Jesper just this week.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 243d5212 0e97a340

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

+16 −15
Original line number Diff line number Diff line
@@ -1445,6 +1445,7 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix, 
	c->netdev   = priv->netdev;

	c->mkey_be  = cpu_to_be32(priv->mdev->mlx5e_res.mkey.key);

	c->num_tc   = priv->params.num_tc;

	c->xdp      = !!priv->xdp_prog;



	if (priv->params.rx_am_enabled)

		rx_cq_profile = mlx5e_am_get_def_profile(priv->params.rx_cq_period_mode);
@@ -1468,6 +1469,12 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix, 
	if (err)

		goto err_close_tx_cqs;



	/* XDP SQ CQ params are same as normal TXQ sq CQ params */

	err = c->xdp ? mlx5e_open_cq(c, &cparam->tx_cq, &c->xdp_sq.cq,

				     priv->params.tx_cq_moderation) : 0;

	if (err)

		goto err_close_rx_cq;



	napi_enable(&c->napi);



	err = mlx5e_open_sq(c, 0, &cparam->icosq, &c->icosq);
@@ -1488,21 +1495,10 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix, 
		}

	}



	if (priv->xdp_prog) {

		/* XDP SQ CQ params are same as normal TXQ sq CQ params */

		err = mlx5e_open_cq(c, &cparam->tx_cq, &c->xdp_sq.cq,

				    priv->params.tx_cq_moderation);

	err = c->xdp ? mlx5e_open_sq(c, 0, &cparam->xdp_sq, &c->xdp_sq) : 0;

	if (err)

		goto err_close_sqs;



		err = mlx5e_open_sq(c, 0, &cparam->xdp_sq, &c->xdp_sq);

		if (err) {

			mlx5e_close_cq(&c->xdp_sq.cq);

			goto err_close_sqs;

		}

	}



	c->xdp = !!priv->xdp_prog;

	err = mlx5e_open_rq(c, &cparam->rq, &c->rq);

	if (err)

		goto err_close_xdp_sq;
@@ -1512,6 +1508,7 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix, 


	return 0;

err_close_xdp_sq:

	if (c->xdp)

		mlx5e_close_sq(&c->xdp_sq);



err_close_sqs:
@@ -1522,6 +1519,10 @@ static int mlx5e_open_channel(struct mlx5e_priv *priv, int ix, 


err_disable_napi:

	napi_disable(&c->napi);

	if (c->xdp)

		mlx5e_close_cq(&c->xdp_sq.cq);



err_close_rx_cq:

	mlx5e_close_cq(&c->rq.cq);



err_close_tx_cqs:

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

+1 −1
Original line number Diff line number Diff line
@@ -308,7 +308,7 @@ static void mlx5e_build_rep_netdev(struct net_device *netdev) 
	netdev->switchdev_ops = &mlx5e_rep_switchdev_ops;

#endif



	netdev->features	 |= NETIF_F_VLAN_CHALLENGED | NETIF_F_HW_TC;

	netdev->features	 |= NETIF_F_VLAN_CHALLENGED | NETIF_F_HW_TC | NETIF_F_NETNS_LOCAL;

	netdev->hw_features      |= NETIF_F_HW_TC;



	eth_hw_addr_random(netdev);

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

+4 −1
Original line number Diff line number Diff line
@@ -237,12 +237,15 @@ static int parse_cls_flower(struct mlx5e_priv *priv, struct mlx5_flow_spec *spec 
			skb_flow_dissector_target(f->dissector,

						  FLOW_DISSECTOR_KEY_VLAN,

						  f->mask);

		if (mask->vlan_id) {

		if (mask->vlan_id || mask->vlan_priority) {

			MLX5_SET(fte_match_set_lyr_2_4, headers_c, vlan_tag, 1);

			MLX5_SET(fte_match_set_lyr_2_4, headers_v, vlan_tag, 1);



			MLX5_SET(fte_match_set_lyr_2_4, headers_c, first_vid, mask->vlan_id);

			MLX5_SET(fte_match_set_lyr_2_4, headers_v, first_vid, key->vlan_id);



			MLX5_SET(fte_match_set_lyr_2_4, headers_c, first_prio, mask->vlan_priority);

			MLX5_SET(fte_match_set_lyr_2_4, headers_v, first_prio, key->vlan_priority);

		}

	}

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

+2 −1
Original line number Diff line number Diff line
@@ -57,7 +57,8 @@ mlx5_eswitch_add_offloaded_rule(struct mlx5_eswitch *esw, 
	if (esw->mode != SRIOV_OFFLOADS)

		return ERR_PTR(-EOPNOTSUPP);



	action = attr->action;

	/* per flow vlan pop/push is emulated, don't set that into the firmware */

	action = attr->action & ~(MLX5_FLOW_CONTEXT_ACTION_VLAN_PUSH | MLX5_FLOW_CONTEXT_ACTION_VLAN_POP);



	if (action & MLX5_FLOW_CONTEXT_ACTION_FWD_DEST) {

		dest.type = MLX5_FLOW_DESTINATION_TYPE_VPORT;

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

+3 −2
Original line number Diff line number Diff line
@@ -1226,6 +1226,9 @@ static int init_one(struct pci_dev *pdev, 


	pci_set_drvdata(pdev, dev);



	dev->pdev = pdev;

	dev->event = mlx5_core_event;



	if (prof_sel < 0 || prof_sel >= ARRAY_SIZE(profile)) {

		mlx5_core_warn(dev,

			       "selected profile out of range, selecting default (%d)\n",
@@ -1233,8 +1236,6 @@ static int init_one(struct pci_dev *pdev, 
		prof_sel = MLX5_DEFAULT_PROF;

	}

	dev->profile = &profile[prof_sel];

	dev->pdev = pdev;

	dev->event = mlx5_core_event;



	INIT_LIST_HEAD(&priv->ctx_list);

	spin_lock_init(&priv->ctx_lock);