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

Commit f4d997fd authored by Hadar Hen Zion's avatar Hadar Hen Zion Committed by David S. Miller
Browse files

net/sched: cls_flower: Add UDP port to tunnel parameters 



The current IP tunneling classification supports only IP addresses and key.
Enhance UDP based IP tunneling classification parameters by adding UDP
src and dst port.

Signed-off-by: default avatarHadar Hen Zion <hadarh@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 519d1052

include/net/flow_dissector.h

+1 −0
Original line number Diff line number Diff line
@@ -132,6 +132,7 @@ enum flow_dissector_key_id { 
	FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS, /* struct flow_dissector_key_ipv4_addrs */

	FLOW_DISSECTOR_KEY_ENC_IPV6_ADDRS, /* struct flow_dissector_key_ipv6_addrs */

	FLOW_DISSECTOR_KEY_ENC_CONTROL, /* struct flow_dissector_key_control */

	FLOW_DISSECTOR_KEY_ENC_PORTS, /* struct flow_dissector_key_ports */



	FLOW_DISSECTOR_KEY_MAX,

};

include/uapi/linux/pkt_cls.h

+5 −0
Original line number Diff line number Diff line
@@ -452,6 +452,11 @@ enum { 


	TCA_FLOWER_KEY_SCTP_SRC,	/* be16 */

	TCA_FLOWER_KEY_SCTP_DST,	/* be16 */



	TCA_FLOWER_KEY_ENC_UDP_SRC_PORT,	/* be16 */

	TCA_FLOWER_KEY_ENC_UDP_SRC_PORT_MASK,	/* be16 */

	TCA_FLOWER_KEY_ENC_UDP_DST_PORT,	/* be16 */

	TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK,	/* be16 */

	__TCA_FLOWER_MAX,

};

net/sched/cls_flower.c

+28 −1
Original line number Diff line number Diff line
@@ -43,6 +43,7 @@ struct fl_flow_key { 
		struct flow_dissector_key_ipv4_addrs enc_ipv4;

		struct flow_dissector_key_ipv6_addrs enc_ipv6;

	};

	struct flow_dissector_key_ports enc_tp;

} __aligned(BITS_PER_LONG / 8); /* Ensure that we can do comparisons as longs. */



struct fl_flow_mask_range {
@@ -155,6 +156,8 @@ static int fl_classify(struct sk_buff *skb, const struct tcf_proto *tp, 
		}



		skb_key.enc_key_id.keyid = tunnel_id_to_key32(key->tun_id);

		skb_key.enc_tp.src = key->tp_src;

		skb_key.enc_tp.dst = key->tp_dst;

	}



	skb_key.indev_ifindex = skb->skb_iif;
@@ -348,6 +351,10 @@ static const struct nla_policy fl_policy[TCA_FLOWER_MAX + 1] = { 
	[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 },

	[TCA_FLOWER_KEY_ENC_UDP_SRC_PORT]	= { .type = NLA_U16 },

	[TCA_FLOWER_KEY_ENC_UDP_SRC_PORT_MASK]	= { .type = NLA_U16 },

	[TCA_FLOWER_KEY_ENC_UDP_DST_PORT]	= { .type = NLA_U16 },

	[TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK]	= { .type = NLA_U16 },

};



static void fl_set_key_val(struct nlattr **tb,
@@ -500,6 +507,14 @@ static int fl_set_key(struct net *net, struct nlattr **tb, 
		       &mask->enc_key_id.keyid, TCA_FLOWER_UNSPEC,

		       sizeof(key->enc_key_id.keyid));



	fl_set_key_val(tb, &key->enc_tp.src, TCA_FLOWER_KEY_ENC_UDP_SRC_PORT,

		       &mask->enc_tp.src, TCA_FLOWER_KEY_ENC_UDP_SRC_PORT_MASK,

		       sizeof(key->enc_tp.src));



	fl_set_key_val(tb, &key->enc_tp.dst, TCA_FLOWER_KEY_ENC_UDP_DST_PORT,

		       &mask->enc_tp.dst, TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK,

		       sizeof(key->enc_tp.dst));



	return 0;

}
@@ -577,6 +592,8 @@ static void fl_init_dissector(struct cls_fl_head *head, 
	    FL_KEY_IS_MASKED(&mask->key, enc_ipv6))

		FL_KEY_SET(keys, cnt, FLOW_DISSECTOR_KEY_ENC_CONTROL,

			   enc_control);

	FL_KEY_SET_IF_MASKED(&mask->key, keys, cnt,

			     FLOW_DISSECTOR_KEY_ENC_PORTS, enc_tp);



	skb_flow_dissector_init(&head->dissector, keys, cnt);

}
@@ -951,7 +968,17 @@ static int fl_dump(struct net *net, struct tcf_proto *tp, unsigned long fh, 


	if (fl_dump_key_val(skb, &key->enc_key_id, TCA_FLOWER_KEY_ENC_KEY_ID,

			    &mask->enc_key_id, TCA_FLOWER_UNSPEC,

			    sizeof(key->enc_key_id)))

			    sizeof(key->enc_key_id)) ||

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

			    TCA_FLOWER_KEY_ENC_UDP_SRC_PORT,

			    &mask->enc_tp.src,

			    TCA_FLOWER_KEY_ENC_UDP_SRC_PORT_MASK,

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

	    fl_dump_key_val(skb, &key->enc_tp.dst,

			    TCA_FLOWER_KEY_ENC_UDP_DST_PORT,

			    &mask->enc_tp.dst,

			    TCA_FLOWER_KEY_ENC_UDP_DST_PORT_MASK,

			    sizeof(key->enc_tp.dst)))

		goto nla_put_failure;



	nla_put_u32(skb, TCA_FLOWER_FLAGS, f->flags);