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

Commit 0a6ce1e3 authored by David S. Miller's avatar David S. Miller
Browse files

Merge tag 'shared-for-4.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/leon/linux-rdma 



Saeed Mahameed says:

====================
Mellanox mlx5 core driver updates 2016-10-25

This series contains some updates and fixes of mlx5 core and
IB drivers with the addition of two features that demand
new low level commands and infrastructure updates.
 - SRIOV VF max rate limit support
 - mlx5e tc support for FWD rules with counter.

Needed for both net and rdma subsystems.

Updates and Fixes:
From Saeed Mahameed (2):
  - mlx5 IB: Skip handling unknown mlx5 events
  - Add ConnectX-5 PCIe 4.0 VF device ID

From Artemy Kovalyov (2):
  - Update struct mlx5_ifc_xrqc_bits
  - Ensure SRQ physical address structure endianness

From Eugenia Emantayev (1):
  - Fix length of async_event_mask

New Features:
From Mohamad Haj Yahia (3): mlx5 SRIOV VF max rate limit support
  - Introduce TSAR manipulation firmware commands
  - Introduce E-switch QoS management
  - Add SRIOV VF max rate configuration support

From Mark Bloch (7): mlx5e Tc support for FWD rule with counter
  - Don't unlock fte while still using it
  - Use fte status to decide on firmware command
  - Refactor find_flow_rule
  - Group similar rules under the same fte
  - Add multi dest support
  - Add option to add fwd rule with counter
  - mlx5e tc support for FWD rule with counter
  Mark here fixed two trivial issues with the flow steering core, and did
  some refactoring in the flow steering API to support adding mulit destination
  rules to the same hardware flow table entry at once.  In the last two patches
  added the ability to populate a flow rule with a flow counter to the same flow entry.

V2: Dropped some patches that added new structures without adding any usage of them.
    Added SRIOV VF max rate configuration support patch that introduces
    the usage of the TSAR infrastructure.
    Added flow steering fixes and refactoring in addition to mlx5 tc
    support for forward rule with counter.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents d46b6349 e37a79e5

drivers/infiniband/hw/mlx5/main.c

+9 −7
Original line number Diff line number Diff line
@@ -1771,13 +1771,13 @@ static int mlx5_ib_destroy_flow(struct ib_flow *flow_id) 
	mutex_lock(&dev->flow_db.lock);



	list_for_each_entry_safe(iter, tmp, &handler->list, list) {

		mlx5_del_flow_rule(iter->rule);

		mlx5_del_flow_rules(iter->rule);

		put_flow_table(dev, iter->prio, true);

		list_del(&iter->list);

		kfree(iter);

	}



	mlx5_del_flow_rule(handler->rule);

	mlx5_del_flow_rules(handler->rule);

	put_flow_table(dev, handler->prio, true);

	mutex_unlock(&dev->flow_db.lock);
