Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5976c5f4 authored by Simon Horman's avatar Simon Horman Committed by David S. Miller
Browse files

net/sched: cls_flower: Support matching on SCTP ports 



Support matching on SCTP ports in the same way that matching
on TCP and UDP ports is already supported.

Example usage:

tc qdisc add dev eth0 ingress

tc filter add dev eth0 protocol ip parent ffff: \
        flower indev eth0 ip_proto sctp dst_port 80 \
        action drop

Signed-off-by: default avatarSimon Horman <simon.horman@netronome.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5e5f89e7

include/uapi/linux/pkt_cls.h

+5 −0
Original line number Diff line number Diff line
@@ -447,6 +447,11 @@ enum { 
	TCA_FLOWER_KEY_TCP_DST_MASK,	/* be16 */

	TCA_FLOWER_KEY_UDP_SRC_MASK,	/* be16 */

	TCA_FLOWER_KEY_UDP_DST_MASK,	/* be16 */

	TCA_FLOWER_KEY_SCTP_SRC_MASK,	/* be16 */

	TCA_FLOWER_KEY_SCTP_DST_MASK,	/* be16 */



	TCA_FLOWER_KEY_SCTP_SRC,	/* be16 */

	TCA_FLOWER_KEY_SCTP_DST,	/* be16 */

	__TCA_FLOWER_MAX,

};

net/sched/cls_flower.c

+19 −0
Original line number Diff line number Diff line
@@ -344,6 +344,10 @@ static const struct nla_policy fl_policy[TCA_FLOWER_MAX + 1] = { 
	[TCA_FLOWER_KEY_TCP_DST_MASK]	= { .type = NLA_U16 },

	[TCA_FLOWER_KEY_UDP_SRC_MASK]	= { .type = NLA_U16 },

	[TCA_FLOWER_KEY_UDP_DST_MASK]	= { .type = NLA_U16 },

	[TCA_FLOWER_KEY_SCTP_SRC_MASK]	= { .type = NLA_U16 },

	[TCA_FLOWER_KEY_SCTP_DST_MASK]	= { .type = NLA_U16 },

	[TCA_FLOWER_KEY_SCTP_SRC]	= { .type = NLA_U16 },

	[TCA_FLOWER_KEY_SCTP_DST]	= { .type = NLA_U16 },

};



static void fl_set_key_val(struct nlattr **tb,
@@ -453,6 +457,13 @@ static int fl_set_key(struct net *net, struct nlattr **tb, 
		fl_set_key_val(tb, &key->tp.dst, TCA_FLOWER_KEY_UDP_DST,

			       &mask->tp.dst, TCA_FLOWER_KEY_UDP_DST_MASK,

			       sizeof(key->tp.dst));

	} else if (key->basic.ip_proto == IPPROTO_SCTP) {

		fl_set_key_val(tb, &key->tp.src, TCA_FLOWER_KEY_SCTP_SRC,

			       &mask->tp.src, TCA_FLOWER_KEY_SCTP_SRC_MASK,

			       sizeof(key->tp.src));

		fl_set_key_val(tb, &key->tp.dst, TCA_FLOWER_KEY_SCTP_DST,

			       &mask->tp.dst, TCA_FLOWER_KEY_SCTP_DST_MASK,

			       sizeof(key->tp.dst));

	}



	if (tb[TCA_FLOWER_KEY_ENC_IPV4_SRC] ||
@@ -897,6 +908,14 @@ static int fl_dump(struct net *net, struct tcf_proto *tp, unsigned long fh, 
				  &mask->tp.dst, TCA_FLOWER_KEY_UDP_DST_MASK,

				  sizeof(key->tp.dst))))

		goto nla_put_failure;

	else if (key->basic.ip_proto == IPPROTO_SCTP &&

		 (fl_dump_key_val(skb, &key->tp.src, TCA_FLOWER_KEY_SCTP_SRC,

				  &mask->tp.src, TCA_FLOWER_KEY_SCTP_SRC_MASK,

				  sizeof(key->tp.src)) ||

		  fl_dump_key_val(skb, &key->tp.dst, TCA_FLOWER_KEY_SCTP_DST,

				  &mask->tp.dst, TCA_FLOWER_KEY_SCTP_DST_MASK,

				  sizeof(key->tp.dst))))

		goto nla_put_failure;



	if (key->enc_control.addr_type == FLOW_DISSECTOR_KEY_IPV4_ADDRS &&

	    (fl_dump_key_val(skb, &key->enc_ipv4.src,