Re: [net-next,v1] net: mscc: ocelot: add action of police on vcap_is2

From: Vladimir Oltean
Date: Sat Mar 28 2020 - 09:50:44 EST

Next message: Markus Elfring: "Re: [Cocci] [v3 05/10] mmap locking API: Checking the Coccinelle software"
Previous message: Lukas Bulwahn: "[PATCH] MAINTAINERS: clarify maintenance of ARM Dove drivers"
In reply to: Xiaoliang Yang: "[net-next,v1] net: mscc: ocelot: add action of police on vcap_is2"
Next in thread: Vladimir Oltean: "Re: [net-next,v1] net: mscc: ocelot: add action of police on vcap_is2"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]

Hi Xiaoliang,

Thanks for the patch. I've tested it, but sadly, as-is it doesn't compile.
But then again, net-next doesn't compile either, so there...

On Sat, 28 Mar 2020 at 14:41, Xiaoliang Yang <xiaoliang.yang_1@xxxxxxx> wrote:
>
> Ocelot has 384 policers that can be allocated to ingress ports,
> QoS classes per port, and VCAP IS2 entries. ocelot_police.c
> supports to set policers which can be allocated to police action
> of VCAP IS2. We allocate policers from maximum pol_id, and
> decrease the pol_id when add a new vcap_is2 entry which is
> police action.
>
> Signed-off-by: Xiaoliang Yang <xiaoliang.yang_1@xxxxxxx>
> ---
> drivers/net/ethernet/mscc/ocelot_ace.c | 62 ++++++++++++++++++++---
> drivers/net/ethernet/mscc/ocelot_ace.h | 4 ++
> drivers/net/ethernet/mscc/ocelot_flower.c | 9 ++++
> drivers/net/ethernet/mscc/ocelot_police.c | 24 +++++++++
> drivers/net/ethernet/mscc/ocelot_police.h | 5 ++
> include/soc/mscc/ocelot.h | 1 +
> 6 files changed, 98 insertions(+), 7 deletions(-)
>
> diff --git a/drivers/net/ethernet/mscc/ocelot_ace.c b/drivers/net/ethernet/mscc/ocelot_ace.c
> index 906b54025b17..159490212f4b 100644
> --- a/drivers/net/ethernet/mscc/ocelot_ace.c
> +++ b/drivers/net/ethernet/mscc/ocelot_ace.c
> @@ -7,6 +7,7 @@
> #include <linux/proc_fs.h>
>
> #include <soc/mscc/ocelot_vcap.h>
> +#include "ocelot_police.h"
> #include "ocelot_ace.h"
> #include "ocelot_s2.h"
>
> @@ -299,9 +300,9 @@ static void vcap_action_set(struct ocelot *ocelot, struct vcap_data *data,
> }
>
> static void is2_action_set(struct ocelot *ocelot, struct vcap_data *data,
> - enum ocelot_ace_action action)
> + struct ocelot_ace_rule *ace)
> {
> - switch (action) {
> + switch (ace->action) {
> case OCELOT_ACL_ACTION_DROP:
> vcap_action_set(ocelot, data, VCAP_IS2_ACT_PORT_MASK, 0);
> vcap_action_set(ocelot, data, VCAP_IS2_ACT_MASK_MODE, 1);
> @@ -319,6 +320,14 @@ static void is2_action_set(struct ocelot *ocelot, struct vcap_data *data,
> vcap_action_set(ocelot, data, VCAP_IS2_ACT_CPU_QU_NUM, 0);
> vcap_action_set(ocelot, data, VCAP_IS2_ACT_CPU_COPY_ENA, 1);
> break;
> + case OCELOT_ACL_ACTION_POLICE:
> + vcap_action_set(ocelot, data, VCAP_IS2_ACT_PORT_MASK, 0);
> + vcap_action_set(ocelot, data, VCAP_IS2_ACT_MASK_MODE, 0);
> + vcap_action_set(ocelot, data, VCAP_IS2_ACT_POLICE_ENA, 1);
> + vcap_action_set(ocelot, data, VCAP_IS2_ACT_POLICE_IDX, ace->pol_ix);
> + vcap_action_set(ocelot, data, VCAP_IS2_ACT_CPU_QU_NUM, 0);
> + vcap_action_set(ocelot, data, VCAP_IS2_ACT_CPU_COPY_ENA, 0);
> + break;
> }
> }
>
> @@ -611,7 +620,7 @@ static void is2_entry_set(struct ocelot *ocelot, int ix,
> }
>
> vcap_key_set(ocelot, &data, VCAP_IS2_TYPE, type, type_mask);
> - is2_action_set(ocelot, &data, ace->action);
> + is2_action_set(ocelot, &data, ace);
> vcap_data_set(data.counter, data.counter_offset,
> vcap_is2->counter_width, ace->stats.pkts);
>
> @@ -639,12 +648,19 @@ static void is2_entry_get(struct ocelot *ocelot, struct ocelot_ace_rule *rule,
> rule->stats.pkts = cnt;
> }
>
> -static void ocelot_ace_rule_add(struct ocelot_acl_block *block,
> +static void ocelot_ace_rule_add(struct ocelot *ocelot,
> + struct ocelot_acl_block *block,
> struct ocelot_ace_rule *rule)
> {
> struct ocelot_ace_rule *tmp;
> struct list_head *pos, *n;
>
> + if (rule->action == OCELOT_ACL_ACTION_POLICE) {
> + block->pol_lpr--;
> + rule->pol_ix = block->pol_lpr;
> + ocelot_ace_policer_add(ocelot, rule->pol_ix, &rule->pol);
> + }
> +
> block->count++;
>
> if (list_empty(&block->rules)) {
> @@ -697,7 +713,7 @@ int ocelot_ace_rule_offload_add(struct ocelot *ocelot,
> int i, index;
>
> /* Add rule to the linked list */
> - ocelot_ace_rule_add(block, rule);
> + ocelot_ace_rule_add(ocelot, block, rule);
>
> /* Get the index of the inserted rule */
> index = ocelot_ace_rule_get_index_id(block, rule);
> @@ -713,7 +729,33 @@ int ocelot_ace_rule_offload_add(struct ocelot *ocelot,
> return 0;
> }
>
> -static void ocelot_ace_rule_del(struct ocelot_acl_block *block,
> +static void ocelot_ace_police_del(struct ocelot *ocelot,
> + struct ocelot_acl_block *block,
> + u32 ix)
> +{
> + struct ocelot_ace_rule *tmp;
> + int index = -1;
> +
> + if (ix < block->pol_lpr)
> + return;
> +
> + list_for_each_entry(tmp, &block->rules, list) {
> + index++;
> + if (tmp->action == OCELOT_ACL_ACTION_POLICE &&
> + tmp->pol_ix < ix) {
> + tmp->pol_ix += 1;
> + ocelot_ace_policer_add(ocelot, tmp->pol_ix,
> + &rule->pol);

The "rule" variable doesn't exist here, you probably mean "tmp".
But I'm sure this patch was written before commit ce6659c55b7d ("net:
mscc: ocelot: replace "rule" and "ocelot_rule" variable names with
"ace""), can we please stick to that convention and name the variable
"ace" where possible (and here is an example of that)? It's easier to
follow the code.

> + is2_entry_set(ocelot, index, tmp);
> + }
> + }
> +
> + ocelot_ace_policer_del(ocelot, block->pol_lpr);
> + block->pol_lpr++;
> +}
> +
> +static void ocelot_ace_rule_del(struct ocelot *ocelot,
> + struct ocelot_acl_block *block,
> struct ocelot_ace_rule *rule)
> {
> struct ocelot_ace_rule *tmp;
> @@ -722,6 +764,9 @@ static void ocelot_ace_rule_del(struct ocelot_acl_block *block,
> list_for_each_safe(pos, q, &block->rules) {
> tmp = list_entry(pos, struct ocelot_ace_rule, list);
> if (tmp->id == rule->id) {
> + if (tmp->action == OCELOT_ACL_ACTION_POLICE)
> + ocelot_ace_police_del(ocelot, block, tmp->pol_ix);
> +
> list_del(pos);
> kfree(tmp);
> }
> @@ -744,7 +789,7 @@ int ocelot_ace_rule_offload_del(struct ocelot *ocelot,
> index = ocelot_ace_rule_get_index_id(block, rule);
>
> /* Delete rule */
> - ocelot_ace_rule_del(block, rule);
> + ocelot_ace_rule_del(ocelot, block, rule);
>
> /* Move up all the blocks over the deleted rule */
> for (i = index; i < block->count; i++) {
> @@ -779,6 +824,7 @@ int ocelot_ace_rule_stats_update(struct ocelot *ocelot,
> int ocelot_ace_init(struct ocelot *ocelot)
> {
> const struct vcap_props *vcap_is2 = &ocelot->vcap[VCAP_IS2];
> + struct ocelot_acl_block *block = &ocelot->acl_block;
> struct vcap_data data;
>
> memset(&data, 0, sizeof(data));
> @@ -807,6 +853,8 @@ int ocelot_ace_init(struct ocelot *ocelot)
> ocelot_write_gix(ocelot, 0x3fffff, ANA_POL_CIR_STATE,
> OCELOT_POLICER_DISCARD);
>
> + block->pol_lpr = OCELOT_POLICER_DISCARD - 1;
> +
> INIT_LIST_HEAD(&ocelot->acl_block.rules);
>
> return 0;
> diff --git a/drivers/net/ethernet/mscc/ocelot_ace.h b/drivers/net/ethernet/mscc/ocelot_ace.h
> index b9a5868e3f15..29d22c566786 100644
> --- a/drivers/net/ethernet/mscc/ocelot_ace.h
> +++ b/drivers/net/ethernet/mscc/ocelot_ace.h
> @@ -7,6 +7,7 @@
> #define _MSCC_OCELOT_ACE_H_
>
> #include "ocelot.h"
> +#include "ocelot_police.h"
> #include <net/sch_generic.h>
> #include <net/pkt_cls.h>
>
> @@ -176,6 +177,7 @@ struct ocelot_ace_frame_ipv6 {
> enum ocelot_ace_action {
> OCELOT_ACL_ACTION_DROP,
> OCELOT_ACL_ACTION_TRAP,
> + OCELOT_ACL_ACTION_POLICE,
> };
>
> struct ocelot_ace_stats {
> @@ -208,6 +210,8 @@ struct ocelot_ace_rule {
> struct ocelot_ace_frame_ipv4 ipv4;
> struct ocelot_ace_frame_ipv6 ipv6;
> } frame;
> + struct ocelot_policer pol;
> + u32 pol_ix;
> };
>
> int ocelot_ace_rule_offload_add(struct ocelot *ocelot,
> diff --git a/drivers/net/ethernet/mscc/ocelot_flower.c b/drivers/net/ethernet/mscc/ocelot_flower.c
> index 873a9944fbfb..1af7968ad598 100644
> --- a/drivers/net/ethernet/mscc/ocelot_flower.c
> +++ b/drivers/net/ethernet/mscc/ocelot_flower.c
> @@ -12,6 +12,8 @@ static int ocelot_flower_parse_action(struct flow_cls_offload *f,
> struct ocelot_ace_rule *ace)
> {
> const struct flow_action_entry *a;
> + s64 burst;
> + u64 rate;
> int i;
>
> if (!flow_offload_has_one_action(&f->rule->action))
> @@ -29,6 +31,13 @@ static int ocelot_flower_parse_action(struct flow_cls_offload *f,
> case FLOW_ACTION_TRAP:
> ace->action = OCELOT_ACL_ACTION_TRAP;
> break;
> + case FLOW_ACTION_POLICE:
> + ace->action = OCELOT_ACL_ACTION_POLICE;
> + rate = a->police.rate_bytes_ps;
> + ace->pol.rate = (u32)div_u64(rate, 1000) * 8;
> + burst = rate * PSCHED_NS2TICKS(a->police.burst);
> + ace->pol.burst = (u32)div_u64(burst, PSCHED_TICKS_PER_SEC);
> + break;
> default:
> return -EOPNOTSUPP;
> }
> diff --git a/drivers/net/ethernet/mscc/ocelot_police.c b/drivers/net/ethernet/mscc/ocelot_police.c
> index faddce43f2e3..8d25b2706ff0 100644
> --- a/drivers/net/ethernet/mscc/ocelot_police.c
> +++ b/drivers/net/ethernet/mscc/ocelot_police.c
> @@ -225,3 +225,27 @@ int ocelot_port_policer_del(struct ocelot *ocelot, int port)
>
> return 0;
> }
> +
> +int ocelot_ace_policer_add(struct ocelot *ocelot, u32 pol_ix,
> + struct ocelot_policer *pol)
> +{
> + struct qos_policer_conf pp = { 0 };
> +
> + if (!pol)
> + return -EINVAL;
> +
> + pp.mode = MSCC_QOS_RATE_MODE_DATA;
> + pp.pir = pol->rate;
> + pp.pbs = pol->burst;
> +
> + return qos_policer_conf_set(ocelot, 0, pol_ix, &pp);
> +}
> +
> +int ocelot_ace_policer_del(struct ocelot *ocelot, u32 pol_ix)
> +{
> + struct qos_policer_conf pp = { 0 };
> +
> + pp.mode = MSCC_QOS_RATE_MODE_DISABLED;
> +
> + return qos_policer_conf_set(ocelot, 0, pol_ix, &pp);
> +}
> diff --git a/drivers/net/ethernet/mscc/ocelot_police.h b/drivers/net/ethernet/mscc/ocelot_police.h
> index ae9509229463..22025cce0a6a 100644
> --- a/drivers/net/ethernet/mscc/ocelot_police.h
> +++ b/drivers/net/ethernet/mscc/ocelot_police.h
> @@ -19,4 +19,9 @@ int ocelot_port_policer_add(struct ocelot *ocelot, int port,
>
> int ocelot_port_policer_del(struct ocelot *ocelot, int port);
>
> +int ocelot_ace_policer_add(struct ocelot *ocelot, u32 pol_ix,
> + struct ocelot_policer *pol);
> +
> +int ocelot_ace_policer_del(struct ocelot *ocelot, u32 pol_ix);
> +
> #endif /* _MSCC_OCELOT_POLICE_H_ */
> diff --git a/include/soc/mscc/ocelot.h b/include/soc/mscc/ocelot.h
> index 007b584cc431..388504c94f6e 100644
> --- a/include/soc/mscc/ocelot.h
> +++ b/include/soc/mscc/ocelot.h
> @@ -468,6 +468,7 @@ struct ocelot_ops {
> struct ocelot_acl_block {
> struct list_head rules;
> int count;
> + int pol_lpr;
> };
>
> struct ocelot_port {
> --
> 2.17.1
>

For what it's worth, I am preparing another patch series for port
policers in DSA, and I'm keeping your patch in my tree and rebasing on
top of it. Depending on how things go with review, do you mind if I
just take your patch to address other received feedback, and repost
your flow-based policers together with my port-based policers?

Regards,
-Vladimir

Next message: Markus Elfring: "Re: [Cocci] [v3 05/10] mmap locking API: Checking the Coccinelle software"
Previous message: Lukas Bulwahn: "[PATCH] MAINTAINERS: clarify maintenance of ARM Dove drivers"
In reply to: Xiaoliang Yang: "[net-next,v1] net: mscc: ocelot: add action of police on vcap_is2"
Next in thread: Vladimir Oltean: "Re: [net-next,v1] net: mscc: ocelot: add action of police on vcap_is2"
Messages sorted by: [ date ] [ thread ] [ subject ] [ author ]