Commit 4d0aed38 authored by Asbjørn Sloth Tønnesen's avatar Asbjørn Sloth Tønnesen Committed by Jakub Kicinski
Browse files

flow_dissector: prepare for encapsulated control flags 



Rename skb_flow_dissect_set_enc_addr_type() to
skb_flow_dissect_set_enc_control(), and make it set both
addr_type and flags in FLOW_DISSECTOR_KEY_ENC_CONTROL.

Signed-off-by: default avatarAsbjørn Sloth Tønnesen <ast@fiberby.net>
Tested-by: default avatarDavide Caratti <dcaratti@redhat.com>
Reviewed-by: default avatarDavide Caratti <dcaratti@redhat.com>
Link: https://patch.msgid.link/20240713021911.1631517-7-ast@fiberby.net


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 0e83a787

net/core/flow_dissector.c

+12 −9
Original line number Diff line number Diff line
@@ -299,7 +299,8 @@ void skb_flow_dissect_meta(const struct sk_buff *skb, 
EXPORT_SYMBOL(skb_flow_dissect_meta);



static void

skb_flow_dissect_set_enc_addr_type(enum flow_dissector_key_id type,

skb_flow_dissect_set_enc_control(enum flow_dissector_key_id type,

				 u32 ctrl_flags,

				 struct flow_dissector *flow_dissector,

				 void *target_container)

{
@@ -312,6 +313,7 @@ skb_flow_dissect_set_enc_addr_type(enum flow_dissector_key_id type, 
					 FLOW_DISSECTOR_KEY_ENC_CONTROL,

					 target_container);

	ctrl->addr_type = type;

	ctrl->flags = ctrl_flags;

}



void
@@ -367,6 +369,7 @@ skb_flow_dissect_tunnel_info(const struct sk_buff *skb, 
{

	struct ip_tunnel_info *info;

	struct ip_tunnel_key *key;

	u32 ctrl_flags = 0;



	/* A quick check to see if there might be something to do. */

	if (!dissector_uses_key(flow_dissector,
@@ -395,8 +398,8 @@ skb_flow_dissect_tunnel_info(const struct sk_buff *skb, 


	switch (ip_tunnel_info_af(info)) {

	case AF_INET:

		skb_flow_dissect_set_enc_addr_type(FLOW_DISSECTOR_KEY_IPV4_ADDRS,

						   flow_dissector,

		skb_flow_dissect_set_enc_control(FLOW_DISSECTOR_KEY_IPV4_ADDRS,

						 ctrl_flags, flow_dissector,

						 target_container);

		if (dissector_uses_key(flow_dissector,

				       FLOW_DISSECTOR_KEY_ENC_IPV4_ADDRS)) {
@@ -410,8 +413,8 @@ skb_flow_dissect_tunnel_info(const struct sk_buff *skb, 
		}

		break;

	case AF_INET6:

		skb_flow_dissect_set_enc_addr_type(FLOW_DISSECTOR_KEY_IPV6_ADDRS,

						   flow_dissector,

		skb_flow_dissect_set_enc_control(FLOW_DISSECTOR_KEY_IPV6_ADDRS,

						 ctrl_flags, flow_dissector,

						 target_container);

		if (dissector_uses_key(flow_dissector,

				       FLOW_DISSECTOR_KEY_ENC_IPV6_ADDRS)) {