Commit 4cd016ca authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'remove-dependency-between-mlx5-act_ct-nf_flow_table' 



Roi Dayan says:

====================
remove dependency between mlx5, act_ct, nf_flow_table

Some exported functions from act_ct and nf_flow_table being used in mlx5_core.
This leads that mlx5 module always require act_ct and nf_flow_table modules.
Those small exported functions can be moved to the header files to
avoid this module dependency.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents c92cbaea 505ee3a1

include/net/netfilter/nf_flow_table.h

+45 −4
Original line number Diff line number Diff line
@@ -161,10 +161,51 @@ struct nf_flow_route { 
struct flow_offload *flow_offload_alloc(struct nf_conn *ct);

void flow_offload_free(struct flow_offload *flow);



int nf_flow_table_offload_add_cb(struct nf_flowtable *flow_table,

				 flow_setup_cb_t *cb, void *cb_priv);

void nf_flow_table_offload_del_cb(struct nf_flowtable *flow_table,

				  flow_setup_cb_t *cb, void *cb_priv);

static inline int

nf_flow_table_offload_add_cb(struct nf_flowtable *flow_table,

			     flow_setup_cb_t *cb, void *cb_priv)

{

	struct flow_block *block = &flow_table->flow_block;

	struct flow_block_cb *block_cb;

	int err = 0;



	down_write(&flow_table->flow_block_lock);

	block_cb = flow_block_cb_lookup(block, cb, cb_priv);

	if (block_cb) {

		err = -EEXIST;

		goto unlock;

	}



	block_cb = flow_block_cb_alloc(cb, cb_priv, cb_priv, NULL);

	if (IS_ERR(block_cb)) {

		err = PTR_ERR(block_cb);

		goto unlock;

	}



	list_add_tail(&block_cb->list, &block->cb_list);



unlock:

	up_write(&flow_table->flow_block_lock);

	return err;

}



static inline void

nf_flow_table_offload_del_cb(struct nf_flowtable *flow_table,

			     flow_setup_cb_t *cb, void *cb_priv)

{

	struct flow_block *block = &flow_table->flow_block;

	struct flow_block_cb *block_cb;



	down_write(&flow_table->flow_block_lock);

	block_cb = flow_block_cb_lookup(block, cb, cb_priv);

	if (block_cb) {

		list_del(&block_cb->list);

		flow_block_cb_free(block_cb);

	} else {

		WARN_ON(true);

	}

	up_write(&flow_table->flow_block_lock);

}



int flow_offload_route_init(struct flow_offload *flow,

			    const struct nf_flow_route *route);

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/netfilter/nf_flow_table_core.c

+0 −45
Original line number Diff line number Diff line
@@ -387,51 +387,6 @@ static void nf_flow_offload_work_gc(struct work_struct *work) 
	queue_delayed_work(system_power_efficient_wq, &flow_table->gc_work, HZ);

}



int nf_flow_table_offload_add_cb(struct nf_flowtable *flow_table,

				 flow_setup_cb_t *cb, void *cb_priv)

{

	struct flow_block *block = &flow_table->flow_block;

	struct flow_block_cb *block_cb;

	int err = 0;



	down_write(&flow_table->flow_block_lock);

	block_cb = flow_block_cb_lookup(block, cb, cb_priv);

	if (block_cb) {

		err = -EEXIST;

		goto unlock;

	}



	block_cb = flow_block_cb_alloc(cb, cb_priv, cb_priv, NULL);

	if (IS_ERR(block_cb)) {

		err = PTR_ERR(block_cb);

		goto unlock;

	}



	list_add_tail(&block_cb->list, &block->cb_list);



unlock:

	up_write(&flow_table->flow_block_lock);

	return err;

}

EXPORT_SYMBOL_GPL(nf_flow_table_offload_add_cb);



void nf_flow_table_offload_del_cb(struct nf_flowtable *flow_table,

				  flow_setup_cb_t *cb, void *cb_priv)

{

	struct flow_block *block = &flow_table->flow_block;

	struct flow_block_cb *block_cb;



	down_write(&flow_table->flow_block_lock);

	block_cb = flow_block_cb_lookup(block, cb, cb_priv);

	if (block_cb) {

		list_del(&block_cb->list);

		flow_block_cb_free(block_cb);

	} else {

		WARN_ON(true);

	}

	up_write(&flow_table->flow_block_lock);

}

EXPORT_SYMBOL_GPL(nf_flow_table_offload_del_cb);



static int nf_flow_nat_port_tcp(struct sk_buff *skb, unsigned int thoff,

				__be16 port, __be16 new_port)

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>");

CRA Git | Maintained and supported by SUSTech CRA and CCSE