Commit 8b3646d6 authored by Paul Blakey's avatar Paul Blakey Committed by David S. Miller
Browse files

net/sched: act_ct: Support refreshing the flow table entries 



If driver deleted an FT entry, a FT failed to offload, or registered to the
flow table after flows were already added, we still get packets in
software.

For those packets, while restoring the ct state from the flow table
entry, refresh it's hardware offload.

Signed-off-by: default avatarPaul Blakey <paulb@mellanox.com>
Reviewed-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 30b0cf90

include/net/netfilter/nf_flow_table.h

+3 −0
Original line number Diff line number Diff line
@@ -162,6 +162,9 @@ int flow_offload_route_init(struct flow_offload *flow, 
			    const struct nf_flow_route *route);



int flow_offload_add(struct nf_flowtable *flow_table, struct flow_offload *flow);

void flow_offload_refresh(struct nf_flowtable *flow_table,

			  struct flow_offload *flow);



struct flow_offload_tuple_rhash *flow_offload_lookup(struct nf_flowtable *flow_table,

						     struct flow_offload_tuple *tuple);

void nf_flow_table_cleanup(struct net_device *dev);

net/netfilter/nf_flow_table_core.c

+13 −0
Original line number Diff line number Diff line
@@ -252,6 +252,19 @@ int flow_offload_add(struct nf_flowtable *flow_table, struct flow_offload *flow) 
}

EXPORT_SYMBOL_GPL(flow_offload_add);



void flow_offload_refresh(struct nf_flowtable *flow_table,

			  struct flow_offload *flow)

{

	flow->timeout = nf_flowtable_time_stamp + NF_FLOW_TIMEOUT;



	if (likely(!nf_flowtable_hw_offload(flow_table) ||

		   !test_and_clear_bit(NF_FLOW_HW_REFRESH, &flow->flags)))

		return;



	nf_flow_offload_add(flow_table, flow);

}

EXPORT_SYMBOL_GPL(flow_offload_refresh);



static inline bool nf_flow_has_expired(const struct flow_offload *flow)

{

	return nf_flow_timeout_delta(flow->timeout) <= 0;

net/netfilter/nf_flow_table_ip.c

+2 −13
Original line number Diff line number Diff line
@@ -232,13 +232,6 @@ static unsigned int nf_flow_xmit_xfrm(struct sk_buff *skb, 
	return NF_STOLEN;

}



static bool nf_flow_offload_refresh(struct nf_flowtable *flow_table,

				    struct flow_offload *flow)

{

	return nf_flowtable_hw_offload(flow_table) &&

	       test_and_clear_bit(NF_FLOW_HW_REFRESH, &flow->flags);

}



unsigned int

nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb,

			const struct nf_hook_state *state)
@@ -279,8 +272,7 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb, 
	if (nf_flow_state_check(flow, ip_hdr(skb)->protocol, skb, thoff))

		return NF_ACCEPT;



	if (unlikely(nf_flow_offload_refresh(flow_table, flow)))

		nf_flow_offload_add(flow_table, flow);

	flow_offload_refresh(flow_table, flow);



	if (nf_flow_offload_dst_check(&rt->dst)) {

		flow_offload_teardown(flow);
@@ -290,7 +282,6 @@ nf_flow_offload_ip_hook(void *priv, struct sk_buff *skb, 
	if (nf_flow_nat_ip(flow, skb, thoff, dir) < 0)

		return NF_DROP;



	flow->timeout = nf_flowtable_time_stamp + NF_FLOW_TIMEOUT;

	iph = ip_hdr(skb);

	ip_decrease_ttl(iph);

	skb->tstamp = 0;
@@ -508,8 +499,7 @@ nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb, 
				sizeof(*ip6h)))

		return NF_ACCEPT;



	if (unlikely(nf_flow_offload_refresh(flow_table, flow)))

		nf_flow_offload_add(flow_table, flow);

	flow_offload_refresh(flow_table, flow);



	if (nf_flow_offload_dst_check(&rt->dst)) {

		flow_offload_teardown(flow);
@@ -522,7 +512,6 @@ nf_flow_offload_ipv6_hook(void *priv, struct sk_buff *skb, 
	if (nf_flow_nat_ipv6(flow, skb, dir) < 0)

		return NF_DROP;



	flow->timeout = nf_flowtable_time_stamp + NF_FLOW_TIMEOUT;

	ip6h = ipv6_hdr(skb);

	ip6h->hop_limit--;

	skb->tstamp = 0;

net/sched/act_ct.c

+1 −0
Original line number Diff line number Diff line
@@ -531,6 +531,7 @@ static bool tcf_ct_flow_table_lookup(struct tcf_ct_params *p, 
	ctinfo = dir == FLOW_OFFLOAD_DIR_ORIGINAL ? IP_CT_ESTABLISHED :

						    IP_CT_ESTABLISHED_REPLY;



	flow_offload_refresh(nf_ft, flow);

	nf_conntrack_get(&ct->ct_general);

	nf_ct_set(skb, ct, ctinfo);

CRA Git | Maintained and supported by SUSTech CRA and CCSE