Commit d97b4b10 authored by Jianbo Liu's avatar Jianbo Liu Committed by David S. Miller
Browse files

flow_offload: reject offload for all drivers with invalid police parameters 



As more police parameters are passed to flow_offload, driver can check
them to make sure hardware handles packets in the way indicated by tc.
The conform-exceed control should be drop/pipe or drop/ok. Besides,
for drop/ok, the police should be the last action. As hardware can't
configure peakrate/avrate/overhead, offload should not be supported if
any of them is configured.

Signed-off-by: default avatarJianbo Liu <jianbol@nvidia.com>
Reviewed-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent b8cd5831

drivers/net/dsa/sja1105/sja1105_flower.c

+42 −5
Original line number Diff line number Diff line
@@ -300,6 +300,46 @@ static int sja1105_flower_parse_key(struct sja1105_private *priv, 
	return -EOPNOTSUPP;

}



static int sja1105_policer_validate(const struct flow_action *action,

				    const struct flow_action_entry *act,

				    struct netlink_ext_ack *extack)

{

	if (act->police.exceed.act_id != FLOW_ACTION_DROP) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Offload not supported when exceed action is not drop");

		return -EOPNOTSUPP;

	}



	if (act->police.notexceed.act_id != FLOW_ACTION_PIPE &&

	    act->police.notexceed.act_id != FLOW_ACTION_ACCEPT) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Offload not supported when conform action is not pipe or ok");

		return -EOPNOTSUPP;

	}



	if (act->police.notexceed.act_id == FLOW_ACTION_ACCEPT &&

	    !flow_action_is_last_entry(action, act)) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Offload not supported when conform action is ok, but action is not last");

		return -EOPNOTSUPP;

	}



	if (act->police.peakrate_bytes_ps ||

	    act->police.avrate || act->police.overhead) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Offload not supported when peakrate/avrate/overhead is configured");

		return -EOPNOTSUPP;

	}



	if (act->police.rate_pkt_ps) {

		NL_SET_ERR_MSG_MOD(extack,

				   "QoS offload not support packets per second");

		return -EOPNOTSUPP;

	}



	return 0;

}



int sja1105_cls_flower_add(struct dsa_switch *ds, int port,

			   struct flow_cls_offload *cls, bool ingress)