@@ -1907,10 +1907,10 @@ static struct mlx5_ib_flow_handler *create_flow_rule(struct mlx5_ib_dev *dev, 
	spec->match_criteria_enable = get_match_criteria_enable(spec->match_criteria);

	action = dst ? MLX5_FLOW_CONTEXT_ACTION_FWD_DEST :

		MLX5_FLOW_CONTEXT_ACTION_FWD_NEXT_PRIO;

	handler->rule = mlx5_add_flow_rule(ft, spec,

	handler->rule = mlx5_add_flow_rules(ft, spec,

					   action,

					   MLX5_FS_DEFAULT_FLOW_TAG,

					   dst);

					   dst, 1);



	if (IS_ERR(handler->rule)) {

		err = PTR_ERR(handler->rule);
@@ -1941,7 +1941,7 @@ static struct mlx5_ib_flow_handler *create_dont_trap_rule(struct mlx5_ib_dev *de 
		handler_dst = create_flow_rule(dev, ft_prio,

					       flow_attr, dst);

		if (IS_ERR(handler_dst)) {

			mlx5_del_flow_rule(handler->rule);

			mlx5_del_flow_rules(handler->rule);

			ft_prio->refcount--;

			kfree(handler);

			handler = handler_dst;
@@ -2004,7 +2004,7 @@ static struct mlx5_ib_flow_handler *create_leftovers_rule(struct mlx5_ib_dev *de 
						 &leftovers_specs[LEFTOVERS_UC].flow_attr,

						 dst);

		if (IS_ERR(handler_ucast)) {

			mlx5_del_flow_rule(handler->rule);

			mlx5_del_flow_rules(handler->rule);

			ft_prio->refcount--;

			kfree(handler);

			handler = handler_ucast;
@@ -2046,7 +2046,7 @@ static struct mlx5_ib_flow_handler *create_sniffer_rule(struct mlx5_ib_dev *dev, 
	return handler_rx;



err_tx:

	mlx5_del_flow_rule(handler_rx->rule);

	mlx5_del_flow_rules(handler_rx->rule);

	ft_rx->refcount--;

	kfree(handler_rx);

err:
@@ -2358,6 +2358,8 @@ static void mlx5_ib_event(struct mlx5_core_dev *dev, void *context, 
		ibev.event = IB_EVENT_CLIENT_REREGISTER;

		port = (u8)param;

		break;

	default:

		return;

	}



	ibev.device	      = &ibdev->ib_dev;

drivers/infiniband/hw/mlx5/mlx5_ib.h

+1 −1
Original line number Diff line number Diff line
@@ -153,7 +153,7 @@ struct mlx5_ib_flow_handler { 
	struct list_head		list;

	struct ib_flow			ibflow;

	struct mlx5_ib_flow_prio	*prio;

	struct mlx5_flow_rule	*rule;

	struct mlx5_flow_handle		*rule;

};



struct mlx5_ib_flow_db {

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

+12 −1
Original line number Diff line number Diff line
@@ -318,6 +318,8 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, 
	case MLX5_CMD_OP_SET_FLOW_TABLE_ENTRY:

	case MLX5_CMD_OP_SET_FLOW_TABLE_ROOT:

	case MLX5_CMD_OP_DEALLOC_ENCAP_HEADER:

	case MLX5_CMD_OP_DESTROY_SCHEDULING_ELEMENT:

	case MLX5_CMD_OP_DESTROY_QOS_PARA_VPORT:

		return MLX5_CMD_STAT_OK;



	case MLX5_CMD_OP_QUERY_HCA_CAP:
@@ -419,11 +421,14 @@ static int mlx5_internal_err_ret_value(struct mlx5_core_dev *dev, u16 op, 
	case MLX5_CMD_OP_QUERY_FLOW_TABLE:

	case MLX5_CMD_OP_CREATE_FLOW_GROUP:

	case MLX5_CMD_OP_QUERY_FLOW_GROUP:



	case MLX5_CMD_OP_QUERY_FLOW_TABLE_ENTRY:

	case MLX5_CMD_OP_ALLOC_FLOW_COUNTER:

	case MLX5_CMD_OP_QUERY_FLOW_COUNTER:

	case MLX5_CMD_OP_ALLOC_ENCAP_HEADER:

	case MLX5_CMD_OP_CREATE_SCHEDULING_ELEMENT:

	case MLX5_CMD_OP_QUERY_SCHEDULING_ELEMENT:

	case MLX5_CMD_OP_MODIFY_SCHEDULING_ELEMENT:

	case MLX5_CMD_OP_CREATE_QOS_PARA_VPORT:

		*status = MLX5_DRIVER_STATUS_ABORTED;

		*synd = MLX5_DRIVER_SYND;

		return -EIO;
@@ -580,6 +585,12 @@ const char *mlx5_command_str(int command) 
	MLX5_COMMAND_STR_CASE(MODIFY_FLOW_TABLE);

	MLX5_COMMAND_STR_CASE(ALLOC_ENCAP_HEADER);

	MLX5_COMMAND_STR_CASE(DEALLOC_ENCAP_HEADER);

	MLX5_COMMAND_STR_CASE(CREATE_SCHEDULING_ELEMENT);

	MLX5_COMMAND_STR_CASE(DESTROY_SCHEDULING_ELEMENT);

	MLX5_COMMAND_STR_CASE(QUERY_SCHEDULING_ELEMENT);

	MLX5_COMMAND_STR_CASE(MODIFY_SCHEDULING_ELEMENT);

	MLX5_COMMAND_STR_CASE(CREATE_QOS_PARA_VPORT);

	MLX5_COMMAND_STR_CASE(DESTROY_QOS_PARA_VPORT);

	default: return "unknown command opcode";

	}

}

drivers/net/ethernet/mellanox/mlx5/core/en.h

+7 −7
Original line number Diff line number Diff line
@@ -524,7 +524,7 @@ struct mlx5e_vxlan_db { 


struct mlx5e_l2_rule {

	u8  addr[ETH_ALEN + 2];

	struct mlx5_flow_rule *rule;

	struct mlx5_flow_handle *rule;

};



struct mlx5e_flow_table {
@@ -545,9 +545,9 @@ struct mlx5e_tc_table { 
struct mlx5e_vlan_table {

	struct mlx5e_flow_table		ft;

	unsigned long active_vlans[BITS_TO_LONGS(VLAN_N_VID)];

	struct mlx5_flow_rule	*active_vlans_rule[VLAN_N_VID];

	struct mlx5_flow_rule	*untagged_rule;

	struct mlx5_flow_rule	*any_vlan_rule;

	struct mlx5_flow_handle	*active_vlans_rule[VLAN_N_VID];

	struct mlx5_flow_handle	*untagged_rule;

	struct mlx5_flow_handle	*any_vlan_rule;

	bool		filter_disabled;

};
@@ -566,14 +566,14 @@ struct mlx5e_l2_table { 
/* L3/L4 traffic type classifier */

struct mlx5e_ttc_table {

	struct mlx5e_flow_table  ft;

	struct mlx5_flow_rule	 *rules[MLX5E_NUM_TT];

	struct mlx5_flow_handle	 *rules[MLX5E_NUM_TT];

};



#define ARFS_HASH_SHIFT BITS_PER_BYTE

#define ARFS_HASH_SIZE BIT(BITS_PER_BYTE)

struct arfs_table {

	struct mlx5e_flow_table  ft;

	struct mlx5_flow_rule    *default_rule;

	struct mlx5_flow_handle	 *default_rule;

	struct hlist_head	 rules_hash[ARFS_HASH_SIZE];

};

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

+19 −19
Original line number Diff line number Diff line
@@ -56,7 +56,7 @@ struct arfs_tuple { 
struct arfs_rule {

	struct mlx5e_priv	*priv;

	struct work_struct      arfs_work;

	struct mlx5_flow_rule   *rule;

	struct mlx5_flow_handle *rule;

	struct hlist_node	hlist;

	int			rxq;

	/* Flow ID passed to ndo_rx_flow_steer */
@@ -104,7 +104,7 @@ static int arfs_disable(struct mlx5e_priv *priv) 
		tt = arfs_get_tt(i);

		/* Modify ttc rules destination to bypass the aRFS tables*/

		err = mlx5_modify_rule_destination(priv->fs.ttc.rules[tt],

						   &dest);

						   &dest, NULL);

		if (err) {

			netdev_err(priv->netdev,

				   "%s: modify ttc destination failed\n",
@@ -137,7 +137,7 @@ int mlx5e_arfs_enable(struct mlx5e_priv *priv) 
		tt = arfs_get_tt(i);

		/* Modify ttc rules destination to point on the aRFS FTs */

		err = mlx5_modify_rule_destination(priv->fs.ttc.rules[tt],

						   &dest);

						   &dest, NULL);

		if (err) {

			netdev_err(priv->netdev,

				   "%s: modify ttc destination failed err=%d\n",
@@ -151,7 +151,7 @@ int mlx5e_arfs_enable(struct mlx5e_priv *priv) 


static void arfs_destroy_table(struct arfs_table *arfs_t)

{

	mlx5_del_flow_rule(arfs_t->default_rule);

	mlx5_del_flow_rules(arfs_t->default_rule);

	mlx5e_destroy_flow_table(&arfs_t->ft);

}
@@ -205,10 +205,10 @@ static int arfs_add_default_rule(struct mlx5e_priv *priv, 
		goto out;

	}



	arfs_t->default_rule = mlx5_add_flow_rule(arfs_t->ft.t, spec,

	arfs_t->default_rule = mlx5_add_flow_rules(arfs_t->ft.t, spec,

						   MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,

						   MLX5_FS_DEFAULT_FLOW_TAG,

						  &dest);

						   &dest, 1);

	if (IS_ERR(arfs_t->default_rule)) {

		err = PTR_ERR(arfs_t->default_rule);

		arfs_t->default_rule = NULL;
@@ -396,7 +396,7 @@ static void arfs_may_expire_flow(struct mlx5e_priv *priv) 
	spin_unlock_bh(&priv->fs.arfs.arfs_lock);

	hlist_for_each_entry_safe(arfs_rule, htmp, &del_list, hlist) {

		if (arfs_rule->rule)

			mlx5_del_flow_rule(arfs_rule->rule);

			mlx5_del_flow_rules(arfs_rule->rule);

		hlist_del(&arfs_rule->hlist);

		kfree(arfs_rule);

	}
@@ -420,7 +420,7 @@ static void arfs_del_rules(struct mlx5e_priv *priv) 
	hlist_for_each_entry_safe(rule, htmp, &del_list, hlist) {

		cancel_work_sync(&rule->arfs_work);

		if (rule->rule)

			mlx5_del_flow_rule(rule->rule);

			mlx5_del_flow_rules(rule->rule);

		hlist_del(&rule->hlist);

		kfree(rule);

	}
@@ -462,12 +462,12 @@ static struct arfs_table *arfs_get_table(struct mlx5e_arfs_tables *arfs, 
	return NULL;

}



static struct mlx5_flow_rule *arfs_add_rule(struct mlx5e_priv *priv,

static struct mlx5_flow_handle *arfs_add_rule(struct mlx5e_priv *priv,

					      struct arfs_rule *arfs_rule)

{

	struct mlx5e_arfs_tables *arfs = &priv->fs.arfs;

	struct arfs_tuple *tuple = &arfs_rule->tuple;

	struct mlx5_flow_rule *rule = NULL;

	struct mlx5_flow_handle *rule = NULL;

	struct mlx5_flow_destination dest;

	struct arfs_table *arfs_table;

	struct mlx5_flow_spec *spec;
@@ -544,9 +544,9 @@ static struct mlx5_flow_rule *arfs_add_rule(struct mlx5e_priv *priv, 
	}

	dest.type = MLX5_FLOW_DESTINATION_TYPE_TIR;

	dest.tir_num = priv->direct_tir[arfs_rule->rxq].tirn;

	rule = mlx5_add_flow_rule(ft, spec, MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,

	rule = mlx5_add_flow_rules(ft, spec, MLX5_FLOW_CONTEXT_ACTION_FWD_DEST,

				   MLX5_FS_DEFAULT_FLOW_TAG,

				  &dest);

				   &dest, 1);

	if (IS_ERR(rule)) {

		err = PTR_ERR(rule);

		netdev_err(priv->netdev, "%s: add rule(filter id=%d, rq idx=%d) failed, err=%d\n",
@@ -559,14 +559,14 @@ static struct mlx5_flow_rule *arfs_add_rule(struct mlx5e_priv *priv, 
}



static void arfs_modify_rule_rq(struct mlx5e_priv *priv,

				struct mlx5_flow_rule *rule, u16 rxq)

				struct mlx5_flow_handle *rule, u16 rxq)

{

	struct mlx5_flow_destination dst;

	int err = 0;



	dst.type = MLX5_FLOW_DESTINATION_TYPE_TIR;

	dst.tir_num = priv->direct_tir[rxq].tirn;

	err =  mlx5_modify_rule_destination(rule, &dst);

	err =  mlx5_modify_rule_destination(rule, &dst, NULL);

	if (err)

		netdev_warn(priv->netdev,

			    "Failed to modfiy aRFS rule destination to rq=%d\n", rxq);
@@ -578,7 +578,7 @@ static void arfs_handle_work(struct work_struct *work) 
						   struct arfs_rule,

						   arfs_work);

	struct mlx5e_priv *priv = arfs_rule->priv;

	struct mlx5_flow_rule *rule;

	struct mlx5_flow_handle *rule;



	mutex_lock(&priv->state_lock);

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