Benefit from the support of tcp flags dissection and allow user to insert rules matching on tcp flags.
Unified · Split
| @@ -451,6 +451,9 @@ enum { · 450 unmodified lines | ||
| 451 | 451 | TCA_FLOWER_KEY_MPLS_TC, /* u8 - 3 bits */ |
| 452 | 452 | TCA_FLOWER_KEY_MPLS_LABEL, /* be32 - 20 bits */ |
| 453 | 453 | |
| 454 | + TCA_FLOWER_KEY_TCP_FLAGS, /* be16 */ | |
| 455 | + TCA_FLOWER_KEY_TCP_FLAGS_MASK, /* be16 */ | |
| 456 | + | |
| 454 | 457 | __TCA_FLOWER_MAX, |
| 455 | 458 | }; |
| 456 | 459 | |
| @@ -49,6 +49,7 @@ struct fl_flow_key { · 48 unmodified lines | ||
| 49 | 49 | }; |
| 50 | 50 | struct flow_dissector_key_ports enc_tp; |
| 51 | 51 | struct flow_dissector_key_mpls mpls; |
| 52 | + struct flow_dissector_key_tcp tcp; | |
| 52 | 53 | } __aligned(BITS_PER_LONG / 8); /* Ensure that we can do comparisons as longs. */ |
| 53 | 54 | |
| 54 | 55 | struct fl_flow_mask_range { |
| @@ -424,6 +425,8 @@ static const struct nla_policy fl_policy[TCA_FLOWER_MAX + 1] = { · 369 unmodified lines | ||
| 424 | 425 | [TCA_FLOWER_KEY_MPLS_BOS] = { .type = NLA_U8 }, |
| 425 | 426 | [TCA_FLOWER_KEY_MPLS_TC] = { .type = NLA_U8 }, |
| 426 | 427 | [TCA_FLOWER_KEY_MPLS_LABEL] = { .type = NLA_U32 }, |
| 428 | + [TCA_FLOWER_KEY_TCP_FLAGS] = { .type = NLA_U16 }, | |
| 429 | + [TCA_FLOWER_KEY_TCP_FLAGS_MASK] = { .type = NLA_U16 }, | |
| 427 | 430 | }; |
| 428 | 431 | |
| 429 | 432 | static void fl_set_key_val(struct nlattr **tb, |
| @@ -596,6 +599,9 @@ static int fl_set_key(struct net *net, struct nlattr **tb, · 166 unmodified lines | ||
| 596 | 599 | fl_set_key_val(tb, &key->tp.dst, TCA_FLOWER_KEY_TCP_DST, |
| 597 | 600 | &mask->tp.dst, TCA_FLOWER_KEY_TCP_DST_MASK, |
| 598 | 601 | sizeof(key->tp.dst)); |
| 602 | + fl_set_key_val(tb, &key->tcp.flags, TCA_FLOWER_KEY_TCP_FLAGS, | |
| 603 | + &mask->tcp.flags, TCA_FLOWER_KEY_TCP_FLAGS_MASK, | |
| 604 | + sizeof(key->tcp.flags)); | |
| 599 | 605 | } else if (key->basic.ip_proto == IPPROTO_UDP) { |
| 600 | 606 | fl_set_key_val(tb, &key->tp.src, TCA_FLOWER_KEY_UDP_SRC, |
| 601 | 607 | &mask->tp.src, TCA_FLOWER_KEY_UDP_SRC_MASK, |
| @@ -766,6 +772,8 @@ static void fl_init_dissector(struct cls_fl_head *head, · 164 unmodified lines | ||
| 766 | 772 | FLOW_DISSECTOR_KEY_IPV6_ADDRS, ipv6); |
| 767 | 773 | FL_KEY_SET_IF_MASKED(&mask->key, keys, cnt, |
| 768 | 774 | FLOW_DISSECTOR_KEY_PORTS, tp); |
| 775 | + FL_KEY_SET_IF_MASKED(&mask->key, keys, cnt, | |
| 776 | + FLOW_DISSECTOR_KEY_TCP, tcp); | |
| 769 | 777 | FL_KEY_SET_IF_MASKED(&mask->key, keys, cnt, |
| 770 | 778 | FLOW_DISSECTOR_KEY_ICMP, icmp); |
| 771 | 779 | FL_KEY_SET_IF_MASKED(&mask->key, keys, cnt, |
| @@ -1215,7 +1223,10 @@ static int fl_dump(struct net *net, struct tcf_proto *tp, unsigned long fh, · 443 unmodified lines | ||
| 1215 | 1223 | sizeof(key->tp.src)) || |
| 1216 | 1224 | fl_dump_key_val(skb, &key->tp.dst, TCA_FLOWER_KEY_TCP_DST, |
| 1217 | 1225 | &mask->tp.dst, TCA_FLOWER_KEY_TCP_DST_MASK, |
| 1218 | − sizeof(key->tp.dst)))) | |
| 1226 | + sizeof(key->tp.dst)) || | |
| 1227 | + fl_dump_key_val(skb, &key->tcp.flags, TCA_FLOWER_KEY_TCP_FLAGS, | |
| 1228 | + &mask->tcp.flags, TCA_FLOWER_KEY_TCP_FLAGS_MASK, | |
| 1229 | + sizeof(key->tcp.flags)))) | |
| 1219 | 1230 | goto nla_put_failure; |
| 1220 | 1231 | else if (key->basic.ip_proto == IPPROTO_UDP && |
| 1221 | 1232 | (fl_dump_key_val(skb, &key->tp.src, TCA_FLOWER_KEY_UDP_SRC, |