{
@@ -321,12 +361,9 @@ int sja1105_cls_flower_add(struct dsa_switch *ds, int port, 
	flow_action_for_each(i, act, &rule->action) {

		switch (act->id) {

		case FLOW_ACTION_POLICE:

			if (act->police.rate_pkt_ps) {

				NL_SET_ERR_MSG_MOD(extack,

						   "QoS offload not support packets per second");

				rc = -EOPNOTSUPP;

			rc = sja1105_policer_validate(&rule->action, act, extack);

			if (rc)

				goto out;

			}



			rc = sja1105_flower_policer(priv, port, extack, cookie,

						    &key,

drivers/net/ethernet/chelsio/cxgb4/cxgb4_tc_matchall.c

+49 −10
Original line number Diff line number Diff line
@@ -8,6 +8,46 @@ 
#include "cxgb4_filter.h"

#include "cxgb4_tc_flower.h"



static int cxgb4_policer_validate(const struct flow_action *action,

				  const struct flow_action_entry *act,

				  struct netlink_ext_ack *extack)

{

	if (act->police.exceed.act_id != FLOW_ACTION_DROP) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Offload not supported when exceed action is not drop");

		return -EOPNOTSUPP;

	}



	if (act->police.notexceed.act_id != FLOW_ACTION_PIPE &&

	    act->police.notexceed.act_id != FLOW_ACTION_ACCEPT) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Offload not supported when conform action is not pipe or ok");

		return -EOPNOTSUPP;

	}



	if (act->police.notexceed.act_id == FLOW_ACTION_ACCEPT &&

	    !flow_action_is_last_entry(action, act)) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Offload not supported when conform action is ok, but action is not last");

		return -EOPNOTSUPP;

	}



	if (act->police.peakrate_bytes_ps ||

	    act->police.avrate || act->police.overhead) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Offload not supported when peakrate/avrate/overhead is configured");

		return -EOPNOTSUPP;

	}



	if (act->police.rate_pkt_ps) {

		NL_SET_ERR_MSG_MOD(extack,

				   "QoS offload not support packets per second");

		return -EOPNOTSUPP;

	}



	return 0;

}



static int cxgb4_matchall_egress_validate(struct net_device *dev,

					  struct tc_cls_matchall_offload *cls)

{
@@ -48,11 +88,10 @@ static int cxgb4_matchall_egress_validate(struct net_device *dev, 
	flow_action_for_each(i, entry, actions) {

		switch (entry->id) {

		case FLOW_ACTION_POLICE:

			if (entry->police.rate_pkt_ps) {

				NL_SET_ERR_MSG_MOD(extack,

						   "QoS offload not support packets per second");

				return -EOPNOTSUPP;

			}

			ret = cxgb4_policer_validate(actions, entry, extack);

			if (ret)

				return ret;



			/* Convert bytes per second to bits per second */

			if (entry->police.rate_bytes_ps * 8 > max_link_rate) {

				NL_SET_ERR_MSG_MOD(extack,
@@ -150,11 +189,11 @@ static int cxgb4_matchall_alloc_tc(struct net_device *dev, 
	flow_action_for_each(i, entry, &cls->rule->action)

		if (entry->id == FLOW_ACTION_POLICE)

			break;

	if (entry->police.rate_pkt_ps) {

		NL_SET_ERR_MSG_MOD(extack,

				   "QoS offload not support packets per second");

		return -EOPNOTSUPP;

	}



	ret = cxgb4_policer_validate(&cls->rule->action, entry, extack);

	if (ret)

		return ret;



	/* Convert from bytes per second to Kbps */

	p.u.params.maxrate = div_u64(entry->police.rate_bytes_ps * 8, 1000);

	p.u.params.channel = pi->tx_chan;

drivers/net/ethernet/freescale/enetc/enetc_qos.c

+43 −4
Original line number Diff line number Diff line
@@ -1021,6 +1021,46 @@ static struct actions_fwd *enetc_check_flow_actions(u64 acts, 
	return NULL;

}



static int enetc_psfp_policer_validate(const struct flow_action *action,

				       const struct flow_action_entry *act,

				       struct netlink_ext_ack *extack)

{

	if (act->police.exceed.act_id != FLOW_ACTION_DROP) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Offload not supported when exceed action is not drop");

		return -EOPNOTSUPP;

	}



	if (act->police.notexceed.act_id != FLOW_ACTION_PIPE &&

	    act->police.notexceed.act_id != FLOW_ACTION_ACCEPT) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Offload not supported when conform action is not pipe or ok");

		return -EOPNOTSUPP;

	}



	if (act->police.notexceed.act_id == FLOW_ACTION_ACCEPT &&

	    !flow_action_is_last_entry(action, act)) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Offload not supported when conform action is ok, but action is not last");

		return -EOPNOTSUPP;

	}



	if (act->police.peakrate_bytes_ps ||

	    act->police.avrate || act->police.overhead) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Offload not supported when peakrate/avrate/overhead is configured");

		return -EOPNOTSUPP;

	}



	if (act->police.rate_pkt_ps) {

		NL_SET_ERR_MSG_MOD(extack,

				   "QoS offload not support packets per second");

		return -EOPNOTSUPP;

	}



	return 0;

}



static int enetc_psfp_parse_clsflower(struct enetc_ndev_priv *priv,

				      struct flow_cls_offload *f)

{
@@ -1177,11 +1217,10 @@ static int enetc_psfp_parse_clsflower(struct enetc_ndev_priv *priv, 


	/* Flow meter and max frame size */

	if (entryp) {

		if (entryp->police.rate_pkt_ps) {

			NL_SET_ERR_MSG_MOD(extack, "QoS offload not support packets per second");

			err = -EOPNOTSUPP;

		err = enetc_psfp_policer_validate(&rule->action, entryp, extack);

		if (err)

			goto free_sfi;

		}



		if (entryp->police.burst) {

			fmi = kzalloc(sizeof(*fmi), GFP_KERNEL);

			if (!fmi) {

drivers/net/ethernet/marvell/octeontx2/nic/otx2_tc.c

+43 −0
Original line number Diff line number Diff line
@@ -190,6 +190,40 @@ static int otx2_tc_validate_flow(struct otx2_nic *nic, 
	return 0;

}



static int otx2_policer_validate(const struct flow_action *action,

				 const struct flow_action_entry *act,

				 struct netlink_ext_ack *extack)

{

	if (act->police.exceed.act_id != FLOW_ACTION_DROP) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Offload not supported when exceed action is not drop");

		return -EOPNOTSUPP;

	}



	if (act->police.notexceed.act_id != FLOW_ACTION_PIPE &&

	    act->police.notexceed.act_id != FLOW_ACTION_ACCEPT) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Offload not supported when conform action is not pipe or ok");

		return -EOPNOTSUPP;

	}



	if (act->police.notexceed.act_id == FLOW_ACTION_ACCEPT &&

	    !flow_action_is_last_entry(action, act)) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Offload not supported when conform action is ok, but action is not last");

		return -EOPNOTSUPP;

	}



	if (act->police.peakrate_bytes_ps ||

	    act->police.avrate || act->police.overhead) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Offload not supported when peakrate/avrate/overhead is configured");

		return -EOPNOTSUPP;

	}



	return 0;

}



static int otx2_tc_egress_matchall_install(struct otx2_nic *nic,

					   struct tc_cls_matchall_offload *cls)

{
@@ -212,6 +246,10 @@ static int otx2_tc_egress_matchall_install(struct otx2_nic *nic, 
	entry = &cls->rule->action.entries[0];

	switch (entry->id) {

	case FLOW_ACTION_POLICE:

		err = otx2_policer_validate(&cls->rule->action, entry, extack);

		if (err)

			return err;



		if (entry->police.rate_pkt_ps) {

			NL_SET_ERR_MSG_MOD(extack, "QoS offload not support packets per second");

			return -EOPNOTSUPP;
@@ -315,6 +353,7 @@ static int otx2_tc_parse_actions(struct otx2_nic *nic, 
	u8 nr_police = 0;

	bool pps = false;

	u64 rate;

	int err;

	int i;



	if (!flow_action_has_entries(flow_action)) {
@@ -355,6 +394,10 @@ static int otx2_tc_parse_actions(struct otx2_nic *nic, 
				return -EOPNOTSUPP;

			}



			err = otx2_policer_validate(flow_action, act, extack);

			if (err)

				return err;



			if (act->police.rate_bytes_ps > 0) {

				rate = act->police.rate_bytes_ps * 8;

				burst = act->police.burst;

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

+44 −4
Original line number Diff line number Diff line
@@ -4482,6 +4482,46 @@ static int apply_police_params(struct mlx5e_priv *priv, u64 rate, 
	return err;

}



static int mlx5e_policer_validate(const struct flow_action *action,

				  const struct flow_action_entry *act,

				  struct netlink_ext_ack *extack)

{

	if (act->police.exceed.act_id != FLOW_ACTION_DROP) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Offload not supported when exceed action is not drop");

		return -EOPNOTSUPP;

	}



	if (act->police.notexceed.act_id != FLOW_ACTION_PIPE &&

	    act->police.notexceed.act_id != FLOW_ACTION_ACCEPT) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Offload not supported when conform action is not pipe or ok");

		return -EOPNOTSUPP;

	}



	if (act->police.notexceed.act_id == FLOW_ACTION_ACCEPT &&

	    !flow_action_is_last_entry(action, act)) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Offload not supported when conform action is ok, but action is not last");

		return -EOPNOTSUPP;

	}



	if (act->police.peakrate_bytes_ps ||

	    act->police.avrate || act->police.overhead) {

		NL_SET_ERR_MSG_MOD(extack,

				   "Offload not supported when peakrate/avrate/overhead is configured");

		return -EOPNOTSUPP;

	}



	if (act->police.rate_pkt_ps) {

		NL_SET_ERR_MSG_MOD(extack,

				   "QoS offload not support packets per second");

		return -EOPNOTSUPP;

	}



	return 0;

}



static int scan_tc_matchall_fdb_actions(struct mlx5e_priv *priv,

					struct flow_action *flow_action,

					struct netlink_ext_ack *extack)
@@ -4509,10 +4549,10 @@ static int scan_tc_matchall_fdb_actions(struct mlx5e_priv *priv, 
	flow_action_for_each(i, act, flow_action) {

		switch (act->id) {

		case FLOW_ACTION_POLICE:

			if (act->police.rate_pkt_ps) {

				NL_SET_ERR_MSG_MOD(extack, "QoS offload not support packets per second");

				return -EOPNOTSUPP;

			}

			err = mlx5e_policer_validate(flow_action, act, extack);

			if (err)

				return err;



			err = apply_police_params(priv, act->police.rate_bytes_ps, extack);

			if (err)

				return err;