net:qos: police action offloading parameter 'burst' change to the original value

Since 'tcfp_burst' with TICK factor, driver side always need to recover
it to the original value, this patch moves the generic calculation and
recover to the 'burst' original value before offloading to device driver.

Signed-off-by: Po Liu <po.liu@nxp.com>
Acked-by: Vladimir Oltean <vladimir.oltean@nxp.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/dsa/ocelot/felix.c b/drivers/net/dsa/ocelot/felix.c
index 25046777c9937f6da9f7da5d7f7836cddf3b333c..75020af7f7a4699a0be07330f8c33f7d97b01bd5 100644 (file)
--- a/drivers/net/dsa/ocelot/felix.c
+++ b/drivers/net/dsa/ocelot/felix.c
@@ -746,9 +746,7 @@ static int felix_port_policer_add(struct dsa_switch *ds, int port,
        struct ocelot *ocelot = ds->priv;
        struct ocelot_policer pol = {
                .rate = div_u64(policer->rate_bytes_per_sec, 1000) * 8,
-               .burst = div_u64(policer->rate_bytes_per_sec *
-                                PSCHED_NS2TICKS(policer->burst),
-                                PSCHED_TICKS_PER_SEC),
+               .burst = policer->burst,
        };
 
        return ocelot_port_policer_add(ocelot, port, &pol);

diff --git a/drivers/net/dsa/sja1105/sja1105_flower.c b/drivers/net/dsa/sja1105/sja1105_flower.c
index 9ee8968610cd0c887784468d5f7cdd08319c983b..12e76020bea37e92a7fa60158f8048287d087222 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_flower.c
+++ b/drivers/net/dsa/sja1105/sja1105_flower.c
@@ -31,7 +31,7 @@ static int sja1105_setup_bcast_policer(struct sja1105_private *priv,
                                       struct netlink_ext_ack *extack,
                                       unsigned long cookie, int port,
                                       u64 rate_bytes_per_sec,
-                                      s64 burst)
+                                      u32 burst)
 {
        struct sja1105_rule *rule = sja1105_rule_find(priv, cookie);
        struct sja1105_l2_policing_entry *policing;
@@ -79,9 +79,8 @@ static int sja1105_setup_bcast_policer(struct sja1105_private *priv,
 
        policing[rule->bcast_pol.sharindx].rate = div_u64(rate_bytes_per_sec *
                                                          512, 1000000);
-       policing[rule->bcast_pol.sharindx].smax = div_u64(rate_bytes_per_sec *
-                                                         PSCHED_NS2TICKS(burst),
-                                                         PSCHED_TICKS_PER_SEC);
+       policing[rule->bcast_pol.sharindx].smax = burst;
+
        /* TODO: support per-flow MTU */
        policing[rule->bcast_pol.sharindx].maxlen = VLAN_ETH_FRAME_LEN +
                                                    ETH_FCS_LEN;
@@ -103,7 +102,7 @@ static int sja1105_setup_tc_policer(struct sja1105_private *priv,
                                    struct netlink_ext_ack *extack,
                                    unsigned long cookie, int port, int tc,
                                    u64 rate_bytes_per_sec,
-                                   s64 burst)
+                                   u32 burst)
 {
        struct sja1105_rule *rule = sja1105_rule_find(priv, cookie);
        struct sja1105_l2_policing_entry *policing;
@@ -152,9 +151,8 @@ static int sja1105_setup_tc_policer(struct sja1105_private *priv,
 
        policing[rule->tc_pol.sharindx].rate = div_u64(rate_bytes_per_sec *
                                                       512, 1000000);
-       policing[rule->tc_pol.sharindx].smax = div_u64(rate_bytes_per_sec *
-                                                      PSCHED_NS2TICKS(burst),
-                                                      PSCHED_TICKS_PER_SEC);
+       policing[rule->tc_pol.sharindx].smax = burst;
+
        /* TODO: support per-flow MTU */
        policing[rule->tc_pol.sharindx].maxlen = VLAN_ETH_FRAME_LEN +
                                                 ETH_FCS_LEN;
@@ -177,7 +175,7 @@ static int sja1105_flower_policer(struct sja1105_private *priv, int port,
                                  unsigned long cookie,
                                  struct sja1105_key *key,
                                  u64 rate_bytes_per_sec,
-                                 s64 burst)
+                                 u32 burst)
 {
        switch (key->type) {
        case SJA1105_KEY_BCAST:

diff --git a/drivers/net/dsa/sja1105/sja1105_main.c b/drivers/net/dsa/sja1105/sja1105_main.c
index 789b288cc78bcc3a21c21200c63b4f125d7c329d..5079e4aeef80bbf64ba1b03124a2de86310e7188 100644 (file)
--- a/drivers/net/dsa/sja1105/sja1105_main.c
+++ b/drivers/net/dsa/sja1105/sja1105_main.c
@@ -3324,9 +3324,7 @@ static int sja1105_port_policer_add(struct dsa_switch *ds, int port,
         */
        policing[port].rate = div_u64(512 * policer->rate_bytes_per_sec,
                                      1000000);
-       policing[port].smax = div_u64(policer->rate_bytes_per_sec *
-                                     PSCHED_NS2TICKS(policer->burst),
-                                     PSCHED_TICKS_PER_SEC);
+       policing[port].smax = policer->burst;
 
        return sja1105_static_config_reload(priv, SJA1105_BEST_EFFORT_POLICING);
 }

diff --git a/drivers/net/ethernet/freescale/enetc/enetc_qos.c b/drivers/net/ethernet/freescale/enetc/enetc_qos.c
index 4f670cbdf1867ed062cdfbde059a68bbc3d07821..b8b336179d826f8ac62f445aa10a2913fbd38e05 100644 (file)
--- a/drivers/net/ethernet/freescale/enetc/enetc_qos.c
+++ b/drivers/net/ethernet/freescale/enetc/enetc_qos.c
@@ -1241,8 +1241,6 @@ static int enetc_psfp_parse_clsflower(struct enetc_ndev_priv *priv,
        /* Flow meter and max frame size */
        if (entryp) {
                if (entryp->police.burst) {
-                       u64 temp;
-
                        fmi = kzalloc(sizeof(*fmi), GFP_KERNEL);
                        if (!fmi) {
                                err = -ENOMEM;
@@ -1250,11 +1248,7 @@ static int enetc_psfp_parse_clsflower(struct enetc_ndev_priv *priv,
                        }
                        refcount_set(&fmi->refcount, 1);
                        fmi->cir = entryp->police.rate_bytes_ps;
-                       /* Convert to original burst value */
-                       temp = entryp->police.burst * fmi->cir;
-                       temp = div_u64(temp, 1000000000ULL);
-
-                       fmi->cbs = temp;
+                       fmi->cbs = entryp->police.burst;
                        fmi->index = entryp->police.index;
                        filter->flags |= ENETC_PSFP_FLAGS_FMI;
                        filter->fmi_index = fmi->index;

diff --git a/drivers/net/ethernet/mscc/ocelot_flower.c b/drivers/net/ethernet/mscc/ocelot_flower.c
index f2a85b06a6e7c3672ee141227b3a0ce07cd7d840..ec1b6e2572bab5fccbb4702a25946ed93ae4d7a2 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot_flower.c
+++ b/drivers/net/ethernet/mscc/ocelot_flower.c
@@ -12,7 +12,6 @@ static int ocelot_flower_parse_action(struct flow_cls_offload *f,
                                      struct ocelot_vcap_filter *filter)
 {
        const struct flow_action_entry *a;
-       s64 burst;
        u64 rate;
        int i;
 
@@ -35,8 +34,7 @@ static int ocelot_flower_parse_action(struct flow_cls_offload *f,
                        filter->action = OCELOT_VCAP_ACTION_POLICE;
                        rate = a->police.rate_bytes_ps;
                        filter->pol.rate = div_u64(rate, 1000) * 8;
-                       burst = rate * PSCHED_NS2TICKS(a->police.burst);
-                       filter->pol.burst = div_u64(burst, PSCHED_TICKS_PER_SEC);
+                       filter->pol.burst = a->police.burst;
                        break;
                default:
                        return -EOPNOTSUPP;

diff --git a/drivers/net/ethernet/mscc/ocelot_net.c b/drivers/net/ethernet/mscc/ocelot_net.c
index 5868ff753232f73de61617b124d1ea52aef7e913..41a1b5f6df95d852b07fd2d5a7e700bc06a9331c 100644 (file)
--- a/drivers/net/ethernet/mscc/ocelot_net.c
+++ b/drivers/net/ethernet/mscc/ocelot_net.c
@@ -74,9 +74,7 @@ static int ocelot_setup_tc_cls_matchall(struct ocelot_port_private *priv,
                }
 
                pol.rate = (u32)div_u64(action->police.rate_bytes_ps, 1000) * 8;
-               pol.burst = (u32)div_u64(action->police.rate_bytes_ps *
-                                        PSCHED_NS2TICKS(action->police.burst),
-                                        PSCHED_TICKS_PER_SEC);
+               pol.burst = action->police.burst;
 
                err = ocelot_port_policer_add(ocelot, port, &pol);
                if (err) {

diff --git a/drivers/net/ethernet/netronome/nfp/flower/qos_conf.c b/drivers/net/ethernet/netronome/nfp/flower/qos_conf.c
index bb327d48d1abcad28aa3ba4952d8565e8749bd21..d4ce8f9ef3cc237f529255006c315d1f19cacbef 100644 (file)
--- a/drivers/net/ethernet/netronome/nfp/flower/qos_conf.c
+++ b/drivers/net/ethernet/netronome/nfp/flower/qos_conf.c
@@ -69,7 +69,8 @@ nfp_flower_install_rate_limiter(struct nfp_app *app, struct net_device *netdev,
        struct nfp_repr *repr;
        struct sk_buff *skb;
        u32 netdev_port_id;
-       u64 burst, rate;
+       u32 burst;
+       u64 rate;
 
        if (!nfp_netdev_is_nfp_repr(netdev)) {
                NL_SET_ERR_MSG_MOD(extack, "unsupported offload: qos rate limit offload not supported on higher level port");
@@ -104,8 +105,7 @@ nfp_flower_install_rate_limiter(struct nfp_app *app, struct net_device *netdev,
        }
 
        rate = action->police.rate_bytes_ps;
-       burst = div_u64(rate * PSCHED_NS2TICKS(action->police.burst),
-                       PSCHED_TICKS_PER_SEC);
+       burst = action->police.burst;
        netdev_port_id = nfp_repr_get_port_id(netdev);
 
        skb = nfp_flower_cmsg_alloc(repr->app, sizeof(struct nfp_police_config),

diff --git a/include/net/dsa.h b/include/net/dsa.h
index 50389772c5979c480e6bfe0b2d883e6a1b60ad9d..4046ccd1945d5230b015b2f39cc2c481e5ed902e 100644 (file)
--- a/include/net/dsa.h
+++ b/include/net/dsa.h
@@ -144,7 +144,7 @@ struct dsa_mall_mirror_tc_entry {
 
 /* TC port policer entry */
 struct dsa_mall_policer_tc_entry {
-       s64 burst;
+       u32 burst;
        u64 rate_bytes_per_sec;
 };
 

diff --git a/include/net/flow_offload.h b/include/net/flow_offload.h
index 3e793ac66baf7135d72e077f2fb0d71d529ca84a..de395498440d8428ddc35047568d6d7ba840f8ae 100644 (file)
--- a/include/net/flow_offload.h
+++ b/include/net/flow_offload.h
@@ -233,7 +233,7 @@ struct flow_action_entry {
                } sample;
                struct {                                /* FLOW_ACTION_POLICE */
                        u32                     index;
-                       s64                     burst;
+                       u32                     burst;
                        u64                     rate_bytes_ps;
                        u32                     mtu;
                } police;

diff --git a/include/net/tc_act/tc_police.h b/include/net/tc_act/tc_police.h
index cd973b10ae8c1546e59d2b960abc7218384cc020..6d1e26b709b5a27d5b2571b8dfd9d9fd04304242 100644 (file)
--- a/include/net/tc_act/tc_police.h
+++ b/include/net/tc_act/tc_police.h
@@ -59,14 +59,42 @@ static inline u64 tcf_police_rate_bytes_ps(const struct tc_action *act)
        return params->rate.rate_bytes_ps;
 }
 
-static inline s64 tcf_police_tcfp_burst(const struct tc_action *act)
+static inline u32 tcf_police_burst(const struct tc_action *act)
 {
        struct tcf_police *police = to_police(act);
        struct tcf_police_params *params;
+       u32 burst;
 
        params = rcu_dereference_protected(police->params,
                                           lockdep_is_held(&police->tcf_lock));
-       return params->tcfp_burst;
+
+       /*
+        *  "rate" bytes   "burst" nanoseconds
+        *  ------------ * -------------------
+        *    1 second          2^6 ticks
+        *
+        * ------------------------------------
+        *        NSEC_PER_SEC nanoseconds
+        *        ------------------------
+        *              2^6 ticks
+        *
+        *    "rate" bytes   "burst" nanoseconds            2^6 ticks
+        *  = ------------ * ------------------- * ------------------------
+        *      1 second          2^6 ticks        NSEC_PER_SEC nanoseconds
+        *
+        *   "rate" * "burst"
+        * = ---------------- bytes/nanosecond
+        *    NSEC_PER_SEC^2
+        *
+        *
+        *   "rate" * "burst"
+        * = ---------------- bytes/second
+        *     NSEC_PER_SEC
+        */
+       burst = div_u64(params->tcfp_burst * params->rate.rate_bytes_ps,
+                       NSEC_PER_SEC);
+
+       return burst;
 }
 
 static inline u32 tcf_police_tcfp_mtu(const struct tc_action *act)

diff --git a/net/sched/cls_api.c b/net/sched/cls_api.c
index 1b14d5f57e7f601b2e66affb2a90cd02e0a2516d..e9e119ea6813287d38d1a2a2cb8fb04316e3b4f6 100644 (file)
--- a/net/sched/cls_api.c
+++ b/net/sched/cls_api.c
@@ -3660,7 +3660,7 @@ int tc_setup_flow_action(struct flow_action *flow_action,
                        tcf_sample_get_group(entry, act);
                } else if (is_tcf_police(act)) {
                        entry->id = FLOW_ACTION_POLICE;
-                       entry->police.burst = tcf_police_tcfp_burst(act);
+                       entry->police.burst = tcf_police_burst(act);
                        entry->police.rate_bytes_ps =
                                tcf_police_rate_bytes_ps(act);
                        entry->police.mtu = tcf_police_tcfp_mtu(act);