Re: [PATCH net-next,v3 04/12] cls_api: add translator to flow_action representation

[Marcelo Ricardo Leitner <marcelo.leitner@gmail.com>]

On Wed, Nov 21, 2018 at 03:51:24AM +0100, Pablo Neira Ayuso wrote:
...
> +int tc_setup_flow_action(struct flow_action *flow_action,
> +			 const struct tcf_exts *exts)
> +{
> +	const struct tc_action *act;
> +	int i, j, k;
> +
> +	if (!exts)
> +		return 0;
> +
> +	j = 0;
> +	tcf_exts_for_each_action(i, act, exts) {
> +		struct flow_action_entry *key;
                                   ^^^^^  ^^^

> +
> +		key = &flow_action->entries[j];
                ^^^                 ^^^^^^^

Considering previous changes, what about a s/key/entry/ in the
variable name here too?

> +		if (is_tcf_gact_ok(act)) {
> +			key->id = FLOW_ACTION_ACCEPT;
> +		} else if (is_tcf_gact_shot(act)) {
> +			key->id = FLOW_ACTION_DROP;
> +		} else if (is_tcf_gact_trap(act)) {
> +			key->id = FLOW_ACTION_TRAP;
> +		} else if (is_tcf_gact_goto_chain(act)) {
> +			key->id = FLOW_ACTION_GOTO;
> +			key->chain_index = tcf_gact_goto_chain_index(act);
> +		} else if (is_tcf_mirred_egress_redirect(act)) {
> +			key->id = FLOW_ACTION_REDIRECT;
> +			key->dev = tcf_mirred_dev(act);
> +		} else if (is_tcf_mirred_egress_mirror(act)) {
> +			key->id = FLOW_ACTION_MIRRED;
> +			key->dev = tcf_mirred_dev(act);
> +		} else if (is_tcf_vlan(act)) {
> +			switch (tcf_vlan_action(act)) {
> +			case TCA_VLAN_ACT_PUSH:
> +				key->id = FLOW_ACTION_VLAN_PUSH;
> +				key->vlan.vid = tcf_vlan_push_vid(act);
> +				key->vlan.proto = tcf_vlan_push_proto(act);
> +				key->vlan.prio = tcf_vlan_push_prio(act);
> +				break;
> +			case TCA_VLAN_ACT_POP:
> +				key->id = FLOW_ACTION_VLAN_POP;
> +				break;
> +			case TCA_VLAN_ACT_MODIFY:
> +				key->id = FLOW_ACTION_VLAN_MANGLE;
> +				key->vlan.vid = tcf_vlan_push_vid(act);
> +				key->vlan.proto = tcf_vlan_push_proto(act);
> +				key->vlan.prio = tcf_vlan_push_prio(act);
> +				break;
> +			default:
> +				goto err_out;
> +			}
> +		} else if (is_tcf_tunnel_set(act)) {
> +			key->id = FLOW_ACTION_TUNNEL_ENCAP;
> +			key->tunnel = tcf_tunnel_info(act);
> +		} else if (is_tcf_tunnel_release(act)) {
> +			key->id = FLOW_ACTION_TUNNEL_DECAP;
> +			key->tunnel = tcf_tunnel_info(act);
> +		} else if (is_tcf_pedit(act)) {
> +			for (k = 0; k < tcf_pedit_nkeys(act); k++) {
> +				switch (tcf_pedit_cmd(act, k)) {
> +				case TCA_PEDIT_KEY_EX_CMD_SET:
> +					key->id = FLOW_ACTION_MANGLE;
> +					break;
> +				case TCA_PEDIT_KEY_EX_CMD_ADD:
> +					key->id = FLOW_ACTION_ADD;
> +					break;
> +				default:
> +					goto err_out;
> +				}
> +				key->mangle.htype = tcf_pedit_htype(act, k);
> +				key->mangle.mask = tcf_pedit_mask(act, k);
> +				key->mangle.val = tcf_pedit_val(act, k);
> +				key->mangle.offset = tcf_pedit_offset(act, k);
> +				key = &flow_action->entries[++j];
> +			}
> +		} else if (is_tcf_csum(act)) {
> +			key->id = FLOW_ACTION_CSUM;
> +			key->csum_flags = tcf_csum_update_flags(act);
> +		} else if (is_tcf_skbedit_mark(act)) {
> +			key->id = FLOW_ACTION_MARK;
> +			key->mark = tcf_skbedit_mark(act);
> +		} else {
> +			goto err_out;
> +		}
> +
> +		if (!is_tcf_pedit(act))
> +			j++;
> +	}
> +	return 0;
> +err_out:
> +	return -EOPNOTSUPP;
> +}
> +EXPORT_SYMBOL(tc_setup_flow_action);