On Thu, Oct 12, 2017 at 3:38 PM, Andy Zhou <az...@ovn.org> wrote:
> Implements OVS kernel meter action support.
>
> Signed-off-by: Andy Zhou <az...@ovn.org>
> ---
> include/uapi/linux/openvswitch.h | 1 +
> net/openvswitch/actions.c | 12 ++++++++++++
> net/openvswitch/datapath.h | 1 +
> net/openvswitch/flow_netlink.c | 6 ++++++
> 4 files changed, 20 insertions(+)
>
> diff --git a/include/uapi/linux/openvswitch.h
> b/include/uapi/linux/openvswitch.h
> index 325049a129e4..11fe1a06cdd6 100644
> --- a/include/uapi/linux/openvswitch.h
> +++ b/include/uapi/linux/openvswitch.h
> @@ -835,6 +835,7 @@ enum ovs_action_attr {
> OVS_ACTION_ATTR_TRUNC, /* u32 struct ovs_action_trunc. */
> OVS_ACTION_ATTR_PUSH_ETH, /* struct ovs_action_push_eth. */
> OVS_ACTION_ATTR_POP_ETH, /* No argument. */
> + OVS_ACTION_ATTR_METER, /* u32 meter ID. */
>
> __OVS_ACTION_ATTR_MAX, /* Nothing past this will be accepted
> * from userspace. */
> diff --git a/net/openvswitch/actions.c b/net/openvswitch/actions.c
> index a54a556fcdb5..4eb160ac5a27 100644
> --- a/net/openvswitch/actions.c
> +++ b/net/openvswitch/actions.c
> @@ -1210,6 +1210,12 @@ static int do_execute_actions(struct datapath *dp,
> struct sk_buff *skb,
> case OVS_ACTION_ATTR_POP_ETH:
> err = pop_eth(skb, key);
> break;
> +
> + case OVS_ACTION_ATTR_METER:
> + if (ovs_meter_execute(dp, skb, key, nla_get_u32(a))) {
> + consume_skb(skb);
> + return 0;
> + }
> }
>
> if (unlikely(err)) {
> @@ -1341,6 +1347,12 @@ int ovs_execute_actions(struct datapath *dp, struct
> sk_buff *skb,
> err = do_execute_actions(dp, skb, key,
> acts->actions, acts->actions_len);
>
> + /* OVS action has dropped the packet, do not expose it
> + * to the user.
> + */
> + if (err == -ENODATA)
> + err = 0;
> +
I am not sure who is returning this error code?
