net: openvswitch: add meter drop reason

By using an independent drop reason it makes it easy to distinguish
between QoS-triggered or flow-triggered drop.

Acked-by: Aaron Conole <aconole@redhat.com>
Signed-off-by: Adrian Moreno <amorenoz@redhat.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
index e188f32..1222114 100644 (file)
--- a/net/openvswitch/actions.c
+++ b/net/openvswitch/actions.c
@@ -1454,7 +1454,7 @@ static int do_execute_actions(struct datapath *dp, struct sk_buff *skb,
 
                case OVS_ACTION_ATTR_METER:
                        if (ovs_meter_execute(dp, skb, key, nla_get_u32(a))) {
-                               consume_skb(skb);
+                               ovs_kfree_skb_reason(skb, OVS_DROP_METER);
                                return 0;
                        }
                        break;

diff --git a/net/openvswitch/drop.h b/net/openvswitch/drop.h
index 22e66d2..a35e63d 100644 (file)
--- a/net/openvswitch/drop.h
+++ b/net/openvswitch/drop.h
@@ -13,6 +13,7 @@
        R(OVS_DROP_ACTION_ERROR)                \
        R(OVS_DROP_EXPLICIT)                    \
        R(OVS_DROP_EXPLICIT_WITH_ERROR)         \
+       R(OVS_DROP_METER)                       \
        /* deliberate comment for trailing \ */
 
 enum ovs_drop_reason {