Commit 361f7e4a authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'pps-policing' 



Simon Horman says:

====================
net/sched: act_police: add support for packet-per-second policing

This series enhances the TC policer action implementation to allow a
policer action instance to enforce a rate-limit based on
packets-per-second, configurable using a packet-per-second rate and burst
parameters.

In the hope of aiding review this is broken up into three patches.

* [PATCH 1/3] flow_offload: add support for packet-per-second policing

  Add support for this feature to the flow_offload API that is used to allow
  programming flows, including TC rules and their actions, into hardware.

* [PATCH 2/3] flow_offload: reject configuration of packet-per-second policing in offload drivers

  Teach all exiting users of the flow_offload API that allow offload of
  policer action instances to reject offload if packet-per-second rate
  limiting is configured: none support it at this time

* [PATCH 3/3] net/sched: act_police: add support for packet-per-second policing

  With the above ground-work in place add the new feature to the TC policer
  action itself

With the above in place the feature may be used.

As follow-ups we plan to provide:
* Corresponding updates to iproute2
* Corresponding self tests (which depend on the iproute2 changes)
* Hardware offload support for the NFP driver

Key changes since v2:
* Added patches 1 and 2, which makes adding patch 3 safe for existing
  hardware offload of the policer action
* Re-worked patch 3 so that a TC policer action instance may be configured
  for packet-per-second or byte-per-second rate limiting, but not both.
* Corrected kdoc usage
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 4849d9be 2ffe0395

drivers/net/dsa/sja1105/sja1105_flower.c

+6 −0
Original line number Diff line number Diff line
@@ -322,6 +322,12 @@ 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");

				goto out;

			}



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

						    &key,

						    act->police.rate_bytes_ps,

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

+10 −1
Original line number Diff line number Diff line
@@ -48,6 +48,11 @@ 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;

			}

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

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

				NL_SET_ERR_MSG_MOD(extack,
@@ -145,7 +150,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;

	}

	/* 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

+5 −0
Original line number Diff line number Diff line
@@ -1221,6 +1221,11 @@ 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;

			goto free_sfi;

		}

		if (entryp->police.burst) {

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

			if (!fmi) {

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

+4 −0
Original line number Diff line number Diff line
@@ -4538,6 +4538,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 = apply_police_params(priv, act->police.rate_bytes_ps, extack);

			if (err)

				return err;

drivers/net/ethernet/mellanox/mlxsw/spectrum_flower.c

+5 −0
Original line number Diff line number Diff line
@@ -190,6 +190,11 @@ static int mlxsw_sp_flower_parse_actions(struct mlxsw_sp *mlxsw_sp, 
				return -EOPNOTSUPP;

			}



			if (act->police.rate_pkt_ps) {

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

				return -EOPNOTSUPP;

			}



			/* The kernel might adjust the requested burst size so

			 * that it is not exactly a power of two. Re-adjust it

			 * here since the hardware only supports burst sizes