On Wed, Dec 23, 2020 at 3:08 PM Michael Shamis <michae...@marvell.com> wrote:
>
> Reviewed-by: Michael Shamis <michae...@marvell.com>
>
> -----Original Message-----
> From: dev <dev-boun...@dpdk.org> On Behalf Of lir...@marvell.com
> Sent: Wednesday, December 2, 2020 12:12 PM
> To: Jerin Jacob Kollanukkaran <jer...@marvell.com>
> Cc: dev@dpdk.org; Liron Himi <lir...@marvell.com>
> Subject: [dpdk-dev] [PATCH v1 21/38] net/mvpp2: flow: build table key along
> with rule
>
> From: Liron Himi <lir...@marvell.com>
>
> build table key along with rule
It would be nice to mention what has been changed as well.
>
> Signed-off-by: Liron Himi <lir...@marvell.com>
> Reviewed-by: Liron Himi <lir...@marvell.com>
> ---
> drivers/net/mvpp2/mrvl_ethdev.h | 33 +---
> drivers/net/mvpp2/mrvl_flow.c | 257 +++++++++++++-------------------
> 2 files changed, 106 insertions(+), 184 deletions(-)
>
> diff --git a/drivers/net/mvpp2/mrvl_ethdev.h
> b/drivers/net/mvpp2/mrvl_ethdev.h index db6632f5b..e7f75067f 100644
> --- a/drivers/net/mvpp2/mrvl_ethdev.h
> +++ b/drivers/net/mvpp2/mrvl_ethdev.h
> @@ -82,43 +82,13 @@
> /** Maximum length of a match string */ #define MRVL_MATCH_LEN 16
>
> -/** Parsed fields in processed rte_flow_item. */ -enum mrvl_parsed_fields {
> - /* eth flags */
> - F_DMAC = BIT(0),
> - F_SMAC = BIT(1),
> - F_TYPE = BIT(2),
> - /* vlan flags */
> - F_VLAN_PRI = BIT(3),
> - F_VLAN_ID = BIT(4),
> - F_VLAN_TCI = BIT(5), /* not supported by MUSDK yet */
> - /* ip4 flags */
> - F_IP4_TOS = BIT(6),
> - F_IP4_SIP = BIT(7),
> - F_IP4_DIP = BIT(8),
> - F_IP4_PROTO = BIT(9),
> - /* ip6 flags */
> - F_IP6_TC = BIT(10), /* not supported by MUSDK yet */
> - F_IP6_SIP = BIT(11),
> - F_IP6_DIP = BIT(12),
> - F_IP6_FLOW = BIT(13),
> - F_IP6_NEXT_HDR = BIT(14),
> - /* tcp flags */
> - F_TCP_SPORT = BIT(15),
> - F_TCP_DPORT = BIT(16),
> - /* udp flags */
> - F_UDP_SPORT = BIT(17),
> - F_UDP_DPORT = BIT(18),
> -};
> -
> /** PMD-specific definition of a flow rule handle. */ struct mrvl_mtr;
> struct rte_flow {
> LIST_ENTRY(rte_flow) next;
> struct mrvl_mtr *mtr;
>
> - enum mrvl_parsed_fields pattern;
> -
> + struct pp2_cls_tbl_key table_key;
> struct pp2_cls_tbl_rule rule;
> struct pp2_cls_cos_desc cos;
> struct pp2_cls_tbl_action action;
> @@ -197,7 +167,6 @@ struct mrvl_priv {
>
> struct pp2_cls_tbl_params cls_tbl_params;
> struct pp2_cls_tbl *cls_tbl;
> - uint32_t cls_tbl_pattern;
> LIST_HEAD(mrvl_flows, rte_flow) flows;
>
> struct pp2_cls_plcr *default_policer;
> diff --git a/drivers/net/mvpp2/mrvl_flow.c b/drivers/net/mvpp2/mrvl_flow.c
> index a1a748529..ffa47a12e 100644
> --- a/drivers/net/mvpp2/mrvl_flow.c
> +++ b/drivers/net/mvpp2/mrvl_flow.c
> @@ -192,12 +192,14 @@ mrvl_parse_mac(const struct rte_flow_item_eth *spec,
> k = spec->dst.addr_bytes;
> m = mask->dst.addr_bytes;
>
> - flow->pattern |= F_DMAC;
> + flow->table_key.proto_field[flow->rule.num_fields].field.eth =
> + MV_NET_ETH_F_DA;
> } else {
> k = spec->src.addr_bytes;
> m = mask->src.addr_bytes;
>
> - flow->pattern |= F_SMAC;
> + flow->table_key.proto_field[flow->rule.num_fields].field.eth =
> + MV_NET_ETH_F_SA;
> }
>
> key_field = &flow->rule.fields[flow->rule.num_fields];
> @@ -212,6 +214,10 @@ mrvl_parse_mac(const struct rte_flow_item_eth *spec,
> "%02x:%02x:%02x:%02x:%02x:%02x",
> m[0], m[1], m[2], m[3], m[4], m[5]);
>
> + flow->table_key.proto_field[flow->rule.num_fields].proto =
> + MV_NET_PROTO_ETH;
> + flow->table_key.key_size += key_field->size;
> +
> flow->rule.num_fields += 1;
>
> return 0;
> @@ -272,7 +278,12 @@ mrvl_parse_type(const struct rte_flow_item_eth *spec,
> k = rte_be_to_cpu_16(spec->type);
> snprintf((char *)key_field->key, MRVL_CLS_STR_SIZE_MAX, "%u", k);
>
> - flow->pattern |= F_TYPE;
> + flow->table_key.proto_field[flow->rule.num_fields].proto =
> + MV_NET_PROTO_ETH;
> + flow->table_key.proto_field[flow->rule.num_fields].field.eth =
> + MV_NET_ETH_F_TYPE;
> + flow->table_key.key_size += key_field->size;
> +
> flow->rule.num_fields += 1;
>
> return 0;
> @@ -303,7 +314,12 @@ mrvl_parse_vlan_id(const struct rte_flow_item_vlan *spec,
> k = rte_be_to_cpu_16(spec->tci) & MRVL_VLAN_ID_MASK;
> snprintf((char *)key_field->key, MRVL_CLS_STR_SIZE_MAX, "%u", k);
>
> - flow->pattern |= F_VLAN_ID;
> + flow->table_key.proto_field[flow->rule.num_fields].proto =
> + MV_NET_PROTO_VLAN;
> + flow->table_key.proto_field[flow->rule.num_fields].field.vlan =
> + MV_NET_VLAN_F_ID;
> + flow->table_key.key_size += key_field->size;
> +
> flow->rule.num_fields += 1;
>
> return 0;
> @@ -334,7 +350,12 @@ mrvl_parse_vlan_pri(const struct rte_flow_item_vlan
> *spec,
> k = (rte_be_to_cpu_16(spec->tci) & MRVL_VLAN_PRI_MASK) >> 13;
> snprintf((char *)key_field->key, MRVL_CLS_STR_SIZE_MAX, "%u", k);
>
> - flow->pattern |= F_VLAN_PRI;
> + flow->table_key.proto_field[flow->rule.num_fields].proto =
> + MV_NET_PROTO_VLAN;
> + flow->table_key.proto_field[flow->rule.num_fields].field.vlan =
> + MV_NET_VLAN_F_PRI;
> + flow->table_key.key_size += key_field->size;
> +
> flow->rule.num_fields += 1;
>
> return 0;
> @@ -367,7 +388,12 @@ mrvl_parse_ip4_dscp(const struct rte_flow_item_ipv4
> *spec,
> snprintf((char *)key_field->key, MRVL_CLS_STR_SIZE_MAX, "%u", k);
> snprintf((char *)key_field->mask, MRVL_CLS_STR_SIZE_MAX, "%u", m);
>
> - flow->pattern |= F_IP4_TOS;
> + flow->table_key.proto_field[flow->rule.num_fields].proto =
> + MV_NET_PROTO_IP4;
> + flow->table_key.proto_field[flow->rule.num_fields].field.ipv4 =
> + MV_NET_IP4_F_DSCP;
> + flow->table_key.key_size += key_field->size;
> +
> flow->rule.num_fields += 1;
>
> return 0;
> @@ -399,12 +425,14 @@ mrvl_parse_ip4_addr(const struct rte_flow_item_ipv4
> *spec,
> k.s_addr = spec->hdr.dst_addr;
> m = rte_be_to_cpu_32(mask->hdr.dst_addr);
>
> - flow->pattern |= F_IP4_DIP;
> + flow->table_key.proto_field[flow->rule.num_fields].field.ipv4
> =
> + MV_NET_IP4_F_DA;
> } else {
> k.s_addr = spec->hdr.src_addr;
> m = rte_be_to_cpu_32(mask->hdr.src_addr);
>
> - flow->pattern |= F_IP4_SIP;
> + flow->table_key.proto_field[flow->rule.num_fields].field.ipv4
> =
> + MV_NET_IP4_F_SA;
> }
>
> key_field = &flow->rule.fields[flow->rule.num_fields];
> @@ -414,6 +442,10 @@ mrvl_parse_ip4_addr(const struct rte_flow_item_ipv4
> *spec,
> inet_ntop(AF_INET, &k, (char *)key_field->key, MRVL_CLS_STR_SIZE_MAX);
> snprintf((char *)key_field->mask, MRVL_CLS_STR_SIZE_MAX, "0x%x", m);
>
> + flow->table_key.proto_field[flow->rule.num_fields].proto =
> + MV_NET_PROTO_IP4;
> + flow->table_key.key_size += key_field->size;
> +
> flow->rule.num_fields += 1;
>
> return 0;
> @@ -475,7 +507,12 @@ mrvl_parse_ip4_proto(const struct rte_flow_item_ipv4
> *spec,
>
> snprintf((char *)key_field->key, MRVL_CLS_STR_SIZE_MAX, "%u", k);
>
> - flow->pattern |= F_IP4_PROTO;
> + flow->table_key.proto_field[flow->rule.num_fields].proto =
> + MV_NET_PROTO_IP4;
> + flow->table_key.proto_field[flow->rule.num_fields].field.ipv4 =
> + MV_NET_IP4_F_PROTO;
> + flow->table_key.key_size += key_field->size;
> +
> flow->rule.num_fields += 1;
>
> return 0;
> @@ -507,12 +544,14 @@ mrvl_parse_ip6_addr(const struct rte_flow_item_ipv6
> *spec,
> memcpy(k.s6_addr, spec->hdr.dst_addr, size);
> memcpy(m.s6_addr, mask->hdr.dst_addr, size);
>
> - flow->pattern |= F_IP6_DIP;
> + flow->table_key.proto_field[flow->rule.num_fields].field.ipv6
> =
> + MV_NET_IP6_F_DA;
> } else {
> memcpy(k.s6_addr, spec->hdr.src_addr, size);
> memcpy(m.s6_addr, mask->hdr.src_addr, size);
>
> - flow->pattern |= F_IP6_SIP;
> + flow->table_key.proto_field[flow->rule.num_fields].field.ipv6
> =
> + MV_NET_IP6_F_SA;
> }
>
> key_field = &flow->rule.fields[flow->rule.num_fields];
> @@ -522,6 +561,10 @@ mrvl_parse_ip6_addr(const struct rte_flow_item_ipv6
> *spec,
> inet_ntop(AF_INET6, &k, (char *)key_field->key,
> MRVL_CLS_STR_SIZE_MAX);
> inet_ntop(AF_INET6, &m, (char *)key_field->mask,
> MRVL_CLS_STR_SIZE_MAX);
>
> + flow->table_key.proto_field[flow->rule.num_fields].proto =
> + MV_NET_PROTO_IP6;
> + flow->table_key.key_size += key_field->size;
> +
> flow->rule.num_fields += 1;
>
> return 0;
> @@ -585,7 +628,12 @@ mrvl_parse_ip6_flow(const struct rte_flow_item_ipv6
> *spec,
> snprintf((char *)key_field->key, MRVL_CLS_STR_SIZE_MAX, "%u", k);
> snprintf((char *)key_field->mask, MRVL_CLS_STR_SIZE_MAX, "%u", m);
>
> - flow->pattern |= F_IP6_FLOW;
> + flow->table_key.proto_field[flow->rule.num_fields].proto =
> + MV_NET_PROTO_IP6;
> + flow->table_key.proto_field[flow->rule.num_fields].field.ipv6 =
> + MV_NET_IP6_F_FLOW;
> + flow->table_key.key_size += key_field->size;
> +
> flow->rule.num_fields += 1;
>
> return 0;
> @@ -615,7 +663,12 @@ mrvl_parse_ip6_next_hdr(const struct rte_flow_item_ipv6
> *spec,
>
> snprintf((char *)key_field->key, MRVL_CLS_STR_SIZE_MAX, "%u", k);
>
> - flow->pattern |= F_IP6_NEXT_HDR;
> + flow->table_key.proto_field[flow->rule.num_fields].proto =
> + MV_NET_PROTO_IP6;
> + flow->table_key.proto_field[flow->rule.num_fields].field.ipv6 =
> + MV_NET_IP6_F_NEXT_HDR;
> + flow->table_key.key_size += key_field->size;
> +
> flow->rule.num_fields += 1;
>
> return 0;
> @@ -648,15 +701,21 @@ mrvl_parse_tcp_port(const struct rte_flow_item_tcp
> *spec,
> if (parse_dst) {
> k = rte_be_to_cpu_16(spec->hdr.dst_port);
>
> - flow->pattern |= F_TCP_DPORT;
> + flow->table_key.proto_field[flow->rule.num_fields].field.tcp =
> + MV_NET_TCP_F_DP;
> } else {
> k = rte_be_to_cpu_16(spec->hdr.src_port);
>
> - flow->pattern |= F_TCP_SPORT;
> + flow->table_key.proto_field[flow->rule.num_fields].field.tcp =
> + MV_NET_TCP_F_SP;
> }
>
> snprintf((char *)key_field->key, MRVL_CLS_STR_SIZE_MAX, "%u", k);
>
> + flow->table_key.proto_field[flow->rule.num_fields].proto =
> + MV_NET_PROTO_TCP;
> + flow->table_key.key_size += key_field->size;
> +
> flow->rule.num_fields += 1;
>
> return 0;
> @@ -721,15 +780,21 @@ mrvl_parse_udp_port(const struct rte_flow_item_udp
> *spec,
> if (parse_dst) {
> k = rte_be_to_cpu_16(spec->hdr.dst_port);
>
> - flow->pattern |= F_UDP_DPORT;
> + flow->table_key.proto_field[flow->rule.num_fields].field.udp =
> + MV_NET_UDP_F_DP;
> } else {
> k = rte_be_to_cpu_16(spec->hdr.src_port);
>
> - flow->pattern |= F_UDP_SPORT;
> + flow->table_key.proto_field[flow->rule.num_fields].field.udp =
> + MV_NET_UDP_F_SP;
> }
>
> snprintf((char *)key_field->key, MRVL_CLS_STR_SIZE_MAX, "%u", k);
>
> + flow->table_key.proto_field[flow->rule.num_fields].proto =
> + MV_NET_PROTO_UDP;
> + flow->table_key.key_size += key_field->size;
> +
> flow->rule.num_fields += 1;
>
> return 0;
> @@ -832,7 +897,7 @@ mrvl_parse_vlan(const struct rte_flow_item *item, {
> const struct rte_flow_item_vlan *spec = NULL, *mask = NULL;
> uint16_t m;
> - int ret;
> + int ret, i;
>
> ret = mrvl_parse_init(item, (const void **)&spec, (const void
> **)&mask,
> &rte_flow_item_vlan_mask,
> @@ -855,12 +920,6 @@ mrvl_parse_vlan(const struct rte_flow_item *item,
> goto out;
> }
>
> - if (flow->pattern & F_TYPE) {
> - rte_flow_error_set(error, ENOTSUP,
> - RTE_FLOW_ERROR_TYPE_ITEM, item,
> - "VLAN TPID matching is not supported");
> - return -rte_errno;
> - }
> if (mask->inner_type) {
> struct rte_flow_item_eth spec_eth = {
> .type = spec->inner_type,
> @@ -869,6 +928,21 @@ mrvl_parse_vlan(const struct rte_flow_item *item,
> .type = mask->inner_type,
> };
>
> + /* TPID is not supported so if ETH_TYPE was selected,
> + * error is return. else, classify eth-type with the tpid
> value
> + */
> + for (i = 0; i < flow->rule.num_fields; i++)
> + if (flow->table_key.proto_field[i].proto ==
> + MV_NET_PROTO_ETH &&
> + flow->table_key.proto_field[i].field.eth ==
> + MV_NET_ETH_F_TYPE) {
> + rte_flow_error_set(error, ENOTSUP,
> + RTE_FLOW_ERROR_TYPE_ITEM,
> + item,
> + "VLAN TPID matching is not
> supported");
> + return -rte_errno;
> + }
> +
> MRVL_LOG(WARNING, "inner eth type mask is ignored");
> ret = mrvl_parse_type(&spec_eth, &mask_eth, flow);
> if (ret)
> @@ -1250,6 +1324,8 @@ mrvl_flow_parse_pattern(struct mrvl_priv *priv
> __rte_unused,
> }
> }
>
> + flow->table_key.num_fields = flow->rule.num_fields;
> +
> return 0;
> }
>
> @@ -1462,134 +1538,9 @@ mrvl_create_cls_table(struct rte_eth_dev *dev, struct
> rte_flow *first_flow)
> priv->cls_tbl_params.max_num_rules = MRVL_CLS_MAX_NUM_RULES;
> priv->cls_tbl_params.default_act.type = PP2_CLS_TBL_ACT_DONE;
> priv->cls_tbl_params.default_act.cos = &first_flow->cos;
> -
> - if (first_flow->pattern & F_DMAC) {
> - key->proto_field[key->num_fields].proto = MV_NET_PROTO_ETH;
> - key->proto_field[key->num_fields].field.eth = MV_NET_ETH_F_DA;
> - key->key_size += 6;
> - key->num_fields += 1;
> - }
> -
> - if (first_flow->pattern & F_SMAC) {
> - key->proto_field[key->num_fields].proto = MV_NET_PROTO_ETH;
> - key->proto_field[key->num_fields].field.eth = MV_NET_ETH_F_SA;
> - key->key_size += 6;
> - key->num_fields += 1;
> - }
> -
> - if (first_flow->pattern & F_TYPE) {
> - key->proto_field[key->num_fields].proto = MV_NET_PROTO_ETH;
> - key->proto_field[key->num_fields].field.eth =
> MV_NET_ETH_F_TYPE;
> - key->key_size += 2;
> - key->num_fields += 1;
> - }
> -
> - if (first_flow->pattern & F_VLAN_ID) {
> - key->proto_field[key->num_fields].proto = MV_NET_PROTO_VLAN;
> - key->proto_field[key->num_fields].field.vlan =
> MV_NET_VLAN_F_ID;
> - key->key_size += 2;
> - key->num_fields += 1;
> - }
> -
> - if (first_flow->pattern & F_VLAN_PRI) {
> - key->proto_field[key->num_fields].proto = MV_NET_PROTO_VLAN;
> - key->proto_field[key->num_fields].field.vlan =
> - MV_NET_VLAN_F_PRI;
> - key->key_size += 1;
> - key->num_fields += 1;
> - }
> -
> - if (first_flow->pattern & F_IP4_TOS) {
> - key->proto_field[key->num_fields].proto = MV_NET_PROTO_IP4;
> - key->proto_field[key->num_fields].field.ipv4 =
> - MV_NET_IP4_F_DSCP;
> - key->key_size += 1;
> - key->num_fields += 1;
> - }
> -
> - if (first_flow->pattern & F_IP4_SIP) {
> - key->proto_field[key->num_fields].proto = MV_NET_PROTO_IP4;
> - key->proto_field[key->num_fields].field.ipv4 =
> MV_NET_IP4_F_SA;
> - key->key_size += 4;
> - key->num_fields += 1;
> - }
> -
> - if (first_flow->pattern & F_IP4_DIP) {
> - key->proto_field[key->num_fields].proto = MV_NET_PROTO_IP4;
> - key->proto_field[key->num_fields].field.ipv4 =
> MV_NET_IP4_F_DA;
> - key->key_size += 4;
> - key->num_fields += 1;
> - }
> -
> - if (first_flow->pattern & F_IP4_PROTO) {
> - key->proto_field[key->num_fields].proto = MV_NET_PROTO_IP4;
> - key->proto_field[key->num_fields].field.ipv4 =
> - MV_NET_IP4_F_PROTO;
> - key->key_size += 1;
> - key->num_fields += 1;
> - }
> -
> - if (first_flow->pattern & F_IP6_SIP) {
> - key->proto_field[key->num_fields].proto = MV_NET_PROTO_IP6;
> - key->proto_field[key->num_fields].field.ipv6 =
> MV_NET_IP6_F_SA;
> - key->key_size += 16;
> - key->num_fields += 1;
> - }
> -
> - if (first_flow->pattern & F_IP6_DIP) {
> - key->proto_field[key->num_fields].proto = MV_NET_PROTO_IP6;
> - key->proto_field[key->num_fields].field.ipv6 =
> MV_NET_IP6_F_DA;
> - key->key_size += 16;
> - key->num_fields += 1;
> - }
> -
> - if (first_flow->pattern & F_IP6_FLOW) {
> - key->proto_field[key->num_fields].proto = MV_NET_PROTO_IP6;
> - key->proto_field[key->num_fields].field.ipv6 =
> - MV_NET_IP6_F_FLOW;
> - key->key_size += 3;
> - key->num_fields += 1;
> - }
> -
> - if (first_flow->pattern & F_IP6_NEXT_HDR) {
> - key->proto_field[key->num_fields].proto = MV_NET_PROTO_IP6;
> - key->proto_field[key->num_fields].field.ipv6 =
> - MV_NET_IP6_F_NEXT_HDR;
> - key->key_size += 1;
> - key->num_fields += 1;
> - }
> -
> - if (first_flow->pattern & F_TCP_SPORT) {
> - key->proto_field[key->num_fields].proto = MV_NET_PROTO_TCP;
> - key->proto_field[key->num_fields].field.tcp = MV_NET_TCP_F_SP;
> - key->key_size += 2;
> - key->num_fields += 1;
> - }
> -
> - if (first_flow->pattern & F_TCP_DPORT) {
> - key->proto_field[key->num_fields].proto = MV_NET_PROTO_TCP;
> - key->proto_field[key->num_fields].field.tcp = MV_NET_TCP_F_DP;
> - key->key_size += 2;
> - key->num_fields += 1;
> - }
> -
> - if (first_flow->pattern & F_UDP_SPORT) {
> - key->proto_field[key->num_fields].proto = MV_NET_PROTO_UDP;
> - key->proto_field[key->num_fields].field.udp = MV_NET_UDP_F_SP;
> - key->key_size += 2;
> - key->num_fields += 1;
> - }
> -
> - if (first_flow->pattern & F_UDP_DPORT) {
> - key->proto_field[key->num_fields].proto = MV_NET_PROTO_UDP;
> - key->proto_field[key->num_fields].field.udp = MV_NET_UDP_F_DP;
> - key->key_size += 2;
> - key->num_fields += 1;
> - }
> + memcpy(key, &first_flow->table_key, sizeof(struct pp2_cls_tbl_key));
>
> ret = pp2_cls_tbl_init(&priv->cls_tbl_params, &priv->cls_tbl);
> - if (!ret)
> - priv->cls_tbl_pattern = first_flow->pattern;
>
> return ret;
> }
> @@ -1604,8 +1555,10 @@ mrvl_create_cls_table(struct rte_eth_dev *dev, struct
> rte_flow *first_flow) static inline int mrvl_flow_can_be_added(struct
> mrvl_priv *priv, const struct rte_flow *flow) {
> - return flow->pattern == priv->cls_tbl_pattern &&
> - mrvl_engine_type(flow) == priv->cls_tbl_params.type;
> + int same = memcmp(&flow->table_key, &priv->cls_tbl_params.key,
> + sizeof(struct pp2_cls_tbl_key)) == 0;
> +
> + return same && mrvl_engine_type(flow) == priv->cls_tbl_params.type;
> }
>
> /**
> --
> 2.28.0
>
