Commit 83d85bb0 authored by Maksym Glubokiy's avatar Maksym Glubokiy Committed by David S. Miller
Browse files

net: extract port range fields from fl_flow_key 



So it can be used for port range filter offloading.

Co-developed-by: default avatarVolodymyr Mytnyk <volodymyr.mytnyk@plvision.eu>
Signed-off-by: default avatarVolodymyr Mytnyk <volodymyr.mytnyk@plvision.eu>
Signed-off-by: default avatarMaksym Glubokiy <maksym.glubokiy@plvision.eu>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent dd517237

include/net/flow_dissector.h

+16 −0
Original line number Diff line number Diff line
@@ -178,6 +178,22 @@ struct flow_dissector_key_ports { 
	};

};



/**

 * struct flow_dissector_key_ports_range

 * @tp: port number from packet

 * @tp_min: min port number in range

 * @tp_max: max port number in range

 */

struct flow_dissector_key_ports_range {

	union {

		struct flow_dissector_key_ports tp;

		struct {

			struct flow_dissector_key_ports tp_min;

			struct flow_dissector_key_ports tp_max;

		};

	};

};



/**

 * flow_dissector_key_icmp:

 *		type: ICMP type

include/net/flow_offload.h

+6 −0
Original line number Diff line number Diff line
@@ -48,6 +48,10 @@ struct flow_match_ports { 
	struct flow_dissector_key_ports *key, *mask;

};



struct flow_match_ports_range {

	struct flow_dissector_key_ports_range *key, *mask;

};



struct flow_match_icmp {

	struct flow_dissector_key_icmp *key, *mask;

};
@@ -94,6 +98,8 @@ void flow_rule_match_ip(const struct flow_rule *rule, 
			struct flow_match_ip *out);

void flow_rule_match_ports(const struct flow_rule *rule,

			   struct flow_match_ports *out);

void flow_rule_match_ports_range(const struct flow_rule *rule,

				 struct flow_match_ports_range *out);

void flow_rule_match_tcp(const struct flow_rule *rule,

			 struct flow_match_tcp *out);

void flow_rule_match_icmp(const struct flow_rule *rule,

net/core/flow_offload.c

+7 −0
Original line number Diff line number Diff line
@@ -125,6 +125,13 @@ void flow_rule_match_ports(const struct flow_rule *rule, 
}

EXPORT_SYMBOL(flow_rule_match_ports);



void flow_rule_match_ports_range(const struct flow_rule *rule,

				 struct flow_match_ports_range *out)

{

	FLOW_DISSECTOR_MATCH(rule, FLOW_DISSECTOR_KEY_PORTS_RANGE, out);

}

EXPORT_SYMBOL(flow_rule_match_ports_range);



void flow_rule_match_tcp(const struct flow_rule *rule,

			 struct flow_match_tcp *out)

{

net/sched/cls_flower.c

+1 −7
Original line number Diff line number Diff line
@@ -63,13 +63,7 @@ struct fl_flow_key { 
	struct flow_dissector_key_ip ip;

	struct flow_dissector_key_ip enc_ip;

	struct flow_dissector_key_enc_opts enc_opts;

	union {

		struct flow_dissector_key_ports tp;

		struct {

			struct flow_dissector_key_ports tp_min;

			struct flow_dissector_key_ports tp_max;

		};

	} tp_range;

	struct flow_dissector_key_ports_range tp_range;

	struct flow_dissector_key_ct ct;

	struct flow_dissector_key_hash hash;

	struct flow_dissector_key_num_of_vlans num_of_vlans;