X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=ofproto%2Fofproto-dpif-xlate.c;h=c37796342aa9df799ffcaeb2797d28c2adab9e8d;hb=9bfe933472a784cd6b3f946afc3eed73d74f6a7d;hp=5d6e1ddac408091fc7f18ec1fd5139773711d2ad;hpb=e824d78d8590036387d4d64b71d2302ba9514f0f;p=cascardo%2Fovs.git diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c index 5d6e1ddac..c37796342 100644 --- a/ofproto/ofproto-dpif-xlate.c +++ b/ofproto/ofproto-dpif-xlate.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc. +/* Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015, 2016 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -22,7 +22,7 @@ #include #include -#include "tnl-arp-cache.h" +#include "tnl-neigh-cache.h" #include "bfd.h" #include "bitmap.h" #include "bond.h" @@ -54,6 +54,7 @@ #include "ofproto/ofproto-dpif-sflow.h" #include "ofproto/ofproto-dpif.h" #include "ofproto/ofproto-provider.h" +#include "packets.h" #include "ovs-router.h" #include "tnl-ports.h" #include "tunnel.h" @@ -71,9 +72,6 @@ VLOG_DEFINE_THIS_MODULE(ofproto_dpif_xlate); #define MAX_INTERNAL_RESUBMITS 1 /* Max resbmits allowed using rules in internal table. */ -/* Timeout for internal rules created to handle recirculation */ -#define RECIRC_TIMEOUT 60 - /* Maximum number of resubmit actions in a flow translation, whether they are * recursive or not. */ #define MAX_RESUBMITS (MAX_RESUBMIT_RECURSION * MAX_RESUBMIT_RECURSION) @@ -99,21 +97,8 @@ struct xbridge { bool has_in_band; /* Bridge has in band control? */ bool forward_bpdu; /* Bridge forwards STP BPDUs? */ - /* True if the datapath supports recirculation. */ - bool enable_recirc; - - /* True if the datapath supports variable-length - * OVS_USERSPACE_ATTR_USERDATA in OVS_ACTION_ATTR_USERSPACE actions. - * False if the datapath supports only 8-byte (or shorter) userdata. */ - bool variable_length_userdata; - - /* Number of MPLS label stack entries that the datapath supports - * in matches. */ - size_t max_mpls_depth; - - /* True if the datapath supports masked data in OVS_ACTION_ATTR_SET - * actions. */ - bool masked_set_action; + /* Datapath feature support. */ + struct dpif_backer_support support; }; struct xbundle { @@ -175,6 +160,9 @@ struct xlate_ctx { const struct xbridge *xbridge; + /* Flow tables version at the beginning of the translation. */ + cls_version_t tables_version; + /* Flow at the last commit. */ struct flow base_flow; @@ -184,32 +172,128 @@ struct xlate_ctx { * which might lead to an infinite loop. This could happen easily * if a tunnel is marked as 'ip_remote=flow', and the flow does not * actually set the tun_dst field. */ - ovs_be32 orig_tunnel_ip_dst; + struct in6_addr orig_tunnel_ipv6_dst; /* Stack for the push and pop actions. Each stack element is of type * "union mf_subvalue". */ - union mf_subvalue init_stack[1024 / sizeof(union mf_subvalue)]; struct ofpbuf stack; /* The rule that we are currently translating, or NULL. */ struct rule_dpif *rule; + /* Flow translation populates this with wildcards relevant in translation. + * When 'xin->wc' is nonnull, this is the same pointer. When 'xin->wc' is + * null, this is a pointer to uninitialized scratch memory. This allows + * code to blindly write to 'ctx->wc' without worrying about whether the + * caller really wants wildcards. */ + struct flow_wildcards *wc; + + /* Output buffer for datapath actions. When 'xin->odp_actions' is nonnull, + * this is the same pointer. When 'xin->odp_actions' is null, this points + * to a scratch ofpbuf. This allows code to add actions to + * 'ctx->odp_actions' without worrying about whether the caller really + * wants actions. */ + struct ofpbuf *odp_actions; + /* Resubmit statistics, via xlate_table_action(). */ int recurse; /* Current resubmit nesting depth. */ int resubmits; /* Total number of resubmits. */ bool in_group; /* Currently translating ofgroup, if true. */ bool in_action_set; /* Currently translating action_set, if true. */ - uint32_t orig_skb_priority; /* Priority when packet arrived. */ uint8_t table_id; /* OpenFlow table ID where flow was found. */ + ovs_be64 rule_cookie; /* Cookie of the rule being translated. */ + uint32_t orig_skb_priority; /* Priority when packet arrived. */ uint32_t sflow_n_outputs; /* Number of output ports. */ odp_port_t sflow_odp_port; /* Output port for composing sFlow action. */ - uint16_t user_cookie_offset;/* Used for user_action_cookie fixup. */ + ofp_port_t nf_output_iface; /* Output interface index for NetFlow. */ bool exit; /* No further actions should be processed. */ - - bool use_recirc; /* Should generate recirc? */ - struct xlate_recirc recirc; /* Information used for generating - * recirculation actions */ + mirror_mask_t mirrors; /* Bitmap of associated mirrors. */ + + /* These are used for non-bond recirculation. The recirculation IDs are + * stored in xout and must be associated with a datapath flow (ukey), + * otherwise they will be freed when the xout is uninitialized. + * + * + * Steps in Recirculation Translation + * ================================== + * + * At some point during translation, the code recognizes the need for + * recirculation. For example, recirculation is necessary when, after + * popping the last MPLS label, an action or a match tries to examine or + * modify a field that has been newly revealed following the MPLS label. + * + * The simplest part of the work to be done is to commit existing changes to + * the packet, which produces datapath actions corresponding to the changes, + * and after this, add an OVS_ACTION_ATTR_RECIRC datapath action. + * + * The main problem here is preserving state. When the datapath executes + * OVS_ACTION_ATTR_RECIRC, it will upcall to userspace to get a translation + * for the post-recirculation actions. At this point userspace has to + * resume the translation where it left off, which means that it has to + * execute the following: + * + * - The action that prompted recirculation, and any actions following + * it within the same flow. + * + * - If the action that prompted recirculation was invoked within a + * NXAST_RESUBMIT, then any actions following the resubmit. These + * "resubmit"s can be nested, so this has to go all the way up the + * control stack. + * + * - The OpenFlow 1.1+ action set. + * + * State that actions and flow table lookups can depend on, such as the + * following, must also be preserved: + * + * - Metadata fields (input port, registers, OF1.1+ metadata, ...). + * + * - Action set, stack + * + * - The table ID and cookie of the flow being translated at each level + * of the control stack (since OFPAT_CONTROLLER actions send these to + * the controller). + * + * Translation allows for the control of this state preservation via these + * members. When a need for recirculation is identified, the translation + * process: + * + * 1. Sets 'recirc_action_offset' to the current size of 'action_set'. The + * action set is part of what needs to be preserved, so this allows the + * action set and the additional state to share the 'action_set' buffer. + * Later steps can tell that setup for recirculation is in progress from + * the nonnegative value of 'recirc_action_offset'. + * + * 2. Sets 'exit' to true to tell later steps that we're exiting from the + * translation process. + * + * 3. Adds an OFPACT_UNROLL_XLATE action to 'action_set'. This action + * holds the current table ID and cookie so that they can be restored + * during a post-recirculation upcall translation. + * + * 4. Adds the action that prompted recirculation and any actions following + * it within the same flow to 'action_set', so that they can be executed + * during a post-recirculation upcall translation. + * + * 5. Returns. + * + * 6. The action that prompted recirculation might be nested in a stack of + * nested "resubmit"s that have actions remaining. Each of these notices + * that we're exiting (from 'exit') and that recirculation setup is in + * progress (from 'recirc_action_offset') and responds by adding more + * OFPACT_UNROLL_XLATE actions to 'action_set', as necessary, and any + * actions that were yet unprocessed. + * + * The caller stores all the state produced by this process associated with + * the recirculation ID. For post-recirculation upcall translation, the + * caller passes it back in for the new translation to execute. The + * process yielded a set of ofpacts that can be translated directly, so it + * is not much of a special case at that point. + */ + int recirc_action_offset; /* Offset in 'action_set' to actions to be + * executed after recirculation, or -1. */ + int last_unroll_offset; /* Offset in 'action_set' to the latest unroll + * action, or -1. */ /* True if a packet was but is no longer MPLS (due to an MPLS pop action). * This is a trigger for recirculation in cases where translating an action @@ -217,17 +301,75 @@ struct xlate_ctx { * the MPLS label stack that was originally present. */ bool was_mpls; + /* True if conntrack has been performed on this packet during processing + * on the current bridge. This is used to determine whether conntrack + * state from the datapath should be honored after recirculation. */ + bool conntracked; + + /* Pointer to an embedded NAT action in a conntrack action, or NULL. */ + struct ofpact_nat *ct_nat_action; + /* OpenFlow 1.1+ action set. * * 'action_set' accumulates "struct ofpact"s added by OFPACT_WRITE_ACTIONS. * When translation is otherwise complete, ofpacts_execute_action_set() * converts it to a set of "struct ofpact"s that can be translated into - * datapath actions. */ + * datapath actions. */ bool action_set_has_group; /* Action set contains OFPACT_GROUP? */ struct ofpbuf action_set; /* Action set. */ - uint64_t action_set_stub[1024 / 8]; + + enum xlate_error error; /* Translation failed. */ }; +const char *xlate_strerror(enum xlate_error error) +{ + switch (error) { + case XLATE_OK: + return "OK"; + case XLATE_BRIDGE_NOT_FOUND: + return "Bridge not found"; + case XLATE_RECURSION_TOO_DEEP: + return "Recursion too deep"; + case XLATE_TOO_MANY_RESUBMITS: + return "Too many resubmits"; + case XLATE_STACK_TOO_DEEP: + return "Stack too deep"; + case XLATE_NO_RECIRCULATION_CONTEXT: + return "No recirculation context"; + case XLATE_RECIRCULATION_CONFLICT: + return "Recirculation conflict"; + case XLATE_TOO_MANY_MPLS_LABELS: + return "Too many MPLS labels"; + } + return "Unknown error"; +} + +static void xlate_action_set(struct xlate_ctx *ctx); +static void xlate_commit_actions(struct xlate_ctx *ctx); + +static void +ctx_trigger_recirculation(struct xlate_ctx *ctx) +{ + ctx->exit = true; + ctx->recirc_action_offset = ctx->action_set.size; +} + +static bool +ctx_first_recirculation_action(const struct xlate_ctx *ctx) +{ + return ctx->recirc_action_offset == ctx->action_set.size; +} + +static inline bool +exit_recirculates(const struct xlate_ctx *ctx) +{ + /* When recirculating the 'recirc_action_offset' has a non-negative value. + */ + return ctx->recirc_action_offset >= 0; +} + +static void compose_recirculate_action(struct xlate_ctx *ctx); + /* A controller may use OFPP_NONE as the ingress port to indicate that * it did not arrive on a "real" port. 'ofpp_none_bundle' exists for * when an input bundle is needed for validation (e.g., mirroring or @@ -258,7 +400,7 @@ enum xc_type { XC_NORMAL, XC_FIN_TIMEOUT, XC_GROUP, - XC_TNL_ARP, + XC_TNL_NEIGH, }; /* xlate_cache entries hold enough information to perform the side effects of @@ -310,8 +452,8 @@ struct xc_entry { } group; struct { char br_name[IFNAMSIZ]; - ovs_be32 d_ip; - } tnl_arp_cache; + struct in6_addr d_ipv6; + } tnl_neigh_cache; } u; }; @@ -342,7 +484,8 @@ static bool may_receive(const struct xport *, struct xlate_ctx *); static void do_xlate_actions(const struct ofpact *, size_t ofpacts_len, struct xlate_ctx *); static void xlate_normal(struct xlate_ctx *); -static inline void xlate_report(struct xlate_ctx *, const char *); +static inline void xlate_report(struct xlate_ctx *, const char *, ...) + OVS_PRINTF_FORMAT(2, 3); static void xlate_table_action(struct xlate_ctx *, ofp_port_t in_port, uint8_t table_id, bool may_packet_in, bool honor_table_miss); @@ -350,7 +493,16 @@ static bool input_vid_is_valid(uint16_t vid, struct xbundle *, bool warn); static uint16_t input_vid_to_vlan(const struct xbundle *, uint16_t vid); static void output_normal(struct xlate_ctx *, const struct xbundle *, uint16_t vlan); -static void compose_output_action(struct xlate_ctx *, ofp_port_t ofp_port); + +/* Optional bond recirculation parameter to compose_output_action(). */ +struct xlate_bond_recirc { + uint32_t recirc_id; /* !0 Use recirculation instead of output. */ + uint8_t hash_alg; /* !0 Compute hash for recirc before. */ + uint32_t hash_basis; /* Compute hash for recirc before. */ +}; + +static void compose_output_action(struct xlate_ctx *, ofp_port_t ofp_port, + const struct xlate_bond_recirc *xr); static struct xbridge *xbridge_lookup(struct xlate_cfg *, const struct ofproto_dpif *); @@ -379,10 +531,7 @@ static void xlate_xbridge_set(struct xbridge *, struct dpif *, const struct dpif_ipfix *, const struct netflow *, bool forward_bpdu, bool has_in_band, - bool enable_recirc, - bool variable_length_userdata, - size_t max_mpls_depth, - bool masked_set_action); + const struct dpif_backer_support *); static void xlate_xbundle_set(struct xbundle *xbundle, enum port_vlan_mode vlan_mode, int vlan, unsigned long *trunks, bool use_priority_tags, @@ -405,10 +554,37 @@ static void xlate_xport_copy(struct xbridge *, struct xbundle *, static void xlate_xcfg_free(struct xlate_cfg *); static inline void -xlate_report(struct xlate_ctx *ctx, const char *s) +xlate_report(struct xlate_ctx *ctx, const char *format, ...) +{ + if (OVS_UNLIKELY(ctx->xin->report_hook)) { + va_list args; + + va_start(args, format); + ctx->xin->report_hook(ctx->xin, ctx->recurse, format, args); + va_end(args); + } +} + +static struct vlog_rate_limit error_report_rl = VLOG_RATE_LIMIT_INIT(1, 5); + +#define XLATE_REPORT_ERROR(CTX, ...) \ + do { \ + if (OVS_UNLIKELY((CTX)->xin->report_hook)) { \ + xlate_report(CTX, __VA_ARGS__); \ + } else { \ + VLOG_ERR_RL(&error_report_rl, __VA_ARGS__); \ + } \ + } while (0) + +static inline void +xlate_report_actions(struct xlate_ctx *ctx, const char *title, + const struct ofpact *ofpacts, size_t ofpacts_len) { if (OVS_UNLIKELY(ctx->xin->report_hook)) { - ctx->xin->report_hook(ctx->xin, s, ctx->recurse); + struct ds s = DS_EMPTY_INITIALIZER; + ofpacts_format(ofpacts, ofpacts_len, &s); + xlate_report(ctx, "%s: %s", title, ds_cstr(&s)); + ds_destroy(&s); } } @@ -450,10 +626,7 @@ xlate_xbridge_set(struct xbridge *xbridge, const struct dpif_ipfix *ipfix, const struct netflow *netflow, bool forward_bpdu, bool has_in_band, - bool enable_recirc, - bool variable_length_userdata, - size_t max_mpls_depth, - bool masked_set_action) + const struct dpif_backer_support *support) { if (xbridge->ml != ml) { mac_learning_unref(xbridge->ml); @@ -498,10 +671,7 @@ xlate_xbridge_set(struct xbridge *xbridge, xbridge->dpif = dpif; xbridge->forward_bpdu = forward_bpdu; xbridge->has_in_band = has_in_band; - xbridge->enable_recirc = enable_recirc; - xbridge->variable_length_userdata = variable_length_userdata; - xbridge->max_mpls_depth = max_mpls_depth; - xbridge->masked_set_action = masked_set_action; + xbridge->support = *support; } static void @@ -585,10 +755,8 @@ xlate_xbridge_copy(struct xbridge *xbridge) xbridge->dpif, xbridge->ml, xbridge->stp, xbridge->rstp, xbridge->ms, xbridge->mbridge, xbridge->sflow, xbridge->ipfix, xbridge->netflow, - xbridge->forward_bpdu, - xbridge->has_in_band, xbridge->enable_recirc, - xbridge->variable_length_userdata, - xbridge->max_mpls_depth, xbridge->masked_set_action); + xbridge->forward_bpdu, xbridge->has_in_band, + &xbridge->support); LIST_FOR_EACH (xbundle, list_node, &xbridge->xbundles) { xlate_xbundle_copy(new_xbridge, xbundle); } @@ -739,9 +907,8 @@ xlate_ofproto_set(struct ofproto_dpif *ofproto, const char *name, const struct dpif_sflow *sflow, const struct dpif_ipfix *ipfix, const struct netflow *netflow, - bool forward_bpdu, bool has_in_band, bool enable_recirc, - bool variable_length_userdata, size_t max_mpls_depth, - bool masked_set_action) + bool forward_bpdu, bool has_in_band, + const struct dpif_backer_support *support) { struct xbridge *xbridge; @@ -759,9 +926,7 @@ xlate_ofproto_set(struct ofproto_dpif *ofproto, const char *name, xbridge->name = xstrdup(name); xlate_xbridge_set(xbridge, dpif, ml, stp, rstp, ms, mbridge, sflow, ipfix, - netflow, forward_bpdu, has_in_band, enable_recirc, - variable_length_userdata, max_mpls_depth, - masked_set_action); + netflow, forward_bpdu, has_in_band, support); } static void @@ -836,14 +1001,13 @@ xlate_bundle_set(struct ofproto_dpif *ofproto, struct ofbundle *ofbundle, static void xlate_xbundle_remove(struct xlate_cfg *xcfg, struct xbundle *xbundle) { - struct xport *xport, *next; + struct xport *xport; if (!xbundle) { return; } - LIST_FOR_EACH_SAFE (xport, next, bundle_node, &xbundle->xports) { - list_remove(&xport->bundle_node); + LIST_FOR_EACH_POP (xport, bundle_node, &xbundle->xports) { xport->xbundle = NULL; } @@ -974,64 +1138,24 @@ xlate_ofport_remove(struct ofport_dpif *ofport) xlate_xport_remove(new_xcfg, xport); } -/* Given a datapath and flow metadata ('backer', and 'flow' respectively) - * returns the corresponding struct xport, or NULL if none is found. */ -static struct xport * -xlate_lookup_xport(const struct dpif_backer *backer, const struct flow *flow) -{ - struct xlate_cfg *xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp); - - return xport_lookup(xcfg, tnl_port_should_receive(flow) - ? tnl_port_receive(flow) - : odp_port_to_ofport(backer, flow->in_port.odp_port)); -} - static struct ofproto_dpif * xlate_lookup_ofproto_(const struct dpif_backer *backer, const struct flow *flow, ofp_port_t *ofp_in_port, const struct xport **xportp) { - struct ofproto_dpif *recv_ofproto = NULL; - struct ofproto_dpif *recirc_ofproto = NULL; + struct xlate_cfg *xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp); const struct xport *xport; - ofp_port_t in_port = OFPP_NONE; - - *xportp = xport = xlate_lookup_xport(backer, flow); - - if (xport) { - recv_ofproto = xport->xbridge->ofproto; - in_port = xport->ofp_port; - } - /* When recirc_id is set in 'flow', checks whether the ofproto_dpif that - * corresponds to the recirc_id is same as the receiving bridge. If they - * are the same, uses the 'recv_ofproto' and keeps the 'ofp_in_port' as - * assigned. Otherwise, uses the 'recirc_ofproto' that owns recirc_id and - * assigns OFPP_NONE to 'ofp_in_port'. Doing this is in that, the - * recirculated flow must be processced by the ofproto which originates - * the recirculation, and as bridges can only see their own ports, the - * in_port of the 'recv_ofproto' should not be passed to the - * 'recirc_ofproto'. - * - * Admittedly, setting the 'ofp_in_port' to OFPP_NONE limits the - * 'recirc_ofproto' from meaningfully matching on in_port of recirculated - * flow, and should be fixed in the near future. - * - * TODO: Restore the original patch port. - */ - if (recv_ofproto && flow->recirc_id) { - recirc_ofproto = ofproto_dpif_recirc_get_ofproto(backer, - flow->recirc_id); - if (recv_ofproto != recirc_ofproto) { - *xportp = xport = NULL; - in_port = OFPP_NONE; - } + xport = xport_lookup(xcfg, tnl_port_should_receive(flow) + ? tnl_port_receive(flow) + : odp_port_to_ofport(backer, flow->in_port.odp_port)); + if (OVS_UNLIKELY(!xport)) { + return NULL; } - + *xportp = xport; if (ofp_in_port) { - *ofp_in_port = in_port; + *ofp_in_port = xport->ofp_port; } - - return xport ? recv_ofproto : recirc_ofproto; + return xport->xbridge->ofproto; } /* Given a datapath and flow metadata ('backer', and 'flow' respectively) @@ -1464,75 +1588,61 @@ lookup_input_bundle(const struct xbridge *xbridge, ofp_port_t in_port, } static void -add_mirror_actions(struct xlate_ctx *ctx, const struct flow *orig_flow) +mirror_packet(struct xlate_ctx *ctx, struct xbundle *xbundle, + mirror_mask_t mirrors) { - const struct xbridge *xbridge = ctx->xbridge; - mirror_mask_t mirrors; - struct xbundle *in_xbundle; - uint16_t vlan; - uint16_t vid; - - mirrors = ctx->xout->mirrors; - ctx->xout->mirrors = 0; - - in_xbundle = lookup_input_bundle(xbridge, orig_flow->in_port.ofp_port, - ctx->xin->packet != NULL, NULL); - if (!in_xbundle) { + bool warn = ctx->xin->packet != NULL; + uint16_t vid = vlan_tci_to_vid(ctx->xin->flow.vlan_tci); + if (!input_vid_is_valid(vid, xbundle, warn)) { return; } - mirrors |= xbundle_mirror_src(xbridge, in_xbundle); + uint16_t vlan = input_vid_to_vlan(xbundle, vid); - /* Drop frames on bundles reserved for mirroring. */ - if (xbundle_mirror_out(xbridge, in_xbundle)) { - if (ctx->xin->packet != NULL) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); - VLOG_WARN_RL(&rl, "bridge %s: dropping packet received on port " - "%s, which is reserved exclusively for mirroring", - ctx->xbridge->name, in_xbundle->name); - } - ofpbuf_clear(ctx->xout->odp_actions); - return; - } + const struct xbridge *xbridge = ctx->xbridge; - /* Check VLAN. */ - vid = vlan_tci_to_vid(orig_flow->vlan_tci); - if (!input_vid_is_valid(vid, in_xbundle, ctx->xin->packet != NULL)) { + /* Don't mirror to destinations that we've already mirrored to. */ + mirrors &= ~ctx->mirrors; + if (!mirrors) { return; } - vlan = input_vid_to_vlan(in_xbundle, vid); - if (!mirrors) { - return; + /* Record these mirrors so that we don't mirror to them again. */ + ctx->mirrors |= mirrors; + + if (ctx->xin->resubmit_stats) { + mirror_update_stats(xbridge->mbridge, mirrors, + ctx->xin->resubmit_stats->n_packets, + ctx->xin->resubmit_stats->n_bytes); } + if (ctx->xin->xcache) { + struct xc_entry *entry; - /* Restore the original packet before adding the mirror actions. */ - ctx->xin->flow = *orig_flow; + entry = xlate_cache_add_entry(ctx->xin->xcache, XC_MIRROR); + entry->u.mirror.mbridge = mbridge_ref(xbridge->mbridge); + entry->u.mirror.mirrors = mirrors; + } while (mirrors) { + const unsigned long *vlans; mirror_mask_t dup_mirrors; struct ofbundle *out; - unsigned long *vlans; - bool vlan_mirrored; - bool has_mirror; int out_vlan; - has_mirror = mirror_get(xbridge->mbridge, raw_ctz(mirrors), - &vlans, &dup_mirrors, &out, &out_vlan); + bool has_mirror = mirror_get(xbridge->mbridge, raw_ctz(mirrors), + &vlans, &dup_mirrors, &out, &out_vlan); ovs_assert(has_mirror); if (vlans) { - ctx->xout->wc.masks.vlan_tci |= htons(VLAN_CFI | VLAN_VID_MASK); + ctx->wc->masks.vlan_tci |= htons(VLAN_CFI | VLAN_VID_MASK); } - vlan_mirrored = !vlans || bitmap_is_set(vlans, vlan); - free(vlans); - if (!vlan_mirrored) { + if (vlans && !bitmap_is_set(vlans, vlan)) { mirrors = zero_rightmost_1bit(mirrors); continue; } mirrors &= ~dup_mirrors; - ctx->xout->mirrors |= dup_mirrors; + ctx->mirrors |= dup_mirrors; if (out) { struct xlate_cfg *xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp); struct xbundle *out_xbundle = xbundle_lookup(xcfg, out); @@ -1540,7 +1650,7 @@ add_mirror_actions(struct xlate_ctx *ctx, const struct flow *orig_flow) output_normal(ctx, out_xbundle, vlan); } } else if (vlan != out_vlan - && !eth_addr_is_reserved(orig_flow->dl_dst)) { + && !eth_addr_is_reserved(ctx->xin->flow.dl_dst)) { struct xbundle *xbundle; LIST_FOR_EACH (xbundle, list_node, &xbridge->xbundles) { @@ -1553,6 +1663,20 @@ add_mirror_actions(struct xlate_ctx *ctx, const struct flow *orig_flow) } } +static void +mirror_ingress_packet(struct xlate_ctx *ctx) +{ + if (mbridge_has_mirrors(ctx->xbridge->mbridge)) { + bool warn = ctx->xin->packet != NULL; + struct xbundle *xbundle = lookup_input_bundle( + ctx->xbridge, ctx->xin->flow.in_port.ofp_port, warn, NULL); + if (xbundle) { + mirror_packet(ctx, xbundle, + xbundle_mirror_src(ctx->xbridge, xbundle)); + } + } +} + /* Given 'vid', the VID obtained from the 802.1Q header that was received as * part of a packet (specify 0 if there was no 802.1Q header), and 'in_xbundle', * the bundle on which the packet was received, returns the VLAN to which the @@ -1667,28 +1791,28 @@ output_normal(struct xlate_ctx *ctx, const struct xbundle *out_xbundle, uint16_t vid; ovs_be16 tci, old_tci; struct xport *xport; + struct xlate_bond_recirc xr; + bool use_recirc = false; vid = output_vlan_to_vid(out_xbundle, vlan); if (list_is_empty(&out_xbundle->xports)) { /* Partially configured bundle with no slaves. Drop the packet. */ return; } else if (!out_xbundle->bond) { - ctx->use_recirc = false; xport = CONTAINER_OF(list_front(&out_xbundle->xports), struct xport, bundle_node); } else { struct xlate_cfg *xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp); - struct flow_wildcards *wc = &ctx->xout->wc; - struct xlate_recirc *xr = &ctx->recirc; + struct flow_wildcards *wc = ctx->wc; struct ofport_dpif *ofport; - if (ctx->xbridge->enable_recirc) { - ctx->use_recirc = bond_may_recirc( - out_xbundle->bond, &xr->recirc_id, &xr->hash_basis); + if (ctx->xbridge->support.odp.recirc) { + use_recirc = bond_may_recirc( + out_xbundle->bond, &xr.recirc_id, &xr.hash_basis); - if (ctx->use_recirc) { + if (use_recirc) { /* Only TCP mode uses recirculation. */ - xr->hash_alg = OVS_HASH_ALG_L4; + xr.hash_alg = OVS_HASH_ALG_L4; bond_update_post_recirc_rules(out_xbundle->bond, false); /* Recirculation does not require unmasking hash fields. */ @@ -1705,9 +1829,9 @@ output_normal(struct xlate_ctx *ctx, const struct xbundle *out_xbundle, return; } - /* If ctx->xout->use_recirc is set, the main thread will handle stats + /* If use_recirc is set, the main thread will handle stats * accounting for this bond. */ - if (!ctx->use_recirc) { + if (!use_recirc) { if (ctx->xin->resubmit_stats) { bond_account(out_xbundle->bond, &ctx->xin->flow, vid, ctx->xin->resubmit_stats->n_bytes); @@ -1735,7 +1859,7 @@ output_normal(struct xlate_ctx *ctx, const struct xbundle *out_xbundle, } *flow_tci = tci; - compose_output_action(ctx, xport->ofp_port); + compose_output_action(ctx, xport->ofp_port, use_recirc ? &xr : NULL); *flow_tci = old_tci; } @@ -1813,7 +1937,7 @@ is_admissible(struct xlate_ctx *ctx, struct xport *in_port, mac = mac_learning_lookup(xbridge->ml, flow->dl_src, vlan); if (mac && mac_entry_get_port(xbridge->ml, mac) != in_xbundle->ofbundle - && (!is_gratuitous_arp(flow, &ctx->xout->wc) + && (!is_gratuitous_arp(flow, ctx->wc) || mac_entry_is_grat_arp_locked(mac))) { ovs_rwlock_unlock(&xbridge->ml->rwlock); xlate_report(ctx, "SLB bond thinks this packet looped back, " @@ -1945,26 +2069,28 @@ update_learning_table(const struct xbridge *xbridge, /* Updates multicast snooping table 'ms' given that a packet matching 'flow' * was received on 'in_xbundle' in 'vlan' and is either Report or Query. */ static void -update_mcast_snooping_table__(const struct xbridge *xbridge, - const struct flow *flow, - struct mcast_snooping *ms, - ovs_be32 ip4, int vlan, - struct xbundle *in_xbundle) +update_mcast_snooping_table4__(const struct xbridge *xbridge, + const struct flow *flow, + struct mcast_snooping *ms, int vlan, + struct xbundle *in_xbundle, + const struct dp_packet *packet) OVS_REQ_WRLOCK(ms->rwlock) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(60, 30); + int count; + ovs_be32 ip4 = flow->igmp_group_ip4; switch (ntohs(flow->tp_src)) { case IGMP_HOST_MEMBERSHIP_REPORT: case IGMPV2_HOST_MEMBERSHIP_REPORT: - if (mcast_snooping_add_group(ms, ip4, vlan, in_xbundle->ofbundle)) { + if (mcast_snooping_add_group4(ms, ip4, vlan, in_xbundle->ofbundle)) { VLOG_DBG_RL(&rl, "bridge %s: multicast snooping learned that " IP_FMT" is on port %s in VLAN %d", xbridge->name, IP_ARGS(ip4), in_xbundle->name, vlan); } break; case IGMP_HOST_LEAVE_MESSAGE: - if (mcast_snooping_leave_group(ms, ip4, vlan, in_xbundle->ofbundle)) { + if (mcast_snooping_leave_group4(ms, ip4, vlan, in_xbundle->ofbundle)) { VLOG_DBG_RL(&rl, "bridge %s: multicast snooping leaving " IP_FMT" is on port %s in VLAN %d", xbridge->name, IP_ARGS(ip4), in_xbundle->name, vlan); @@ -1979,6 +2105,47 @@ update_mcast_snooping_table__(const struct xbridge *xbridge, in_xbundle->name, vlan); } break; + case IGMPV3_HOST_MEMBERSHIP_REPORT: + if ((count = mcast_snooping_add_report(ms, packet, vlan, + in_xbundle->ofbundle))) { + VLOG_DBG_RL(&rl, "bridge %s: multicast snooping processed %d " + "addresses on port %s in VLAN %d", + xbridge->name, count, in_xbundle->name, vlan); + } + break; + } +} + +static void +update_mcast_snooping_table6__(const struct xbridge *xbridge, + const struct flow *flow, + struct mcast_snooping *ms, int vlan, + struct xbundle *in_xbundle, + const struct dp_packet *packet) + OVS_REQ_WRLOCK(ms->rwlock) +{ + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(60, 30); + int count; + + switch (ntohs(flow->tp_src)) { + case MLD_QUERY: + if (!ipv6_addr_equals(&flow->ipv6_src, &in6addr_any) + && mcast_snooping_add_mrouter(ms, vlan, in_xbundle->ofbundle)) { + VLOG_DBG_RL(&rl, "bridge %s: multicast snooping query on port %s" + "in VLAN %d", + xbridge->name, in_xbundle->name, vlan); + } + break; + case MLD_REPORT: + case MLD_DONE: + case MLD2_REPORT: + count = mcast_snooping_add_mld(ms, packet, vlan, in_xbundle->ofbundle); + if (count) { + VLOG_DBG_RL(&rl, "bridge %s: multicast snooping processed %d " + "addresses on port %s in VLAN %d", + xbridge->name, count, in_xbundle->name, vlan); + } + break; } } @@ -1987,7 +2154,8 @@ update_mcast_snooping_table__(const struct xbridge *xbridge, static void update_mcast_snooping_table(const struct xbridge *xbridge, const struct flow *flow, int vlan, - struct xbundle *in_xbundle) + struct xbundle *in_xbundle, + const struct dp_packet *packet) { struct mcast_snooping *ms = xbridge->ms; struct xlate_cfg *xcfg; @@ -2011,8 +2179,13 @@ update_mcast_snooping_table(const struct xbridge *xbridge, } if (!mcast_xbundle || mcast_xbundle != in_xbundle) { - update_mcast_snooping_table__(xbridge, flow, ms, flow->igmp_group_ip4, - vlan, in_xbundle); + if (flow->dl_type == htons(ETH_TYPE_IP)) { + update_mcast_snooping_table4__(xbridge, flow, ms, vlan, + in_xbundle, packet); + } else { + update_mcast_snooping_table6__(xbridge, flow, ms, vlan, + in_xbundle, packet); + } } ovs_rwlock_unlock(&ms->rwlock); } @@ -2132,13 +2305,13 @@ xlate_normal_flood(struct xlate_ctx *ctx, struct xbundle *in_xbundle, output_normal(ctx, xbundle, vlan); } } - ctx->xout->nf_output_iface = NF_OUT_FLOOD; + ctx->nf_output_iface = NF_OUT_FLOOD; } static void xlate_normal(struct xlate_ctx *ctx) { - struct flow_wildcards *wc = &ctx->xout->wc; + struct flow_wildcards *wc = ctx->wc; struct flow *flow = &ctx->xin->flow; struct xbundle *in_xbundle; struct xport *in_port; @@ -2147,8 +2320,6 @@ xlate_normal(struct xlate_ctx *ctx) uint16_t vlan; uint16_t vid; - ctx->xout->has_normal = true; - memset(&wc->masks.dl_src, 0xff, sizeof wc->masks.dl_src); memset(&wc->masks.dl_dst, 0xff, sizeof wc->masks.dl_dst); wc->masks.vlan_tci |= htons(VLAN_VID_MASK | VLAN_CFI); @@ -2216,17 +2387,23 @@ xlate_normal(struct xlate_ctx *ctx) if (mcast_snooping_enabled(ctx->xbridge->ms) && !eth_addr_is_broadcast(flow->dl_dst) && eth_addr_is_multicast(flow->dl_dst) - && flow->dl_type == htons(ETH_TYPE_IP)) { + && is_ip_any(flow)) { struct mcast_snooping *ms = ctx->xbridge->ms; - struct mcast_group *grp; + struct mcast_group *grp = NULL; - if (flow->nw_proto == IPPROTO_IGMP) { - if (ctx->xin->may_learn) { - if (mcast_snooping_is_membership(flow->tp_src) || - mcast_snooping_is_query(flow->tp_src)) { + if (is_igmp(flow)) { + if (mcast_snooping_is_membership(flow->tp_src) || + mcast_snooping_is_query(flow->tp_src)) { + if (ctx->xin->may_learn) { update_mcast_snooping_table(ctx->xbridge, flow, vlan, - in_xbundle); - } + in_xbundle, ctx->xin->packet); + } + /* + * IGMP packets need to take the slow path, in order to be + * processed for mdb updates. That will prevent expires + * firing off even after hosts have sent reports. + */ + ctx->xout->slow |= SLOW_ACTION; } if (mcast_snooping_is_membership(flow->tp_src)) { @@ -2247,8 +2424,26 @@ xlate_normal(struct xlate_ctx *ctx) xlate_normal_flood(ctx, in_xbundle, vlan); } return; + } else if (is_mld(flow)) { + ctx->xout->slow |= SLOW_ACTION; + if (ctx->xin->may_learn) { + update_mcast_snooping_table(ctx->xbridge, flow, vlan, + in_xbundle, ctx->xin->packet); + } + if (is_mld_report(flow)) { + ovs_rwlock_rdlock(&ms->rwlock); + xlate_normal_mcast_send_mrouters(ctx, ms, in_xbundle, vlan); + xlate_normal_mcast_send_rports(ctx, ms, in_xbundle, vlan); + ovs_rwlock_unlock(&ms->rwlock); + } else { + xlate_report(ctx, "MLD query, flooding"); + xlate_normal_flood(ctx, in_xbundle, vlan); + } } else { - if (ip_is_local_multicast(flow->nw_dst)) { + if ((flow->dl_type == htons(ETH_TYPE_IP) + && ip_is_local_multicast(flow->nw_dst)) + || (flow->dl_type == htons(ETH_TYPE_IPV6) + && ipv6_is_all_hosts(&flow->ipv6_dst))) { /* RFC4541: section 2.1.2, item 2: Packets with a dst IP * address in the 224.0.0.x range which are not IGMP must * be forwarded on all ports */ @@ -2260,7 +2455,11 @@ xlate_normal(struct xlate_ctx *ctx) /* forwarding to group base ports */ ovs_rwlock_rdlock(&ms->rwlock); - grp = mcast_snooping_lookup(ms, flow->nw_dst, vlan); + if (flow->dl_type == htons(ETH_TYPE_IP)) { + grp = mcast_snooping_lookup4(ms, flow->nw_dst, vlan); + } else if (flow->dl_type == htons(ETH_TYPE_IPV6)) { + grp = mcast_snooping_lookup(ms, &flow->ipv6_dst, vlan); + } if (grp) { xlate_normal_mcast_send_group(ctx, ms, grp, in_xbundle, vlan); xlate_normal_mcast_send_fports(ctx, ms, in_xbundle, vlan); @@ -2299,222 +2498,165 @@ xlate_normal(struct xlate_ctx *ctx) } } -/* Compose SAMPLE action for sFlow or IPFIX. The given probability is - * the number of packets out of UINT32_MAX to sample. The given - * cookie is passed back in the callback for each sampled packet. +/* Appends a "sample" action for sFlow or IPFIX to 'ctx->odp_actions'. The + * 'probability' is the number of packets out of UINT32_MAX to sample. The + * 'cookie' (of length 'cookie_size' bytes) is passed back in the callback for + * each sampled packet. 'tunnel_out_port', if not ODPP_NONE, is added as the + * OVS_USERSPACE_ATTR_EGRESS_TUN_PORT attribute. If 'include_actions', an + * OVS_USERSPACE_ATTR_ACTIONS attribute is added. */ static size_t -compose_sample_action(const struct xbridge *xbridge, - struct ofpbuf *odp_actions, - const struct flow *flow, +compose_sample_action(struct xlate_ctx *ctx, const uint32_t probability, const union user_action_cookie *cookie, const size_t cookie_size, - const odp_port_t tunnel_out_port) + const odp_port_t tunnel_out_port, + bool include_actions) { - size_t sample_offset, actions_offset; - odp_port_t odp_port; - int cookie_offset; - uint32_t pid; + size_t sample_offset = nl_msg_start_nested(ctx->odp_actions, + OVS_ACTION_ATTR_SAMPLE); - sample_offset = nl_msg_start_nested(odp_actions, OVS_ACTION_ATTR_SAMPLE); + nl_msg_put_u32(ctx->odp_actions, OVS_SAMPLE_ATTR_PROBABILITY, probability); - nl_msg_put_u32(odp_actions, OVS_SAMPLE_ATTR_PROBABILITY, probability); + size_t actions_offset = nl_msg_start_nested(ctx->odp_actions, + OVS_SAMPLE_ATTR_ACTIONS); - actions_offset = nl_msg_start_nested(odp_actions, OVS_SAMPLE_ATTR_ACTIONS); + odp_port_t odp_port = ofp_port_to_odp_port( + ctx->xbridge, ctx->xin->flow.in_port.ofp_port); + uint32_t pid = dpif_port_get_pid(ctx->xbridge->dpif, odp_port, + flow_hash_5tuple(&ctx->xin->flow, 0)); + int cookie_offset = odp_put_userspace_action(pid, cookie, cookie_size, + tunnel_out_port, + include_actions, + ctx->odp_actions); - odp_port = ofp_port_to_odp_port(xbridge, flow->in_port.ofp_port); - pid = dpif_port_get_pid(xbridge->dpif, odp_port, - flow_hash_5tuple(flow, 0)); - cookie_offset = odp_put_userspace_action(pid, cookie, cookie_size, - tunnel_out_port, odp_actions); + nl_msg_end_nested(ctx->odp_actions, actions_offset); + nl_msg_end_nested(ctx->odp_actions, sample_offset); - nl_msg_end_nested(odp_actions, actions_offset); - nl_msg_end_nested(odp_actions, sample_offset); return cookie_offset; } -static void -compose_sflow_cookie(const struct xbridge *xbridge, ovs_be16 vlan_tci, - odp_port_t odp_port, unsigned int n_outputs, - union user_action_cookie *cookie) -{ - int ifindex; - - cookie->type = USER_ACTION_COOKIE_SFLOW; - cookie->sflow.vlan_tci = vlan_tci; - - /* See http://www.sflow.org/sflow_version_5.txt (search for "Input/output - * port information") for the interpretation of cookie->output. */ - switch (n_outputs) { - case 0: - /* 0x40000000 | 256 means "packet dropped for unknown reason". */ - cookie->sflow.output = 0x40000000 | 256; - break; - - case 1: - ifindex = dpif_sflow_odp_port_to_ifindex(xbridge->sflow, odp_port); - if (ifindex) { - cookie->sflow.output = ifindex; - break; - } - /* Fall through. */ - default: - /* 0x80000000 means "multiple output ports. */ - cookie->sflow.output = 0x80000000 | n_outputs; - break; - } -} - -/* Compose SAMPLE action for sFlow bridge sampling. */ +/* If sFLow is not enabled, returns 0 without doing anything. + * + * If sFlow is enabled, appends a template "sample" action to the ODP actions + * in 'ctx'. This action is a template because some of the information needed + * to fill it out is not available until flow translation is complete. In this + * case, this functions returns an offset, which is always nonzero, to pass + * later to fix_sflow_action() to fill in the rest of the template. */ static size_t -compose_sflow_action(const struct xbridge *xbridge, - struct ofpbuf *odp_actions, - const struct flow *flow, - odp_port_t odp_port) +compose_sflow_action(struct xlate_ctx *ctx) { - uint32_t probability; - union user_action_cookie cookie; - - if (!xbridge->sflow || flow->in_port.ofp_port == OFPP_NONE) { + struct dpif_sflow *sflow = ctx->xbridge->sflow; + if (!sflow || ctx->xin->flow.in_port.ofp_port == OFPP_NONE) { return 0; } - probability = dpif_sflow_get_probability(xbridge->sflow); - compose_sflow_cookie(xbridge, htons(0), odp_port, - odp_port == ODPP_NONE ? 0 : 1, &cookie); - - return compose_sample_action(xbridge, odp_actions, flow, probability, - &cookie, sizeof cookie.sflow, ODPP_NONE); -} - -static void -compose_flow_sample_cookie(uint16_t probability, uint32_t collector_set_id, - uint32_t obs_domain_id, uint32_t obs_point_id, - union user_action_cookie *cookie) -{ - cookie->type = USER_ACTION_COOKIE_FLOW_SAMPLE; - cookie->flow_sample.probability = probability; - cookie->flow_sample.collector_set_id = collector_set_id; - cookie->flow_sample.obs_domain_id = obs_domain_id; - cookie->flow_sample.obs_point_id = obs_point_id; -} - -static void -compose_ipfix_cookie(union user_action_cookie *cookie, - odp_port_t output_odp_port) -{ - cookie->type = USER_ACTION_COOKIE_IPFIX; - cookie->ipfix.output_odp_port = output_odp_port; + union user_action_cookie cookie = { .type = USER_ACTION_COOKIE_SFLOW }; + return compose_sample_action(ctx, dpif_sflow_get_probability(sflow), + &cookie, sizeof cookie.sflow, ODPP_NONE, + true); } -/* Compose SAMPLE action for IPFIX bridge sampling. */ +/* If IPFIX is enabled, this appends a "sample" action to implement IPFIX to + * 'ctx->odp_actions'. */ static void -compose_ipfix_action(const struct xbridge *xbridge, - struct ofpbuf *odp_actions, - const struct flow *flow, - odp_port_t output_odp_port) +compose_ipfix_action(struct xlate_ctx *ctx, odp_port_t output_odp_port) { - uint32_t probability; - union user_action_cookie cookie; + struct dpif_ipfix *ipfix = ctx->xbridge->ipfix; odp_port_t tunnel_out_port = ODPP_NONE; - if (!xbridge->ipfix || flow->in_port.ofp_port == OFPP_NONE) { + if (!ipfix || ctx->xin->flow.in_port.ofp_port == OFPP_NONE) { return; } /* For input case, output_odp_port is ODPP_NONE, which is an invalid port * number. */ if (output_odp_port == ODPP_NONE && - !dpif_ipfix_get_bridge_exporter_input_sampling(xbridge->ipfix)) { + !dpif_ipfix_get_bridge_exporter_input_sampling(ipfix)) { return; } /* For output case, output_odp_port is valid*/ if (output_odp_port != ODPP_NONE) { - if (!dpif_ipfix_get_bridge_exporter_output_sampling(xbridge->ipfix)) { + if (!dpif_ipfix_get_bridge_exporter_output_sampling(ipfix)) { return; } /* If tunnel sampling is enabled, put an additional option attribute: * OVS_USERSPACE_ATTR_TUNNEL_OUT_PORT */ - if (dpif_ipfix_get_bridge_exporter_tunnel_sampling(xbridge->ipfix) && - dpif_ipfix_get_tunnel_port(xbridge->ipfix, output_odp_port) ) { + if (dpif_ipfix_get_bridge_exporter_tunnel_sampling(ipfix) && + dpif_ipfix_get_tunnel_port(ipfix, output_odp_port) ) { tunnel_out_port = output_odp_port; } } - probability = dpif_ipfix_get_bridge_exporter_probability(xbridge->ipfix); - compose_ipfix_cookie(&cookie, output_odp_port); - - compose_sample_action(xbridge, odp_actions, flow, probability, - &cookie, sizeof cookie.ipfix, tunnel_out_port); -} - -/* SAMPLE action for sFlow must be first action in any given list of - * actions. At this point we do not have all information required to - * build it. So try to build sample action as complete as possible. */ -static void -add_sflow_action(struct xlate_ctx *ctx) -{ - ctx->user_cookie_offset = compose_sflow_action(ctx->xbridge, - ctx->xout->odp_actions, - &ctx->xin->flow, ODPP_NONE); - ctx->sflow_odp_port = 0; - ctx->sflow_n_outputs = 0; -} - -/* SAMPLE action for IPFIX must be 1st or 2nd action in any given list - * of actions, eventually after the SAMPLE action for sFlow. */ -static void -add_ipfix_action(struct xlate_ctx *ctx) -{ - compose_ipfix_action(ctx->xbridge, ctx->xout->odp_actions, - &ctx->xin->flow, ODPP_NONE); -} - -static void -add_ipfix_output_action(struct xlate_ctx *ctx, odp_port_t port) -{ - compose_ipfix_action(ctx->xbridge, ctx->xout->odp_actions, - &ctx->xin->flow, port); + union user_action_cookie cookie = { + .ipfix = { + .type = USER_ACTION_COOKIE_IPFIX, + .output_odp_port = output_odp_port, + } + }; + compose_sample_action(ctx, + dpif_ipfix_get_bridge_exporter_probability(ipfix), + &cookie, sizeof cookie.ipfix, tunnel_out_port, + false); } -/* Fix SAMPLE action according to data collected while composing ODP actions. - * We need to fix SAMPLE actions OVS_SAMPLE_ATTR_ACTIONS attribute, i.e. nested - * USERSPACE action's user-cookie which is required for sflow. */ +/* Fix "sample" action according to data collected while composing ODP actions, + * as described in compose_sflow_action(). + * + * 'user_cookie_offset' must be the offset returned by add_sflow_action(). */ static void -fix_sflow_action(struct xlate_ctx *ctx) +fix_sflow_action(struct xlate_ctx *ctx, unsigned int user_cookie_offset) { const struct flow *base = &ctx->base_flow; union user_action_cookie *cookie; - if (!ctx->user_cookie_offset) { - return; - } - - cookie = ofpbuf_at(ctx->xout->odp_actions, ctx->user_cookie_offset, + cookie = ofpbuf_at(ctx->odp_actions, user_cookie_offset, sizeof cookie->sflow); ovs_assert(cookie->type == USER_ACTION_COOKIE_SFLOW); - compose_sflow_cookie(ctx->xbridge, base->vlan_tci, - ctx->sflow_odp_port, ctx->sflow_n_outputs, cookie); + cookie->type = USER_ACTION_COOKIE_SFLOW; + cookie->sflow.vlan_tci = base->vlan_tci; + + /* See http://www.sflow.org/sflow_version_5.txt (search for "Input/output + * port information") for the interpretation of cookie->output. */ + switch (ctx->sflow_n_outputs) { + case 0: + /* 0x40000000 | 256 means "packet dropped for unknown reason". */ + cookie->sflow.output = 0x40000000 | 256; + break; + + case 1: + cookie->sflow.output = dpif_sflow_odp_port_to_ifindex( + ctx->xbridge->sflow, ctx->sflow_odp_port); + if (cookie->sflow.output) { + break; + } + /* Fall through. */ + default: + /* 0x80000000 means "multiple output ports. */ + cookie->sflow.output = 0x80000000 | ctx->sflow_n_outputs; + break; + } } -static enum slow_path_reason -process_special(struct xlate_ctx *ctx, const struct flow *flow, - const struct xport *xport, const struct dp_packet *packet) +static bool +process_special(struct xlate_ctx *ctx, const struct xport *xport) { - struct flow_wildcards *wc = &ctx->xout->wc; + const struct flow *flow = &ctx->xin->flow; + struct flow_wildcards *wc = ctx->wc; const struct xbridge *xbridge = ctx->xbridge; + const struct dp_packet *packet = ctx->xin->packet; + enum slow_path_reason slow; if (!xport) { - return 0; + slow = 0; } else if (xport->cfm && cfm_should_process_flow(xport->cfm, flow, wc)) { if (packet) { cfm_process_heartbeat(xport->cfm, packet); } - return SLOW_CFM; + slow = SLOW_CFM; } else if (xport->bfd && bfd_should_process_flow(xport->bfd, flow, wc)) { if (packet) { bfd_process_packet(xport->bfd, flow, packet); @@ -2523,13 +2665,13 @@ process_special(struct xlate_ctx *ctx, const struct flow *flow, ofproto_dpif_monitor_port_send_soon(xport->ofport); } } - return SLOW_BFD; + slow = SLOW_BFD; } else if (xport->xbundle && xport->xbundle->lacp && flow->dl_type == htons(ETH_TYPE_LACP)) { if (packet) { lacp_process_packet(xport->xbundle->lacp, xport->ofport, packet); } - return SLOW_LACP; + slow = SLOW_LACP; } else if ((xbridge->stp || xbridge->rstp) && stp_should_process_flow(flow, wc)) { if (packet) { @@ -2537,34 +2679,44 @@ process_special(struct xlate_ctx *ctx, const struct flow *flow, ? stp_process_packet(xport, packet) : rstp_process_packet(xport, packet); } - return SLOW_STP; - } else if (xport->lldp && lldp_should_process_flow(flow)) { + slow = SLOW_STP; + } else if (xport->lldp && lldp_should_process_flow(xport->lldp, flow)) { if (packet) { lldp_process_packet(xport->lldp, packet); } - return SLOW_LLDP; + slow = SLOW_LLDP; } else { - return 0; + slow = 0; + } + + if (slow) { + ctx->xout->slow |= slow; + return true; + } else { + return false; } } static int tnl_route_lookup_flow(const struct flow *oflow, - ovs_be32 *ip, struct xport **out_port) + struct in6_addr *ip, struct xport **out_port) { char out_dev[IFNAMSIZ]; struct xbridge *xbridge; struct xlate_cfg *xcfg; - ovs_be32 gw; + struct in6_addr gw; + struct in6_addr dst; - if (!ovs_router_lookup(oflow->tunnel.ip_dst, out_dev, &gw)) { + dst = flow_tnl_dst(&oflow->tunnel); + if (!ovs_router_lookup(&dst, out_dev, &gw)) { return -ENOENT; } - if (gw) { + if (ipv6_addr_is_set(&gw) && + (!IN6_IS_ADDR_V4MAPPED(&gw) || in6_addr_get_mapped_ipv4(&gw))) { *ip = gw; } else { - *ip = oflow->tunnel.ip_dst; + *ip = dst; } xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp); @@ -2586,94 +2738,163 @@ tnl_route_lookup_flow(const struct flow *oflow, } static int -xlate_flood_packet(struct xbridge *xbridge, struct dp_packet *packet) +compose_table_xlate(struct xlate_ctx *ctx, const struct xport *out_dev, + struct dp_packet *packet) { + struct xbridge *xbridge = out_dev->xbridge; struct ofpact_output output; struct flow flow; ofpact_init(&output.ofpact, OFPACT_OUTPUT, sizeof output); - /* Use OFPP_NONE as the in_port to avoid special packet processing. */ flow_extract(packet, &flow); - flow.in_port.ofp_port = OFPP_NONE; - output.port = OFPP_FLOOD; + flow.in_port.ofp_port = out_dev->ofp_port; + output.port = OFPP_TABLE; output.max_len = 0; - return ofproto_dpif_execute_actions(xbridge->ofproto, &flow, NULL, - &output.ofpact, sizeof output, - packet); + return ofproto_dpif_execute_actions__(xbridge->ofproto, &flow, NULL, + &output.ofpact, sizeof output, + ctx->recurse, ctx->resubmits, packet); +} + +static void +tnl_send_nd_request(struct xlate_ctx *ctx, const struct xport *out_dev, + const struct eth_addr eth_src, + struct in6_addr * ipv6_src, struct in6_addr * ipv6_dst) +{ + struct dp_packet packet; + + dp_packet_init(&packet, 0); + compose_nd(&packet, eth_src, ipv6_src, ipv6_dst); + compose_table_xlate(ctx, out_dev, &packet); + dp_packet_uninit(&packet); } static void -tnl_send_arp_request(const struct xport *out_dev, const uint8_t eth_src[ETH_ADDR_LEN], +tnl_send_arp_request(struct xlate_ctx *ctx, const struct xport *out_dev, + const struct eth_addr eth_src, ovs_be32 ip_src, ovs_be32 ip_dst) { - struct xbridge *xbridge = out_dev->xbridge; struct dp_packet packet; dp_packet_init(&packet, 0); - compose_arp(&packet, eth_src, ip_src, ip_dst); + compose_arp(&packet, ARP_OP_REQUEST, + eth_src, eth_addr_zero, true, ip_src, ip_dst); - xlate_flood_packet(xbridge, &packet); + compose_table_xlate(ctx, out_dev, &packet); dp_packet_uninit(&packet); } static int -build_tunnel_send(const struct xlate_ctx *ctx, const struct xport *xport, +build_tunnel_send(struct xlate_ctx *ctx, const struct xport *xport, const struct flow *flow, odp_port_t tunnel_odp_port) { struct ovs_action_push_tnl tnl_push_data; struct xport *out_dev = NULL; - ovs_be32 s_ip, d_ip = 0; - uint8_t smac[ETH_ADDR_LEN]; - uint8_t dmac[ETH_ADDR_LEN]; + ovs_be32 s_ip = 0, d_ip = 0; + struct in6_addr s_ip6 = in6addr_any; + struct in6_addr d_ip6 = in6addr_any; + struct eth_addr smac; + struct eth_addr dmac; int err; + char buf_sip6[INET6_ADDRSTRLEN]; + char buf_dip6[INET6_ADDRSTRLEN]; - err = tnl_route_lookup_flow(flow, &d_ip, &out_dev); + err = tnl_route_lookup_flow(flow, &d_ip6, &out_dev); if (err) { + xlate_report(ctx, "native tunnel routing failed"); return err; } + xlate_report(ctx, "tunneling to %s via %s", + ipv6_string_mapped(buf_dip6, &d_ip6), + netdev_get_name(out_dev->netdev)); + /* Use mac addr of bridge port of the peer. */ - err = netdev_get_etheraddr(out_dev->netdev, smac); + err = netdev_get_etheraddr(out_dev->netdev, &smac); if (err) { + xlate_report(ctx, "tunnel output device lacks Ethernet address"); return err; } - err = netdev_get_in4(out_dev->netdev, (struct in_addr *) &s_ip, NULL); - if (err) { - return err; + d_ip = in6_addr_get_mapped_ipv4(&d_ip6); + if (d_ip) { + err = netdev_get_in4(out_dev->netdev, (struct in_addr *) &s_ip, NULL); + if (err) { + xlate_report(ctx, "tunnel output device lacks IPv4 address"); + return err; + } + in6_addr_set_mapped_ipv4(&s_ip6, s_ip); + } else { + err = netdev_get_in6(out_dev->netdev, &s_ip6); + if (err) { + xlate_report(ctx, "tunnel output device lacks IPv6 address"); + return err; + } } - err = tnl_arp_lookup(out_dev->xbridge->name, d_ip, dmac); + err = tnl_neigh_lookup(out_dev->xbridge->name, &d_ip6, &dmac); if (err) { - tnl_send_arp_request(out_dev, smac, s_ip, d_ip); + xlate_report(ctx, "neighbor cache miss for %s on bridge %s, " + "sending %s request", + buf_dip6, out_dev->xbridge->name, d_ip ? "ARP" : "ND"); + if (d_ip) { + tnl_send_arp_request(ctx, out_dev, smac, s_ip, d_ip); + } else { + tnl_send_nd_request(ctx, out_dev, smac, &s_ip6, &d_ip6); + } return err; } + if (ctx->xin->xcache) { struct xc_entry *entry; - entry = xlate_cache_add_entry(ctx->xin->xcache, XC_TNL_ARP); - ovs_strlcpy(entry->u.tnl_arp_cache.br_name, out_dev->xbridge->name, - sizeof entry->u.tnl_arp_cache.br_name); - entry->u.tnl_arp_cache.d_ip = d_ip; + entry = xlate_cache_add_entry(ctx->xin->xcache, XC_TNL_NEIGH); + ovs_strlcpy(entry->u.tnl_neigh_cache.br_name, out_dev->xbridge->name, + sizeof entry->u.tnl_neigh_cache.br_name); + entry->u.tnl_neigh_cache.d_ipv6 = d_ip6; } + + xlate_report(ctx, "tunneling from "ETH_ADDR_FMT" %s" + " to "ETH_ADDR_FMT" %s", + ETH_ADDR_ARGS(smac), ipv6_string_mapped(buf_sip6, &s_ip6), + ETH_ADDR_ARGS(dmac), buf_dip6); + err = tnl_port_build_header(xport->ofport, flow, - dmac, smac, s_ip, &tnl_push_data); + dmac, smac, &s_ip6, &tnl_push_data); if (err) { return err; } tnl_push_data.tnl_port = odp_to_u32(tunnel_odp_port); tnl_push_data.out_port = odp_to_u32(out_dev->odp_port); - odp_put_tnl_push_action(ctx->xout->odp_actions, &tnl_push_data); + odp_put_tnl_push_action(ctx->odp_actions, &tnl_push_data); return 0; } +static void +xlate_commit_actions(struct xlate_ctx *ctx) +{ + bool use_masked = ctx->xbridge->support.masked_set_action; + + ctx->xout->slow |= commit_odp_actions(&ctx->xin->flow, &ctx->base_flow, + ctx->odp_actions, ctx->wc, + use_masked); +} + +static void +clear_conntrack(struct flow *flow) +{ + flow->ct_state = 0; + flow->ct_zone = 0; + flow->ct_mark = 0; + memset(&flow->ct_label, 0, sizeof flow->ct_label); +} + static void compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port, - bool check_stp) + const struct xlate_bond_recirc *xr, bool check_stp) { const struct xport *xport = get_ofp_port(ctx->xbridge, ofp_port); - struct flow_wildcards *wc = &ctx->xout->wc; + struct flow_wildcards *wc = ctx->wc; struct flow *flow = &ctx->xin->flow; struct flow_tnl flow_tnl; ovs_be16 flow_vlan_tci; @@ -2685,7 +2906,7 @@ compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port, /* If 'struct flow' gets additional metadata, we'll need to zero it out * before traversing a patch port. */ - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 31); + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 35); memset(&flow_tnl, 0, sizeof flow_tnl); if (!xport) { @@ -2720,48 +2941,94 @@ compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port, } } - if (mbridge_has_mirrors(ctx->xbridge->mbridge) && xport->xbundle) { - ctx->xout->mirrors |= xbundle_mirror_dst(xport->xbundle->xbridge, - xport->xbundle); - } - if (xport->peer) { const struct xport *peer = xport->peer; struct flow old_flow = ctx->xin->flow; - enum slow_path_reason special; - uint8_t table_id = rule_dpif_lookup_get_init_table_id(&ctx->xin->flow); - + bool old_conntrack = ctx->conntracked; + bool old_was_mpls = ctx->was_mpls; + cls_version_t old_version = ctx->tables_version; + struct ofpbuf old_stack = ctx->stack; + union mf_subvalue new_stack[1024 / sizeof(union mf_subvalue)]; + struct ofpbuf old_action_set = ctx->action_set; + uint64_t actset_stub[1024 / 8]; + + ofpbuf_use_stub(&ctx->stack, new_stack, sizeof new_stack); + ofpbuf_use_stub(&ctx->action_set, actset_stub, sizeof actset_stub); ctx->xbridge = peer->xbridge; flow->in_port.ofp_port = peer->ofp_port; flow->metadata = htonll(0); memset(&flow->tunnel, 0, sizeof flow->tunnel); memset(flow->regs, 0, sizeof flow->regs); flow->actset_output = OFPP_UNSET; + ctx->conntracked = false; + clear_conntrack(flow); + + /* The bridge is now known so obtain its table version. */ + ctx->tables_version + = ofproto_dpif_get_tables_version(ctx->xbridge->ofproto); - special = process_special(ctx, &ctx->xin->flow, peer, - ctx->xin->packet); - if (special) { - ctx->xout->slow |= special; - } else if (may_receive(peer, ctx)) { + if (!process_special(ctx, peer) && may_receive(peer, ctx)) { if (xport_stp_forward_state(peer) && xport_rstp_forward_state(peer)) { - xlate_table_action(ctx, flow->in_port.ofp_port, table_id, - true, true); + xlate_table_action(ctx, flow->in_port.ofp_port, 0, true, true); + if (ctx->action_set.size) { + /* Translate action set only if not dropping the packet and + * not recirculating. */ + if (!exit_recirculates(ctx)) { + xlate_action_set(ctx); + } + } + /* Check if need to recirculate. */ + if (exit_recirculates(ctx)) { + compose_recirculate_action(ctx); + } } else { /* Forwarding is disabled by STP and RSTP. Let OFPP_NORMAL and * the learning action look at the packet, then drop it. */ struct flow old_base_flow = ctx->base_flow; - size_t old_size = ctx->xout->odp_actions->size; - mirror_mask_t old_mirrors = ctx->xout->mirrors; - xlate_table_action(ctx, flow->in_port.ofp_port, table_id, - true, true); - ctx->xout->mirrors = old_mirrors; + size_t old_size = ctx->odp_actions->size; + mirror_mask_t old_mirrors = ctx->mirrors; + + xlate_table_action(ctx, flow->in_port.ofp_port, 0, true, true); + ctx->mirrors = old_mirrors; ctx->base_flow = old_base_flow; - ctx->xout->odp_actions->size = old_size; + ctx->odp_actions->size = old_size; + + /* Undo changes that may have been done for recirculation. */ + if (exit_recirculates(ctx)) { + ctx->action_set.size = ctx->recirc_action_offset; + ctx->recirc_action_offset = -1; + ctx->last_unroll_offset = -1; + } } } ctx->xin->flow = old_flow; ctx->xbridge = xport->xbridge; + ofpbuf_uninit(&ctx->action_set); + ctx->action_set = old_action_set; + ofpbuf_uninit(&ctx->stack); + ctx->stack = old_stack; + + /* Restore calling bridge's lookup version. */ + ctx->tables_version = old_version; + + /* The peer bridge popping MPLS should have no effect on the original + * bridge. */ + ctx->was_mpls = old_was_mpls; + + /* The peer bridge's conntrack execution should have no effect on the + * original bridge. */ + ctx->conntracked = old_conntrack; + + /* The fact that the peer bridge exits (for any reason) does not mean + * that the original bridge should exit. Specifically, if the peer + * bridge recirculates (which typically modifies the packet), the + * original bridge must continue processing with the original, not the + * recirculated packet! */ + ctx->exit = false; + + /* Peer bridge errors do not propagate back. */ + ctx->error = XLATE_OK; if (ctx->xin->resubmit_stats) { netdev_vport_inc_tx(xport->netdev, ctx->xin->resubmit_stats); @@ -2795,17 +3062,19 @@ compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port, } if (xport->is_tunnel) { + struct in6_addr dst; /* Save tunnel metadata so that changes made due to * the Logical (tunnel) Port are not visible for any further * matches, while explicit set actions on tunnel metadata are. */ flow_tnl = flow->tunnel; - odp_port = tnl_port_send(xport->ofport, flow, &ctx->xout->wc); + odp_port = tnl_port_send(xport->ofport, flow, ctx->wc); if (odp_port == ODPP_NONE) { xlate_report(ctx, "Tunneling decided against output"); goto out; /* restore flow_nw_tos */ } - if (flow->tunnel.ip_dst == ctx->orig_tunnel_ip_dst) { + dst = flow_tnl_dst(&flow->tunnel); + if (ipv6_addr_equals(&dst, &ctx->orig_tunnel_ipv6_dst)) { xlate_report(ctx, "Not tunneling to our own address"); goto out; /* restore flow_nw_tos */ } @@ -2820,10 +3089,11 @@ compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port, } out_port = odp_port; if (ovs_native_tunneling_is_on(ctx->xbridge->ofproto)) { + xlate_report(ctx, "output to native tunnel"); tnl_push_pop_send = true; } else { - commit_odp_tunnel_action(flow, &ctx->base_flow, - ctx->xout->odp_actions); + xlate_report(ctx, "output to kernel tunnel"); + commit_odp_tunnel_action(flow, &ctx->base_flow, ctx->odp_actions); flow->tunnel = flow_tnl; /* Restore tunnel metadata */ } } else { @@ -2843,24 +3113,20 @@ compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port, } if (out_port != ODPP_NONE) { - ctx->xout->slow |= commit_odp_actions(flow, &ctx->base_flow, - ctx->xout->odp_actions, - wc, - ctx->xbridge->masked_set_action); + xlate_commit_actions(ctx); - if (ctx->use_recirc) { + if (xr) { struct ovs_action_hash *act_hash; - struct xlate_recirc *xr = &ctx->recirc; /* Hash action. */ - act_hash = nl_msg_put_unspec_uninit(ctx->xout->odp_actions, + act_hash = nl_msg_put_unspec_uninit(ctx->odp_actions, OVS_ACTION_ATTR_HASH, sizeof *act_hash); act_hash->hash_alg = xr->hash_alg; act_hash->hash_basis = xr->hash_basis; /* Recirc action. */ - nl_msg_put_u32(ctx->xout->odp_actions, OVS_ACTION_ATTR_RECIRC, + nl_msg_put_u32(ctx->odp_actions, OVS_ACTION_ATTR_RECIRC, xr->recirc_id); } else { @@ -2879,14 +3145,14 @@ compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port, } if (odp_tnl_port != ODPP_NONE) { - nl_msg_put_odp_port(ctx->xout->odp_actions, + nl_msg_put_odp_port(ctx->odp_actions, OVS_ACTION_ATTR_TUNNEL_POP, odp_tnl_port); } else { /* Tunnel push-pop action is not compatible with * IPFIX action. */ - add_ipfix_output_action(ctx, out_port); - nl_msg_put_odp_port(ctx->xout->odp_actions, + compose_ipfix_action(ctx, out_port); + nl_msg_put_odp_port(ctx->odp_actions, OVS_ACTION_ATTR_OUTPUT, out_port); } @@ -2895,7 +3161,13 @@ compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port, ctx->sflow_odp_port = odp_port; ctx->sflow_n_outputs++; - ctx->xout->nf_output_iface = ofp_port; + ctx->nf_output_iface = ofp_port; + } + + if (mbridge_has_mirrors(ctx->xbridge->mbridge) && xport->xbundle) { + mirror_packet(ctx, xport->xbundle, + xbundle_mirror_dst(xport->xbundle->xbridge, + xport->xbundle)); } out: @@ -2906,15 +3178,17 @@ compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port, } static void -compose_output_action(struct xlate_ctx *ctx, ofp_port_t ofp_port) +compose_output_action(struct xlate_ctx *ctx, ofp_port_t ofp_port, + const struct xlate_bond_recirc *xr) { - compose_output_action__(ctx, ofp_port, true); + compose_output_action__(ctx, ofp_port, xr, true); } static void xlate_recursively(struct xlate_ctx *ctx, struct rule_dpif *rule) { struct rule_dpif *old_rule = ctx->rule; + ovs_be64 old_cookie = ctx->rule_cookie; const struct rule_actions *actions; if (ctx->xin->resubmit_stats) { @@ -2924,8 +3198,10 @@ xlate_recursively(struct xlate_ctx *ctx, struct rule_dpif *rule) ctx->resubmits++; ctx->recurse++; ctx->rule = rule; + ctx->rule_cookie = rule_dpif_get_flow_cookie(rule); actions = rule_dpif_get_actions(rule); do_xlate_actions(actions->ofpacts, actions->ofpacts_len, ctx); + ctx->rule_cookie = old_cookie; ctx->rule = old_rule; ctx->recurse--; } @@ -2933,17 +3209,20 @@ xlate_recursively(struct xlate_ctx *ctx, struct rule_dpif *rule) static bool xlate_resubmit_resource_check(struct xlate_ctx *ctx) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); - if (ctx->recurse >= MAX_RESUBMIT_RECURSION + MAX_INTERNAL_RESUBMITS) { - VLOG_ERR_RL(&rl, "resubmit actions recursed over %d times", - MAX_RESUBMIT_RECURSION); + XLATE_REPORT_ERROR(ctx, "resubmit actions recursed over %d times", + MAX_RESUBMIT_RECURSION); + ctx->error = XLATE_RECURSION_TOO_DEEP; } else if (ctx->resubmits >= MAX_RESUBMITS + MAX_INTERNAL_RESUBMITS) { - VLOG_ERR_RL(&rl, "over %d resubmit actions", MAX_RESUBMITS); - } else if (ctx->xout->odp_actions->size > UINT16_MAX) { - VLOG_ERR_RL(&rl, "resubmits yielded over 64 kB of actions"); + XLATE_REPORT_ERROR(ctx, "over %d resubmit actions", MAX_RESUBMITS); + ctx->error = XLATE_TOO_MANY_RESUBMITS; + } else if (ctx->odp_actions->size > UINT16_MAX) { + XLATE_REPORT_ERROR(ctx, "resubmits yielded over 64 kB of actions"); + /* NOT an error, as we'll be slow-pathing the flow in this case? */ + ctx->exit = true; /* XXX: translation still terminated! */ } else if (ctx->stack.size >= 65536) { - VLOG_ERR_RL(&rl, "resubmits yielded over 64 kB of stack"); + XLATE_REPORT_ERROR(ctx, "resubmits yielded over 64 kB of stack"); + ctx->error = XLATE_STACK_TOO_DEEP; } else { return true; } @@ -2955,17 +3234,20 @@ static void xlate_table_action(struct xlate_ctx *ctx, ofp_port_t in_port, uint8_t table_id, bool may_packet_in, bool honor_table_miss) { + /* Check if we need to recirculate before matching in a table. */ + if (ctx->was_mpls) { + ctx_trigger_recirculation(ctx); + return; + } if (xlate_resubmit_resource_check(ctx)) { - struct flow_wildcards *wc; uint8_t old_table_id = ctx->table_id; struct rule_dpif *rule; ctx->table_id = table_id; - wc = (ctx->xin->skip_wildcards) ? NULL : &ctx->xout->wc; rule = rule_dpif_lookup_from_table(ctx->xbridge->ofproto, - &ctx->xin->flow, wc, - ctx->xin->xcache != NULL, + ctx->tables_version, + &ctx->xin->flow, ctx->xin->wc, ctx->xin->resubmit_stats, &ctx->table_id, in_port, may_packet_in, honor_table_miss); @@ -2984,6 +3266,7 @@ xlate_table_action(struct xlate_ctx *ctx, ofp_port_t in_port, uint8_t table_id, entry = xlate_cache_add_entry(ctx->xin->xcache, XC_RULE); entry->u.rule = rule; + rule_dpif_ref(rule); } xlate_recursively(ctx, rule); } @@ -2991,8 +3274,6 @@ xlate_table_action(struct xlate_ctx *ctx, ofp_port_t in_port, uint8_t table_id, ctx->table_id = old_table_id; return; } - - ctx->exit = true; } static void @@ -3016,6 +3297,8 @@ xlate_group_bucket(struct xlate_ctx *ctx, struct ofputil_bucket *bucket) { uint64_t action_list_stub[1024 / 8]; struct ofpbuf action_list, action_set; + struct flow old_flow = ctx->xin->flow; + bool old_was_mpls = ctx->was_mpls; ofpbuf_use_const(&action_set, bucket->ofpacts, bucket->ofpacts_len); ofpbuf_use_stub(&action_list, action_list_stub, sizeof action_list_stub); @@ -3027,6 +3310,38 @@ xlate_group_bucket(struct xlate_ctx *ctx, struct ofputil_bucket *bucket) ofpbuf_uninit(&action_set); ofpbuf_uninit(&action_list); + + /* Check if need to recirculate. */ + if (exit_recirculates(ctx)) { + compose_recirculate_action(ctx); + } + + /* Roll back flow to previous state. + * This is equivalent to cloning the packet for each bucket. + * + * As a side effect any subsequently applied actions will + * also effectively be applied to a clone of the packet taken + * just before applying the all or indirect group. + * + * Note that group buckets are action sets, hence they cannot modify the + * main action set. Also any stack actions are ignored when executing an + * action set, so group buckets cannot change the stack either. + * However, we do allow resubmit actions in group buckets, which could + * break the above assumptions. It is up to the controller to not mess up + * with the action_set and stack in the tables resubmitted to from + * group buckets. */ + ctx->xin->flow = old_flow; + + /* The group bucket popping MPLS should have no effect after bucket + * execution. */ + ctx->was_mpls = old_was_mpls; + + /* The fact that the group bucket exits (for any reason) does not mean that + * the translation after the group action should exit. Specifically, if + * the group bucket recirculates (which typically modifies the packet), the + * actions after the group action must continue processing with the + * original, not the recirculated packet! */ + ctx->exit = false; } static void @@ -3034,19 +3349,11 @@ xlate_all_group(struct xlate_ctx *ctx, struct group_dpif *group) { struct ofputil_bucket *bucket; const struct ovs_list *buckets; - struct flow old_flow = ctx->xin->flow; group_dpif_get_buckets(group, &buckets); LIST_FOR_EACH (bucket, list_node, buckets) { xlate_group_bucket(ctx, bucket); - /* Roll back flow to previous state. - * This is equivalent to cloning the packet for each bucket. - * - * As a side effect any subsequently applied actions will - * also effectively be applied to a clone of the packet taken - * just before applying the all or indirect group. */ - ctx->xin->flow = old_flow; } xlate_group_stats(ctx, group, NULL); } @@ -3064,33 +3371,109 @@ xlate_ff_group(struct xlate_ctx *ctx, struct group_dpif *group) } static void -xlate_select_group(struct xlate_ctx *ctx, struct group_dpif *group) +xlate_default_select_group(struct xlate_ctx *ctx, struct group_dpif *group) { - struct flow_wildcards *wc = &ctx->xout->wc; + struct flow_wildcards *wc = ctx->wc; struct ofputil_bucket *bucket; uint32_t basis; basis = flow_hash_symmetric_l4(&ctx->xin->flow, 0); + flow_mask_hash_fields(&ctx->xin->flow, wc, NX_HASH_FIELDS_SYMMETRIC_L4); bucket = group_best_live_bucket(ctx, group, basis); if (bucket) { - memset(&wc->masks.dl_dst, 0xff, sizeof wc->masks.dl_dst); - memset(&wc->masks.dl_src, 0xff, sizeof wc->masks.dl_src); - memset(&wc->masks.dl_type, 0xff, sizeof wc->masks.dl_type); - memset(&wc->masks.nw_dst, 0xff, sizeof wc->masks.nw_dst); - memset(&wc->masks.nw_proto, 0xff, sizeof wc->masks.nw_proto); - memset(&wc->masks.nw_src, 0xff, sizeof wc->masks.nw_src); - memset(&wc->masks.tp_dst, 0xff, sizeof wc->masks.tp_dst); - memset(&wc->masks.tp_src, 0xff, sizeof wc->masks.tp_src); - memset(&wc->masks.vlan_tci, 0xff, sizeof wc->masks.vlan_tci); + xlate_group_bucket(ctx, bucket); + xlate_group_stats(ctx, group, bucket); + } +} + +static void +xlate_hash_fields_select_group(struct xlate_ctx *ctx, struct group_dpif *group) +{ + struct mf_bitmap hash_fields = MF_BITMAP_INITIALIZER; + const struct field_array *fields; + struct ofputil_bucket *bucket; + uint32_t basis; + int i; + + fields = group_dpif_get_fields(group); + basis = hash_uint64(group_dpif_get_selection_method_param(group)); + + /* Determine which fields to hash */ + for (i = 0; i < MFF_N_IDS; i++) { + if (bitmap_is_set(fields->used.bm, i)) { + const struct mf_field *mf; + + /* If the field is already present in 'hash_fields' then + * this loop has already checked that it and its pre-requisites + * are present in the flow and its pre-requisites have + * already been added to 'hash_fields'. There is nothing more + * to do here and as an optimisation the loop can continue. */ + if (bitmap_is_set(hash_fields.bm, i)) { + continue; + } + + mf = mf_from_id(i); + + /* Only hash a field if it and its pre-requisites are present + * in the flow. */ + if (!mf_are_prereqs_ok(mf, &ctx->xin->flow)) { + continue; + } + /* Hash both the field and its pre-requisites */ + mf_bitmap_set_field_and_prereqs(mf, &hash_fields); + } + } + + /* Hash the fields */ + for (i = 0; i < MFF_N_IDS; i++) { + if (bitmap_is_set(hash_fields.bm, i)) { + const struct mf_field *mf = mf_from_id(i); + union mf_value value; + int j; + + mf_get_value(mf, &ctx->xin->flow, &value); + /* This seems inefficient but so does apply_mask() */ + for (j = 0; j < mf->n_bytes; j++) { + ((uint8_t *) &value)[j] &= ((uint8_t *) &fields->value[i])[j]; + } + basis = hash_bytes(&value, mf->n_bytes, basis); + + /* For tunnels, hash in whether the field is present. */ + if (mf_is_tun_metadata(mf)) { + basis = hash_boolean(mf_is_set(mf, &ctx->xin->flow), basis); + } + + mf_mask_field(mf, &ctx->wc->masks); + } + } + + bucket = group_best_live_bucket(ctx, group, basis); + if (bucket) { xlate_group_bucket(ctx, bucket); xlate_group_stats(ctx, group, bucket); } } +static void +xlate_select_group(struct xlate_ctx *ctx, struct group_dpif *group) +{ + const char *selection_method = group_dpif_get_selection_method(group); + + if (selection_method[0] == '\0') { + xlate_default_select_group(ctx, group); + } else if (!strcasecmp("hash", selection_method)) { + xlate_hash_fields_select_group(ctx, group); + } else { + /* Parsing of groups should ensure this never happens */ + OVS_NOT_REACHED(); + } +} + static void xlate_group_action__(struct xlate_ctx *ctx, struct group_dpif *group) { + bool was_in_group = ctx->in_group; ctx->in_group = true; switch (group_dpif_get_type(group)) { @@ -3109,37 +3492,13 @@ xlate_group_action__(struct xlate_ctx *ctx, struct group_dpif *group) } group_dpif_unref(group); - ctx->in_group = false; -} - -static bool -xlate_group_resource_check(struct xlate_ctx *ctx) -{ - if (!xlate_resubmit_resource_check(ctx)) { - return false; - } else if (ctx->in_group) { - /* Prevent nested translation of OpenFlow groups. - * - * OpenFlow allows this restriction. We enforce this restriction only - * because, with the current architecture, we would otherwise have to - * take a possibly recursive read lock on the ofgroup rwlock, which is - * unsafe given that POSIX allows taking a read lock to block if there - * is a thread blocked on taking the write lock. Other solutions - * without this restriction are also possible, but seem unwarranted - * given the current limited use of groups. */ - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); - - VLOG_ERR_RL(&rl, "cannot recursively translate OpenFlow group"); - return false; - } else { - return true; - } + ctx->in_group = was_in_group; } static bool xlate_group_action(struct xlate_ctx *ctx, uint32_t group_id) { - if (xlate_group_resource_check(ctx)) { + if (xlate_resubmit_resource_check(ctx)) { struct group_dpif *group; bool got_group; @@ -3195,13 +3554,13 @@ flood_packets(struct xlate_ctx *ctx, bool all) } if (all) { - compose_output_action__(ctx, xport->ofp_port, false); + compose_output_action__(ctx, xport->ofp_port, NULL, false); } else if (!(xport->config & OFPUTIL_PC_NO_FLOOD)) { - compose_output_action(ctx, xport->ofp_port); + compose_output_action(ctx, xport->ofp_port, NULL); } } - ctx->xout->nf_output_iface = NF_OUT_FLOOD; + ctx->nf_output_iface = NF_OUT_FLOOD; } static void @@ -3213,170 +3572,150 @@ execute_controller_action(struct xlate_ctx *ctx, int len, struct dp_packet *packet; ctx->xout->slow |= SLOW_CONTROLLER; + xlate_commit_actions(ctx); if (!ctx->xin->packet) { return; } packet = dp_packet_clone(ctx->xin->packet); - ctx->xout->slow |= commit_odp_actions(&ctx->xin->flow, &ctx->base_flow, - ctx->xout->odp_actions, - &ctx->xout->wc, - ctx->xbridge->masked_set_action); - odp_execute_actions(NULL, &packet, 1, false, - ctx->xout->odp_actions->data, - ctx->xout->odp_actions->size, NULL); + ctx->odp_actions->data, ctx->odp_actions->size, NULL); - pin = xmalloc(sizeof *pin); - pin->up.packet_len = dp_packet_size(packet); - pin->up.packet = dp_packet_steal_data(packet); - pin->up.reason = reason; - pin->up.table_id = ctx->table_id; - pin->up.cookie = (ctx->rule - ? rule_dpif_get_flow_cookie(ctx->rule) - : OVS_BE64_MAX); - - flow_get_metadata(&ctx->xin->flow, &pin->up.fmd); - - pin->controller_id = controller_id; - pin->send_len = len; - /* If a rule is a table-miss rule then this is - * a table-miss handled by a table-miss rule. - * - * Else, if rule is internal and has a controller action, - * the later being implied by the rule being processed here, - * then this is a table-miss handled without a table-miss rule. - * - * Otherwise this is not a table-miss. */ - pin->miss_type = OFPROTO_PACKET_IN_NO_MISS; - if (ctx->rule) { - if (rule_dpif_is_table_miss(ctx->rule)) { - pin->miss_type = OFPROTO_PACKET_IN_MISS_FLOW; - } else if (rule_dpif_is_internal(ctx->rule)) { - pin->miss_type = OFPROTO_PACKET_IN_MISS_WITHOUT_FLOW; - } + /* A packet sent by an action in a table-miss rule is considered an + * explicit table miss. OpenFlow before 1.3 doesn't have that concept so + * it will get translated back to OFPR_ACTION for those versions. */ + if (reason == OFPR_ACTION + && ctx->rule && rule_dpif_is_table_miss(ctx->rule)) { + reason = OFPR_EXPLICIT_MISS; } + + size_t packet_len = dp_packet_size(packet); + + pin = xmalloc(sizeof *pin); + *pin = (struct ofproto_packet_in) { + .controller_id = controller_id, + .up = { + .packet = dp_packet_steal_data(packet), + .len = packet_len, + .reason = reason, + .table_id = ctx->table_id, + .cookie = ctx->rule_cookie, + }, + .max_len = len, + }; + flow_get_metadata(&ctx->xin->flow, &pin->up.flow_metadata); + ofproto_dpif_send_packet_in(ctx->xbridge->ofproto, pin); dp_packet_delete(packet); } static void -compose_recirculate_action(struct xlate_ctx *ctx, - const struct ofpact *ofpacts_base, - const struct ofpact *ofpact_current, - size_t ofpacts_base_len) +compose_recirculate_action__(struct xlate_ctx *ctx, uint8_t table) { + struct recirc_metadata md; uint32_t id; - int error; - unsigned ofpacts_len; - struct match match; - struct rule *rule; - struct ofpbuf ofpacts; - - ctx->exit = true; - ofpacts_len = ofpacts_base_len - - ((uint8_t *)ofpact_current - (uint8_t *)ofpacts_base); - - if (ctx->rule) { - id = rule_dpif_get_recirc_id(ctx->rule); - } else { - /* In the case where ctx has no rule then allocate a recirc id. - * The life-cycle of this recirc id is managed by associating it - * with the internal rule that is created to to handle - * recirculation below. - * - * The known use-case of this is packet_out which - * translates actions without a rule */ - id = ofproto_dpif_alloc_recirc_id(ctx->xbridge->ofproto); - } + recirc_metadata_from_flow(&md, &ctx->xin->flow); + + ovs_assert(ctx->recirc_action_offset >= 0); + + struct recirc_state state = { + .table_id = table, + .ofproto = ctx->xbridge->ofproto, + .metadata = md, + .stack = &ctx->stack, + .mirrors = ctx->mirrors, + .conntracked = ctx->conntracked, + .action_set_len = ctx->recirc_action_offset, + .ofpacts_len = ctx->action_set.size, + .ofpacts = ctx->action_set.data, + }; + + /* Allocate a unique recirc id for the given metadata state in the + * flow. An existing id, with a new reference to the corresponding + * recirculation context, will be returned if possible. + * The life-cycle of this recirc id is managed by associating it + * with the udpif key ('ukey') created for each new datapath flow. */ + id = recirc_alloc_id_ctx(&state); if (!id) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); - VLOG_ERR_RL(&rl, "Failed to allocate recirculation id"); + XLATE_REPORT_ERROR(ctx, "Failed to allocate recirculation id"); + ctx->error = XLATE_NO_RECIRCULATION_CONTEXT; return; } + recirc_refs_add(&ctx->xout->recircs, id); - match_init_catchall(&match); - match_set_recirc_id(&match, id); - ofpbuf_use_const(&ofpacts, ofpact_current, ofpacts_len); - error = ofproto_dpif_add_internal_flow(ctx->xbridge->ofproto, &match, - RECIRC_RULE_PRIORITY, - RECIRC_TIMEOUT, &ofpacts, &rule); - if (error) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); - VLOG_ERR_RL(&rl, "Failed to add post recirculation flow %s", - match_to_string(&match, 0)); - if (!ctx->rule) { - ofproto_dpif_free_recirc_id(ctx->xbridge->ofproto, id); - } - return; - } - /* If ctx has no rule then associate the recirc id, which - * was allocated above, with the internal rule. This allows - * the recirc id to be released when the internal rule times out. */ - if (!ctx->rule) { - rule_set_recirc_id(rule, id); - } + nl_msg_put_u32(ctx->odp_actions, OVS_ACTION_ATTR_RECIRC, id); - ctx->xout->slow |= commit_odp_actions(&ctx->xin->flow, &ctx->base_flow, - ctx->xout->odp_actions, - &ctx->xout->wc, - ctx->xbridge->masked_set_action); - nl_msg_put_u32(ctx->xout->odp_actions, OVS_ACTION_ATTR_RECIRC, id); + /* Undo changes done by recirculation. */ + ctx->action_set.size = ctx->recirc_action_offset; + ctx->recirc_action_offset = -1; + ctx->last_unroll_offset = -1; +} + +/* Called only when ctx->recirc_action_offset is set. */ +static void +compose_recirculate_action(struct xlate_ctx *ctx) +{ + xlate_commit_actions(ctx); + compose_recirculate_action__(ctx, 0); +} + +/* Fork the pipeline here. The current packet will continue processing the + * current action list. A clone of the current packet will recirculate, skip + * the remainder of the current action list and asynchronously resume pipeline + * processing in 'table' with the current metadata and action set. */ +static void +compose_recirculate_and_fork(struct xlate_ctx *ctx, uint8_t table) +{ + ctx->recirc_action_offset = ctx->action_set.size; + compose_recirculate_action__(ctx, table); } static void compose_mpls_push_action(struct xlate_ctx *ctx, struct ofpact_push_mpls *mpls) { - struct flow_wildcards *wc = &ctx->xout->wc; struct flow *flow = &ctx->xin->flow; int n; ovs_assert(eth_type_mpls(mpls->ethertype)); - n = flow_count_mpls_labels(flow, wc); + n = flow_count_mpls_labels(flow, ctx->wc); if (!n) { - ctx->xout->slow |= commit_odp_actions(flow, &ctx->base_flow, - ctx->xout->odp_actions, - &ctx->xout->wc, - ctx->xbridge->masked_set_action); + xlate_commit_actions(ctx); } else if (n >= FLOW_MAX_MPLS_LABELS) { if (ctx->xin->packet != NULL) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); - VLOG_WARN_RL(&rl, "bridge %s: dropping packet on which an " + XLATE_REPORT_ERROR(ctx, "bridge %s: dropping packet on which an " "MPLS push action can't be performed as it would " "have more MPLS LSEs than the %d supported.", ctx->xbridge->name, FLOW_MAX_MPLS_LABELS); } - ctx->exit = true; + ctx->error = XLATE_TOO_MANY_MPLS_LABELS; return; } - flow_push_mpls(flow, n, mpls->ethertype, wc); + flow_push_mpls(flow, n, mpls->ethertype, ctx->wc); } static void compose_mpls_pop_action(struct xlate_ctx *ctx, ovs_be16 eth_type) { - struct flow_wildcards *wc = &ctx->xout->wc; struct flow *flow = &ctx->xin->flow; - int n = flow_count_mpls_labels(flow, wc); + int n = flow_count_mpls_labels(flow, ctx->wc); - if (flow_pop_mpls(flow, n, eth_type, wc)) { - if (ctx->xbridge->enable_recirc) { + if (flow_pop_mpls(flow, n, eth_type, ctx->wc)) { + if (ctx->xbridge->support.odp.recirc) { ctx->was_mpls = true; } } else if (n >= FLOW_MAX_MPLS_LABELS) { if (ctx->xin->packet != NULL) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); - VLOG_WARN_RL(&rl, "bridge %s: dropping packet on which an " + XLATE_REPORT_ERROR(ctx, "bridge %s: dropping packet on which an " "MPLS pop action can't be performed as it has " "more MPLS LSEs than the %d supported.", ctx->xbridge->name, FLOW_MAX_MPLS_LABELS); } - ctx->exit = true; - ofpbuf_clear(ctx->xout->odp_actions); + ctx->error = XLATE_TOO_MANY_MPLS_LABELS; + ofpbuf_clear(ctx->odp_actions); } } @@ -3389,7 +3728,7 @@ compose_dec_ttl(struct xlate_ctx *ctx, struct ofpact_cnt_ids *ids) return false; } - ctx->xout->wc.masks.nw_ttl = 0xff; + ctx->wc->masks.nw_ttl = 0xff; if (flow->nw_ttl > 1) { flow->nw_ttl--; return false; @@ -3410,7 +3749,7 @@ static void compose_set_mpls_label_action(struct xlate_ctx *ctx, ovs_be32 label) { if (eth_type_mpls(ctx->xin->flow.dl_type)) { - ctx->xout->wc.masks.mpls_lse[0] |= htonl(MPLS_LABEL_MASK); + ctx->wc->masks.mpls_lse[0] |= htonl(MPLS_LABEL_MASK); set_mpls_lse_label(&ctx->xin->flow.mpls_lse[0], label); } } @@ -3419,7 +3758,7 @@ static void compose_set_mpls_tc_action(struct xlate_ctx *ctx, uint8_t tc) { if (eth_type_mpls(ctx->xin->flow.dl_type)) { - ctx->xout->wc.masks.mpls_lse[0] |= htonl(MPLS_TC_MASK); + ctx->wc->masks.mpls_lse[0] |= htonl(MPLS_TC_MASK); set_mpls_lse_tc(&ctx->xin->flow.mpls_lse[0], tc); } } @@ -3428,7 +3767,7 @@ static void compose_set_mpls_ttl_action(struct xlate_ctx *ctx, uint8_t ttl) { if (eth_type_mpls(ctx->xin->flow.dl_type)) { - ctx->xout->wc.masks.mpls_lse[0] |= htonl(MPLS_TTL_MASK); + ctx->wc->masks.mpls_lse[0] |= htonl(MPLS_TTL_MASK); set_mpls_lse_ttl(&ctx->xin->flow.mpls_lse[0], ttl); } } @@ -3437,12 +3776,11 @@ static bool compose_dec_mpls_ttl_action(struct xlate_ctx *ctx) { struct flow *flow = &ctx->xin->flow; - struct flow_wildcards *wc = &ctx->xout->wc; if (eth_type_mpls(flow->dl_type)) { uint8_t ttl = mpls_lse_to_ttl(flow->mpls_lse[0]); - wc->masks.mpls_lse[0] |= htonl(MPLS_TTL_MASK); + ctx->wc->masks.mpls_lse[0] |= htonl(MPLS_TTL_MASK); if (ttl > 1) { ttl--; set_mpls_lse_ttl(&flow->mpls_lse[0], ttl); @@ -3460,13 +3798,13 @@ static void xlate_output_action(struct xlate_ctx *ctx, ofp_port_t port, uint16_t max_len, bool may_packet_in) { - ofp_port_t prev_nf_output_iface = ctx->xout->nf_output_iface; + ofp_port_t prev_nf_output_iface = ctx->nf_output_iface; - ctx->xout->nf_output_iface = NF_OUT_DROP; + ctx->nf_output_iface = NF_OUT_DROP; switch (port) { case OFPP_IN_PORT: - compose_output_action(ctx, ctx->xin->flow.in_port.ofp_port); + compose_output_action(ctx, ctx->xin->flow.in_port.ofp_port, NULL); break; case OFPP_TABLE: xlate_table_action(ctx, ctx->xin->flow.in_port.ofp_port, @@ -3493,7 +3831,7 @@ xlate_output_action(struct xlate_ctx *ctx, case OFPP_LOCAL: default: if (port != ctx->xin->flow.in_port.ofp_port) { - compose_output_action(ctx, port); + compose_output_action(ctx, port, NULL); } else { xlate_report(ctx, "skipping output to input port"); } @@ -3501,12 +3839,12 @@ xlate_output_action(struct xlate_ctx *ctx, } if (prev_nf_output_iface == NF_OUT_FLOOD) { - ctx->xout->nf_output_iface = NF_OUT_FLOOD; - } else if (ctx->xout->nf_output_iface == NF_OUT_DROP) { - ctx->xout->nf_output_iface = prev_nf_output_iface; + ctx->nf_output_iface = NF_OUT_FLOOD; + } else if (ctx->nf_output_iface == NF_OUT_DROP) { + ctx->nf_output_iface = prev_nf_output_iface; } else if (prev_nf_output_iface != NF_OUT_DROP && - ctx->xout->nf_output_iface != NF_OUT_FLOOD) { - ctx->xout->nf_output_iface = NF_OUT_MULTI; + ctx->nf_output_iface != NF_OUT_FLOOD) { + ctx->nf_output_iface = NF_OUT_MULTI; } } @@ -3519,7 +3857,7 @@ xlate_output_reg_action(struct xlate_ctx *ctx, union mf_subvalue value; memset(&value, 0xff, sizeof value); - mf_write_subfield_flow(&or->src, &value, &ctx->xout->wc.masks); + mf_write_subfield_flow(&or->src, &value, &ctx->wc->masks); xlate_output_action(ctx, u16_to_ofp(port), or->max_len, false); } @@ -3552,14 +3890,14 @@ xlate_enqueue_action(struct xlate_ctx *ctx, /* Add datapath actions. */ flow_priority = ctx->xin->flow.skb_priority; ctx->xin->flow.skb_priority = priority; - compose_output_action(ctx, ofp_port); + compose_output_action(ctx, ofp_port, NULL); ctx->xin->flow.skb_priority = flow_priority; /* Update NetFlow output port. */ - if (ctx->xout->nf_output_iface == NF_OUT_DROP) { - ctx->xout->nf_output_iface = ofp_port; - } else if (ctx->xout->nf_output_iface != NF_OUT_FLOOD) { - ctx->xout->nf_output_iface = NF_OUT_MULTI; + if (ctx->nf_output_iface == NF_OUT_DROP) { + ctx->nf_output_iface = ofp_port; + } else if (ctx->nf_output_iface != NF_OUT_FLOOD) { + ctx->nf_output_iface = NF_OUT_MULTI; } } @@ -3604,12 +3942,10 @@ xlate_bundle_action(struct xlate_ctx *ctx, { ofp_port_t port; - port = bundle_execute(bundle, &ctx->xin->flow, &ctx->xout->wc, - slave_enabled_cb, + port = bundle_execute(bundle, &ctx->xin->flow, ctx->wc, slave_enabled_cb, CONST_CAST(struct xbridge *, ctx->xbridge)); if (bundle->dst.field) { - nxm_reg_load(&bundle->dst, ofp_to_u16(port), &ctx->xin->flow, - &ctx->xout->wc); + nxm_reg_load(&bundle->dst, ofp_to_u16(port), &ctx->xin->flow, ctx->wc); } else { xlate_output_action(ctx, port, 0, false); } @@ -3628,8 +3964,7 @@ xlate_learn_action__(struct xlate_ctx *ctx, const struct ofpact_learn *learn, static void xlate_learn_action(struct xlate_ctx *ctx, const struct ofpact_learn *learn) { - ctx->xout->has_learn = true; - learn_mask(learn, &ctx->xout->wc); + learn_mask(learn, ctx->wc); if (ctx->xin->xcache) { struct xc_entry *entry; @@ -3684,12 +4019,11 @@ static void xlate_sample_action(struct xlate_ctx *ctx, const struct ofpact_sample *os) { - union user_action_cookie cookie; /* Scale the probability from 16-bit to 32-bit while representing * the same percentage. */ uint32_t probability = (os->probability << 16) | os->probability; - if (!ctx->xbridge->variable_length_userdata) { + if (!ctx->xbridge->support.variable_length_userdata) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); VLOG_ERR_RL(&rl, "ignoring NXAST_SAMPLE action because datapath " @@ -3698,16 +4032,19 @@ xlate_sample_action(struct xlate_ctx *ctx, return; } - ctx->xout->slow |= commit_odp_actions(&ctx->xin->flow, &ctx->base_flow, - ctx->xout->odp_actions, - &ctx->xout->wc, - ctx->xbridge->masked_set_action); + xlate_commit_actions(ctx); - compose_flow_sample_cookie(os->probability, os->collector_set_id, - os->obs_domain_id, os->obs_point_id, &cookie); - compose_sample_action(ctx->xbridge, ctx->xout->odp_actions, - &ctx->xin->flow, probability, &cookie, - sizeof cookie.flow_sample, ODPP_NONE); + union user_action_cookie cookie = { + .flow_sample = { + .type = USER_ACTION_COOKIE_FLOW_SAMPLE, + .probability = os->probability, + .collector_set_id = os->collector_set_id, + .obs_domain_id = os->obs_domain_id, + .obs_point_id = os->obs_point_id, + } + }; + compose_sample_action(ctx, probability, &cookie, sizeof cookie.flow_sample, + ODPP_NONE, false); } static bool @@ -3754,12 +4091,12 @@ xlate_write_actions(struct xlate_ctx *ctx, const struct ofpact *a) } else if (inner->type == OFPACT_GROUP) { ctx->xin->flow.actset_output = OFPP_UNSET; ctx->action_set_has_group = true; + break; } } } ofpbuf_put(&ctx->action_set, on->actions, on_len); - ofpact_pad(&ctx->action_set); } static void @@ -3771,99 +4108,289 @@ xlate_action_set(struct xlate_ctx *ctx) ctx->in_action_set = true; ofpbuf_use_stub(&action_list, action_list_stub, sizeof action_list_stub); ofpacts_execute_action_set(&action_list, &ctx->action_set); + /* Clear the action set, as it is not needed any more. */ + ofpbuf_clear(&ctx->action_set); do_xlate_actions(action_list.data, action_list.size, ctx); ctx->in_action_set = false; ofpbuf_uninit(&action_list); } -static bool -ofpact_needs_recirculation_after_mpls(const struct ofpact *a, struct xlate_ctx *ctx) +static void +recirc_put_unroll_xlate(struct xlate_ctx *ctx) { - struct flow_wildcards *wc = &ctx->xout->wc; - struct flow *flow = &ctx->xin->flow; + struct ofpact_unroll_xlate *unroll; - if (!ctx->was_mpls) { - return false; + unroll = ctx->last_unroll_offset < 0 + ? NULL + : ALIGNED_CAST(struct ofpact_unroll_xlate *, + (char *)ctx->action_set.data + ctx->last_unroll_offset); + + /* Restore the table_id and rule cookie for a potential PACKET + * IN if needed. */ + if (!unroll || + (ctx->table_id != unroll->rule_table_id + || ctx->rule_cookie != unroll->rule_cookie)) { + + ctx->last_unroll_offset = ctx->action_set.size; + unroll = ofpact_put_UNROLL_XLATE(&ctx->action_set); + unroll->rule_table_id = ctx->table_id; + unroll->rule_cookie = ctx->rule_cookie; } +} - switch (a->type) { - case OFPACT_OUTPUT: - case OFPACT_GROUP: - case OFPACT_CONTROLLER: - case OFPACT_STRIP_VLAN: - case OFPACT_SET_VLAN_PCP: - case OFPACT_SET_VLAN_VID: - case OFPACT_ENQUEUE: - case OFPACT_PUSH_VLAN: - case OFPACT_SET_ETH_SRC: - case OFPACT_SET_ETH_DST: - case OFPACT_SET_TUNNEL: - case OFPACT_SET_QUEUE: - case OFPACT_POP_QUEUE: - case OFPACT_CONJUNCTION: - case OFPACT_NOTE: - case OFPACT_OUTPUT_REG: - case OFPACT_EXIT: - case OFPACT_METER: - case OFPACT_WRITE_METADATA: - case OFPACT_WRITE_ACTIONS: - case OFPACT_CLEAR_ACTIONS: - case OFPACT_SAMPLE: - return false; - case OFPACT_POP_MPLS: - case OFPACT_DEC_MPLS_TTL: - case OFPACT_SET_MPLS_TTL: - case OFPACT_SET_MPLS_TC: - case OFPACT_SET_MPLS_LABEL: - case OFPACT_SET_IPV4_SRC: - case OFPACT_SET_IPV4_DST: - case OFPACT_SET_IP_DSCP: - case OFPACT_SET_IP_ECN: - case OFPACT_SET_IP_TTL: - case OFPACT_SET_L4_SRC_PORT: - case OFPACT_SET_L4_DST_PORT: - case OFPACT_RESUBMIT: - case OFPACT_STACK_PUSH: - case OFPACT_STACK_POP: - case OFPACT_DEC_TTL: - case OFPACT_MULTIPATH: - case OFPACT_BUNDLE: - case OFPACT_LEARN: - case OFPACT_FIN_TIMEOUT: - case OFPACT_GOTO_TABLE: - return true; +/* Copy remaining actions to the action_set to be executed after recirculation. + * UNROLL_XLATE action is inserted, if not already done so, before actions that + * may generate PACKET_INs from the current table and without matching another + * rule. */ +static void +recirc_unroll_actions(const struct ofpact *ofpacts, size_t ofpacts_len, + struct xlate_ctx *ctx) +{ + const struct ofpact *a; - case OFPACT_REG_MOVE: - return (mf_is_l3_or_higher(ofpact_get_REG_MOVE(a)->dst.field) || - mf_is_l3_or_higher(ofpact_get_REG_MOVE(a)->src.field)); + OFPACT_FOR_EACH (a, ofpacts, ofpacts_len) { + switch (a->type) { + /* May generate PACKET INs. */ + case OFPACT_OUTPUT_REG: + case OFPACT_GROUP: + case OFPACT_OUTPUT: + case OFPACT_CONTROLLER: + case OFPACT_DEC_MPLS_TTL: + case OFPACT_DEC_TTL: + recirc_put_unroll_xlate(ctx); + break; - case OFPACT_SET_FIELD: - return mf_is_l3_or_higher(ofpact_get_SET_FIELD(a)->field); + /* These may not generate PACKET INs. */ + case OFPACT_SET_TUNNEL: + case OFPACT_REG_MOVE: + case OFPACT_SET_FIELD: + case OFPACT_STACK_PUSH: + case OFPACT_STACK_POP: + case OFPACT_LEARN: + case OFPACT_WRITE_METADATA: + case OFPACT_RESUBMIT: /* May indirectly generate PACKET INs, */ + case OFPACT_GOTO_TABLE: /* but from a different table and rule. */ + case OFPACT_ENQUEUE: + case OFPACT_SET_VLAN_VID: + case OFPACT_SET_VLAN_PCP: + case OFPACT_STRIP_VLAN: + case OFPACT_PUSH_VLAN: + case OFPACT_SET_ETH_SRC: + case OFPACT_SET_ETH_DST: + case OFPACT_SET_IPV4_SRC: + case OFPACT_SET_IPV4_DST: + case OFPACT_SET_IP_DSCP: + case OFPACT_SET_IP_ECN: + case OFPACT_SET_IP_TTL: + case OFPACT_SET_L4_SRC_PORT: + case OFPACT_SET_L4_DST_PORT: + case OFPACT_SET_QUEUE: + case OFPACT_POP_QUEUE: + case OFPACT_PUSH_MPLS: + case OFPACT_POP_MPLS: + case OFPACT_SET_MPLS_LABEL: + case OFPACT_SET_MPLS_TC: + case OFPACT_SET_MPLS_TTL: + case OFPACT_MULTIPATH: + case OFPACT_BUNDLE: + case OFPACT_EXIT: + case OFPACT_UNROLL_XLATE: + case OFPACT_FIN_TIMEOUT: + case OFPACT_CLEAR_ACTIONS: + case OFPACT_WRITE_ACTIONS: + case OFPACT_METER: + case OFPACT_SAMPLE: + case OFPACT_DEBUG_RECIRC: + case OFPACT_CT: + case OFPACT_NAT: + break; - case OFPACT_PUSH_MPLS: - /* Recirculate if it is an IP packet with a zero ttl. This may - * indicate that the packet was previously MPLS and an MPLS pop action - * converted it to IP. In this case recirculating should reveal the IP - * TTL which is used as the basis for a new MPLS LSE. */ - return (!flow_count_mpls_labels(flow, wc) - && flow->nw_ttl == 0 - && is_ip_any(flow)); + /* These need not be copied for restoration. */ + case OFPACT_NOTE: + case OFPACT_CONJUNCTION: + continue; + } + /* Copy the action over. */ + ofpbuf_put(&ctx->action_set, a, OFPACT_ALIGN(a->len)); + } +} + +#define CHECK_MPLS_RECIRCULATION() \ + if (ctx->was_mpls) { \ + ctx_trigger_recirculation(ctx); \ + break; \ + } +#define CHECK_MPLS_RECIRCULATION_IF(COND) \ + if (COND) { \ + CHECK_MPLS_RECIRCULATION(); \ } - OVS_NOT_REACHED(); +static void +put_ct_mark(const struct flow *flow, struct flow *base_flow, + struct ofpbuf *odp_actions, struct flow_wildcards *wc) +{ + struct { + uint32_t key; + uint32_t mask; + } odp_attr; + + odp_attr.key = flow->ct_mark; + odp_attr.mask = wc->masks.ct_mark; + + if (odp_attr.mask && odp_attr.key != base_flow->ct_mark) { + nl_msg_put_unspec(odp_actions, OVS_CT_ATTR_MARK, &odp_attr, + sizeof(odp_attr)); + } +} + +static void +put_ct_label(const struct flow *flow, struct flow *base_flow, + struct ofpbuf *odp_actions, struct flow_wildcards *wc) +{ + if (!ovs_u128_is_zero(&wc->masks.ct_label) + && !ovs_u128_equals(&flow->ct_label, &base_flow->ct_label)) { + struct { + ovs_u128 key; + ovs_u128 mask; + } *odp_ct_label; + + odp_ct_label = nl_msg_put_unspec_uninit(odp_actions, + OVS_CT_ATTR_LABELS, + sizeof(*odp_ct_label)); + odp_ct_label->key = flow->ct_label; + odp_ct_label->mask = wc->masks.ct_label; + } +} + +static void +put_ct_helper(struct ofpbuf *odp_actions, struct ofpact_conntrack *ofc) +{ + if (ofc->alg) { + if (ofc->alg == IPPORT_FTP) { + nl_msg_put_string(odp_actions, OVS_CT_ATTR_HELPER, "ftp"); + } else { + VLOG_WARN("Cannot serialize ct_helper %d\n", ofc->alg); + } + } +} + +static void +put_ct_nat(struct xlate_ctx *ctx) +{ + struct ofpact_nat *ofn = ctx->ct_nat_action; + size_t nat_offset; + + if (!ofn) { + return; + } + + nat_offset = nl_msg_start_nested(ctx->odp_actions, OVS_CT_ATTR_NAT); + if (ofn->flags & NX_NAT_F_SRC || ofn->flags & NX_NAT_F_DST) { + nl_msg_put_flag(ctx->odp_actions, ofn->flags & NX_NAT_F_SRC + ? OVS_NAT_ATTR_SRC : OVS_NAT_ATTR_DST); + if (ofn->flags & NX_NAT_F_PERSISTENT) { + nl_msg_put_flag(ctx->odp_actions, OVS_NAT_ATTR_PERSISTENT); + } + if (ofn->flags & NX_NAT_F_PROTO_HASH) { + nl_msg_put_flag(ctx->odp_actions, OVS_NAT_ATTR_PROTO_HASH); + } else if (ofn->flags & NX_NAT_F_PROTO_RANDOM) { + nl_msg_put_flag(ctx->odp_actions, OVS_NAT_ATTR_PROTO_RANDOM); + } + if (ofn->range_af == AF_INET) { + nl_msg_put_be32(ctx->odp_actions, OVS_NAT_ATTR_IP_MIN, + ofn->range.addr.ipv4.min); + if (ofn->range.addr.ipv4.max && + (ntohl(ofn->range.addr.ipv4.max) + > ntohl(ofn->range.addr.ipv4.min))) { + nl_msg_put_be32(ctx->odp_actions, OVS_NAT_ATTR_IP_MAX, + ofn->range.addr.ipv4.max); + } + } else if (ofn->range_af == AF_INET6) { + nl_msg_put_unspec(ctx->odp_actions, OVS_NAT_ATTR_IP_MIN, + &ofn->range.addr.ipv6.min, + sizeof ofn->range.addr.ipv6.min); + if (!ipv6_mask_is_any(&ofn->range.addr.ipv6.max) && + memcmp(&ofn->range.addr.ipv6.max, &ofn->range.addr.ipv6.min, + sizeof ofn->range.addr.ipv6.max) > 0) { + nl_msg_put_unspec(ctx->odp_actions, OVS_NAT_ATTR_IP_MAX, + &ofn->range.addr.ipv6.max, + sizeof ofn->range.addr.ipv6.max); + } + } + if (ofn->range_af != AF_UNSPEC && ofn->range.proto.min) { + nl_msg_put_u16(ctx->odp_actions, OVS_NAT_ATTR_PROTO_MIN, + ofn->range.proto.min); + if (ofn->range.proto.max && + ofn->range.proto.max > ofn->range.proto.min) { + nl_msg_put_u16(ctx->odp_actions, OVS_NAT_ATTR_PROTO_MAX, + ofn->range.proto.max); + } + } + } + nl_msg_end_nested(ctx->odp_actions, nat_offset); +} + +static void +compose_conntrack_action(struct xlate_ctx *ctx, struct ofpact_conntrack *ofc) +{ + ovs_u128 old_ct_label = ctx->base_flow.ct_label; + uint32_t old_ct_mark = ctx->base_flow.ct_mark; + size_t ct_offset; + uint16_t zone; + + /* Ensure that any prior actions are applied before composing the new + * conntrack action. */ + xlate_commit_actions(ctx); + + /* Process nested actions first, to populate the key. */ + ctx->ct_nat_action = NULL; + do_xlate_actions(ofc->actions, ofpact_ct_get_action_len(ofc), ctx); + + if (ofc->zone_src.field) { + zone = mf_get_subfield(&ofc->zone_src, &ctx->xin->flow); + } else { + zone = ofc->zone_imm; + } + + ct_offset = nl_msg_start_nested(ctx->odp_actions, OVS_ACTION_ATTR_CT); + if (ofc->flags & NX_CT_F_COMMIT) { + nl_msg_put_flag(ctx->odp_actions, OVS_CT_ATTR_COMMIT); + } + nl_msg_put_u16(ctx->odp_actions, OVS_CT_ATTR_ZONE, zone); + put_ct_mark(&ctx->xin->flow, &ctx->base_flow, ctx->odp_actions, ctx->wc); + put_ct_label(&ctx->xin->flow, &ctx->base_flow, ctx->odp_actions, ctx->wc); + put_ct_helper(ctx->odp_actions, ofc); + put_ct_nat(ctx); + ctx->ct_nat_action = NULL; + nl_msg_end_nested(ctx->odp_actions, ct_offset); + + /* Restore the original ct fields in the key. These should only be exposed + * after recirculation to another table. */ + ctx->base_flow.ct_mark = old_ct_mark; + ctx->base_flow.ct_label = old_ct_label; + + if (ofc->recirc_table == NX_CT_RECIRC_NONE) { + /* If we do not recirculate as part of this action, hide the results of + * connection tracking from subsequent recirculations. */ + ctx->conntracked = false; + } else { + /* Use ct_* fields from datapath during recirculation upcall. */ + ctx->conntracked = true; + compose_recirculate_and_fork(ctx, ofc->recirc_table); + } } static void do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, struct xlate_ctx *ctx) { - struct flow_wildcards *wc = &ctx->xout->wc; + struct flow_wildcards *wc = ctx->wc; struct flow *flow = &ctx->xin->flow; const struct ofpact *a; if (ovs_native_tunneling_is_on(ctx->xbridge->ofproto)) { - tnl_arp_snoop(flow, wc, ctx->xbridge->name); + tnl_neigh_snoop(flow, wc, ctx->xbridge->name); } /* dl_type already in the mask, not set below. */ @@ -3873,13 +4400,20 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, const struct ofpact_set_field *set_field; const struct mf_field *mf; - if (ctx->exit) { + if (ctx->error) { break; } - if (ofpact_needs_recirculation_after_mpls(a, ctx)) { - compose_recirculate_action(ctx, ofpacts, a, ofpacts_len); - return; + if (ctx->exit) { + /* Check if need to store the remaining actions for later + * execution. */ + if (exit_recirculates(ctx)) { + recirc_unroll_actions(a, OFPACT_ALIGN(ofpacts_len - + ((uint8_t *)a - + (uint8_t *)ofpacts)), + ctx); + } + break; } switch (a->type) { @@ -3890,6 +4424,7 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, case OFPACT_GROUP: if (xlate_group_action(ctx, ofpact_get_GROUP(a)->group_id)) { + /* Group could not be found. */ return; } break; @@ -3939,16 +4474,17 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, break; case OFPACT_SET_ETH_SRC: - memset(&wc->masks.dl_src, 0xff, sizeof wc->masks.dl_src); - memcpy(flow->dl_src, ofpact_get_SET_ETH_SRC(a)->mac, ETH_ADDR_LEN); + WC_MASK_FIELD(wc, dl_src); + flow->dl_src = ofpact_get_SET_ETH_SRC(a)->mac; break; case OFPACT_SET_ETH_DST: - memset(&wc->masks.dl_dst, 0xff, sizeof wc->masks.dl_dst); - memcpy(flow->dl_dst, ofpact_get_SET_ETH_DST(a)->mac, ETH_ADDR_LEN); + WC_MASK_FIELD(wc, dl_dst); + flow->dl_dst = ofpact_get_SET_ETH_DST(a)->mac; break; case OFPACT_SET_IPV4_SRC: + CHECK_MPLS_RECIRCULATION(); if (flow->dl_type == htons(ETH_TYPE_IP)) { memset(&wc->masks.nw_src, 0xff, sizeof wc->masks.nw_src); flow->nw_src = ofpact_get_SET_IPV4_SRC(a)->ipv4; @@ -3956,6 +4492,7 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, break; case OFPACT_SET_IPV4_DST: + CHECK_MPLS_RECIRCULATION(); if (flow->dl_type == htons(ETH_TYPE_IP)) { memset(&wc->masks.nw_dst, 0xff, sizeof wc->masks.nw_dst); flow->nw_dst = ofpact_get_SET_IPV4_DST(a)->ipv4; @@ -3963,6 +4500,7 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, break; case OFPACT_SET_IP_DSCP: + CHECK_MPLS_RECIRCULATION(); if (is_ip_any(flow)) { wc->masks.nw_tos |= IP_DSCP_MASK; flow->nw_tos &= ~IP_DSCP_MASK; @@ -3971,6 +4509,7 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, break; case OFPACT_SET_IP_ECN: + CHECK_MPLS_RECIRCULATION(); if (is_ip_any(flow)) { wc->masks.nw_tos |= IP_ECN_MASK; flow->nw_tos &= ~IP_ECN_MASK; @@ -3979,6 +4518,7 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, break; case OFPACT_SET_IP_TTL: + CHECK_MPLS_RECIRCULATION(); if (is_ip_any(flow)) { wc->masks.nw_ttl = 0xff; flow->nw_ttl = ofpact_get_SET_IP_TTL(a)->ttl; @@ -3986,6 +4526,7 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, break; case OFPACT_SET_L4_SRC_PORT: + CHECK_MPLS_RECIRCULATION(); if (is_ip_any(flow) && !(flow->nw_frag & FLOW_NW_FRAG_LATER)) { memset(&wc->masks.nw_proto, 0xff, sizeof wc->masks.nw_proto); memset(&wc->masks.tp_src, 0xff, sizeof wc->masks.tp_src); @@ -3994,6 +4535,7 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, break; case OFPACT_SET_L4_DST_PORT: + CHECK_MPLS_RECIRCULATION(); if (is_ip_any(flow) && !(flow->nw_frag & FLOW_NW_FRAG_LATER)) { memset(&wc->masks.nw_proto, 0xff, sizeof wc->masks.nw_proto); memset(&wc->masks.tp_dst, 0xff, sizeof wc->masks.tp_dst); @@ -4022,10 +4564,15 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, break; case OFPACT_REG_MOVE: + CHECK_MPLS_RECIRCULATION_IF( + mf_is_l3_or_higher(ofpact_get_REG_MOVE(a)->dst.field) || + mf_is_l3_or_higher(ofpact_get_REG_MOVE(a)->src.field)); nxm_execute_reg_move(ofpact_get_REG_MOVE(a), flow, wc); break; case OFPACT_SET_FIELD: + CHECK_MPLS_RECIRCULATION_IF( + mf_is_l3_or_higher(ofpact_get_SET_FIELD(a)->field)); set_field = ofpact_get_SET_FIELD(a); mf = set_field->field; @@ -4041,9 +4588,9 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, && !eth_type_mpls(flow->dl_type)) { break; } - /* A flow may wildcard nw_frag. Do nothing if setting a trasport + /* A flow may wildcard nw_frag. Do nothing if setting a transport * header field on a packet that does not have them. */ - mf_mask_field_and_prereqs(mf, &wc->masks); + mf_mask_field_and_prereqs(mf, wc); if (mf_are_prereqs_ok(mf, flow)) { mf_set_flow_value_masked(mf, &set_field->value, &set_field->mask, flow); @@ -4051,43 +4598,62 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, break; case OFPACT_STACK_PUSH: + CHECK_MPLS_RECIRCULATION_IF( + mf_is_l3_or_higher(ofpact_get_STACK_PUSH(a)->subfield.field)); nxm_execute_stack_push(ofpact_get_STACK_PUSH(a), flow, wc, &ctx->stack); break; case OFPACT_STACK_POP: + CHECK_MPLS_RECIRCULATION_IF( + mf_is_l3_or_higher(ofpact_get_STACK_POP(a)->subfield.field)); nxm_execute_stack_pop(ofpact_get_STACK_POP(a), flow, wc, &ctx->stack); break; case OFPACT_PUSH_MPLS: + /* Recirculate if it is an IP packet with a zero ttl. This may + * indicate that the packet was previously MPLS and an MPLS pop + * action converted it to IP. In this case recirculating should + * reveal the IP TTL which is used as the basis for a new MPLS + * LSE. */ + CHECK_MPLS_RECIRCULATION_IF( + !flow_count_mpls_labels(flow, wc) + && flow->nw_ttl == 0 + && is_ip_any(flow)); compose_mpls_push_action(ctx, ofpact_get_PUSH_MPLS(a)); break; case OFPACT_POP_MPLS: + CHECK_MPLS_RECIRCULATION(); compose_mpls_pop_action(ctx, ofpact_get_POP_MPLS(a)->ethertype); break; case OFPACT_SET_MPLS_LABEL: + CHECK_MPLS_RECIRCULATION(); compose_set_mpls_label_action( ctx, ofpact_get_SET_MPLS_LABEL(a)->label); - break; + break; case OFPACT_SET_MPLS_TC: + CHECK_MPLS_RECIRCULATION(); compose_set_mpls_tc_action(ctx, ofpact_get_SET_MPLS_TC(a)->tc); break; case OFPACT_SET_MPLS_TTL: + CHECK_MPLS_RECIRCULATION(); compose_set_mpls_ttl_action(ctx, ofpact_get_SET_MPLS_TTL(a)->ttl); break; case OFPACT_DEC_MPLS_TTL: + CHECK_MPLS_RECIRCULATION(); if (compose_dec_mpls_ttl_action(ctx)) { return; } break; case OFPACT_DEC_TTL: + CHECK_MPLS_RECIRCULATION(); wc->masks.nw_ttl = 0xff; if (compose_dec_ttl(ctx, ofpact_get_DEC_TTL(a))) { return; @@ -4099,10 +4665,12 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, break; case OFPACT_MULTIPATH: + CHECK_MPLS_RECIRCULATION(); multipath_execute(ofpact_get_MULTIPATH(a), flow, wc); break; case OFPACT_BUNDLE: + CHECK_MPLS_RECIRCULATION(); xlate_bundle_action(ctx, ofpact_get_BUNDLE(a)); break; @@ -4111,6 +4679,7 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, break; case OFPACT_LEARN: + CHECK_MPLS_RECIRCULATION(); xlate_learn_action(ctx, ofpact_get_LEARN(a)); break; @@ -4128,9 +4697,17 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, ctx->exit = true; break; + case OFPACT_UNROLL_XLATE: { + struct ofpact_unroll_xlate *unroll = ofpact_get_UNROLL_XLATE(a); + + /* Restore translation context data that was stored earlier. */ + ctx->table_id = unroll->rule_table_id; + ctx->rule_cookie = unroll->rule_cookie; + break; + } case OFPACT_FIN_TIMEOUT: + CHECK_MPLS_RECIRCULATION(); memset(&wc->masks.nw_proto, 0xff, sizeof wc->masks.nw_proto); - ctx->xout->has_fin_timeout = true; xlate_fin_timeout(ctx, ofpact_get_FIN_TIMEOUT(a)); break; @@ -4171,6 +4748,31 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, case OFPACT_SAMPLE: xlate_sample_action(ctx, ofpact_get_SAMPLE(a)); break; + + case OFPACT_CT: + CHECK_MPLS_RECIRCULATION(); + compose_conntrack_action(ctx, ofpact_get_CT(a)); + break; + + case OFPACT_NAT: + /* This will be processed by compose_conntrack_action(). */ + ctx->ct_nat_action = ofpact_get_NAT(a); + break; + + case OFPACT_DEBUG_RECIRC: + ctx_trigger_recirculation(ctx); + a = ofpact_next(a); + break; + } + + /* Check if need to store this and the remaining actions for later + * execution. */ + if (!ctx->error && ctx->exit && ctx_first_recirculation_action(ctx)) { + recirc_unroll_actions(a, OFPACT_ALIGN(ofpacts_len - + ((uint8_t *)a - + (uint8_t *)ofpacts)), + ctx); + break; } } } @@ -4179,7 +4781,8 @@ void xlate_in_init(struct xlate_in *xin, struct ofproto_dpif *ofproto, const struct flow *flow, ofp_port_t in_port, struct rule_dpif *rule, uint16_t tcp_flags, - const struct dp_packet *packet) + const struct dp_packet *packet, struct flow_wildcards *wc, + struct ofpbuf *odp_actions) { xin->ofproto = ofproto; xin->flow = *flow; @@ -4195,15 +4798,22 @@ xlate_in_init(struct xlate_in *xin, struct ofproto_dpif *ofproto, xin->resubmit_hook = NULL; xin->report_hook = NULL; xin->resubmit_stats = NULL; - xin->skip_wildcards = false; - xin->odp_actions = NULL; + xin->recurse = 0; + xin->resubmits = 0; + xin->wc = wc; + xin->odp_actions = odp_actions; + + /* Do recirc lookup. */ + xin->recirc = flow->recirc_id + ? recirc_id_node_find(flow->recirc_id) + : NULL; } void xlate_out_uninit(struct xlate_out *xout) { - if (xout && xout->odp_actions == &xout->odp_actions_buf) { - ofpbuf_uninit(xout->odp_actions); + if (xout) { + recirc_refs_unref(&xout->recircs); } } @@ -4213,26 +4823,16 @@ void xlate_actions_for_side_effects(struct xlate_in *xin) { struct xlate_out xout; + enum xlate_error error; - xlate_actions(xin, &xout); - xlate_out_uninit(&xout); -} + error = xlate_actions(xin, &xout); + if (error) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); -void -xlate_out_copy(struct xlate_out *dst, const struct xlate_out *src) -{ - dst->wc = src->wc; - dst->slow = src->slow; - dst->has_learn = src->has_learn; - dst->has_normal = src->has_normal; - dst->has_fin_timeout = src->has_fin_timeout; - dst->nf_output_iface = src->nf_output_iface; - dst->mirrors = src->mirrors; + VLOG_WARN_RL(&rl, "xlate_actions failed (%s)!", xlate_strerror(error)); + } - dst->odp_actions = &dst->odp_actions_buf; - ofpbuf_use_stub(dst->odp_actions, dst->odp_actions_stub, - sizeof dst->odp_actions_stub); - ofpbuf_put(dst->odp_actions, src->odp_actions->data, src->odp_actions->size); + xlate_out_uninit(&xout); } static struct skb_priority_to_dscp * @@ -4283,8 +4883,8 @@ actions_output_to_local_port(const struct xlate_ctx *ctx) const struct nlattr *a; unsigned int left; - NL_ATTR_FOR_EACH_UNSAFE (a, left, ctx->xout->odp_actions->data, - ctx->xout->odp_actions->size) { + NL_ATTR_FOR_EACH_UNSAFE (a, left, ctx->odp_actions->data, + ctx->odp_actions->size) { if (nl_attr_type(a) == OVS_ACTION_ATTR_OUTPUT && nl_attr_get_odp_port(a) == local_odp_port) { return true; @@ -4310,7 +4910,7 @@ netdev_max_backlog(void) stream = fopen(filename, "r"); if (!stream) { - VLOG_WARN("%s: open failed (%s)", filename, ovs_strerror(errno)); + VLOG_INFO("%s: open failed (%s)", filename, ovs_strerror(errno)); } else { if (fscanf(stream, "%d", &n) != 1) { VLOG_WARN("%s: read error", filename); @@ -4365,150 +4965,274 @@ too_many_output_actions(const struct ofpbuf *odp_actions OVS_UNUSED) #endif } -/* Translates the 'ofpacts_len' bytes of "struct ofpacts" starting at 'ofpacts' - * into datapath actions in 'odp_actions', using 'ctx'. - * +static void +xlate_wc_init(struct xlate_ctx *ctx) +{ + flow_wildcards_init_catchall(ctx->wc); + + /* Some fields we consider to always be examined. */ + WC_MASK_FIELD(ctx->wc, in_port); + WC_MASK_FIELD(ctx->wc, dl_type); + if (is_ip_any(&ctx->xin->flow)) { + WC_MASK_FIELD_MASK(ctx->wc, nw_frag, FLOW_NW_FRAG_MASK); + } + + if (ctx->xbridge->support.odp.recirc) { + /* Always exactly match recirc_id when datapath supports + * recirculation. */ + WC_MASK_FIELD(ctx->wc, recirc_id); + } + + if (ctx->xbridge->netflow) { + netflow_mask_wc(&ctx->xin->flow, ctx->wc); + } + + tnl_wc_init(&ctx->xin->flow, ctx->wc); +} + +static void +xlate_wc_finish(struct xlate_ctx *ctx) +{ + /* Clear the metadata and register wildcard masks, because we won't + * use non-header fields as part of the cache. */ + flow_wildcards_clear_non_packet_fields(ctx->wc); + + /* ICMPv4 and ICMPv6 have 8-bit "type" and "code" fields. struct flow + * uses the low 8 bits of the 16-bit tp_src and tp_dst members to + * represent these fields. The datapath interface, on the other hand, + * represents them with just 8 bits each. This means that if the high + * 8 bits of the masks for these fields somehow become set, then they + * will get chopped off by a round trip through the datapath, and + * revalidation will spot that as an inconsistency and delete the flow. + * Avoid the problem here by making sure that only the low 8 bits of + * either field can be unwildcarded for ICMP. + */ + if (is_icmpv4(&ctx->xin->flow) || is_icmpv6(&ctx->xin->flow)) { + ctx->wc->masks.tp_src &= htons(UINT8_MAX); + ctx->wc->masks.tp_dst &= htons(UINT8_MAX); + } + /* VLAN_TCI CFI bit must be matched if any of the TCI is matched. */ + if (ctx->wc->masks.vlan_tci) { + ctx->wc->masks.vlan_tci |= htons(VLAN_CFI); + } +} + +/* Translates the flow, actions, or rule in 'xin' into datapath actions in + * 'xout'. * The caller must take responsibility for eventually freeing 'xout', with - * xlate_out_uninit(). */ -void + * xlate_out_uninit(). + * Returns 'XLATE_OK' if translation was successful. In case of an error an + * empty set of actions will be returned in 'xin->odp_actions' (if non-NULL), + * so that most callers may ignore the return value and transparently install a + * drop flow when the translation fails. */ +enum xlate_error xlate_actions(struct xlate_in *xin, struct xlate_out *xout) { + *xout = (struct xlate_out) { + .slow = 0, + .recircs = RECIRC_REFS_EMPTY_INITIALIZER, + }; + struct xlate_cfg *xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp); - struct flow_wildcards *wc = &xout->wc; + struct xbridge *xbridge = xbridge_lookup(xcfg, xin->ofproto); + if (!xbridge) { + return XLATE_BRIDGE_NOT_FOUND; + } + struct flow *flow = &xin->flow; - struct rule_dpif *rule = NULL; - enum slow_path_reason special; - const struct ofpact *ofpacts; - struct xport *in_port; - struct flow orig_flow; - struct xlate_ctx ctx; - size_t ofpacts_len; - bool tnl_may_send; - bool is_icmp; + union mf_subvalue stack_stub[1024 / sizeof(union mf_subvalue)]; + uint64_t action_set_stub[1024 / 8]; + struct flow_wildcards scratch_wc; + uint64_t actions_stub[256 / 8]; + struct ofpbuf scratch_actions = OFPBUF_STUB_INITIALIZER(actions_stub); + struct xlate_ctx ctx = { + .xin = xin, + .xout = xout, + .base_flow = *flow, + .orig_tunnel_ipv6_dst = flow_tnl_dst(&flow->tunnel), + .xbridge = xbridge, + .stack = OFPBUF_STUB_INITIALIZER(stack_stub), + .rule = xin->rule, + .wc = xin->wc ? xin->wc : &scratch_wc, + .odp_actions = xin->odp_actions ? xin->odp_actions : &scratch_actions, + + .recurse = xin->recurse, + .resubmits = xin->resubmits, + .in_group = false, + .in_action_set = false, + + .table_id = 0, + .rule_cookie = OVS_BE64_MAX, + .orig_skb_priority = flow->skb_priority, + .sflow_n_outputs = 0, + .sflow_odp_port = 0, + .nf_output_iface = NF_OUT_DROP, + .exit = false, + .error = XLATE_OK, + .mirrors = 0, + + .recirc_action_offset = -1, + .last_unroll_offset = -1, + + .was_mpls = false, + .conntracked = false, + + .ct_nat_action = NULL, + + .action_set_has_group = false, + .action_set = OFPBUF_STUB_INITIALIZER(action_set_stub), + }; + + /* 'base_flow' reflects the packet as it came in, but we need it to reflect + * the packet as the datapath will treat it for output actions: + * + * - Our datapath doesn't retain tunneling information without us + * re-setting it, so clear the tunnel data. + * + * - For VLAN splinters, a higher layer may pretend that the packet + * came in on 'flow->in_port.ofp_port' with 'flow->vlan_tci' + * attached, because that's how we want to treat it from an OpenFlow + * perspective. But from the datapath's perspective it actually came + * in on a VLAN device without any VLAN attached. So here we put the + * datapath's view of the VLAN information in 'base_flow' to ensure + * correct treatment. + */ + memset(&ctx.base_flow.tunnel, 0, sizeof ctx.base_flow.tunnel); + if (flow->in_port.ofp_port + != vsp_realdev_to_vlandev(xbridge->ofproto, + flow->in_port.ofp_port, + flow->vlan_tci)) { + ctx.base_flow.vlan_tci = 0; + } + + ofpbuf_reserve(ctx.odp_actions, NL_A_U32_SIZE); + if (xin->wc) { + xlate_wc_init(&ctx); + } COVERAGE_INC(xlate_actions); - /* Flow initialization rules: - * - 'base_flow' must match the kernel's view of the packet at the - * time that action processing starts. 'flow' represents any - * transformations we wish to make through actions. - * - By default 'base_flow' and 'flow' are the same since the input - * packet matches the output before any actions are applied. - * - When using VLAN splinters, 'base_flow''s VLAN is set to the value - * of the received packet as seen by the kernel. If we later output - * to another device without any modifications this will cause us to - * insert a new tag since the original one was stripped off by the - * VLAN device. - * - Tunnel metadata as received is retained in 'flow'. This allows - * tunnel metadata matching also in later tables. - * Since a kernel action for setting the tunnel metadata will only be - * generated with actual tunnel output, changing the tunnel metadata - * values in 'flow' (such as tun_id) will only have effect with a later - * tunnel output action. - * - Tunnel 'base_flow' is completely cleared since that is what the - * kernel does. If we wish to maintain the original values an action - * needs to be generated. */ - - ctx.xin = xin; - ctx.xout = xout; - ctx.xout->slow = 0; - ctx.xout->has_learn = false; - ctx.xout->has_normal = false; - ctx.xout->has_fin_timeout = false; - ctx.xout->nf_output_iface = NF_OUT_DROP; - ctx.xout->mirrors = 0; - - xout->odp_actions = xin->odp_actions; - if (!xout->odp_actions) { - xout->odp_actions = &xout->odp_actions_buf; - ofpbuf_use_stub(xout->odp_actions, xout->odp_actions_stub, - sizeof xout->odp_actions_stub); - } - ofpbuf_reserve(xout->odp_actions, NL_A_U32_SIZE); - - ctx.xbridge = xbridge_lookup(xcfg, xin->ofproto); - if (!ctx.xbridge) { - return; - } + if (xin->recirc) { + const struct recirc_state *state = &xin->recirc->state; - ctx.rule = xin->rule; + xlate_report(&ctx, "Restoring state post-recirculation:"); - ctx.base_flow = *flow; - memset(&ctx.base_flow.tunnel, 0, sizeof ctx.base_flow.tunnel); - ctx.orig_tunnel_ip_dst = flow->tunnel.ip_dst; + if (xin->ofpacts_len > 0 || ctx.rule) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); + const char *conflict = xin->ofpacts_len ? "actions" : "rule"; - flow_wildcards_init_catchall(wc); - memset(&wc->masks.in_port, 0xff, sizeof wc->masks.in_port); - memset(&wc->masks.dl_type, 0xff, sizeof wc->masks.dl_type); - if (is_ip_any(flow)) { - wc->masks.nw_frag |= FLOW_NW_FRAG_MASK; - } - is_icmp = is_icmpv4(flow) || is_icmpv6(flow); + VLOG_WARN_RL(&rl, "Recirculation conflict (%s)!", conflict); + xlate_report(&ctx, "- Recirculation conflict (%s)!", conflict); + ctx.error = XLATE_RECIRCULATION_CONFLICT; + goto exit; + } - tnl_may_send = tnl_xlate_init(&ctx.base_flow, flow, wc); - if (ctx.xbridge->netflow) { - netflow_mask_wc(flow, wc); - } + /* Set the bridge for post-recirculation processing if needed. */ + if (ctx.xbridge->ofproto != state->ofproto) { + struct xlate_cfg *xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp); + const struct xbridge *new_bridge + = xbridge_lookup(xcfg, state->ofproto); + + if (OVS_UNLIKELY(!new_bridge)) { + /* Drop the packet if the bridge cannot be found. */ + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); + VLOG_WARN_RL(&rl, "Recirculation bridge no longer exists."); + xlate_report(&ctx, "- Recirculation bridge no longer exists."); + ctx.error = XLATE_BRIDGE_NOT_FOUND; + goto exit; + } + ctx.xbridge = new_bridge; + } + + /* Set the post-recirculation table id. Note: A table lookup is done + * only if there are no post-recirculation actions. */ + ctx.table_id = state->table_id; + xlate_report(&ctx, "- Resuming from table %"PRIu8, ctx.table_id); + + if (!state->conntracked) { + clear_conntrack(flow); + } + + /* Restore pipeline metadata. May change flow's in_port and other + * metadata to the values that existed when recirculation was + * triggered. */ + recirc_metadata_to_flow(&state->metadata, flow); + + /* Restore stack, if any. */ + if (state->stack) { + ofpbuf_put(&ctx.stack, state->stack->data, state->stack->size); + } + + /* Restore mirror state. */ + ctx.mirrors = state->mirrors; + + /* Restore action set, if any. */ + if (state->action_set_len) { + const struct ofpact *a; - ctx.recurse = 0; - ctx.resubmits = 0; - ctx.in_group = false; - ctx.in_action_set = false; - ctx.orig_skb_priority = flow->skb_priority; - ctx.table_id = 0; - ctx.exit = false; - ctx.use_recirc = false; - ctx.was_mpls = false; + xlate_report_actions(&ctx, "- Restoring action set", + state->ofpacts, state->action_set_len); + + ofpbuf_put(&ctx.action_set, state->ofpacts, state->action_set_len); + + OFPACT_FOR_EACH(a, state->ofpacts, state->action_set_len) { + if (a->type == OFPACT_GROUP) { + ctx.action_set_has_group = true; + break; + } + } + } + + /* Restore recirculation actions. If there are no actions, processing + * will start with a lookup in the table set above. */ + if (state->ofpacts_len > state->action_set_len) { + xin->ofpacts_len = state->ofpacts_len - state->action_set_len; + xin->ofpacts = state->ofpacts + + state->action_set_len / sizeof *state->ofpacts; + + xlate_report_actions(&ctx, "- Restoring actions", + xin->ofpacts, xin->ofpacts_len); + } + } else if (OVS_UNLIKELY(flow->recirc_id)) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); + + VLOG_WARN_RL(&rl, "Recirculation context not found for ID %"PRIx32, + flow->recirc_id); + ctx.error = XLATE_NO_RECIRCULATION_CONTEXT; + goto exit; + } + /* The bridge is now known so obtain its table version. */ + ctx.tables_version = ofproto_dpif_get_tables_version(ctx.xbridge->ofproto); if (!xin->ofpacts && !ctx.rule) { - rule = rule_dpif_lookup(ctx.xbridge->ofproto, flow, - xin->skip_wildcards ? NULL : wc, - ctx.xin->xcache != NULL, - ctx.xin->resubmit_stats, &ctx.table_id); + ctx.rule = rule_dpif_lookup_from_table( + ctx.xbridge->ofproto, ctx.tables_version, flow, xin->wc, + ctx.xin->resubmit_stats, &ctx.table_id, + flow->in_port.ofp_port, true, true); if (ctx.xin->resubmit_stats) { - rule_dpif_credit_stats(rule, ctx.xin->resubmit_stats); + rule_dpif_credit_stats(ctx.rule, ctx.xin->resubmit_stats); } if (ctx.xin->xcache) { struct xc_entry *entry; entry = xlate_cache_add_entry(ctx.xin->xcache, XC_RULE); - entry->u.rule = rule; + entry->u.rule = ctx.rule; + rule_dpif_ref(ctx.rule); } - ctx.rule = rule; if (OVS_UNLIKELY(ctx.xin->resubmit_hook)) { - ctx.xin->resubmit_hook(ctx.xin, rule, 0); + ctx.xin->resubmit_hook(ctx.xin, ctx.rule, 0); } } - xout->fail_open = ctx.rule && rule_dpif_is_fail_open(ctx.rule); - - if (xin->ofpacts) { - ofpacts = xin->ofpacts; - ofpacts_len = xin->ofpacts_len; - } else if (ctx.rule) { - const struct rule_actions *actions = rule_dpif_get_actions(ctx.rule); - - ofpacts = actions->ofpacts; - ofpacts_len = actions->ofpacts_len; - } else { - OVS_NOT_REACHED(); - } - ofpbuf_use_stub(&ctx.stack, ctx.init_stack, sizeof ctx.init_stack); + /* Get the proximate input port of the packet. (If xin->recirc, + * flow->in_port is the ultimate input port of the packet.) */ + struct xport *in_port = get_ofp_port(xbridge, + ctx.base_flow.in_port.ofp_port); - ctx.action_set_has_group = false; - ofpbuf_use_stub(&ctx.action_set, - ctx.action_set_stub, sizeof ctx.action_set_stub); - - if (mbridge_has_mirrors(ctx.xbridge->mbridge)) { - /* Do this conditionally because the copy is expensive enough that it - * shows up in profiles. */ - orig_flow = *flow; - } - - in_port = get_ofp_port(ctx.xbridge, flow->in_port.ofp_port); - if (in_port && in_port->is_tunnel) { + /* Tunnel stats only for non-recirculated packets. */ + if (!xin->recirc && in_port && in_port->is_tunnel) { if (ctx.xin->resubmit_stats) { netdev_vport_inc_rx(in_port->netdev, ctx.xin->resubmit_stats); if (in_port->bfd) { @@ -4524,123 +5248,139 @@ xlate_actions(struct xlate_in *xin, struct xlate_out *xout) } } - special = process_special(&ctx, flow, in_port, ctx.xin->packet); - if (special) { - ctx.xout->slow |= special; + if (!xin->recirc && process_special(&ctx, in_port)) { + /* process_special() did all the processing for this packet. + * + * We do not perform special processing on recirculated packets, as + * recirculated packets are not really received by the bridge.*/ + } else if (in_port && in_port->xbundle + && xbundle_mirror_out(xbridge, in_port->xbundle)) { + if (ctx.xin->packet != NULL) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); + VLOG_WARN_RL(&rl, "bridge %s: dropping packet received on port " + "%s, which is reserved exclusively for mirroring", + ctx.xbridge->name, in_port->xbundle->name); + } } else { - size_t sample_actions_len; - - if (flow->in_port.ofp_port - != vsp_realdev_to_vlandev(ctx.xbridge->ofproto, - flow->in_port.ofp_port, - flow->vlan_tci)) { - ctx.base_flow.vlan_tci = 0; + /* Sampling is done only for packets really received by the bridge. */ + unsigned int user_cookie_offset = 0; + if (!xin->recirc) { + user_cookie_offset = compose_sflow_action(&ctx); + compose_ipfix_action(&ctx, ODPP_NONE); } + size_t sample_actions_len = ctx.odp_actions->size; + + if (tnl_process_ecn(flow) + && (!in_port || may_receive(in_port, &ctx))) { + const struct ofpact *ofpacts; + size_t ofpacts_len; + + if (xin->ofpacts) { + ofpacts = xin->ofpacts; + ofpacts_len = xin->ofpacts_len; + } else if (ctx.rule) { + const struct rule_actions *actions + = rule_dpif_get_actions(ctx.rule); + ofpacts = actions->ofpacts; + ofpacts_len = actions->ofpacts_len; + ctx.rule_cookie = rule_dpif_get_flow_cookie(ctx.rule); + } else { + OVS_NOT_REACHED(); + } - add_sflow_action(&ctx); - add_ipfix_action(&ctx); - sample_actions_len = ctx.xout->odp_actions->size; - - if (tnl_may_send && (!in_port || may_receive(in_port, &ctx))) { + mirror_ingress_packet(&ctx); do_xlate_actions(ofpacts, ofpacts_len, &ctx); + if (ctx.error) { + goto exit; + } /* We've let OFPP_NORMAL and the learning action look at the * packet, so drop it now if forwarding is disabled. */ if (in_port && (!xport_stp_forward_state(in_port) || !xport_rstp_forward_state(in_port))) { /* Drop all actions added by do_xlate_actions() above. */ - ctx.xout->odp_actions->size = sample_actions_len; + ctx.odp_actions->size = sample_actions_len; + + /* Undo changes that may have been done for recirculation. */ + if (exit_recirculates(&ctx)) { + ctx.action_set.size = ctx.recirc_action_offset; + ctx.recirc_action_offset = -1; + ctx.last_unroll_offset = -1; + } } else if (ctx.action_set.size) { - /* Translate action set only if not dropping the packet. */ - xlate_action_set(&ctx); + /* Translate action set only if not dropping the packet and + * not recirculating. */ + if (!exit_recirculates(&ctx)) { + xlate_action_set(&ctx); + } + } + /* Check if need to recirculate. */ + if (exit_recirculates(&ctx)) { + compose_recirculate_action(&ctx); } } - if (ctx.xbridge->has_in_band + /* Output only fully processed packets. */ + if (!exit_recirculates(&ctx) + && xbridge->has_in_band && in_band_must_output_to_local_port(flow) && !actions_output_to_local_port(&ctx)) { - compose_output_action(&ctx, OFPP_LOCAL); + compose_output_action(&ctx, OFPP_LOCAL, NULL); } - fix_sflow_action(&ctx); - - if (mbridge_has_mirrors(ctx.xbridge->mbridge)) { - add_mirror_actions(&ctx, &orig_flow); + if (user_cookie_offset) { + fix_sflow_action(&ctx, user_cookie_offset); } } - if (nl_attr_oversized(ctx.xout->odp_actions->size)) { + if (nl_attr_oversized(ctx.odp_actions->size)) { /* These datapath actions are too big for a Netlink attribute, so we * can't hand them to the kernel directly. dpif_execute() can execute * them one by one with help, so just mark the result as SLOW_ACTION to * prevent the flow from being installed. */ COVERAGE_INC(xlate_actions_oversize); ctx.xout->slow |= SLOW_ACTION; - } else if (too_many_output_actions(ctx.xout->odp_actions)) { + } else if (too_many_output_actions(ctx.odp_actions)) { COVERAGE_INC(xlate_actions_too_many_output); ctx.xout->slow |= SLOW_ACTION; } - if (mbridge_has_mirrors(ctx.xbridge->mbridge)) { + /* Do netflow only for packets really received by the bridge and not sent + * to the controller. We consider packets sent to the controller to be + * part of the control plane rather than the data plane. */ + if (!xin->recirc && xbridge->netflow && !(xout->slow & SLOW_CONTROLLER)) { if (ctx.xin->resubmit_stats) { - mirror_update_stats(ctx.xbridge->mbridge, xout->mirrors, - ctx.xin->resubmit_stats->n_packets, - ctx.xin->resubmit_stats->n_bytes); + netflow_flow_update(xbridge->netflow, flow, + ctx.nf_output_iface, + ctx.xin->resubmit_stats); } if (ctx.xin->xcache) { struct xc_entry *entry; - entry = xlate_cache_add_entry(ctx.xin->xcache, XC_MIRROR); - entry->u.mirror.mbridge = mbridge_ref(ctx.xbridge->mbridge); - entry->u.mirror.mirrors = xout->mirrors; + entry = xlate_cache_add_entry(ctx.xin->xcache, XC_NETFLOW); + entry->u.nf.netflow = netflow_ref(xbridge->netflow); + entry->u.nf.flow = xmemdup(flow, sizeof *flow); + entry->u.nf.iface = ctx.nf_output_iface; } } - if (ctx.xbridge->netflow) { - /* Only update netflow if we don't have controller flow. We don't - * report NetFlow expiration messages for such facets because they - * are just part of the control logic for the network, not real - * traffic. */ - if (ofpacts_len == 0 - || ofpacts->type != OFPACT_CONTROLLER - || ofpact_next(ofpacts) < ofpact_end(ofpacts, ofpacts_len)) { - if (ctx.xin->resubmit_stats) { - netflow_flow_update(ctx.xbridge->netflow, flow, - xout->nf_output_iface, - ctx.xin->resubmit_stats); - } - if (ctx.xin->xcache) { - struct xc_entry *entry; - - entry = xlate_cache_add_entry(ctx.xin->xcache, XC_NETFLOW); - entry->u.nf.netflow = netflow_ref(ctx.xbridge->netflow); - entry->u.nf.flow = xmemdup(flow, sizeof *flow); - entry->u.nf.iface = xout->nf_output_iface; - } - } + if (xin->wc) { + xlate_wc_finish(&ctx); } +exit: ofpbuf_uninit(&ctx.stack); ofpbuf_uninit(&ctx.action_set); + ofpbuf_uninit(&scratch_actions); - /* Clear the metadata and register wildcard masks, because we won't - * use non-header fields as part of the cache. */ - flow_wildcards_clear_non_packet_fields(wc); - - /* ICMPv4 and ICMPv6 have 8-bit "type" and "code" fields. struct flow uses - * the low 8 bits of the 16-bit tp_src and tp_dst members to represent - * these fields. The datapath interface, on the other hand, represents - * them with just 8 bits each. This means that if the high 8 bits of the - * masks for these fields somehow become set, then they will get chopped - * off by a round trip through the datapath, and revalidation will spot - * that as an inconsistency and delete the flow. Avoid the problem here by - * making sure that only the low 8 bits of either field can be unwildcarded - * for ICMP. - */ - if (is_icmp) { - wc->masks.tp_src &= htons(UINT8_MAX); - wc->masks.tp_dst &= htons(UINT8_MAX); + /* Make sure we return a "drop flow" in case of an error. */ + if (ctx.error) { + xout->slow = 0; + if (xin->odp_actions) { + ofpbuf_clear(xin->odp_actions); + } } + return ctx.error; } /* Sends 'packet' out 'ofport'. @@ -4734,7 +5474,7 @@ xlate_push_stats(struct xlate_cache *xcache, { struct xc_entry *entry; struct ofpbuf entries = xcache->entries; - uint8_t dmac[ETH_ADDR_LEN]; + struct eth_addr dmac; if (!stats->n_packets) { return; @@ -4776,9 +5516,10 @@ xlate_push_stats(struct xlate_cache *xcache, group_dpif_credit_stats(entry->u.group.group, entry->u.group.bucket, stats); break; - case XC_TNL_ARP: - /* Lookup arp to avoid arp timeout. */ - tnl_arp_lookup(entry->u.tnl_arp_cache.br_name, entry->u.tnl_arp_cache.d_ip, dmac); + case XC_TNL_NEIGH: + /* Lookup neighbor to avoid timeout. */ + tnl_neigh_lookup(entry->u.tnl_neigh_cache.br_name, + &entry->u.tnl_neigh_cache.d_ipv6, &dmac); break; default: OVS_NOT_REACHED(); @@ -4850,7 +5591,7 @@ xlate_cache_clear(struct xlate_cache *xcache) case XC_GROUP: group_dpif_unref(entry->u.group.group); break; - case XC_TNL_ARP: + case XC_TNL_NEIGH: break; default: OVS_NOT_REACHED();