diff options
| author | Jason Wang <jasowang@redhat.com> | 2012-08-15 20:44:27 +0000 |
|---|---|---|
| committer | Ben Hutchings <ben@decadent.org.uk> | 2014-06-09 13:28:59 +0100 |
| commit | 9a45de4b54dc3e6ecbdc1f4d0d15dcbd2410bad3 (patch) | |
| tree | 3b8b3fcbebfdcef3e66668a34fb527b9ec600f44 /net | |
| parent | 5b64df7dd898e1b05ecb77d06a69313a9d7c43db (diff) | |
| download | linux-stable-9a45de4b54dc3e6ecbdc1f4d0d15dcbd2410bad3.tar.gz linux-stable-9a45de4b54dc3e6ecbdc1f4d0d15dcbd2410bad3.tar.bz2 linux-stable-9a45de4b54dc3e6ecbdc1f4d0d15dcbd2410bad3.zip | |
act_mirred: do not drop packets when fails to mirror it
[ Upstream commit 16c0b164bd24d44db137693a36b428ba28970c62 ]
We drop packet unconditionally when we fail to mirror it. This is not intended
in some cases. Consdier for kvm guest, we may mirror the traffic of the bridge
to a tap device used by a VM. When kernel fails to mirror the packet in
conditions such as when qemu crashes or stop polling the tap, it's hard for the
management software to detect such condition and clean the the mirroring
before. This would lead all packets to the bridge to be dropped and break the
netowrk of other virtual machines.
To solve the issue, the patch does not drop packets when kernel fails to mirror
it, and only drop the redirected packets.
Signed-off-by: Jason Wang <jasowang@redhat.com>
Signed-off-by: Jamal Hadi Salim <jhs@mojatatu.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Ben Hutchings <ben@decadent.org.uk>
Diffstat (limited to 'net')
| -rw-r--r-- | net/sched/act_mirred.c | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c index e051398fdf6b..d067ed16bab1 100644 --- a/net/sched/act_mirred.c +++ b/net/sched/act_mirred.c @@ -201,13 +201,12 @@ static int tcf_mirred(struct sk_buff *skb, const struct tc_action *a, out: if (err) { m->tcf_qstats.overlimits++; - /* should we be asking for packet to be dropped? - * may make sense for redirect case only - */ - retval = TC_ACT_SHOT; - } else { + if (m->tcfm_eaction != TCA_EGRESS_MIRROR) + retval = TC_ACT_SHOT; + else + retval = m->tcf_action; + } else retval = m->tcf_action; - } spin_unlock(&m->tcf_lock); return retval; |