653cd284a8
Recently, ops->init() and ops->dump() of all actions were modified to always obtain tcf_lock when accessing private action state. Actions that don't depend on tcf_lock for synchronization with their data path use non-bh locking API. However, tcf_lock is also used to protect rate estimator stats in softirq context by timer callback. Change ops->init() and ops->dump() of all actions to disable bh when using tcf_lock to prevent deadlock reported by following lockdep warning: [ 105.470398] ================================ [ 105.475014] WARNING: inconsistent lock state [ 105.479628] 4.18.0-rc8+ #664 Not tainted [ 105.483897] -------------------------------- [ 105.488511] inconsistent {SOFTIRQ-ON-W} -> {IN-SOFTIRQ-W} usage. [ 105.494871] swapper/16/0 [HC0[0]:SC1[1]:HE1:SE0] takes: [ 105.500449] 00000000f86c012e (&(&p->tcfa_lock)->rlock){+.?.}, at: est_fetch_counters+0x3c/0xa0 [ 105.509696] {SOFTIRQ-ON-W} state was registered at: [ 105.514925] _raw_spin_lock+0x2c/0x40 [ 105.519022] tcf_bpf_init+0x579/0x820 [act_bpf] [ 105.523990] tcf_action_init_1+0x4e4/0x660 [ 105.528518] tcf_action_init+0x1ce/0x2d0 [ 105.532880] tcf_exts_validate+0x1d8/0x200 [ 105.537416] fl_change+0x55a/0x268b [cls_flower] [ 105.542469] tc_new_tfilter+0x748/0xa20 [ 105.546738] rtnetlink_rcv_msg+0x56a/0x6d0 [ 105.551268] netlink_rcv_skb+0x18d/0x200 [ 105.555628] netlink_unicast+0x2d0/0x370 [ 105.559990] netlink_sendmsg+0x3b9/0x6a0 [ 105.564349] sock_sendmsg+0x6b/0x80 [ 105.568271] ___sys_sendmsg+0x4a1/0x520 [ 105.572547] __sys_sendmsg+0xd7/0x150 [ 105.576655] do_syscall_64+0x72/0x2c0 [ 105.580757] entry_SYSCALL_64_after_hwframe+0x49/0xbe [ 105.586243] irq event stamp: 489296 [ 105.590084] hardirqs last enabled at (489296): [<ffffffffb507e639>] _raw_spin_unlock_irq+0x29/0x40 [ 105.599765] hardirqs last disabled at (489295): [<ffffffffb507e745>] _raw_spin_lock_irq+0x15/0x50 [ 105.609277] softirqs last enabled at (489292): [<ffffffffb413a6a3>] irq_enter+0x83/0xa0 [ 105.618001] softirqs last disabled at (489293): [<ffffffffb413a800>] irq_exit+0x140/0x190 [ 105.626813] other info that might help us debug this: [ 105.633976] Possible unsafe locking scenario: [ 105.640526] CPU0 [ 105.643325] ---- [ 105.646125] lock(&(&p->tcfa_lock)->rlock); [ 105.650747] <Interrupt> [ 105.653717] lock(&(&p->tcfa_lock)->rlock); [ 105.658514] *** DEADLOCK *** [ 105.665349] 1 lock held by swapper/16/0: [ 105.669629] #0: 00000000a640ad99 ((&est->timer)){+.-.}, at: call_timer_fn+0x10b/0x550 [ 105.678200] stack backtrace: [ 105.683194] CPU: 16 PID: 0 Comm: swapper/16 Not tainted 4.18.0-rc8+ #664 [ 105.690249] Hardware name: Supermicro SYS-2028TP-DECR/X10DRT-P, BIOS 2.0b 03/30/2017 [ 105.698626] Call Trace: [ 105.701421] <IRQ> [ 105.703791] dump_stack+0x92/0xeb [ 105.707461] print_usage_bug+0x336/0x34c [ 105.711744] mark_lock+0x7c9/0x980 [ 105.715500] ? print_shortest_lock_dependencies+0x2e0/0x2e0 [ 105.721424] ? check_usage_forwards+0x230/0x230 [ 105.726315] __lock_acquire+0x923/0x26f0 [ 105.730597] ? debug_show_all_locks+0x240/0x240 [ 105.735478] ? mark_lock+0x493/0x980 [ 105.739412] ? check_chain_key+0x140/0x1f0 [ 105.743861] ? __lock_acquire+0x836/0x26f0 [ 105.748323] ? lock_acquire+0x12e/0x290 [ 105.752516] lock_acquire+0x12e/0x290 [ 105.756539] ? est_fetch_counters+0x3c/0xa0 [ 105.761084] _raw_spin_lock+0x2c/0x40 [ 105.765099] ? est_fetch_counters+0x3c/0xa0 [ 105.769633] est_fetch_counters+0x3c/0xa0 [ 105.773995] est_timer+0x87/0x390 [ 105.777670] ? est_fetch_counters+0xa0/0xa0 [ 105.782210] ? lock_acquire+0x12e/0x290 [ 105.786410] call_timer_fn+0x161/0x550 [ 105.790512] ? est_fetch_counters+0xa0/0xa0 [ 105.795055] ? del_timer_sync+0xd0/0xd0 [ 105.799249] ? __lock_is_held+0x93/0x110 [ 105.803531] ? mark_held_locks+0x20/0xe0 [ 105.807813] ? _raw_spin_unlock_irq+0x29/0x40 [ 105.812525] ? est_fetch_counters+0xa0/0xa0 [ 105.817069] ? est_fetch_counters+0xa0/0xa0 [ 105.821610] run_timer_softirq+0x3c4/0x9f0 [ 105.826064] ? lock_acquire+0x12e/0x290 [ 105.830257] ? __bpf_trace_timer_class+0x10/0x10 [ 105.835237] ? __lock_is_held+0x25/0x110 [ 105.839517] __do_softirq+0x11d/0x7bf [ 105.843542] irq_exit+0x140/0x190 [ 105.847208] smp_apic_timer_interrupt+0xac/0x3b0 [ 105.852182] apic_timer_interrupt+0xf/0x20 [ 105.856628] </IRQ> [ 105.859081] RIP: 0010:cpuidle_enter_state+0xd8/0x4d0 [ 105.864395] Code: 46 ff 48 89 44 24 08 0f 1f 44 00 00 31 ff e8 cf ec 46 ff 80 7c 24 07 00 0f 85 1d 02 00 00 e8 9f 90 4b ff fb 66 0f 1f 44 00 00 <4c> 8b 6c 24 08 4d 29 fd 0f 80 36 03 00 00 4c 89 e8 48 ba cf f7 53 [ 105.884288] RSP: 0018:ffff8803ad94fd20 EFLAGS: 00000246 ORIG_RAX: ffffffffffffff13 [ 105.892494] RAX: 0000000000000000 RBX: ffffe8fb300829c0 RCX: ffffffffb41e19e1 [ 105.899988] RDX: 0000000000000007 RSI: dffffc0000000000 RDI: ffff8803ad9358ac [ 105.907503] RBP: ffffffffb6636300 R08: 0000000000000004 R09: 0000000000000000 [ 105.914997] R10: 0000000000000000 R11: 0000000000000000 R12: 0000000000000004 [ 105.922487] R13: ffffffffb6636140 R14: ffffffffb66362d8 R15: 000000188d36091b [ 105.929988] ? trace_hardirqs_on_caller+0x141/0x2d0 [ 105.935232] do_idle+0x28e/0x320 [ 105.938817] ? arch_cpu_idle_exit+0x40/0x40 [ 105.943361] ? mark_lock+0x8c1/0x980 [ 105.947295] ? _raw_spin_unlock_irqrestore+0x32/0x60 [ 105.952619] cpu_startup_entry+0xc2/0xd0 [ 105.956900] ? cpu_in_idle+0x20/0x20 [ 105.960830] ? _raw_spin_unlock_irqrestore+0x32/0x60 [ 105.966146] ? trace_hardirqs_on_caller+0x141/0x2d0 [ 105.971391] start_secondary+0x2b5/0x360 [ 105.975669] ? set_cpu_sibling_map+0x1330/0x1330 [ 105.980654] secondary_startup_64+0xa5/0xb0 Taking tcf_lock in sample action with bh disabled causes lockdep to issue a warning regarding possible irq lock inversion dependency between tcf_lock, and psample_groups_lock that is taken when holding tcf_lock in sample init: [ 162.108959] Possible interrupt unsafe locking scenario: [ 162.116386] CPU0 CPU1 [ 162.121277] ---- ---- [ 162.126162] lock(psample_groups_lock); [ 162.130447] local_irq_disable(); [ 162.136772] lock(&(&p->tcfa_lock)->rlock); [ 162.143957] lock(psample_groups_lock); [ 162.150813] <Interrupt> [ 162.153808] lock(&(&p->tcfa_lock)->rlock); [ 162.158608] *** DEADLOCK *** In order to prevent potential lock inversion dependency between tcf_lock and psample_groups_lock, extract call to psample_group_get() from tcf_lock protected section in sample action init function. Fixes:4e232818bd
("net: sched: act_mirred: remove dependency on rtnl lock") Fixes:764e9a2448
("net: sched: act_vlan: remove dependency on rtnl lock") Fixes:729e012609
("net: sched: act_tunnel_key: remove dependency on rtnl lock") Fixes:d772849566
("net: sched: act_sample: remove dependency on rtnl lock") Fixes:e8917f4370
("net: sched: act_gact: remove dependency on rtnl lock") Fixes:b6a2b971c0
("net: sched: act_csum: remove dependency on rtnl lock") Fixes:2142236b45
("net: sched: act_bpf: remove dependency on rtnl lock") Signed-off-by: Vlad Buslov <vladbu@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
354 lines
8.5 KiB
C
354 lines
8.5 KiB
C
/*
|
|
* Copyright (c) 2014 Jiri Pirko <jiri@resnulli.us>
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
#include <linux/init.h>
|
|
#include <linux/kernel.h>
|
|
#include <linux/skbuff.h>
|
|
#include <linux/rtnetlink.h>
|
|
#include <linux/if_vlan.h>
|
|
#include <net/netlink.h>
|
|
#include <net/pkt_sched.h>
|
|
|
|
#include <linux/tc_act/tc_vlan.h>
|
|
#include <net/tc_act/tc_vlan.h>
|
|
|
|
static unsigned int vlan_net_id;
|
|
static struct tc_action_ops act_vlan_ops;
|
|
|
|
static int tcf_vlan_act(struct sk_buff *skb, const struct tc_action *a,
|
|
struct tcf_result *res)
|
|
{
|
|
struct tcf_vlan *v = to_vlan(a);
|
|
struct tcf_vlan_params *p;
|
|
int action;
|
|
int err;
|
|
u16 tci;
|
|
|
|
tcf_lastuse_update(&v->tcf_tm);
|
|
bstats_cpu_update(this_cpu_ptr(v->common.cpu_bstats), skb);
|
|
|
|
/* Ensure 'data' points at mac_header prior calling vlan manipulating
|
|
* functions.
|
|
*/
|
|
if (skb_at_tc_ingress(skb))
|
|
skb_push_rcsum(skb, skb->mac_len);
|
|
|
|
action = READ_ONCE(v->tcf_action);
|
|
|
|
p = rcu_dereference_bh(v->vlan_p);
|
|
|
|
switch (p->tcfv_action) {
|
|
case TCA_VLAN_ACT_POP:
|
|
err = skb_vlan_pop(skb);
|
|
if (err)
|
|
goto drop;
|
|
break;
|
|
case TCA_VLAN_ACT_PUSH:
|
|
err = skb_vlan_push(skb, p->tcfv_push_proto, p->tcfv_push_vid |
|
|
(p->tcfv_push_prio << VLAN_PRIO_SHIFT));
|
|
if (err)
|
|
goto drop;
|
|
break;
|
|
case TCA_VLAN_ACT_MODIFY:
|
|
/* No-op if no vlan tag (either hw-accel or in-payload) */
|
|
if (!skb_vlan_tagged(skb))
|
|
goto out;
|
|
/* extract existing tag (and guarantee no hw-accel tag) */
|
|
if (skb_vlan_tag_present(skb)) {
|
|
tci = skb_vlan_tag_get(skb);
|
|
skb->vlan_tci = 0;
|
|
} else {
|
|
/* in-payload vlan tag, pop it */
|
|
err = __skb_vlan_pop(skb, &tci);
|
|
if (err)
|
|
goto drop;
|
|
}
|
|
/* replace the vid */
|
|
tci = (tci & ~VLAN_VID_MASK) | p->tcfv_push_vid;
|
|
/* replace prio bits, if tcfv_push_prio specified */
|
|
if (p->tcfv_push_prio) {
|
|
tci &= ~VLAN_PRIO_MASK;
|
|
tci |= p->tcfv_push_prio << VLAN_PRIO_SHIFT;
|
|
}
|
|
/* put updated tci as hwaccel tag */
|
|
__vlan_hwaccel_put_tag(skb, p->tcfv_push_proto, tci);
|
|
break;
|
|
default:
|
|
BUG();
|
|
}
|
|
|
|
out:
|
|
if (skb_at_tc_ingress(skb))
|
|
skb_pull_rcsum(skb, skb->mac_len);
|
|
|
|
return action;
|
|
|
|
drop:
|
|
qstats_drop_inc(this_cpu_ptr(v->common.cpu_qstats));
|
|
return TC_ACT_SHOT;
|
|
}
|
|
|
|
static const struct nla_policy vlan_policy[TCA_VLAN_MAX + 1] = {
|
|
[TCA_VLAN_PARMS] = { .len = sizeof(struct tc_vlan) },
|
|
[TCA_VLAN_PUSH_VLAN_ID] = { .type = NLA_U16 },
|
|
[TCA_VLAN_PUSH_VLAN_PROTOCOL] = { .type = NLA_U16 },
|
|
[TCA_VLAN_PUSH_VLAN_PRIORITY] = { .type = NLA_U8 },
|
|
};
|
|
|
|
static int tcf_vlan_init(struct net *net, struct nlattr *nla,
|
|
struct nlattr *est, struct tc_action **a,
|
|
int ovr, int bind, bool rtnl_held,
|
|
struct netlink_ext_ack *extack)
|
|
{
|
|
struct tc_action_net *tn = net_generic(net, vlan_net_id);
|
|
struct nlattr *tb[TCA_VLAN_MAX + 1];
|
|
struct tcf_vlan_params *p;
|
|
struct tc_vlan *parm;
|
|
struct tcf_vlan *v;
|
|
int action;
|
|
u16 push_vid = 0;
|
|
__be16 push_proto = 0;
|
|
u8 push_prio = 0;
|
|
bool exists = false;
|
|
int ret = 0, err;
|
|
|
|
if (!nla)
|
|
return -EINVAL;
|
|
|
|
err = nla_parse_nested(tb, TCA_VLAN_MAX, nla, vlan_policy, NULL);
|
|
if (err < 0)
|
|
return err;
|
|
|
|
if (!tb[TCA_VLAN_PARMS])
|
|
return -EINVAL;
|
|
parm = nla_data(tb[TCA_VLAN_PARMS]);
|
|
err = tcf_idr_check_alloc(tn, &parm->index, a, bind);
|
|
if (err < 0)
|
|
return err;
|
|
exists = err;
|
|
if (exists && bind)
|
|
return 0;
|
|
|
|
switch (parm->v_action) {
|
|
case TCA_VLAN_ACT_POP:
|
|
break;
|
|
case TCA_VLAN_ACT_PUSH:
|
|
case TCA_VLAN_ACT_MODIFY:
|
|
if (!tb[TCA_VLAN_PUSH_VLAN_ID]) {
|
|
if (exists)
|
|
tcf_idr_release(*a, bind);
|
|
else
|
|
tcf_idr_cleanup(tn, parm->index);
|
|
return -EINVAL;
|
|
}
|
|
push_vid = nla_get_u16(tb[TCA_VLAN_PUSH_VLAN_ID]);
|
|
if (push_vid >= VLAN_VID_MASK) {
|
|
if (exists)
|
|
tcf_idr_release(*a, bind);
|
|
else
|
|
tcf_idr_cleanup(tn, parm->index);
|
|
return -ERANGE;
|
|
}
|
|
|
|
if (tb[TCA_VLAN_PUSH_VLAN_PROTOCOL]) {
|
|
push_proto = nla_get_be16(tb[TCA_VLAN_PUSH_VLAN_PROTOCOL]);
|
|
switch (push_proto) {
|
|
case htons(ETH_P_8021Q):
|
|
case htons(ETH_P_8021AD):
|
|
break;
|
|
default:
|
|
if (exists)
|
|
tcf_idr_release(*a, bind);
|
|
else
|
|
tcf_idr_cleanup(tn, parm->index);
|
|
return -EPROTONOSUPPORT;
|
|
}
|
|
} else {
|
|
push_proto = htons(ETH_P_8021Q);
|
|
}
|
|
|
|
if (tb[TCA_VLAN_PUSH_VLAN_PRIORITY])
|
|
push_prio = nla_get_u8(tb[TCA_VLAN_PUSH_VLAN_PRIORITY]);
|
|
break;
|
|
default:
|
|
if (exists)
|
|
tcf_idr_release(*a, bind);
|
|
else
|
|
tcf_idr_cleanup(tn, parm->index);
|
|
return -EINVAL;
|
|
}
|
|
action = parm->v_action;
|
|
|
|
if (!exists) {
|
|
ret = tcf_idr_create(tn, parm->index, est, a,
|
|
&act_vlan_ops, bind, true);
|
|
if (ret) {
|
|
tcf_idr_cleanup(tn, parm->index);
|
|
return ret;
|
|
}
|
|
|
|
ret = ACT_P_CREATED;
|
|
} else if (!ovr) {
|
|
tcf_idr_release(*a, bind);
|
|
return -EEXIST;
|
|
}
|
|
|
|
v = to_vlan(*a);
|
|
|
|
p = kzalloc(sizeof(*p), GFP_KERNEL);
|
|
if (!p) {
|
|
tcf_idr_release(*a, bind);
|
|
return -ENOMEM;
|
|
}
|
|
|
|
p->tcfv_action = action;
|
|
p->tcfv_push_vid = push_vid;
|
|
p->tcfv_push_prio = push_prio;
|
|
p->tcfv_push_proto = push_proto;
|
|
|
|
spin_lock_bh(&v->tcf_lock);
|
|
v->tcf_action = parm->action;
|
|
rcu_swap_protected(v->vlan_p, p, lockdep_is_held(&v->tcf_lock));
|
|
spin_unlock_bh(&v->tcf_lock);
|
|
|
|
if (p)
|
|
kfree_rcu(p, rcu);
|
|
|
|
if (ret == ACT_P_CREATED)
|
|
tcf_idr_insert(tn, *a);
|
|
return ret;
|
|
}
|
|
|
|
static void tcf_vlan_cleanup(struct tc_action *a)
|
|
{
|
|
struct tcf_vlan *v = to_vlan(a);
|
|
struct tcf_vlan_params *p;
|
|
|
|
p = rcu_dereference_protected(v->vlan_p, 1);
|
|
if (p)
|
|
kfree_rcu(p, rcu);
|
|
}
|
|
|
|
static int tcf_vlan_dump(struct sk_buff *skb, struct tc_action *a,
|
|
int bind, int ref)
|
|
{
|
|
unsigned char *b = skb_tail_pointer(skb);
|
|
struct tcf_vlan *v = to_vlan(a);
|
|
struct tcf_vlan_params *p;
|
|
struct tc_vlan opt = {
|
|
.index = v->tcf_index,
|
|
.refcnt = refcount_read(&v->tcf_refcnt) - ref,
|
|
.bindcnt = atomic_read(&v->tcf_bindcnt) - bind,
|
|
};
|
|
struct tcf_t t;
|
|
|
|
spin_lock_bh(&v->tcf_lock);
|
|
opt.action = v->tcf_action;
|
|
p = rcu_dereference_protected(v->vlan_p, lockdep_is_held(&v->tcf_lock));
|
|
opt.v_action = p->tcfv_action;
|
|
if (nla_put(skb, TCA_VLAN_PARMS, sizeof(opt), &opt))
|
|
goto nla_put_failure;
|
|
|
|
if ((p->tcfv_action == TCA_VLAN_ACT_PUSH ||
|
|
p->tcfv_action == TCA_VLAN_ACT_MODIFY) &&
|
|
(nla_put_u16(skb, TCA_VLAN_PUSH_VLAN_ID, p->tcfv_push_vid) ||
|
|
nla_put_be16(skb, TCA_VLAN_PUSH_VLAN_PROTOCOL,
|
|
p->tcfv_push_proto) ||
|
|
(nla_put_u8(skb, TCA_VLAN_PUSH_VLAN_PRIORITY,
|
|
p->tcfv_push_prio))))
|
|
goto nla_put_failure;
|
|
|
|
tcf_tm_dump(&t, &v->tcf_tm);
|
|
if (nla_put_64bit(skb, TCA_VLAN_TM, sizeof(t), &t, TCA_VLAN_PAD))
|
|
goto nla_put_failure;
|
|
spin_unlock_bh(&v->tcf_lock);
|
|
|
|
return skb->len;
|
|
|
|
nla_put_failure:
|
|
spin_unlock_bh(&v->tcf_lock);
|
|
nlmsg_trim(skb, b);
|
|
return -1;
|
|
}
|
|
|
|
static int tcf_vlan_walker(struct net *net, struct sk_buff *skb,
|
|
struct netlink_callback *cb, int type,
|
|
const struct tc_action_ops *ops,
|
|
struct netlink_ext_ack *extack)
|
|
{
|
|
struct tc_action_net *tn = net_generic(net, vlan_net_id);
|
|
|
|
return tcf_generic_walker(tn, skb, cb, type, ops, extack);
|
|
}
|
|
|
|
static int tcf_vlan_search(struct net *net, struct tc_action **a, u32 index,
|
|
struct netlink_ext_ack *extack)
|
|
{
|
|
struct tc_action_net *tn = net_generic(net, vlan_net_id);
|
|
|
|
return tcf_idr_search(tn, a, index);
|
|
}
|
|
|
|
static int tcf_vlan_delete(struct net *net, u32 index)
|
|
{
|
|
struct tc_action_net *tn = net_generic(net, vlan_net_id);
|
|
|
|
return tcf_idr_delete_index(tn, index);
|
|
}
|
|
|
|
static struct tc_action_ops act_vlan_ops = {
|
|
.kind = "vlan",
|
|
.type = TCA_ACT_VLAN,
|
|
.owner = THIS_MODULE,
|
|
.act = tcf_vlan_act,
|
|
.dump = tcf_vlan_dump,
|
|
.init = tcf_vlan_init,
|
|
.cleanup = tcf_vlan_cleanup,
|
|
.walk = tcf_vlan_walker,
|
|
.lookup = tcf_vlan_search,
|
|
.delete = tcf_vlan_delete,
|
|
.size = sizeof(struct tcf_vlan),
|
|
};
|
|
|
|
static __net_init int vlan_init_net(struct net *net)
|
|
{
|
|
struct tc_action_net *tn = net_generic(net, vlan_net_id);
|
|
|
|
return tc_action_net_init(tn, &act_vlan_ops);
|
|
}
|
|
|
|
static void __net_exit vlan_exit_net(struct list_head *net_list)
|
|
{
|
|
tc_action_net_exit(net_list, vlan_net_id);
|
|
}
|
|
|
|
static struct pernet_operations vlan_net_ops = {
|
|
.init = vlan_init_net,
|
|
.exit_batch = vlan_exit_net,
|
|
.id = &vlan_net_id,
|
|
.size = sizeof(struct tc_action_net),
|
|
};
|
|
|
|
static int __init vlan_init_module(void)
|
|
{
|
|
return tcf_register_action(&act_vlan_ops, &vlan_net_ops);
|
|
}
|
|
|
|
static void __exit vlan_cleanup_module(void)
|
|
{
|
|
tcf_unregister_action(&act_vlan_ops, &vlan_net_ops);
|
|
}
|
|
|
|
module_init(vlan_init_module);
|
|
module_exit(vlan_cleanup_module);
|
|
|
|
MODULE_AUTHOR("Jiri Pirko <jiri@resnulli.us>");
|
|
MODULE_DESCRIPTION("vlan manipulation actions");
|
|
MODULE_LICENSE("GPL v2");
|