Commit b409074e authored by Vlad Buslov's avatar Vlad Buslov Committed by David S. Miller
Browse files

net: sched: add 'delete' function to action ops 



Extend action ops with 'delete' function. Each action type to implements
its own delete function that doesn't depend on rtnl lock.

Implement delete function that is required to delete actions without
holding rtnl lock. Use action API function that atomically deletes action
only if it is still in action idr. This implementation prevents concurrent
threads from deleting same action twice.

Reviewed-by: default avatarMarcelo Ricardo Leitner <marcelo.leitner@gmail.com>
Signed-off-by: default avatarVlad Buslov <vladbu@mellanox.com>
Signed-off-by: default avatarJiri Pirko <jiri@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2a2ea349

include/net/act_api.h

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ struct tc_action_ops { 
	void	(*stats_update)(struct tc_action *, u64, u32, u64);

	size_t  (*get_fill_size)(const struct tc_action *act);

	struct net_device *(*get_dev)(const struct tc_action *a);

	int     (*delete)(struct net *net, u32 index);

};



struct tc_action_net {

net/sched/act_bpf.c

+8 −0
Original line number Diff line number Diff line
@@ -388,6 +388,13 @@ static int tcf_bpf_search(struct net *net, struct tc_action **a, u32 index, 
	return tcf_idr_search(tn, a, index);

}



static int tcf_bpf_delete(struct net *net, u32 index)

{

	struct tc_action_net *tn = net_generic(net, bpf_net_id);



	return tcf_idr_delete_index(tn, index);

}



static struct tc_action_ops act_bpf_ops __read_mostly = {

	.kind		=	"bpf",

	.type		=	TCA_ACT_BPF,
@@ -398,6 +405,7 @@ static struct tc_action_ops act_bpf_ops __read_mostly = { 
	.init		=	tcf_bpf_init,

	.walk		=	tcf_bpf_walker,

	.lookup		=	tcf_bpf_search,

	.delete		=	tcf_bpf_delete,

	.size		=	sizeof(struct tcf_bpf),

};

net/sched/act_connmark.c

+8 −0
Original line number Diff line number Diff line
@@ -193,6 +193,13 @@ static int tcf_connmark_search(struct net *net, struct tc_action **a, u32 index, 
	return tcf_idr_search(tn, a, index);

}



static int tcf_connmark_delete(struct net *net, u32 index)

{

	struct tc_action_net *tn = net_generic(net, connmark_net_id);



	return tcf_idr_delete_index(tn, index);

}



static struct tc_action_ops act_connmark_ops = {

	.kind		=	"connmark",

	.type		=	TCA_ACT_CONNMARK,
@@ -202,6 +209,7 @@ static struct tc_action_ops act_connmark_ops = { 
	.init		=	tcf_connmark_init,

	.walk		=	tcf_connmark_walker,

	.lookup		=	tcf_connmark_search,

	.delete		=	tcf_connmark_delete,

	.size		=	sizeof(struct tcf_connmark_info),

};

net/sched/act_csum.c

+8 −0
Original line number Diff line number Diff line
@@ -654,6 +654,13 @@ static size_t tcf_csum_get_fill_size(const struct tc_action *act) 
	return nla_total_size(sizeof(struct tc_csum));

}



static int tcf_csum_delete(struct net *net, u32 index)

{

	struct tc_action_net *tn = net_generic(net, csum_net_id);



	return tcf_idr_delete_index(tn, index);

}



static struct tc_action_ops act_csum_ops = {

	.kind		= "csum",

	.type		= TCA_ACT_CSUM,
@@ -665,6 +672,7 @@ static struct tc_action_ops act_csum_ops = { 
	.walk		= tcf_csum_walker,

	.lookup		= tcf_csum_search,

	.get_fill_size  = tcf_csum_get_fill_size,

	.delete		= tcf_csum_delete,

	.size		= sizeof(struct tcf_csum),

};

net/sched/act_gact.c

+8 −0
Original line number Diff line number Diff line
@@ -231,6 +231,13 @@ static size_t tcf_gact_get_fill_size(const struct tc_action *act) 
	return sz;

}



static int tcf_gact_delete(struct net *net, u32 index)

{

	struct tc_action_net *tn = net_generic(net, gact_net_id);



	return tcf_idr_delete_index(tn, index);

}



static struct tc_action_ops act_gact_ops = {

	.kind		=	"gact",

	.type		=	TCA_ACT_GACT,
@@ -242,6 +249,7 @@ static struct tc_action_ops act_gact_ops = { 
	.walk		=	tcf_gact_walker,

	.lookup		=	tcf_gact_search,

	.get_fill_size	=	tcf_gact_get_fill_size,

	.delete		=	tcf_gact_delete,

	.size		=	sizeof(struct tcf_gact),

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE