| Message ID | 1620755410-29350-2-git-send-email-danielj@nvidia.com |
|---|---|
| State | New |
| Headers | show |
| Series | Remove dependency between module and driver | expand |
On 11/05/2021 13:50, Daniel Jurgens wrote: > From: Alaa Hleihel <alaa@mellanox.com> > > BugLink: https://bugs.launchpad.net/bugs/1927246 > > Currently, tcf_ct_flow_table_restore_skb is exported by act_ct > module, therefore modules using it will have hard-dependency > on act_ct and will require loading it all the time. > > This can lead to an unnecessary overhead on systems that do not > use hardware connection tracking action (ct_metadata action) in > the first place. > > To relax the hard-dependency between the modules, we unexport this > function and make it a static inline one. > > Fixes: 30b0cf90c6dd ("net/sched: act_ct: Support restoring conntrack info on skbs") > Signed-off-by: Alaa Hleihel <alaa@mellanox.com> > Reviewed-by: Roi Dayan <roid@mellanox.com> > Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> > Signed-off-by: David S. Miller <davem@davemloft.net> > (cherry picked from commit 762f926d6f19b9ab4dee0f98d55fc67e276cd094) Thanks for the patch. Your SoB here is missing. Best regards, Krzysztof
> From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> > Sent: Tuesday, May 11, 2021 1:00 PM > On 11/05/2021 13:50, Daniel Jurgens wrote: > > From: Alaa Hleihel <alaa@mellanox.com> > > > > BugLink: https://bugs.launchpad.net/bugs/1927246 > > > > Currently, tcf_ct_flow_table_restore_skb is exported by act_ct module, > > therefore modules using it will have hard-dependency on act_ct and > > will require loading it all the time. > > > > This can lead to an unnecessary overhead on systems that do not use > > hardware connection tracking action (ct_metadata action) in the first > > place. > > > > To relax the hard-dependency between the modules, we unexport this > > function and make it a static inline one. > > > > Fixes: 30b0cf90c6dd ("net/sched: act_ct: Support restoring conntrack > > info on skbs") > > Signed-off-by: Alaa Hleihel <alaa@mellanox.com> > > Reviewed-by: Roi Dayan <roid@mellanox.com> > > Acked-by: Marcelo Ricardo Leitner <marcelo.leitner@gmail.com> > > Signed-off-by: David S. Miller <davem@davemloft.net> (cherry picked > > from commit 762f926d6f19b9ab4dee0f98d55fc67e276cd094) > > Thanks for the patch. > > Your SoB here is missing. > Sorry. Will resubmit. > > Best regards, > Krzysztof
diff --git a/include/net/tc_act/tc_ct.h b/include/net/tc_act/tc_ct.h index 9f6019d..ba76bde 100644 --- a/include/net/tc_act/tc_ct.h +++ b/include/net/tc_act/tc_ct.h @@ -64,7 +64,16 @@ static inline struct nf_flowtable *tcf_ct_ft(const struct tc_action *a) #endif /* CONFIG_NF_CONNTRACK */ #if IS_ENABLED(CONFIG_NET_ACT_CT) -void tcf_ct_flow_table_restore_skb(struct sk_buff *skb, unsigned long cookie); +static inline void +tcf_ct_flow_table_restore_skb(struct sk_buff *skb, unsigned long cookie) +{ + enum ip_conntrack_info ctinfo = cookie & NFCT_INFOMASK; + struct nf_conn *ct; + + ct = (struct nf_conn *)(cookie & NFCT_PTRMASK); + nf_conntrack_get(&ct->ct_general); + nf_ct_set(skb, ct, ctinfo); +} #else static inline void tcf_ct_flow_table_restore_skb(struct sk_buff *skb, unsigned long cookie) { } diff --git a/net/sched/act_ct.c b/net/sched/act_ct.c index 4627bb7..c954226 100644 --- a/net/sched/act_ct.c +++ b/net/sched/act_ct.c @@ -1544,17 +1544,6 @@ static void __exit ct_cleanup_module(void) destroy_workqueue(act_ct_wq); } -void tcf_ct_flow_table_restore_skb(struct sk_buff *skb, unsigned long cookie) -{ - enum ip_conntrack_info ctinfo = cookie & NFCT_INFOMASK; - struct nf_conn *ct; - - ct = (struct nf_conn *)(cookie & NFCT_PTRMASK); - nf_conntrack_get(&ct->ct_general); - nf_ct_set(skb, ct, ctinfo); -} -EXPORT_SYMBOL_GPL(tcf_ct_flow_table_restore_skb); - module_init(ct_init_module); module_exit(ct_cleanup_module); MODULE_AUTHOR("Paul Blakey <paulb@mellanox.com>");