Commit 77a5f73a authored by John Hurley's avatar John Hurley Committed by David S. Miller
Browse files

nfp: flower: move udp tunnel key match compilation to helper function 



IPv4 UDP and GRE tunnel match rule compile helpers share functions for
compiling fields such as IP addresses. However, they handle fields such
tunnel IDs differently.

Create new helper functions for compiling GRE and UDP tunnel key data.
This is in preparation for supporting IPv6 tunnels where these new
functions can be reused.

This patch does not change functionality.

Signed-off-by: default avatarJohn Hurley <john.hurley@netronome.com>
Reviewed-by: default avatarSimon Horman <simon.horman@netronome.com>
Reviewed-by: default avatarJakub Kicinski <jakub.kicinski@netronome.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 31c491e5

drivers/net/ethernet/netronome/nfp/flower/match.c

+35 −22
Original line number Diff line number Diff line
@@ -298,30 +298,53 @@ nfp_flower_compile_tun_ip_ext(struct nfp_flower_tun_ip_ext *ext, 
}



static void

nfp_flower_compile_ipv4_gre_tun(struct nfp_flower_ipv4_gre_tun *ext,

				struct nfp_flower_ipv4_gre_tun *msk,

nfp_flower_compile_tun_udp_key(__be32 *key, __be32 *key_msk,

			       struct flow_rule *rule)

{

	memset(ext, 0, sizeof(struct nfp_flower_ipv4_gre_tun));

	memset(msk, 0, sizeof(struct nfp_flower_ipv4_gre_tun));

	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_KEYID)) {

		struct flow_match_enc_keyid match;

		u32 vni;



	/* NVGRE is the only supported GRE tunnel type */

	ext->ethertype = cpu_to_be16(ETH_P_TEB);

	msk->ethertype = cpu_to_be16(~0);

		flow_rule_match_enc_keyid(rule, &match);

		vni = be32_to_cpu(match.key->keyid) << NFP_FL_TUN_VNI_OFFSET;

		*key = cpu_to_be32(vni);

		vni = be32_to_cpu(match.mask->keyid) << NFP_FL_TUN_VNI_OFFSET;

		*key_msk = cpu_to_be32(vni);

	}

}



static void

nfp_flower_compile_tun_gre_key(__be32 *key, __be32 *key_msk, __be16 *flags,

			       __be16 *flags_msk, struct flow_rule *rule)

{

	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_KEYID)) {

		struct flow_match_enc_keyid match;



		flow_rule_match_enc_keyid(rule, &match);

		ext->tun_key = match.key->keyid;

		msk->tun_key = match.mask->keyid;

		*key = match.key->keyid;

		*key_msk = match.mask->keyid;



		ext->tun_flags = cpu_to_be16(NFP_FL_GRE_FLAG_KEY);

		msk->tun_flags = cpu_to_be16(NFP_FL_GRE_FLAG_KEY);

		*flags = cpu_to_be16(NFP_FL_GRE_FLAG_KEY);

		*flags_msk = cpu_to_be16(NFP_FL_GRE_FLAG_KEY);

	}

}



static void

nfp_flower_compile_ipv4_gre_tun(struct nfp_flower_ipv4_gre_tun *ext,

				struct nfp_flower_ipv4_gre_tun *msk,

				struct flow_rule *rule)

{

	memset(ext, 0, sizeof(struct nfp_flower_ipv4_gre_tun));

	memset(msk, 0, sizeof(struct nfp_flower_ipv4_gre_tun));



	/* NVGRE is the only supported GRE tunnel type */

	ext->ethertype = cpu_to_be16(ETH_P_TEB);

	msk->ethertype = cpu_to_be16(~0);



	nfp_flower_compile_tun_ipv4_addrs(&ext->ipv4, &msk->ipv4, rule);

	nfp_flower_compile_tun_ip_ext(&ext->ip_ext, &msk->ip_ext, rule);

	nfp_flower_compile_tun_gre_key(&ext->tun_key, &msk->tun_key,

				       &ext->tun_flags, &msk->tun_flags, rule);

}



static void
@@ -332,19 +355,9 @@ nfp_flower_compile_ipv4_udp_tun(struct nfp_flower_ipv4_udp_tun *ext, 
	memset(ext, 0, sizeof(struct nfp_flower_ipv4_udp_tun));

	memset(msk, 0, sizeof(struct nfp_flower_ipv4_udp_tun));



	if (flow_rule_match_key(rule, FLOW_DISSECTOR_KEY_ENC_KEYID)) {

		struct flow_match_enc_keyid match;

		u32 temp_vni;



		flow_rule_match_enc_keyid(rule, &match);

		temp_vni = be32_to_cpu(match.key->keyid) << NFP_FL_TUN_VNI_OFFSET;

		ext->tun_id = cpu_to_be32(temp_vni);

		temp_vni = be32_to_cpu(match.mask->keyid) << NFP_FL_TUN_VNI_OFFSET;

		msk->tun_id = cpu_to_be32(temp_vni);

	}



	nfp_flower_compile_tun_ipv4_addrs(&ext->ipv4, &msk->ipv4, rule);

	nfp_flower_compile_tun_ip_ext(&ext->ip_ext, &msk->ip_ext, rule);

	nfp_flower_compile_tun_udp_key(&ext->tun_id, &msk->tun_id, rule);

}



int nfp_flower_compile_flow_match(struct nfp_app *app,

CRA Git | Maintained and supported by SUSTech CRA and CCSE