diff options
| author |   Tom Herbert <tom@herbertland.com> | 2016-10-14 11:25:36 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-10-15 17:33:41 -0400 |
| commit | 1104d9ba443a3972052ea4eaa01e51f9ee084652 (patch) | |
| tree | 3541ac4778bb5286fb77c7eed4c9ac914fd96ad4 /include/net | |
| parent | Merge branch 'fjes-next' (diff) | |
| download | linux-dev-1104d9ba443a3972052ea4eaa01e51f9ee084652.tar.xz linux-dev-1104d9ba443a3972052ea4eaa01e51f9ee084652.zip | |
lwtunnel: Add destroy state operation
Users of lwt tunnels may set up some secondary state in build_state
function. Add a corresponding destroy_state function to allow users to
clean up state. This destroy state function is called from lwstate_free.
Also, we now free lwstate using kfree_rcu so user can assume structure
is not freed before rcu.
Acked-by: Roopa Prabhu <roopa@cumulusnetworks.com>
Signed-off-by: Tom Herbert <tom@herbertland.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/net')
| -rw-r--r-- | include/net/lwtunnel.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/include/net/lwtunnel.h b/include/net/lwtunnel.h index ea3f80f58fd6..67d235f43202 100644 --- a/include/net/lwtunnel.h +++ b/include/net/lwtunnel.h @@ -29,6 +29,7 @@ struct lwtunnel_state { int (*orig_input)(struct sk_buff *); int len; __u16 headroom; + struct rcu_head rcu; __u8 data[0]; }; @@ -36,6 +37,7 @@ struct lwtunnel_encap_ops { int (*build_state)(struct net_device *dev, struct nlattr *encap, unsigned int family, const void *cfg, struct lwtunnel_state **ts); + void (*destroy_state)(struct lwtunnel_state *lws); int (*output)(struct net *net, struct sock *sk, struct sk_buff *skb); int (*input)(struct sk_buff *skb); int (*fill_encap)(struct sk_buff *skb, @@ -46,10 +48,7 @@ struct lwtunnel_encap_ops { }; #ifdef CONFIG_LWTUNNEL -static inline void lwtstate_free(struct lwtunnel_state *lws) -{ - kfree(lws); -} +void lwtstate_free(struct lwtunnel_state *lws); static inline struct lwtunnel_state * lwtstate_get(struct lwtunnel_state *lws) |