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

Commit faef091c authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'cls_flower-port-masks' 



Or Gerlitz says:

====================
net/sched: cls_flower: Add ports masks

This series adds the ability to specify tcp/udp ports masks
for TC/flower filter matches.

I also removed an unused fields from the flower keys struct
and clarified the format of the recently added vlan attibutes.

v1--> v2 changes:

 * fixes typo in patch #2 title and change log (Sergei)
 * added acks provided by Jiri on v1

FWIW, by mistake the cover letter of V1 (but not the patches)
carried V2 tag, hope this doesn't create too much confusion.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0ca4e20b 37a6c151

include/uapi/linux/pkt_cls.h

+7 −3
Original line number Diff line number Diff line
@@ -428,9 +428,9 @@ enum { 
	TCA_FLOWER_KEY_UDP_DST,		/* be16 */



	TCA_FLOWER_FLAGS,

	TCA_FLOWER_KEY_VLAN_ID,

	TCA_FLOWER_KEY_VLAN_PRIO,

	TCA_FLOWER_KEY_VLAN_ETH_TYPE,

	TCA_FLOWER_KEY_VLAN_ID,		/* be16 */

	TCA_FLOWER_KEY_VLAN_PRIO,	/* u8   */

	TCA_FLOWER_KEY_VLAN_ETH_TYPE,	/* be16 */



	TCA_FLOWER_KEY_ENC_KEY_ID,	/* be32 */

	TCA_FLOWER_KEY_ENC_IPV4_SRC,	/* be32 */
@@ -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 −9
Original line number Diff line number Diff line
@@ -33,7 +33,6 @@ struct fl_flow_key { 
	struct flow_dissector_key_basic basic;

	struct flow_dissector_key_eth_addrs eth;

	struct flow_dissector_key_vlan vlan;

	struct flow_dissector_key_addrs ipaddrs;

	union {

		struct flow_dissector_key_ipv4_addrs ipv4;

		struct flow_dissector_key_ipv6_addrs ipv6;
@@ -335,6 +334,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 +435,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 +880,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;