mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-05 10:29:37 +00:00
net/sched: act_mirred: refactor the handle of xmit
[ Upstream commit fa6d639930
]
This one is prepare for the next patch.
Signed-off-by: wenxu <wenxu@ucloud.cn>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
[DP: adjusted context for linux-5.10.y]
Signed-off-by: Dragos-Marian Panait <dragos.panait@windriver.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
047f618d19
commit
bba7ebe10b
2 changed files with 15 additions and 11 deletions
|
@ -1320,11 +1320,6 @@ void mini_qdisc_pair_init(struct mini_Qdisc_pair *miniqp, struct Qdisc *qdisc,
|
|||
void mini_qdisc_pair_block_init(struct mini_Qdisc_pair *miniqp,
|
||||
struct tcf_block *block);
|
||||
|
||||
static inline int skb_tc_reinsert(struct sk_buff *skb, struct tcf_result *res)
|
||||
{
|
||||
return res->ingress ? netif_receive_skb(skb) : dev_queue_xmit(skb);
|
||||
}
|
||||
|
||||
/* Make sure qdisc is no longer in SCHED state. */
|
||||
static inline void qdisc_synchronize(const struct Qdisc *q)
|
||||
{
|
||||
|
|
|
@ -206,6 +206,18 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla,
|
|||
return err;
|
||||
}
|
||||
|
||||
static int tcf_mirred_forward(bool want_ingress, struct sk_buff *skb)
|
||||
{
|
||||
int err;
|
||||
|
||||
if (!want_ingress)
|
||||
err = dev_queue_xmit(skb);
|
||||
else
|
||||
err = netif_receive_skb(skb);
|
||||
|
||||
return err;
|
||||
}
|
||||
|
||||
static int tcf_mirred_act(struct sk_buff *skb, const struct tc_action *a,
|
||||
struct tcf_result *res)
|
||||
{
|
||||
|
@ -295,18 +307,15 @@ static int tcf_mirred_act(struct sk_buff *skb, const struct tc_action *a,
|
|||
/* let's the caller reinsert the packet, if possible */
|
||||
if (use_reinsert) {
|
||||
res->ingress = want_ingress;
|
||||
if (skb_tc_reinsert(skb, res))
|
||||
err = tcf_mirred_forward(res->ingress, skb);
|
||||
if (err)
|
||||
tcf_action_inc_overlimit_qstats(&m->common);
|
||||
__this_cpu_dec(mirred_rec_level);
|
||||
return TC_ACT_CONSUMED;
|
||||
}
|
||||
}
|
||||
|
||||
if (!want_ingress)
|
||||
err = dev_queue_xmit(skb2);
|
||||
else
|
||||
err = netif_receive_skb(skb2);
|
||||
|
||||
err = tcf_mirred_forward(want_ingress, skb2);
|
||||
if (err) {
|
||||
out:
|
||||
tcf_action_inc_overlimit_qstats(&m->common);
|
||||
|
|
Loading…
Reference in a new issue