net/sched: act_ct: Make tcf_ct_flow_table_restore_skb inline (762f926d) · Commits · 戴 / test

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: ("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>

include/net/tc_act/tc_ct.h

+10 −1

Original line number	Diff line number	Diff line
		@@ -66,7 +66,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) { }

net/sched/act_ct.c

+0 −11

Original line number	Diff line number	Diff line
		@@ -1543,17 +1543,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>");

Admin message