Commit baa501b1 authored by Lorenzo Bianconi's avatar Lorenzo Bianconi Committed by Florian Westphal
Browse files

netfilter: Add ctx pointer in nf_flow_skb_encap_protocol/nf_flow_ip4_tunnel_proto signature 



Rely on nf_flowtable_ctx struct pointer in nf_flow_ip4_tunnel_proto and
nf_flow_skb_encap_protocol routine signature. This is a preliminary patch
to introduce IP6IP6 flowtable acceleration since nf_flowtable_ctx will
be used to store IP6IP6 tunnel info.

Signed-off-by: default avatarLorenzo Bianconi <lorenzo@kernel.org>
Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
parent aba0138e

net/netfilter/nf_flow_table_ip.c

+12 −11
Original line number Diff line number Diff line
@@ -295,15 +295,16 @@ static unsigned int nf_flow_xmit_xfrm(struct sk_buff *skb, 
	return NF_STOLEN;

}



static bool nf_flow_ip4_tunnel_proto(struct sk_buff *skb, u32 *psize)

static bool nf_flow_ip4_tunnel_proto(struct nf_flowtable_ctx *ctx,

				     struct sk_buff *skb)

{

	struct iphdr *iph;

	u16 size;



	if (!pskb_may_pull(skb, sizeof(*iph) + *psize))

	if (!pskb_may_pull(skb, sizeof(*iph) + ctx->offset))

		return false;



	iph = (struct iphdr *)(skb_network_header(skb) + *psize);

	iph = (struct iphdr *)(skb_network_header(skb) + ctx->offset);

	size = iph->ihl << 2;



	if (ip_is_fragment(iph) || unlikely(ip_has_options(size)))
@@ -313,7 +314,7 @@ static bool nf_flow_ip4_tunnel_proto(struct sk_buff *skb, u32 *psize) 
		return false;



	if (iph->protocol == IPPROTO_IPIP)

		*psize += size;

		ctx->offset += size;



	return true;

}
@@ -329,8 +330,8 @@ static void nf_flow_ip4_tunnel_pop(struct sk_buff *skb) 
	skb_reset_network_header(skb);

}



static bool nf_flow_skb_encap_protocol(struct sk_buff *skb, __be16 proto,

				       u32 *offset)

static bool nf_flow_skb_encap_protocol(struct nf_flowtable_ctx *ctx,

				       struct sk_buff *skb, __be16 proto)

{

	__be16 inner_proto = skb->protocol;

	struct vlan_ethhdr *veth;
@@ -343,7 +344,7 @@ static bool nf_flow_skb_encap_protocol(struct sk_buff *skb, __be16 proto, 


		veth = (struct vlan_ethhdr *)skb_mac_header(skb);

		if (veth->h_vlan_encapsulated_proto == proto) {

			*offset += VLAN_HLEN;

			ctx->offset += VLAN_HLEN;

			inner_proto = proto;

			ret = true;

		}
@@ -351,14 +352,14 @@ static bool nf_flow_skb_encap_protocol(struct sk_buff *skb, __be16 proto, 
	case htons(ETH_P_PPP_SES):

		if (nf_flow_pppoe_proto(skb, &inner_proto) &&

		    inner_proto == proto) {

			*offset += PPPOE_SES_HLEN;

			ctx->offset += PPPOE_SES_HLEN;

			ret = true;

		}

		break;

	}



	if (inner_proto == htons(ETH_P_IP))

		ret = nf_flow_ip4_tunnel_proto(skb, offset);

		ret = nf_flow_ip4_tunnel_proto(ctx, skb);



	return ret;

}
@@ -416,7 +417,7 @@ nf_flow_offload_lookup(struct nf_flowtable_ctx *ctx, 
{

	struct flow_offload_tuple tuple = {};



	if (!nf_flow_skb_encap_protocol(skb, htons(ETH_P_IP), &ctx->offset))

	if (!nf_flow_skb_encap_protocol(ctx, skb, htons(ETH_P_IP)))

		return NULL;



	if (nf_flow_tuple_ip(ctx, skb, &tuple) < 0)
@@ -897,7 +898,7 @@ nf_flow_offload_ipv6_lookup(struct nf_flowtable_ctx *ctx, 
	struct flow_offload_tuple tuple = {};



	if (skb->protocol != htons(ETH_P_IPV6) &&

	    !nf_flow_skb_encap_protocol(skb, htons(ETH_P_IPV6), &ctx->offset))

	    !nf_flow_skb_encap_protocol(ctx, skb, htons(ETH_P_IPV6)))

		return NULL;



	if (nf_flow_tuple_ipv6(ctx, skb, &tuple) < 0)