diff options
| author | Andy Zhou <azhou@nicira.com> | 2014-04-08 11:13:42 +0000 |
|---|---|---|
| committer | Andy Zhou <azhou@nicira.com> | 2014-04-21 11:06:55 -0700 |
| commit | a605908001070c27aa8c755c92cd361a10b46beb (patch) | |
| tree | 045e968a4a113283263a728692674426b8e22f43 /datapath/flow_netlink.c | |
| parent | 7804df205faf285037994c7d222dfd45d5c00c49 (diff) | |
datapath: add recirc action
Recirculation implementation for Linux kernel data path.
Signed-off-by: Andy Zhou <azhou@nicira.com>
Acked-by: Jesse Gross <jesse@nicira.com>
Diffstat (limited to 'datapath/flow_netlink.c')
| -rw-r--r-- | datapath/flow_netlink.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/datapath/flow_netlink.c b/datapath/flow_netlink.c index 7db14de52..803a94cb5 100644 --- a/datapath/flow_netlink.c +++ b/datapath/flow_netlink.c @@ -253,6 +253,7 @@ static const int ovs_key_lens[OVS_KEY_ATTR_MAX + 1] = { [OVS_KEY_ATTR_ARP] = sizeof(struct ovs_key_arp), [OVS_KEY_ATTR_ND] = sizeof(struct ovs_key_nd), [OVS_KEY_ATTR_DP_HASH] = sizeof(u32), + [OVS_KEY_ATTR_RECIRC_ID] = sizeof(u32), [OVS_KEY_ATTR_TUNNEL] = -1, }; @@ -463,6 +464,13 @@ static int metadata_from_nlattrs(struct sw_flow_match *match, u64 *attrs, *attrs &= ~(1ULL << OVS_KEY_ATTR_DP_HASH); } + if (*attrs & (1ULL << OVS_KEY_ATTR_RECIRC_ID)) { + u32 recirc_id = nla_get_u32(a[OVS_KEY_ATTR_RECIRC_ID]); + + SW_FLOW_KEY_PUT(match, recirc_id, recirc_id, is_mask); + *attrs &= ~(1ULL << OVS_KEY_ATTR_RECIRC_ID); + } + if (*attrs & (1ULL << OVS_KEY_ATTR_PRIORITY)) { SW_FLOW_KEY_PUT(match, phy.priority, nla_get_u32(a[OVS_KEY_ATTR_PRIORITY]), is_mask); @@ -868,6 +876,7 @@ int ovs_nla_get_flow_metadata(struct sw_flow *flow, flow->key.phy.priority = 0; flow->key.phy.skb_mark = 0; flow->key.ovs_flow_hash = 0; + flow->key.recirc_id = 0; memset(tun_key, 0, sizeof(flow->key.tun_key)); err = parse_flow_nlattrs(attr, a, &attrs); @@ -894,6 +903,9 @@ int ovs_nla_put_flow(const struct sw_flow_key *swkey, if (nla_put_u32(skb, OVS_KEY_ATTR_DP_HASH, output->ovs_flow_hash)) goto nla_put_failure; + if (nla_put_u32(skb, OVS_KEY_ATTR_RECIRC_ID, output->recirc_id)) + goto nla_put_failure; + if (nla_put_u32(skb, OVS_KEY_ATTR_PRIORITY, output->phy.priority)) goto nla_put_failure; @@ -1430,6 +1442,7 @@ int ovs_nla_copy_actions(const struct nlattr *attr, /* Expected argument lengths, (u32)-1 for variable length. */ static const u32 action_lens[OVS_ACTION_ATTR_MAX + 1] = { [OVS_ACTION_ATTR_OUTPUT] = sizeof(u32), + [OVS_ACTION_ATTR_RECIRC] = sizeof(u32), [OVS_ACTION_ATTR_USERSPACE] = (u32)-1, [OVS_ACTION_ATTR_PUSH_VLAN] = sizeof(struct ovs_action_push_vlan), [OVS_ACTION_ATTR_POP_VLAN] = 0, @@ -1486,6 +1499,9 @@ int ovs_nla_copy_actions(const struct nlattr *attr, return -EINVAL; break; + case OVS_ACTION_ATTR_RECIRC: + break; + case OVS_ACTION_ATTR_SET: err = validate_set(a, key, sfa, &skip_copy); if (err) |