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

Commit aa72d708 authored by Or Gerlitz's avatar Or Gerlitz Committed by David S. Miller
Browse files

net/sched: cls_flower: Support masking for matching on tcp/udp ports 



Add the definitions for src/dst udp/tcp port masks and use
them when setting && dumping the relevant keys.

Signed-off-by: default avatarOr Gerlitz <ogerlitz@mellanox.com>
Signed-off-by: default avatarPaul Blakey <paulb@mellanox.com>
Acked-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0ca4e20b

include/uapi/linux/pkt_cls.h

+4 −0
Original line number Diff line number Diff line
@@ -442,6 +442,10 @@ enum { 
	TCA_FLOWER_KEY_ENC_IPV6_DST,	/* struct in6_addr */

	TCA_FLOWER_KEY_ENC_IPV6_DST_MASK,/* struct in6_addr */



	TCA_FLOWER_KEY_TCP_SRC_MASK,	/* be16 */

	TCA_FLOWER_KEY_TCP_DST_MASK,	/* be16 */

	TCA_FLOWER_KEY_UDP_SRC_MASK,	/* be16 */

	TCA_FLOWER_KEY_UDP_DST_MASK,	/* be16 */

	__TCA_FLOWER_MAX,

};

net/sched/cls_flower.c

+12 −8
Original line number Diff line number Diff line
@@ -335,6 +335,10 @@ static const struct nla_policy fl_policy[TCA_FLOWER_MAX + 1] = { 
	[TCA_FLOWER_KEY_ENC_IPV6_SRC_MASK] = { .len = sizeof(struct in6_addr) },

	[TCA_FLOWER_KEY_ENC_IPV6_DST]	= { .len = sizeof(struct in6_addr) },

	[TCA_FLOWER_KEY_ENC_IPV6_DST_MASK] = { .len = sizeof(struct in6_addr) },

	[TCA_FLOWER_KEY_TCP_SRC_MASK]	= { .type = NLA_U16 },

	[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 },

};



static void fl_set_key_val(struct nlattr **tb,
@@ -432,17 +436,17 @@ static int fl_set_key(struct net *net, struct nlattr **tb, 


	if (key->basic.ip_proto == IPPROTO_TCP) {

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

			       &mask->tp.src, TCA_FLOWER_UNSPEC,

			       &mask->tp.src, TCA_FLOWER_KEY_TCP_SRC_MASK,

			       sizeof(key->tp.src));

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

			       &mask->tp.dst, TCA_FLOWER_UNSPEC,

			       &mask->tp.dst, TCA_FLOWER_KEY_TCP_DST_MASK,

			       sizeof(key->tp.dst));

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

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

			       &mask->tp.src, TCA_FLOWER_UNSPEC,

			       &mask->tp.src, TCA_FLOWER_KEY_UDP_SRC_MASK,

			       sizeof(key->tp.src));

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

			       &mask->tp.dst, TCA_FLOWER_UNSPEC,

			       &mask->tp.dst, TCA_FLOWER_KEY_UDP_DST_MASK,

			       sizeof(key->tp.dst));

	}
@@ -877,18 +881,18 @@ static int fl_dump(struct net *net, struct tcf_proto *tp, unsigned long fh, 


	if (key->basic.ip_proto == IPPROTO_TCP &&

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

			     &mask->tp.src, TCA_FLOWER_UNSPEC,

			     &mask->tp.src, TCA_FLOWER_KEY_TCP_SRC_MASK,

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

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

			     &mask->tp.dst, TCA_FLOWER_UNSPEC,

			     &mask->tp.dst, TCA_FLOWER_KEY_TCP_DST_MASK,

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

		goto nla_put_failure;

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

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

				  &mask->tp.src, TCA_FLOWER_UNSPEC,

				  &mask->tp.src, TCA_FLOWER_KEY_UDP_SRC_MASK,

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

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

				  &mask->tp.dst, TCA_FLOWER_UNSPEC,

				  &mask->tp.dst, TCA_FLOWER_KEY_UDP_DST_MASK,

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

		goto nla_put_failure;