X-Git-Url: http://git.cascardo.eti.br/?a=blobdiff_plain;f=ofproto%2Fofproto-dpif-xlate.c;h=541708746009b2d967bbe6f4975b959e9132769b;hb=06994f879c9d;hp=eded9d8066122c557a1c08196c9eeff688f1cb56;hpb=4165b5e0bc6066c8e3fd4af6562bdb2324a4bf12;p=cascardo%2Fovs.git diff --git a/ofproto/ofproto-dpif-xlate.c b/ofproto/ofproto-dpif-xlate.c index eded9d806..541708746 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 Nicira, Inc. +/* Copyright (c) 2009, 2010, 2011, 2012, 2013, 2014, 2015 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,12 @@ #include "ofproto/ofproto-dpif-xlate.h" #include +#include +#include +#include +#include +#include "tnl-arp-cache.h" #include "bfd.h" #include "bitmap.h" #include "bond.h" @@ -26,13 +31,16 @@ #include "cfm.h" #include "connmgr.h" #include "coverage.h" +#include "dp-packet.h" #include "dpif.h" #include "dynamic-string.h" #include "in-band.h" #include "lacp.h" #include "learn.h" #include "list.h" +#include "ovs-lldp.h" #include "mac-learning.h" +#include "mcast-snooping.h" #include "meta-flow.h" #include "multipath.h" #include "netdev-vport.h" @@ -46,12 +54,14 @@ #include "ofproto/ofproto-dpif-sflow.h" #include "ofproto/ofproto-dpif.h" #include "ofproto/ofproto-provider.h" +#include "ovs-router.h" +#include "tnl-ports.h" #include "tunnel.h" -#include "vlog.h" +#include "openvswitch/vlog.h" COVERAGE_DEFINE(xlate_actions); COVERAGE_DEFINE(xlate_actions_oversize); -COVERAGE_DEFINE(xlate_actions_mpls_overflow); +COVERAGE_DEFINE(xlate_actions_too_many_output); VLOG_DEFINE_THIS_MODULE(ofproto_dpif_xlate); @@ -69,47 +79,35 @@ struct xbridge { struct hmap_node hmap_node; /* Node in global 'xbridges' map. */ struct ofproto_dpif *ofproto; /* Key in global 'xbridges' map. */ - struct list xbundles; /* Owned xbundles. */ + struct ovs_list xbundles; /* Owned xbundles. */ struct hmap xports; /* Indexed by ofp_port. */ char *name; /* Name used in log messages. */ struct dpif *dpif; /* Datapath interface. */ struct mac_learning *ml; /* Mac learning handle. */ + struct mcast_snooping *ms; /* Multicast Snooping handle. */ struct mbridge *mbridge; /* Mirroring. */ struct dpif_sflow *sflow; /* SFlow handle, or null. */ struct dpif_ipfix *ipfix; /* Ipfix handle, or null. */ struct netflow *netflow; /* Netflow handle, or null. */ struct stp *stp; /* STP or null if disabled. */ + struct rstp *rstp; /* RSTP or null if disabled. */ - /* Special rules installed by ofproto-dpif. */ - struct rule_dpif *miss_rule; - struct rule_dpif *no_packet_in_rule; - - enum ofp_config_flags frag; /* Fragmentation handling. */ 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; + /* Datapath feature support. */ + struct dpif_backer_support support; }; struct xbundle { struct hmap_node hmap_node; /* In global 'xbundles' map. */ struct ofbundle *ofbundle; /* Key in global 'xbundles' map. */ - struct list list_node; /* In parent 'xbridges' list. */ + struct ovs_list list_node; /* In parent 'xbridges' list. */ struct xbridge *xbridge; /* Parent xbridge. */ - struct list xports; /* Contains "struct xport"s. */ + struct ovs_list xports; /* Contains "struct xport"s. */ char *name; /* Name used in log messages. */ struct bond *bond; /* Nonnull iff more than one port. */ @@ -132,7 +130,7 @@ struct xport { odp_port_t odp_port; /* Datapath port number or ODPP_NONE. */ - struct list bundle_node; /* In parent xbundle (if it exists). */ + struct ovs_list bundle_node; /* In parent xbundle (if it exists). */ struct xbundle *xbundle; /* Parent xbundle or null. */ struct netdev *netdev; /* 'ofport''s netdev. */ @@ -143,6 +141,7 @@ struct xport { enum ofputil_port_config config; /* OpenFlow port configuration. */ enum ofputil_port_state state; /* OpenFlow port state. */ int stp_port_no; /* STP port number or -1 if not in use. */ + struct rstp_port *rstp_port; /* RSTP port or null. */ struct hmap skb_priorities; /* Map of 'skb_priority_to_dscp's. */ @@ -151,6 +150,7 @@ struct xport { struct cfm *cfm; /* CFM handle or null. */ struct bfd *bfd; /* BFD handle or null. */ + struct lldp *lldp; /* LLDP handle or null. */ }; struct xlate_ctx { @@ -159,6 +159,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; @@ -182,28 +185,143 @@ struct xlate_ctx { 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. */ bool exit; /* No further actions should be processed. */ - bool use_recirc; /* Should generate recirc? */ - struct xlate_recirc recirc; /* Information used for generating - * recirculation actions */ + /* 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 + * or looking up a flow requires access to the fields of the packet after + * the MPLS label stack that was originally present. */ + bool was_mpls; /* 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]; }; +static void xlate_action_set(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 @@ -234,6 +352,7 @@ enum xc_type { XC_NORMAL, XC_FIN_TIMEOUT, XC_GROUP, + XC_TNL_ARP, }; /* xlate_cache entries hold enough information to perform the side effects of @@ -283,6 +402,10 @@ struct xc_entry { struct group_dpif *group; struct ofputil_bucket *bucket; } group; + struct { + char br_name[IFNAMSIZ]; + ovs_be32 d_ip; + } tnl_arp_cache; } u; }; @@ -306,14 +429,15 @@ struct xlate_cfg { struct hmap xbundles; struct hmap xports; }; -static OVSRCU_TYPE(struct xlate_cfg *) xcfgp = OVSRCU_TYPE_INITIALIZER; +static OVSRCU_TYPE(struct xlate_cfg *) xcfgp = OVSRCU_INITIALIZER(NULL); static struct xlate_cfg *new_xcfg = NULL; 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 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); @@ -321,7 +445,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 *); @@ -333,6 +466,7 @@ static struct xport *get_ofp_port(const struct xbridge *, ofp_port_t ofp_port); static struct skb_priority_to_dscp *get_skb_priority(const struct xport *, uint32_t skb_priority); static void clear_skb_priorities(struct xport *); +static size_t count_skb_priorities(const struct xport *); static bool dscp_from_skb_priority(const struct xport *, uint32_t skb_priority, uint8_t *dscp); @@ -341,20 +475,15 @@ static struct xc_entry *xlate_cache_add_entry(struct xlate_cache *xc, static void xlate_xbridge_init(struct xlate_cfg *, struct xbridge *); static void xlate_xbundle_init(struct xlate_cfg *, struct xbundle *); static void xlate_xport_init(struct xlate_cfg *, struct xport *); -static void xlate_xbridge_set(struct xbridge *xbridge, - struct dpif *dpif, - struct rule_dpif *miss_rule, - struct rule_dpif *no_packet_in_rule, - const struct mac_learning *ml, struct stp *stp, - const struct mbridge *mbridge, - const struct dpif_sflow *sflow, - const struct dpif_ipfix *ipfix, - const struct netflow *netflow, - enum ofp_config_flags frag, +static void xlate_xbridge_set(struct xbridge *, struct dpif *, + const struct mac_learning *, struct stp *, + struct rstp *, const struct mcast_snooping *, + const struct mbridge *, + const struct dpif_sflow *, + 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); + 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, @@ -362,7 +491,8 @@ static void xlate_xbundle_set(struct xbundle *xbundle, bool floodable); static void xlate_xport_set(struct xport *xport, odp_port_t odp_port, const struct netdev *netdev, const struct cfm *cfm, - const struct bfd *bfd, int stp_port_no, + const struct bfd *bfd, const struct lldp *lldp, + int stp_port_no, const struct rstp_port *rstp_port, enum ofputil_port_config config, enum ofputil_port_state state, bool is_tunnel, bool may_enable); @@ -375,6 +505,17 @@ static void xlate_xport_copy(struct xbridge *, struct xbundle *, struct xport *); static void xlate_xcfg_free(struct xlate_cfg *); +static inline void +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 void xlate_xbridge_init(struct xlate_cfg *xcfg, struct xbridge *xbridge) @@ -407,23 +548,25 @@ xlate_xport_init(struct xlate_cfg *xcfg, struct xport *xport) static void xlate_xbridge_set(struct xbridge *xbridge, struct dpif *dpif, - struct rule_dpif *miss_rule, - struct rule_dpif *no_packet_in_rule, const struct mac_learning *ml, struct stp *stp, + struct rstp *rstp, const struct mcast_snooping *ms, const struct mbridge *mbridge, const struct dpif_sflow *sflow, const struct dpif_ipfix *ipfix, - const struct netflow *netflow, enum ofp_config_flags frag, + const struct netflow *netflow, bool forward_bpdu, bool has_in_band, - bool enable_recirc, - bool variable_length_userdata, - size_t max_mpls_depth) + const struct dpif_backer_support *support) { if (xbridge->ml != ml) { mac_learning_unref(xbridge->ml); xbridge->ml = mac_learning_ref(ml); } + if (xbridge->ms != ms) { + mcast_snooping_unref(xbridge->ms); + xbridge->ms = mcast_snooping_ref(ms); + } + if (xbridge->mbridge != mbridge) { mbridge_unref(xbridge->mbridge); xbridge->mbridge = mbridge_ref(mbridge); @@ -444,6 +587,11 @@ xlate_xbridge_set(struct xbridge *xbridge, xbridge->stp = stp_ref(stp); } + if (xbridge->rstp != rstp) { + rstp_unref(xbridge->rstp); + xbridge->rstp = rstp_ref(rstp); + } + if (xbridge->netflow != netflow) { netflow_unref(xbridge->netflow); xbridge->netflow = netflow_ref(netflow); @@ -452,12 +600,7 @@ xlate_xbridge_set(struct xbridge *xbridge, xbridge->dpif = dpif; xbridge->forward_bpdu = forward_bpdu; xbridge->has_in_band = has_in_band; - xbridge->frag = frag; - xbridge->miss_rule = miss_rule; - xbridge->no_packet_in_rule = no_packet_in_rule; - xbridge->enable_recirc = enable_recirc; - xbridge->variable_length_userdata = variable_length_userdata; - xbridge->max_mpls_depth = max_mpls_depth; + xbridge->support = *support; } static void @@ -489,7 +632,8 @@ xlate_xbundle_set(struct xbundle *xbundle, static void xlate_xport_set(struct xport *xport, odp_port_t odp_port, const struct netdev *netdev, const struct cfm *cfm, - const struct bfd *bfd, int stp_port_no, + const struct bfd *bfd, const struct lldp *lldp, int stp_port_no, + const struct rstp_port* rstp_port, enum ofputil_port_config config, enum ofputil_port_state state, bool is_tunnel, bool may_enable) { @@ -500,6 +644,11 @@ xlate_xport_set(struct xport *xport, odp_port_t odp_port, xport->may_enable = may_enable; xport->odp_port = odp_port; + if (xport->rstp_port != rstp_port) { + rstp_port_unref(xport->rstp_port); + xport->rstp_port = rstp_port_ref(rstp_port); + } + if (xport->cfm != cfm) { cfm_unref(xport->cfm); xport->cfm = cfm_ref(cfm); @@ -510,6 +659,11 @@ xlate_xport_set(struct xport *xport, odp_port_t odp_port, xport->bfd = bfd_ref(bfd); } + if (xport->lldp != lldp) { + lldp_unref(xport->lldp); + xport->lldp = lldp_ref(lldp); + } + if (xport->netdev != netdev) { netdev_close(xport->netdev); xport->netdev = netdev_ref(netdev); @@ -527,13 +681,11 @@ xlate_xbridge_copy(struct xbridge *xbridge) xlate_xbridge_init(new_xcfg, new_xbridge); xlate_xbridge_set(new_xbridge, - xbridge->dpif, xbridge->miss_rule, - xbridge->no_packet_in_rule, xbridge->ml, xbridge->stp, - xbridge->mbridge, xbridge->sflow, xbridge->ipfix, - xbridge->netflow, xbridge->frag, xbridge->forward_bpdu, - xbridge->has_in_band, xbridge->enable_recirc, - xbridge->variable_length_userdata, - xbridge->max_mpls_depth); + 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->support); LIST_FOR_EACH (xbundle, list_node, &xbridge->xbundles) { xlate_xbundle_copy(new_xbridge, xbundle); } @@ -577,7 +729,8 @@ xlate_xport_copy(struct xbridge *xbridge, struct xbundle *xbundle, xlate_xport_init(new_xcfg, new_xport); xlate_xport_set(new_xport, xport->odp_port, xport->netdev, xport->cfm, - xport->bfd, xport->stp_port_no, xport->config, xport->state, + xport->bfd, xport->lldp, xport->stp_port_no, + xport->rstp_port, xport->config, xport->state, xport->is_tunnel, xport->may_enable); if (xport->peer) { @@ -623,8 +776,8 @@ xlate_txn_commit(void) struct xlate_cfg *xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp); ovsrcu_set(&xcfgp, new_xcfg); - ovsrcu_postpone(xlate_xcfg_free, xcfg); - + ovsrcu_synchronize(); + xlate_xcfg_free(xcfg); new_xcfg = NULL; } @@ -676,17 +829,15 @@ xlate_xcfg_free(struct xlate_cfg *xcfg) void xlate_ofproto_set(struct ofproto_dpif *ofproto, const char *name, - struct dpif *dpif, struct rule_dpif *miss_rule, - struct rule_dpif *no_packet_in_rule, + struct dpif *dpif, const struct mac_learning *ml, struct stp *stp, + struct rstp *rstp, const struct mcast_snooping *ms, const struct mbridge *mbridge, const struct dpif_sflow *sflow, const struct dpif_ipfix *ipfix, - const struct netflow *netflow, enum ofp_config_flags frag, + const struct netflow *netflow, bool forward_bpdu, bool has_in_band, - bool enable_recirc, - bool variable_length_userdata, - size_t max_mpls_depth) + const struct dpif_backer_support *support) { struct xbridge *xbridge; @@ -703,10 +854,8 @@ xlate_ofproto_set(struct ofproto_dpif *ofproto, const char *name, free(xbridge->name); xbridge->name = xstrdup(name); - xlate_xbridge_set(xbridge, dpif, miss_rule, no_packet_in_rule, ml, stp, - mbridge, sflow, ipfix, netflow, frag, forward_bpdu, - has_in_band, enable_recirc, variable_length_userdata, - max_mpls_depth); + xlate_xbridge_set(xbridge, dpif, ml, stp, rstp, ms, mbridge, sflow, ipfix, + netflow, forward_bpdu, has_in_band, support); } static void @@ -729,10 +878,12 @@ xlate_xbridge_remove(struct xlate_cfg *xcfg, struct xbridge *xbridge) hmap_remove(&xcfg->xbridges, &xbridge->hmap_node); mac_learning_unref(xbridge->ml); + mcast_snooping_unref(xbridge->ms); mbridge_unref(xbridge->mbridge); dpif_sflow_unref(xbridge->sflow); dpif_ipfix_unref(xbridge->ipfix); stp_unref(xbridge->stp); + rstp_unref(xbridge->rstp); hmap_destroy(&xbridge->xports); free(xbridge->name); free(xbridge); @@ -779,14 +930,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; } @@ -814,7 +964,8 @@ xlate_ofport_set(struct ofproto_dpif *ofproto, struct ofbundle *ofbundle, struct ofport_dpif *ofport, ofp_port_t ofp_port, odp_port_t odp_port, const struct netdev *netdev, const struct cfm *cfm, const struct bfd *bfd, - struct ofport_dpif *peer, int stp_port_no, + const struct lldp *lldp, struct ofport_dpif *peer, + int stp_port_no, const struct rstp_port *rstp_port, const struct ofproto_port_queue *qdscp_list, size_t n_qdscp, enum ofputil_port_config config, enum ofputil_port_state state, bool is_tunnel, @@ -837,8 +988,9 @@ xlate_ofport_set(struct ofproto_dpif *ofproto, struct ofbundle *ofbundle, ovs_assert(xport->ofp_port == ofp_port); - xlate_xport_set(xport, odp_port, netdev, cfm, bfd, stp_port_no, config, - state, is_tunnel, may_enable); + xlate_xport_set(xport, odp_port, netdev, cfm, bfd, lldp, + stp_port_no, rstp_port, config, state, is_tunnel, + may_enable); if (xport->peer) { xport->peer->peer = NULL; @@ -897,8 +1049,10 @@ xlate_xport_remove(struct xlate_cfg *xcfg, struct xport *xport) hmap_remove(&xport->xbridge->xports, &xport->ofp_node); netdev_close(xport->netdev); + rstp_port_unref(xport->rstp_port); cfm_unref(xport->cfm); bfd_unref(xport->bfd); + lldp_unref(xport->lldp); free(xport); } @@ -913,85 +1067,78 @@ xlate_ofport_remove(struct ofport_dpif *ofport) xlate_xport_remove(new_xcfg, xport); } -/* Given a datpath, packet, and flow metadata ('backer', 'packet', and 'key' - * respectively), populates 'flow' with the result of odp_flow_key_to_flow(). - * Optionally populates 'ofproto' with the ofproto_dpif, 'odp_in_port' with - * the datapath in_port, that 'packet' ingressed, and 'ipfix', 'sflow', and - * 'netflow' with the appropriate handles for those protocols if they're - * enabled. Caller is responsible for unrefing them. - * - * If 'ofproto' is nonnull, requires 'flow''s in_port to exist. Otherwise sets - * 'flow''s in_port to OFPP_NONE. - * - * This function does post-processing on data returned from - * odp_flow_key_to_flow() to help make VLAN splinters transparent to the rest - * of the upcall processing logic. In particular, if the extracted in_port is - * a VLAN splinter port, it replaces flow->in_port by the "real" port, sets - * flow->vlan_tci correctly for the VLAN of the VLAN splinter port, and pushes - * a VLAN header onto 'packet' (if it is nonnull). - * - * Similarly, this function also includes some logic to help with tunnels. It - * may modify 'flow' as necessary to make the tunneling implementation - * transparent to the upcall processing logic. - * - * Returns 0 if successful, ENODEV if the parsed flow has no associated ofport, - * or some other positive errno if there are other problems. */ -int -xlate_receive(const struct dpif_backer *backer, struct ofpbuf *packet, - const struct nlattr *key, size_t key_len, struct flow *flow, - struct ofproto_dpif **ofproto, struct dpif_ipfix **ipfix, - struct dpif_sflow **sflow, struct netflow **netflow, - odp_port_t *odp_in_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 xlate_cfg *xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp); - int error = ENODEV; const struct xport *xport; - if (odp_flow_key_to_flow(key, key_len, flow) == ODP_FIT_ERROR) { - error = EINVAL; - return error; - } - - if (odp_in_port) { - *odp_in_port = flow->in_port.odp_port; - } - xport = xport_lookup(xcfg, tnl_port_should_receive(flow) ? tnl_port_receive(flow) : odp_port_to_ofport(backer, flow->in_port.odp_port)); - - flow->in_port.ofp_port = xport ? xport->ofp_port : OFPP_NONE; - if (!xport) { - return error; + if (OVS_UNLIKELY(!xport)) { + return NULL; + } + *xportp = xport; + if (ofp_in_port) { + *ofp_in_port = xport->ofp_port; } + return xport->xbridge->ofproto; +} - if (vsp_adjust_flow(xport->xbridge->ofproto, flow)) { - if (packet) { - /* Make the packet resemble the flow, so that it gets sent to - * an OpenFlow controller properly, so that it looks correct - * for sFlow, and so that flow_extract() will get the correct - * vlan_tci if it is called on 'packet'. */ - eth_push_vlan(packet, htons(ETH_TYPE_VLAN), flow->vlan_tci); - } +/* Given a datapath and flow metadata ('backer', and 'flow' respectively) + * returns the corresponding struct ofproto_dpif and OpenFlow port number. */ +struct ofproto_dpif * +xlate_lookup_ofproto(const struct dpif_backer *backer, const struct flow *flow, + ofp_port_t *ofp_in_port) +{ + const struct xport *xport; + + return xlate_lookup_ofproto_(backer, flow, ofp_in_port, &xport); +} + +/* Given a datapath and flow metadata ('backer', and 'flow' respectively), + * optionally populates 'ofproto' with the ofproto_dpif, 'ofp_in_port' with the + * openflow in_port, and 'ipfix', 'sflow', and 'netflow' with the appropriate + * handles for those protocols if they're enabled. Caller may use the returned + * pointers until quiescing, for longer term use additional references must + * be taken. + * + * Returns 0 if successful, ENODEV if the parsed flow has no associated ofproto. + */ +int +xlate_lookup(const struct dpif_backer *backer, const struct flow *flow, + struct ofproto_dpif **ofprotop, struct dpif_ipfix **ipfix, + struct dpif_sflow **sflow, struct netflow **netflow, + ofp_port_t *ofp_in_port) +{ + struct ofproto_dpif *ofproto; + const struct xport *xport; + + ofproto = xlate_lookup_ofproto_(backer, flow, ofp_in_port, &xport); + + if (!ofproto) { + return ENODEV; } - error = 0; - if (ofproto) { - *ofproto = xport->xbridge->ofproto; + if (ofprotop) { + *ofprotop = ofproto; } if (ipfix) { - *ipfix = dpif_ipfix_ref(xport->xbridge->ipfix); + *ipfix = xport ? xport->xbridge->ipfix : NULL; } if (sflow) { - *sflow = dpif_sflow_ref(xport->xbridge->sflow); + *sflow = xport ? xport->xbridge->sflow : NULL; } if (netflow) { - *netflow = netflow_ref(xport->xbridge->netflow); + *netflow = xport ? xport->xbridge->netflow : NULL; } - return error; + + return 0; } static struct xbridge * @@ -1069,21 +1216,25 @@ static bool xport_stp_learn_state(const struct xport *xport) { struct stp_port *sp = xport_get_stp_port(xport); - return stp_learn_in_state(sp ? stp_port_get_state(sp) : STP_DISABLED); + return sp + ? stp_learn_in_state(stp_port_get_state(sp)) + : true; } static bool xport_stp_forward_state(const struct xport *xport) { struct stp_port *sp = xport_get_stp_port(xport); - return stp_forward_in_state(sp ? stp_port_get_state(sp) : STP_DISABLED); + return sp + ? stp_forward_in_state(stp_port_get_state(sp)) + : true; } static bool -xport_stp_listen_state(const struct xport *xport) +xport_stp_should_forward_bpdu(const struct xport *xport) { struct stp_port *sp = xport_get_stp_port(xport); - return stp_listen_in_state(sp ? stp_port_get_state(sp) : STP_DISABLED); + return stp_should_forward_bpdu(sp ? stp_port_get_state(sp) : STP_DISABLED); } /* Returns true if STP should process 'flow'. Sets fields in 'wc' that @@ -1097,11 +1248,11 @@ stp_should_process_flow(const struct flow *flow, struct flow_wildcards *wc) } static void -stp_process_packet(const struct xport *xport, const struct ofpbuf *packet) +stp_process_packet(const struct xport *xport, const struct dp_packet *packet) { struct stp_port *sp = xport_get_stp_port(xport); - struct ofpbuf payload = *packet; - struct eth_header *eth = ofpbuf_data(&payload); + struct dp_packet payload = *packet; + struct eth_header *eth = dp_packet_data(&payload); /* Sink packets on ports that have STP disabled when the bridge has * STP enabled. */ @@ -1110,12 +1261,64 @@ stp_process_packet(const struct xport *xport, const struct ofpbuf *packet) } /* Trim off padding on payload. */ - if (ofpbuf_size(&payload) > ntohs(eth->eth_type) + ETH_HEADER_LEN) { - ofpbuf_set_size(&payload, ntohs(eth->eth_type) + ETH_HEADER_LEN); + if (dp_packet_size(&payload) > ntohs(eth->eth_type) + ETH_HEADER_LEN) { + dp_packet_set_size(&payload, ntohs(eth->eth_type) + ETH_HEADER_LEN); + } + + if (dp_packet_try_pull(&payload, ETH_HEADER_LEN + LLC_HEADER_LEN)) { + stp_received_bpdu(sp, dp_packet_data(&payload), dp_packet_size(&payload)); + } +} + +static enum rstp_state +xport_get_rstp_port_state(const struct xport *xport) +{ + return xport->rstp_port + ? rstp_port_get_state(xport->rstp_port) + : RSTP_DISABLED; +} + +static bool +xport_rstp_learn_state(const struct xport *xport) +{ + return xport->xbridge->rstp && xport->rstp_port + ? rstp_learn_in_state(xport_get_rstp_port_state(xport)) + : true; +} + +static bool +xport_rstp_forward_state(const struct xport *xport) +{ + return xport->xbridge->rstp && xport->rstp_port + ? rstp_forward_in_state(xport_get_rstp_port_state(xport)) + : true; +} + +static bool +xport_rstp_should_manage_bpdu(const struct xport *xport) +{ + return rstp_should_manage_bpdu(xport_get_rstp_port_state(xport)); +} + +static void +rstp_process_packet(const struct xport *xport, const struct dp_packet *packet) +{ + struct dp_packet payload = *packet; + struct eth_header *eth = dp_packet_data(&payload); + + /* Sink packets on ports that have no RSTP. */ + if (!xport->rstp_port) { + return; + } + + /* Trim off padding on payload. */ + if (dp_packet_size(&payload) > ntohs(eth->eth_type) + ETH_HEADER_LEN) { + dp_packet_set_size(&payload, ntohs(eth->eth_type) + ETH_HEADER_LEN); } - if (ofpbuf_try_pull(&payload, ETH_HEADER_LEN + LLC_HEADER_LEN)) { - stp_received_bpdu(sp, ofpbuf_data(&payload), ofpbuf_size(&payload)); + if (dp_packet_try_pull(&payload, ETH_HEADER_LEN + LLC_HEADER_LEN)) { + rstp_port_received_bpdu(xport->rstp_port, dp_packet_data(&payload), + dp_packet_size(&payload)); } } @@ -1143,15 +1346,8 @@ ofp_port_to_odp_port(const struct xbridge *xbridge, ofp_port_t ofp_port) static bool odp_port_is_alive(const struct xlate_ctx *ctx, ofp_port_t ofp_port) { - struct xport *xport; - - xport = get_ofp_port(ctx->xbridge, ofp_port); - if (!xport || xport->config & OFPUTIL_PC_PORT_DOWN || - xport->state & OFPUTIL_PS_LINK_DOWN) { - return false; - } - - return true; + struct xport *xport = get_ofp_port(ctx->xbridge, ofp_port); + return xport && xport->may_enable; } static struct ofputil_bucket * @@ -1200,7 +1396,7 @@ group_first_live_bucket(const struct xlate_ctx *ctx, const struct group_dpif *group, int depth) { struct ofputil_bucket *bucket; - const struct list *buckets; + const struct ovs_list *buckets; group_dpif_get_buckets(group, &buckets); LIST_FOR_EACH (bucket, list_node, buckets) { @@ -1222,7 +1418,7 @@ group_best_live_bucket(const struct xlate_ctx *ctx, int i = 0; struct ofputil_bucket *bucket; - const struct list *buckets; + const struct ovs_list *buckets; group_dpif_get_buckets(group, &buckets); LIST_FOR_EACH (bucket, list_node, buckets) { @@ -1347,7 +1543,7 @@ add_mirror_actions(struct xlate_ctx *ctx, const struct flow *orig_flow) "%s, which is reserved exclusively for mirroring", ctx->xbridge->name, in_xbundle->name); } - ofpbuf_clear(&ctx->xout->odp_actions); + ofpbuf_clear(ctx->xout->odp_actions); return; } @@ -1524,28 +1720,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 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.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. */ @@ -1562,9 +1758,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); @@ -1592,7 +1788,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; } @@ -1668,9 +1864,10 @@ is_admissible(struct xlate_ctx *ctx, struct xport *in_port, case BV_DROP_IF_MOVED: ovs_rwlock_rdlock(&xbridge->ml->rwlock); mac = mac_learning_lookup(xbridge->ml, flow->dl_src, vlan); - if (mac && mac->port.p != in_xbundle->ofbundle && - (!is_gratuitous_arp(flow, &ctx->xout->wc) - || mac_entry_is_grat_arp_locked(mac))) { + if (mac + && mac_entry_get_port(xbridge->ml, mac) != in_xbundle->ofbundle + && (!is_gratuitous_arp(flow, &ctx->xout->wc) + || mac_entry_is_grat_arp_locked(mac))) { ovs_rwlock_unlock(&xbridge->ml->rwlock); xlate_report(ctx, "SLB bond thinks this packet looped back, " "dropping"); @@ -1722,7 +1919,7 @@ OVS_REQ_RDLOCK(ml->rwlock) } } - return mac->port.p != in_xbundle->ofbundle; + return mac_entry_get_port(ml, mac) != in_xbundle->ofbundle; } @@ -1758,7 +1955,7 @@ OVS_REQ_WRLOCK(xbridge->ml->rwlock) } } - if (mac->port.p != in_xbundle->ofbundle) { + if (mac_entry_get_port(xbridge->ml, mac) != in_xbundle->ofbundle) { /* The log messages here could actually be useful in debugging, * so keep the rate limit relatively high. */ static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(30, 300); @@ -1768,8 +1965,7 @@ OVS_REQ_WRLOCK(xbridge->ml->rwlock) xbridge->name, ETH_ADDR_ARGS(flow->dl_src), in_xbundle->name, vlan); - mac->port.p = in_xbundle->ofbundle; - mac_learning_changed(xbridge->ml); + mac_entry_set_port(xbridge->ml, mac, in_xbundle->ofbundle); } } @@ -1799,6 +1995,231 @@ 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_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_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_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); + } + break; + case IGMP_HOST_MEMBERSHIP_QUERY: + if (flow->nw_src && mcast_snooping_add_mrouter(ms, vlan, + in_xbundle->ofbundle)) { + VLOG_DBG_RL(&rl, "bridge %s: multicast snooping query from " + IP_FMT" is on port %s in VLAN %d", + xbridge->name, IP_ARGS(flow->nw_src), + 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; + } +} + +/* Updates multicast snooping table 'ms' given that a packet matching 'flow' + * was received on 'in_xbundle' in 'vlan'. */ +static void +update_mcast_snooping_table(const struct xbridge *xbridge, + const struct flow *flow, int vlan, + struct xbundle *in_xbundle, + const struct dp_packet *packet) +{ + struct mcast_snooping *ms = xbridge->ms; + struct xlate_cfg *xcfg; + struct xbundle *mcast_xbundle; + struct mcast_port_bundle *fport; + + /* Don't learn the OFPP_NONE port. */ + if (in_xbundle == &ofpp_none_bundle) { + return; + } + + /* Don't learn from flood ports */ + mcast_xbundle = NULL; + ovs_rwlock_wrlock(&ms->rwlock); + xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp); + LIST_FOR_EACH(fport, node, &ms->fport_list) { + mcast_xbundle = xbundle_lookup(xcfg, fport->port); + if (mcast_xbundle == in_xbundle) { + break; + } + } + + if (!mcast_xbundle || mcast_xbundle != 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); +} + +/* send the packet to ports having the multicast group learned */ +static void +xlate_normal_mcast_send_group(struct xlate_ctx *ctx, + struct mcast_snooping *ms OVS_UNUSED, + struct mcast_group *grp, + struct xbundle *in_xbundle, uint16_t vlan) + OVS_REQ_RDLOCK(ms->rwlock) +{ + struct xlate_cfg *xcfg; + struct mcast_group_bundle *b; + struct xbundle *mcast_xbundle; + + xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp); + LIST_FOR_EACH(b, bundle_node, &grp->bundle_lru) { + mcast_xbundle = xbundle_lookup(xcfg, b->port); + if (mcast_xbundle && mcast_xbundle != in_xbundle) { + xlate_report(ctx, "forwarding to mcast group port"); + output_normal(ctx, mcast_xbundle, vlan); + } else if (!mcast_xbundle) { + xlate_report(ctx, "mcast group port is unknown, dropping"); + } else { + xlate_report(ctx, "mcast group port is input port, dropping"); + } + } +} + +/* send the packet to ports connected to multicast routers */ +static void +xlate_normal_mcast_send_mrouters(struct xlate_ctx *ctx, + struct mcast_snooping *ms, + struct xbundle *in_xbundle, uint16_t vlan) + OVS_REQ_RDLOCK(ms->rwlock) +{ + struct xlate_cfg *xcfg; + struct mcast_mrouter_bundle *mrouter; + struct xbundle *mcast_xbundle; + + xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp); + LIST_FOR_EACH(mrouter, mrouter_node, &ms->mrouter_lru) { + mcast_xbundle = xbundle_lookup(xcfg, mrouter->port); + if (mcast_xbundle && mcast_xbundle != in_xbundle) { + xlate_report(ctx, "forwarding to mcast router port"); + output_normal(ctx, mcast_xbundle, vlan); + } else if (!mcast_xbundle) { + xlate_report(ctx, "mcast router port is unknown, dropping"); + } else { + xlate_report(ctx, "mcast router port is input port, dropping"); + } + } +} + +/* send the packet to ports flagged to be flooded */ +static void +xlate_normal_mcast_send_fports(struct xlate_ctx *ctx, + struct mcast_snooping *ms, + struct xbundle *in_xbundle, uint16_t vlan) + OVS_REQ_RDLOCK(ms->rwlock) +{ + struct xlate_cfg *xcfg; + struct mcast_port_bundle *fport; + struct xbundle *mcast_xbundle; + + xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp); + LIST_FOR_EACH(fport, node, &ms->fport_list) { + mcast_xbundle = xbundle_lookup(xcfg, fport->port); + if (mcast_xbundle && mcast_xbundle != in_xbundle) { + xlate_report(ctx, "forwarding to mcast flood port"); + output_normal(ctx, mcast_xbundle, vlan); + } else if (!mcast_xbundle) { + xlate_report(ctx, "mcast flood port is unknown, dropping"); + } else { + xlate_report(ctx, "mcast flood port is input port, dropping"); + } + } +} + +/* forward the Reports to configured ports */ +static void +xlate_normal_mcast_send_rports(struct xlate_ctx *ctx, + struct mcast_snooping *ms, + struct xbundle *in_xbundle, uint16_t vlan) + OVS_REQ_RDLOCK(ms->rwlock) +{ + struct xlate_cfg *xcfg; + struct mcast_port_bundle *rport; + struct xbundle *mcast_xbundle; + + xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp); + LIST_FOR_EACH(rport, node, &ms->rport_list) { + mcast_xbundle = xbundle_lookup(xcfg, rport->port); + if (mcast_xbundle && mcast_xbundle != in_xbundle) { + xlate_report(ctx, "forwarding Report to mcast flagged port"); + output_normal(ctx, mcast_xbundle, vlan); + } else if (!mcast_xbundle) { + xlate_report(ctx, "mcast port is unknown, dropping the Report"); + } else { + xlate_report(ctx, "mcast port is input port, dropping the Report"); + } + } +} + static void xlate_normal_flood(struct xlate_ctx *ctx, struct xbundle *in_xbundle, uint16_t vlan) @@ -1894,25 +2315,117 @@ xlate_normal(struct xlate_ctx *ctx) } /* Determine output bundle. */ - ovs_rwlock_rdlock(&ctx->xbridge->ml->rwlock); - mac = mac_learning_lookup(ctx->xbridge->ml, flow->dl_dst, vlan); - mac_port = mac ? mac->port.p : NULL; - ovs_rwlock_unlock(&ctx->xbridge->ml->rwlock); + if (mcast_snooping_enabled(ctx->xbridge->ms) + && !eth_addr_is_broadcast(flow->dl_dst) + && eth_addr_is_multicast(flow->dl_dst) + && is_ip_any(flow)) { + struct mcast_snooping *ms = ctx->xbridge->ms; + struct mcast_group *grp = NULL; + + 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, 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 (mac_port) { - struct xlate_cfg *xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp); - struct xbundle *mac_xbundle = xbundle_lookup(xcfg, mac_port); - if (mac_xbundle && mac_xbundle != in_xbundle) { - xlate_report(ctx, "forwarding to learned port"); - output_normal(ctx, mac_xbundle, vlan); - } else if (!mac_xbundle) { - xlate_report(ctx, "learned port is unknown, dropping"); + if (mcast_snooping_is_membership(flow->tp_src)) { + ovs_rwlock_rdlock(&ms->rwlock); + xlate_normal_mcast_send_mrouters(ctx, ms, in_xbundle, vlan); + /* RFC4541: section 2.1.1, item 1: A snooping switch should + * forward IGMP Membership Reports only to those ports where + * multicast routers are attached. Alternatively stated: a + * snooping switch should not forward IGMP Membership Reports + * to ports on which only hosts are attached. + * An administrative control may be provided to override this + * restriction, allowing the report messages to be flooded to + * other ports. */ + xlate_normal_mcast_send_rports(ctx, ms, in_xbundle, vlan); + ovs_rwlock_unlock(&ms->rwlock); + } else { + xlate_report(ctx, "multicast traffic, flooding"); + 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 ((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 */ + xlate_report(ctx, "RFC4541: section 2.1.2, item 2, flooding"); + xlate_normal_flood(ctx, in_xbundle, vlan); + return; + } + } + + /* forwarding to group base ports */ + ovs_rwlock_rdlock(&ms->rwlock); + 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); + xlate_normal_mcast_send_mrouters(ctx, ms, in_xbundle, vlan); } else { - xlate_report(ctx, "learned port is input port, dropping"); + if (mcast_snooping_flood_unreg(ms)) { + xlate_report(ctx, "unregistered multicast, flooding"); + xlate_normal_flood(ctx, in_xbundle, vlan); + } else { + xlate_normal_mcast_send_mrouters(ctx, ms, in_xbundle, vlan); + xlate_normal_mcast_send_fports(ctx, ms, in_xbundle, vlan); + } } + ovs_rwlock_unlock(&ms->rwlock); } else { - xlate_report(ctx, "no learned MAC for destination, flooding"); - xlate_normal_flood(ctx, in_xbundle, vlan); + ovs_rwlock_rdlock(&ctx->xbridge->ml->rwlock); + mac = mac_learning_lookup(ctx->xbridge->ml, flow->dl_dst, vlan); + mac_port = mac ? mac_entry_get_port(ctx->xbridge->ml, mac) : NULL; + ovs_rwlock_unlock(&ctx->xbridge->ml->rwlock); + + if (mac_port) { + struct xlate_cfg *xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp); + struct xbundle *mac_xbundle = xbundle_lookup(xcfg, mac_port); + if (mac_xbundle && mac_xbundle != in_xbundle) { + xlate_report(ctx, "forwarding to learned port"); + output_normal(ctx, mac_xbundle, vlan); + } else if (!mac_xbundle) { + xlate_report(ctx, "learned port is unknown, dropping"); + } else { + xlate_report(ctx, "learned port is input port, dropping"); + } + } else { + xlate_report(ctx, "no learned MAC for destination, flooding"); + xlate_normal_flood(ctx, in_xbundle, vlan); + } } } @@ -1926,7 +2439,8 @@ compose_sample_action(const struct xbridge *xbridge, const struct flow *flow, const uint32_t probability, const union user_action_cookie *cookie, - const size_t cookie_size) + const size_t cookie_size, + const odp_port_t tunnel_out_port) { size_t sample_offset, actions_offset; odp_port_t odp_port; @@ -1943,7 +2457,7 @@ compose_sample_action(const struct xbridge *xbridge, pid = dpif_port_get_pid(xbridge->dpif, odp_port, flow_hash_5tuple(flow, 0)); cookie_offset = odp_put_userspace_action(pid, cookie, cookie_size, - odp_actions); + tunnel_out_port, odp_actions); nl_msg_end_nested(odp_actions, actions_offset); nl_msg_end_nested(odp_actions, sample_offset); @@ -2001,7 +2515,7 @@ compose_sflow_action(const struct xbridge *xbridge, odp_port == ODPP_NONE ? 0 : 1, &cookie); return compose_sample_action(xbridge, odp_actions, flow, probability, - &cookie, sizeof cookie.sflow); + &cookie, sizeof cookie.sflow, ODPP_NONE); } static void @@ -2017,29 +2531,54 @@ compose_flow_sample_cookie(uint16_t probability, uint32_t collector_set_id, } static void -compose_ipfix_cookie(union user_action_cookie *cookie) +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; } /* Compose SAMPLE action for IPFIX bridge sampling. */ static void compose_ipfix_action(const struct xbridge *xbridge, struct ofpbuf *odp_actions, - const struct flow *flow) + const struct flow *flow, + odp_port_t output_odp_port) { uint32_t probability; union user_action_cookie cookie; + odp_port_t tunnel_out_port = ODPP_NONE; if (!xbridge->ipfix || 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)) { + 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)) { + 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) ) { + tunnel_out_port = output_odp_port; + } + } + probability = dpif_ipfix_get_bridge_exporter_probability(xbridge->ipfix); - compose_ipfix_cookie(&cookie); + compose_ipfix_cookie(&cookie, output_odp_port); compose_sample_action(xbridge, odp_actions, flow, probability, - &cookie, sizeof cookie.ipfix); + &cookie, sizeof cookie.ipfix, tunnel_out_port); } /* SAMPLE action for sFlow must be first action in any given list of @@ -2049,7 +2588,7 @@ static void add_sflow_action(struct xlate_ctx *ctx) { ctx->user_cookie_offset = compose_sflow_action(ctx->xbridge, - &ctx->xout->odp_actions, + ctx->xout->odp_actions, &ctx->xin->flow, ODPP_NONE); ctx->sflow_odp_port = 0; ctx->sflow_n_outputs = 0; @@ -2060,8 +2599,15 @@ add_sflow_action(struct xlate_ctx *ctx) static void add_ipfix_action(struct xlate_ctx *ctx) { - compose_ipfix_action(ctx->xbridge, &ctx->xout->odp_actions, - &ctx->xin->flow); + 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); } /* Fix SAMPLE action according to data collected while composing ODP actions. @@ -2077,7 +2623,7 @@ fix_sflow_action(struct xlate_ctx *ctx) return; } - cookie = ofpbuf_at(&ctx->xout->odp_actions, ctx->user_cookie_offset, + cookie = ofpbuf_at(ctx->xout->odp_actions, ctx->user_cookie_offset, sizeof cookie->sflow); ovs_assert(cookie->type == USER_ACTION_COOKIE_SFLOW); @@ -2087,7 +2633,7 @@ fix_sflow_action(struct xlate_ctx *ctx) static enum slow_path_reason process_special(struct xlate_ctx *ctx, const struct flow *flow, - const struct xport *xport, const struct ofpbuf *packet) + const struct xport *xport, const struct dp_packet *packet) { struct flow_wildcards *wc = &ctx->xout->wc; const struct xbridge *xbridge = ctx->xbridge; @@ -2114,50 +2660,207 @@ process_special(struct xlate_ctx *ctx, const struct flow *flow, lacp_process_packet(xport->xbundle->lacp, xport->ofport, packet); } return SLOW_LACP; - } else if (xbridge->stp && stp_should_process_flow(flow, wc)) { + } else if ((xbridge->stp || xbridge->rstp) && + stp_should_process_flow(flow, wc)) { if (packet) { - stp_process_packet(xport, packet); + xbridge->stp + ? stp_process_packet(xport, packet) + : rstp_process_packet(xport, packet); } return SLOW_STP; + } else if (xport->lldp && lldp_should_process_flow(xport->lldp, flow)) { + if (packet) { + lldp_process_packet(xport->lldp, packet); + } + return SLOW_LLDP; } else { return 0; } } -static void -compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port, - bool check_stp) +static int +tnl_route_lookup_flow(const struct flow *oflow, + ovs_be32 *ip, struct xport **out_port) { - const struct xport *xport = get_ofp_port(ctx->xbridge, ofp_port); - struct flow_wildcards *wc = &ctx->xout->wc; - struct flow *flow = &ctx->xin->flow; - ovs_be16 flow_vlan_tci; - uint32_t flow_pkt_mark; - uint8_t flow_nw_tos; - odp_port_t out_port, odp_port; - uint8_t dscp; + char out_dev[IFNAMSIZ]; + struct xbridge *xbridge; + struct xlate_cfg *xcfg; + ovs_be32 gw; - /* If 'struct flow' gets additional metadata, we'll need to zero it out - * before traversing a patch port. */ - BUILD_ASSERT_DECL(FLOW_WC_SEQ == 26); + if (!ovs_router_lookup(oflow->tunnel.ip_dst, out_dev, &gw)) { + return -ENOENT; + } - if (!xport) { - xlate_report(ctx, "Nonexistent output port"); - return; - } else if (xport->config & OFPUTIL_PC_NO_FWD) { - xlate_report(ctx, "OFPPC_NO_FWD set, skipping output"); - return; - } else if (check_stp) { - if (is_stp(&ctx->base_flow)) { - if (!xport_stp_listen_state(xport)) { - xlate_report(ctx, "STP not in listening state, " - "skipping bpdu output"); - return; + if (gw) { + *ip = gw; + } else { + *ip = oflow->tunnel.ip_dst; + } + + xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp); + ovs_assert(xcfg); + + HMAP_FOR_EACH (xbridge, hmap_node, &xcfg->xbridges) { + if (!strncmp(xbridge->name, out_dev, IFNAMSIZ)) { + struct xport *port; + + HMAP_FOR_EACH (port, ofp_node, &xbridge->xports) { + if (!strncmp(netdev_get_name(port->netdev), out_dev, IFNAMSIZ)) { + *out_port = port; + return 0; + } } - } else if (!xport_stp_forward_state(xport)) { - xlate_report(ctx, "STP not in forwarding state, " - "skipping output"); - return; + } + } + return -ENOENT; +} + +static int +xlate_flood_packet(struct xbridge *xbridge, struct dp_packet *packet) +{ + 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; + output.max_len = 0; + + return ofproto_dpif_execute_actions(xbridge->ofproto, &flow, NULL, + &output.ofpact, sizeof output, + packet); +} + +static void +tnl_send_arp_request(const struct xport *out_dev, const uint8_t eth_src[ETH_ADDR_LEN], + 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, ARP_OP_REQUEST, + eth_src, eth_addr_zero, true, ip_src, ip_dst); + + xlate_flood_packet(xbridge, &packet); + dp_packet_uninit(&packet); +} + +static int +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]; + int err; + + err = tnl_route_lookup_flow(flow, &d_ip, &out_dev); + if (err) { + xlate_report(ctx, "native tunnel routing failed"); + return err; + } + xlate_report(ctx, "tunneling to "IP_FMT" via %s", + IP_ARGS(d_ip), netdev_get_name(out_dev->netdev)); + + /* Use mac addr of bridge port of the peer. */ + 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) { + xlate_report(ctx, "tunnel output device lacks IPv4 address"); + return err; + } + + err = tnl_arp_lookup(out_dev->xbridge->name, d_ip, dmac); + if (err) { + xlate_report(ctx, "ARP cache miss for "IP_FMT" on bridge %s, " + "sending ARP request", + IP_ARGS(d_ip), out_dev->xbridge->name); + tnl_send_arp_request(out_dev, smac, s_ip, d_ip); + 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; + } + + xlate_report(ctx, "tunneling from "ETH_ADDR_FMT" "IP_FMT + " to "ETH_ADDR_FMT" "IP_FMT, + ETH_ADDR_ARGS(smac), IP_ARGS(s_ip), + ETH_ADDR_ARGS(dmac), IP_ARGS(d_ip)); + err = tnl_port_build_header(xport->ofport, flow, + dmac, smac, s_ip, &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); + return 0; +} + +static void +compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port, + 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 *flow = &ctx->xin->flow; + struct flow_tnl flow_tnl; + ovs_be16 flow_vlan_tci; + uint32_t flow_pkt_mark; + uint8_t flow_nw_tos; + odp_port_t out_port, odp_port; + bool tnl_push_pop_send = false; + uint8_t dscp; + + /* If 'struct flow' gets additional metadata, we'll need to zero it out + * before traversing a patch port. */ + BUILD_ASSERT_DECL(FLOW_WC_SEQ == 32); + memset(&flow_tnl, 0, sizeof flow_tnl); + + if (!xport) { + xlate_report(ctx, "Nonexistent output port"); + return; + } else if (xport->config & OFPUTIL_PC_NO_FWD) { + xlate_report(ctx, "OFPPC_NO_FWD set, skipping output"); + return; + } else if (check_stp) { + if (is_stp(&ctx->base_flow)) { + if (!xport_stp_should_forward_bpdu(xport) && + !xport_rstp_should_manage_bpdu(xport)) { + if (ctx->xbridge->stp != NULL) { + xlate_report(ctx, "STP not in listening state, " + "skipping bpdu output"); + } else if (ctx->xbridge->rstp != NULL) { + xlate_report(ctx, "RSTP not managing BPDU in this state, " + "skipping bpdu output"); + } + return; + } + } else if (!xport_stp_forward_state(xport) || + !xport_rstp_forward_state(xport)) { + if (ctx->xbridge->stp != NULL) { + xlate_report(ctx, "STP not in forwarding state, " + "skipping output"); + } else if (ctx->xbridge->rstp != NULL) { + xlate_report(ctx, "RSTP not in forwarding state, " + "skipping output"); + } + return; } } @@ -2169,36 +2872,86 @@ compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port, if (xport->peer) { const struct xport *peer = xport->peer; struct flow old_flow = ctx->xin->flow; + bool old_was_mpls = ctx->was_mpls; + cls_version_t old_version = ctx->tables_version; enum slow_path_reason special; + 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; + + /* 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 (xport_stp_forward_state(peer)) { + if (xport_stp_forward_state(peer) && xport_rstp_forward_state(peer)) { 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. Let OFPP_NORMAL and the - * learning action look at the packet, then drop it. */ + /* 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 = ofpbuf_size(&ctx->xout->odp_actions); + 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, 0, true, true); ctx->xout->mirrors = old_mirrors; ctx->base_flow = old_base_flow; - ofpbuf_set_size(&ctx->xout->odp_actions, old_size); + ctx->xout->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 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; if (ctx->xin->resubmit_stats) { netdev_vport_inc_tx(xport->netdev, ctx->xin->resubmit_stats); @@ -2222,10 +2975,13 @@ compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port, flow_pkt_mark = flow->pkt_mark; flow_nw_tos = flow->nw_tos; - if (dscp_from_skb_priority(xport, flow->skb_priority, &dscp)) { - wc->masks.nw_tos |= IP_DSCP_MASK; - flow->nw_tos &= ~IP_DSCP_MASK; - flow->nw_tos |= dscp; + if (count_skb_priorities(xport)) { + memset(&wc->masks.skb_priority, 0xff, sizeof wc->masks.skb_priority); + if (dscp_from_skb_priority(xport, flow->skb_priority, &dscp)) { + wc->masks.nw_tos |= IP_DSCP_MASK; + flow->nw_tos &= ~IP_DSCP_MASK; + flow->nw_tos |= dscp; + } } if (xport->is_tunnel) { @@ -2233,7 +2989,7 @@ compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port, * the Logical (tunnel) Port are not visible for any further * matches, while explicit set actions on tunnel metadata are. */ - struct flow_tnl flow_tnl = flow->tunnel; + flow_tnl = flow->tunnel; odp_port = tnl_port_send(xport->ofport, flow, &ctx->xout->wc); if (odp_port == ODPP_NONE) { xlate_report(ctx, "Tunneling decided against output"); @@ -2253,9 +3009,15 @@ compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port, entry->u.dev.tx = netdev_ref(xport->netdev); } out_port = odp_port; - commit_odp_tunnel_action(flow, &ctx->base_flow, - &ctx->xout->odp_actions); - flow->tunnel = flow_tnl; /* Restore tunnel metadata */ + if (ovs_native_tunneling_is_on(ctx->xbridge->ofproto)) { + xlate_report(ctx, "output to native tunnel"); + tnl_push_pop_send = true; + } else { + xlate_report(ctx, "output to kernel tunnel"); + commit_odp_tunnel_action(flow, &ctx->base_flow, + ctx->xout->odp_actions); + flow->tunnel = flow_tnl; /* Restore tunnel metadata */ + } } else { odp_port = xport->odp_port; out_port = odp_port; @@ -2273,27 +3035,54 @@ compose_output_action__(struct xlate_ctx *ctx, ofp_port_t ofp_port, } if (out_port != ODPP_NONE) { + bool use_masked = ctx->xbridge->support.masked_set_action; + ctx->xout->slow |= commit_odp_actions(flow, &ctx->base_flow, - &ctx->xout->odp_actions, - &ctx->xout->wc); + ctx->xout->odp_actions, + wc, use_masked); - 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->xout->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->xout->odp_actions, OVS_ACTION_ATTR_RECIRC, xr->recirc_id); } else { - nl_msg_put_odp_port(&ctx->xout->odp_actions, OVS_ACTION_ATTR_OUTPUT, - out_port); + + if (tnl_push_pop_send) { + build_tunnel_send(ctx, xport, flow, odp_port); + flow->tunnel = flow_tnl; /* Restore tunnel metadata */ + } else { + odp_port_t odp_tnl_port = ODPP_NONE; + + /* XXX: Write better Filter for tunnel port. We can use inport + * int tunnel-port flow to avoid these checks completely. */ + if (ofp_port == OFPP_LOCAL && + ovs_native_tunneling_is_on(ctx->xbridge->ofproto)) { + + odp_tnl_port = tnl_port_map_lookup(flow, wc); + } + + if (odp_tnl_port != ODPP_NONE) { + nl_msg_put_odp_port(ctx->xout->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, + OVS_ACTION_ATTR_OUTPUT, + out_port); + } + } } ctx->sflow_odp_port = odp_port; @@ -2309,15 +3098,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) { @@ -2327,8 +3118,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--; } @@ -2343,9 +3136,9 @@ xlate_resubmit_resource_check(struct xlate_ctx *ctx) MAX_RESUBMIT_RECURSION); } else if (ctx->resubmits >= MAX_RESUBMITS + MAX_INTERNAL_RESUBMITS) { VLOG_ERR_RL(&rl, "over %d resubmit actions", MAX_RESUBMITS); - } else if (ofpbuf_size(&ctx->xout->odp_actions) > UINT16_MAX) { + } else if (ctx->xout->odp_actions->size > UINT16_MAX) { VLOG_ERR_RL(&rl, "resubmits yielded over 64 kB of actions"); - } else if (ofpbuf_size(&ctx->stack) >= 65536) { + } else if (ctx->stack.size >= 65536) { VLOG_ERR_RL(&rl, "resubmits yielded over 64 kB of stack"); } else { return true; @@ -2358,64 +3151,31 @@ 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)) { - ofp_port_t old_in_port = ctx->xin->flow.in_port.ofp_port; - bool skip_wildcards = ctx->xin->skip_wildcards; + struct flow_wildcards *wc; uint8_t old_table_id = ctx->table_id; struct rule_dpif *rule; - enum rule_dpif_lookup_verdict verdict; - enum ofputil_port_config config = 0; ctx->table_id = table_id; - - /* Look up a flow with 'in_port' as the input port. Then restore the - * original input port (otherwise OFPP_NORMAL and OFPP_IN_PORT will - * have surprising behavior). */ - ctx->xin->flow.in_port.ofp_port = in_port; - verdict = rule_dpif_lookup_from_table(ctx->xbridge->ofproto, - &ctx->xin->flow, - !skip_wildcards - ? &ctx->xout->wc : NULL, - honor_table_miss, - &ctx->table_id, &rule, - ctx->xin->xcache != NULL, - ctx->xin->resubmit_stats); - ctx->xin->flow.in_port.ofp_port = old_in_port; - - if (ctx->xin->resubmit_hook) { - ctx->xin->resubmit_hook(ctx->xin, rule, ctx->recurse); - } - - switch (verdict) { - case RULE_DPIF_LOOKUP_VERDICT_MATCH: - goto match; - case RULE_DPIF_LOOKUP_VERDICT_CONTROLLER: - if (may_packet_in) { - struct xport *xport; - - xport = get_ofp_port(ctx->xbridge, - ctx->xin->flow.in_port.ofp_port); - config = xport ? xport->config : 0; - break; - } - /* Fall through to drop */ - case RULE_DPIF_LOOKUP_VERDICT_DROP: - config = OFPUTIL_PC_NO_PACKET_IN; - break; - case RULE_DPIF_LOOKUP_VERDICT_DEFAULT: - if (!ofproto_dpif_wants_packet_in_on_miss(ctx->xbridge->ofproto)) { - config = OFPUTIL_PC_NO_PACKET_IN; - } - break; - default: - OVS_NOT_REACHED(); + wc = (ctx->xin->skip_wildcards) ? NULL : &ctx->xout->wc; + + rule = rule_dpif_lookup_from_table(ctx->xbridge->ofproto, + ctx->tables_version, + &ctx->xin->flow, wc, + ctx->xin->xcache != NULL, + ctx->xin->resubmit_stats, + &ctx->table_id, in_port, + may_packet_in, honor_table_miss); + + if (OVS_UNLIKELY(ctx->xin->resubmit_hook)) { + ctx->xin->resubmit_hook(ctx->xin, rule, ctx->recurse + 1); } - choose_miss_rule(config, ctx->xbridge->miss_rule, - ctx->xbridge->no_packet_in_rule, &rule, - ctx->xin->xcache != NULL); - -match: if (rule) { /* Fill in the cache entry here instead of xlate_recursively * to make the reference counting more explicit. We take a @@ -2458,37 +3218,63 @@ 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); ofpacts_execute_action_set(&action_list, &action_set); ctx->recurse++; - do_xlate_actions(ofpbuf_data(&action_list), ofpbuf_size(&action_list), ctx); + do_xlate_actions(action_list.data, action_list.size, ctx); ctx->recurse--; 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 xlate_all_group(struct xlate_ctx *ctx, struct group_dpif *group) { struct ofputil_bucket *bucket; - const struct list *buckets; - struct flow old_flow = ctx->xin->flow; + const struct ovs_list *buckets; 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); } @@ -2506,24 +3292,105 @@ 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 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) { + 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; struct flow_wildcards *wc = &ctx->xout->wc; + 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); + + mf_mask_field(mf, &wc->masks); + } + } - basis = hash_mac(ctx->xin->flow.dl_dst, 0, 0); bucket = group_best_live_bucket(ctx, group, basis); if (bucket) { - memset(&wc->masks.dl_dst, 0xff, sizeof wc->masks.dl_dst); 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)) { @@ -2542,37 +3409,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; @@ -2628,9 +3471,9 @@ 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); } } @@ -2643,34 +3486,33 @@ execute_controller_action(struct xlate_ctx *ctx, int len, uint16_t controller_id) { struct ofproto_packet_in *pin; - struct ofpbuf *packet; - struct pkt_metadata md = PKT_METADATA_INITIALIZER(0); + struct dp_packet *packet; + bool use_masked; ctx->xout->slow |= SLOW_CONTROLLER; if (!ctx->xin->packet) { return; } - packet = ofpbuf_clone(ctx->xin->packet); + packet = dp_packet_clone(ctx->xin->packet); + use_masked = ctx->xbridge->support.masked_set_action; ctx->xout->slow |= commit_odp_actions(&ctx->xin->flow, &ctx->base_flow, - &ctx->xout->odp_actions, - &ctx->xout->wc); + ctx->xout->odp_actions, + &ctx->xout->wc, use_masked); - odp_execute_actions(NULL, packet, false, &md, - ofpbuf_data(&ctx->xout->odp_actions), - ofpbuf_size(&ctx->xout->odp_actions), NULL); + odp_execute_actions(NULL, &packet, 1, false, + ctx->xout->odp_actions->data, + ctx->xout->odp_actions->size, NULL); pin = xmalloc(sizeof *pin); - pin->up.packet_len = ofpbuf_size(packet); - pin->up.packet = ofpbuf_steal_data(packet); + 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); + pin->up.cookie = ctx->rule_cookie; - flow_get_metadata(&ctx->xin->flow, &pin->up.fmd); + flow_get_metadata(&ctx->xin->flow, &pin->up.flow_metadata); pin->controller_id = controller_id; pin->send_len = len; @@ -2691,7 +3533,57 @@ execute_controller_action(struct xlate_ctx *ctx, int len, } } ofproto_dpif_send_packet_in(ctx->xbridge->ofproto, pin); - ofpbuf_delete(packet); + dp_packet_delete(packet); +} + +/* Called only when ctx->recirc_action_offset is set. */ +static void +compose_recirculate_action(struct xlate_ctx *ctx) +{ + struct recirc_metadata md; + bool use_masked; + uint32_t id; + + use_masked = ctx->xbridge->support.masked_set_action; + ctx->xout->slow |= commit_odp_actions(&ctx->xin->flow, &ctx->base_flow, + ctx->xout->odp_actions, + &ctx->xout->wc, use_masked); + + recirc_metadata_from_flow(&md, &ctx->xin->flow); + + ovs_assert(ctx->recirc_action_offset >= 0); + + /* Only allocate recirculation ID if we have a packet. */ + if (ctx->xin->packet) { + /* Allocate a unique recirc id for the given metadata state in the + * flow. 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(ctx->xbridge->ofproto, 0, &md, &ctx->stack, + ctx->recirc_action_offset, + ctx->action_set.size, ctx->action_set.data); + if (!id) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); + VLOG_ERR_RL(&rl, "Failed to allocate recirculation id"); + return; + } + xlate_out_add_recirc(ctx->xout, id); + } else { + /* Look up an existing recirc id for the given metadata state in the + * flow. No new reference is taken, as the ID is RCU protected and is + * only required temporarily for verification. */ + id = recirc_find_id(ctx->xbridge->ofproto, 0, &md, &ctx->stack, + ctx->recirc_action_offset, + ctx->action_set.size, ctx->action_set.data); + /* We let zero 'id' to be used in the RECIRC action below, which will + * fail all revalidations as zero is not a valid recirculation ID. */ + } + + 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; } static void @@ -2705,9 +3597,11 @@ compose_mpls_push_action(struct xlate_ctx *ctx, struct ofpact_push_mpls *mpls) n = flow_count_mpls_labels(flow, wc); if (!n) { + bool use_masked = ctx->xbridge->support.masked_set_action; + ctx->xout->slow |= commit_odp_actions(flow, &ctx->base_flow, - &ctx->xout->odp_actions, - &ctx->xout->wc); + ctx->xout->odp_actions, + &ctx->xout->wc, use_masked); } else if (n >= FLOW_MAX_MPLS_LABELS) { if (ctx->xin->packet != NULL) { static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); @@ -2718,9 +3612,6 @@ compose_mpls_push_action(struct xlate_ctx *ctx, struct ofpact_push_mpls *mpls) } ctx->exit = true; return; - } else if (n >= ctx->xbridge->max_mpls_depth) { - COVERAGE_INC(xlate_actions_mpls_overflow); - ctx->xout->slow |= SLOW_ACTION; } flow_push_mpls(flow, n, mpls->ethertype, wc); @@ -2733,7 +3624,11 @@ compose_mpls_pop_action(struct xlate_ctx *ctx, ovs_be16 eth_type) struct flow *flow = &ctx->xin->flow; int n = flow_count_mpls_labels(flow, wc); - if (!flow_pop_mpls(flow, n, eth_type, wc) && n >= FLOW_MAX_MPLS_LABELS) { + if (flow_pop_mpls(flow, n, eth_type, wc)) { + if (ctx->xbridge->support.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 " @@ -2742,7 +3637,7 @@ compose_mpls_pop_action(struct xlate_ctx *ctx, ovs_be16 eth_type) ctx->xbridge->name, FLOW_MAX_MPLS_LABELS); } ctx->exit = true; - ofpbuf_clear(&ctx->xout->odp_actions); + ofpbuf_clear(ctx->xout->odp_actions); } } @@ -2803,24 +3698,23 @@ static bool compose_dec_mpls_ttl_action(struct xlate_ctx *ctx) { struct flow *flow = &ctx->xin->flow; - uint8_t ttl = mpls_lse_to_ttl(flow->mpls_lse[0]); struct flow_wildcards *wc = &ctx->xout->wc; - memset(&wc->masks.mpls_lse, 0xff, sizeof wc->masks.mpls_lse); 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); if (ttl > 1) { ttl--; set_mpls_lse_ttl(&flow->mpls_lse[0], ttl); return false; } else { execute_controller_action(ctx, UINT16_MAX, OFPR_INVALID_TTL, 0); - - /* Stop processing for current table. */ - return true; } - } else { - return true; } + + /* Stop processing for current table. */ + return true; } static void @@ -2833,7 +3727,7 @@ xlate_output_action(struct xlate_ctx *ctx, 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, @@ -2849,14 +3743,18 @@ xlate_output_action(struct xlate_ctx *ctx, flood_packets(ctx, true); break; case OFPP_CONTROLLER: - execute_controller_action(ctx, max_len, OFPR_ACTION, 0); + execute_controller_action(ctx, max_len, + (ctx->in_group ? OFPR_GROUP + : ctx->in_action_set ? OFPR_ACTION_SET + : OFPR_ACTION), + 0); break; case OFPP_NONE: break; 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"); } @@ -2915,7 +3813,7 @@ 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. */ @@ -3047,28 +3945,31 @@ 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) { - static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); + 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; + bool use_masked; - VLOG_ERR_RL(&rl, "ignoring NXAST_SAMPLE action because datapath " - "lacks support (needs Linux 3.10+ or kernel module from " - "OVS 1.11+)"); - return; - } + if (!ctx->xbridge->support.variable_length_userdata) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); - ctx->xout->slow |= commit_odp_actions(&ctx->xin->flow, &ctx->base_flow, - &ctx->xout->odp_actions, - &ctx->xout->wc); + VLOG_ERR_RL(&rl, "ignoring NXAST_SAMPLE action because datapath " + "lacks support (needs Linux 3.10+ or kernel module from " + "OVS 1.11+)"); + return; + } - 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); + use_masked = ctx->xbridge->support.masked_set_action; + ctx->xout->slow |= commit_odp_actions(&ctx->xin->flow, &ctx->base_flow, + ctx->xout->odp_actions, + &ctx->xout->wc, use_masked); + + 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); } static bool @@ -3084,7 +3985,8 @@ may_receive(const struct xport *xport, struct xlate_ctx *ctx) * disabled. If just learning is enabled, we need to have * OFPP_NORMAL and the learning action have a look at the packet * before we can drop it. */ - if (!xport_stp_forward_state(xport) && !xport_stp_learn_state(xport)) { + if ((!xport_stp_forward_state(xport) && !xport_stp_learn_state(xport)) || + (!xport_rstp_forward_state(xport) && !xport_rstp_learn_state(xport))) { return false; } @@ -3094,8 +3996,31 @@ may_receive(const struct xport *xport, struct xlate_ctx *ctx) static void xlate_write_actions(struct xlate_ctx *ctx, const struct ofpact *a) { - struct ofpact_nest *on = ofpact_get_WRITE_ACTIONS(a); - ofpbuf_put(&ctx->action_set, on->actions, ofpact_nest_get_action_len(on)); + const struct ofpact_nest *on = ofpact_get_WRITE_ACTIONS(a); + size_t on_len = ofpact_nest_get_action_len(on); + const struct ofpact *inner; + + /* Maintain actset_output depending on the contents of the action set: + * + * - OFPP_UNSET, if there is no "output" action. + * + * - The output port, if there is an "output" action and no "group" + * action. + * + * - OFPP_UNSET, if there is a "group" action. + */ + if (!ctx->action_set_has_group) { + OFPACT_FOR_EACH (inner, on->actions, on_len) { + if (inner->type == OFPACT_OUTPUT) { + ctx->xin->flow.actset_output = ofpact_get_OUTPUT(inner)->port; + } else if (inner->type == OFPACT_GROUP) { + ctx->xin->flow.actset_output = OFPP_UNSET; + ctx->action_set_has_group = true; + } + } + } + + ofpbuf_put(&ctx->action_set, on->actions, on_len); ofpact_pad(&ctx->action_set); } @@ -3105,12 +4030,124 @@ xlate_action_set(struct xlate_ctx *ctx) uint64_t action_list_stub[1024 / 64]; struct ofpbuf action_list; + 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); - do_xlate_actions(ofpbuf_data(&action_list), ofpbuf_size(&action_list), ctx); + /* 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 void +recirc_put_unroll_xlate(struct xlate_ctx *ctx) +{ + struct ofpact_unroll_xlate *unroll; + + 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; + } +} + + +/* 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; + + 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; + + /* 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: + break; + + /* 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(); \ + } + static void do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, struct xlate_ctx *ctx) @@ -3119,6 +4156,9 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, 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); + } /* dl_type already in the mask, not set below. */ OFPACT_FOR_EACH (a, ofpacts, ofpacts_len) { @@ -3128,6 +4168,14 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, const struct mf_field *mf; 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; } @@ -3139,6 +4187,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; @@ -3151,6 +4200,8 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, break; case OFPACT_ENQUEUE: + memset(&wc->masks.skb_priority, 0xff, + sizeof wc->masks.skb_priority); xlate_enqueue_action(ctx, ofpact_get_ENQUEUE(a)); break; @@ -3196,6 +4247,7 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, 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; @@ -3203,6 +4255,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; @@ -3210,6 +4263,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; @@ -3218,6 +4272,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; @@ -3226,6 +4281,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; @@ -3233,7 +4289,8 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, break; case OFPACT_SET_L4_SRC_PORT: - if (is_ip_any(flow)) { + 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); flow->tp_src = htons(ofpact_get_SET_L4_SRC_PORT(a)->port); @@ -3241,7 +4298,8 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, break; case OFPACT_SET_L4_DST_PORT: - if (is_ip_any(flow)) { + 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); flow->tp_dst = htons(ofpact_get_SET_L4_DST_PORT(a)->port); @@ -3257,22 +4315,27 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, break; case OFPACT_SET_QUEUE: + memset(&wc->masks.skb_priority, 0xff, + sizeof wc->masks.skb_priority); xlate_set_queue_action(ctx, ofpact_get_SET_QUEUE(a)->queue_id); break; case OFPACT_POP_QUEUE: + memset(&wc->masks.skb_priority, 0xff, + sizeof wc->masks.skb_priority); flow->skb_priority = ctx->orig_skb_priority; 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_REG_LOAD: - nxm_execute_reg_load(ofpact_get_REG_LOAD(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; @@ -3288,49 +4351,72 @@ 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 + * header field on a packet that does not have them. */ mf_mask_field_and_prereqs(mf, &wc->masks); - mf_set_flow_value(mf, &set_field->value, flow); + if (mf_are_prereqs_ok(mf, flow)) { + mf_set_flow_value_masked(mf, &set_field->value, + &set_field->mask, flow); + } 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; @@ -3342,10 +4428,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; @@ -3354,14 +4442,34 @@ 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; + case OFPACT_CONJUNCTION: { + /* A flow with a "conjunction" action represents part of a special + * kind of "set membership match". Such a flow should not actually + * get executed, but it could via, say, a "packet-out", even though + * that wouldn't be useful. Log it to help debugging. */ + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); + VLOG_INFO_RL(&rl, "executing no-op conjunction action"); + break; + } + case OFPACT_EXIT: 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)); @@ -3369,6 +4477,8 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, case OFPACT_CLEAR_ACTIONS: ofpbuf_clear(&ctx->action_set); + ctx->xin->flow.actset_output = OFPP_UNSET; + ctx->action_set_has_group = false; break; case OFPACT_WRITE_ACTIONS: @@ -3388,7 +4498,12 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, case OFPACT_GOTO_TABLE: { struct ofpact_goto_table *ogt = ofpact_get_GOTO_TABLE(a); - ovs_assert(ctx->table_id < ogt->table_id); + /* Allow ctx->table_id == TBL_INTERNAL, which will be greater + * than ogt->table_id. This is to allow goto_table actions that + * triggered recirculation: ctx->table_id will be TBL_INTERNAL + * after recirculation. */ + ovs_assert(ctx->table_id == TBL_INTERNAL + || ctx->table_id < ogt->table_id); xlate_table_action(ctx, ctx->xin->flow.in_port.ofp_port, ogt->table_id, true, true); break; @@ -3398,16 +4513,29 @@ do_xlate_actions(const struct ofpact *ofpacts, size_t ofpacts_len, xlate_sample_action(ctx, ofpact_get_SAMPLE(a)); break; } + + /* Check if need to store this and the remaining actions for later + * execution. */ + if (ctx->exit && ctx_first_recirculation_action(ctx)) { + recirc_unroll_actions(a, OFPACT_ALIGN(ofpacts_len - + ((uint8_t *)a - + (uint8_t *)ofpacts)), + ctx); + break; + } } } void xlate_in_init(struct xlate_in *xin, struct ofproto_dpif *ofproto, - const struct flow *flow, struct rule_dpif *rule, - uint16_t tcp_flags, const struct ofpbuf *packet) + const struct flow *flow, ofp_port_t in_port, + struct rule_dpif *rule, uint16_t tcp_flags, + const struct dp_packet *packet) { xin->ofproto = ofproto; xin->flow = *flow; + xin->flow.in_port.ofp_port = in_port; + xin->flow.actset_output = OFPP_UNSET; xin->packet = packet; xin->may_learn = packet != NULL; xin->rule = rule; @@ -3419,13 +4547,22 @@ xlate_in_init(struct xlate_in *xin, struct ofproto_dpif *ofproto, xin->report_hook = NULL; xin->resubmit_stats = NULL; xin->skip_wildcards = false; + xin->odp_actions = NULL; + + /* 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) { - ofpbuf_uninit(&xout->odp_actions); + if (xout->odp_actions == &xout->odp_actions_buf) { + ofpbuf_uninit(xout->odp_actions); + } + xlate_out_free_recircs(xout); } } @@ -3440,14 +4577,6 @@ xlate_actions_for_side_effects(struct xlate_in *xin) xlate_out_uninit(&xout); } -static void -xlate_report(struct xlate_ctx *ctx, const char *s) -{ - if (ctx->xin->report_hook) { - ctx->xin->report_hook(ctx->xin, s, ctx->recurse); - } -} - void xlate_out_copy(struct xlate_out *dst, const struct xlate_out *src) { @@ -3459,10 +4588,10 @@ xlate_out_copy(struct xlate_out *dst, const struct xlate_out *src) dst->nf_output_iface = src->nf_output_iface; dst->mirrors = src->mirrors; - ofpbuf_use_stub(&dst->odp_actions, dst->odp_actions_stub, + 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, ofpbuf_data(&src->odp_actions), - ofpbuf_size(&src->odp_actions)); + ofpbuf_put(dst->odp_actions, src->odp_actions->data, src->odp_actions->size); } static struct skb_priority_to_dscp * @@ -3489,6 +4618,12 @@ dscp_from_skb_priority(const struct xport *xport, uint32_t skb_priority, return pdscp != NULL; } +static size_t +count_skb_priorities(const struct xport *xport) +{ + return hmap_count(&xport->skb_priorities); +} + static void clear_skb_priorities(struct xport *xport) { @@ -3507,8 +4642,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, ofpbuf_data(&ctx->xout->odp_actions), - ofpbuf_size(&ctx->xout->odp_actions)) { + NL_ATTR_FOR_EACH_UNSAFE (a, left, ctx->xout->odp_actions->data, + ctx->xout->odp_actions->size) { if (nl_attr_type(a) == OVS_ACTION_ATTR_OUTPUT && nl_attr_get_odp_port(a) == local_odp_port) { return true; @@ -3517,22 +4652,93 @@ actions_output_to_local_port(const struct xlate_ctx *ctx) return false; } -/* Translates the 'ofpacts_len' bytes of "struct ofpacts" starting at 'ofpacts' - * into datapath actions in 'odp_actions', using 'ctx'. - * +#if defined(__linux__) +/* Returns the maximum number of packets that the Linux kernel is willing to + * queue up internally to certain kinds of software-implemented ports, or the + * default (and rarely modified) value if it cannot be determined. */ +static int +netdev_max_backlog(void) +{ + static struct ovsthread_once once = OVSTHREAD_ONCE_INITIALIZER; + static int max_backlog = 1000; /* The normal default value. */ + + if (ovsthread_once_start(&once)) { + static const char filename[] = "/proc/sys/net/core/netdev_max_backlog"; + FILE *stream; + int n; + + stream = fopen(filename, "r"); + if (!stream) { + VLOG_WARN("%s: open failed (%s)", filename, ovs_strerror(errno)); + } else { + if (fscanf(stream, "%d", &n) != 1) { + VLOG_WARN("%s: read error", filename); + } else if (n <= 100) { + VLOG_WARN("%s: unexpectedly small value %d", filename, n); + } else { + max_backlog = n; + } + fclose(stream); + } + ovsthread_once_done(&once); + + VLOG_DBG("%s: using %d max_backlog", filename, max_backlog); + } + + return max_backlog; +} + +/* Counts and returns the number of OVS_ACTION_ATTR_OUTPUT actions in + * 'odp_actions'. */ +static int +count_output_actions(const struct ofpbuf *odp_actions) +{ + const struct nlattr *a; + size_t left; + int n = 0; + + NL_ATTR_FOR_EACH_UNSAFE (a, left, odp_actions->data, odp_actions->size) { + if (a->nla_type == OVS_ACTION_ATTR_OUTPUT) { + n++; + } + } + return n; +} +#endif /* defined(__linux__) */ + +/* Returns true if 'odp_actions' contains more output actions than the datapath + * can reliably handle in one go. On Linux, this is the value of the + * net.core.netdev_max_backlog sysctl, which limits the maximum number of + * packets that the kernel is willing to queue up for processing while the + * datapath is processing a set of actions. */ +static bool +too_many_output_actions(const struct ofpbuf *odp_actions OVS_UNUSED) +{ +#ifdef __linux__ + return (odp_actions->size / NL_A_U32_SIZE > netdev_max_backlog() + && count_output_actions(odp_actions) > netdev_max_backlog()); +#else + /* OSes other than Linux might have similar limits, but we don't know how + * to determine them.*/ + return false; +#endif +} + +/* 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_actions(struct xlate_in *xin, struct xlate_out *xout) { struct xlate_cfg *xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp); - struct flow_wildcards *wc = &xout->wc; + struct flow_wildcards *wc = NULL; struct flow *flow = &xin->flow; struct rule_dpif *rule = NULL; - const struct rule_actions *actions = NULL; enum slow_path_reason special; const struct ofpact *ofpacts; + struct xbridge *xbridge; struct xport *in_port; struct flow orig_flow; struct xlate_ctx ctx; @@ -3571,48 +4777,152 @@ xlate_actions(struct xlate_in *xin, struct xlate_out *xout) ctx.xout->has_fin_timeout = false; ctx.xout->nf_output_iface = NF_OUT_DROP; ctx.xout->mirrors = 0; - ofpbuf_use_stub(&ctx.xout->odp_actions, ctx.xout->odp_actions_stub, - sizeof ctx.xout->odp_actions_stub); - ofpbuf_reserve(&ctx.xout->odp_actions, NL_A_U32_SIZE); + ctx.xout->n_recircs = 0; - ctx.xbridge = xbridge_lookup(xcfg, xin->ofproto); - if (!ctx.xbridge) { - return; + 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); + xbridge = xbridge_lookup(xcfg, xin->ofproto); + if (!xbridge) { + return; + } + /* 'ctx.xbridge' may be changed by action processing, whereas 'xbridge' + * will remain set on the original input bridge. */ + ctx.xbridge = xbridge; ctx.rule = xin->rule; ctx.base_flow = *flow; memset(&ctx.base_flow.tunnel, 0, sizeof ctx.base_flow.tunnel); ctx.orig_tunnel_ip_dst = flow->tunnel.ip_dst; - flow_wildcards_init_catchall(wc); - memset(&wc->masks.in_port, 0xff, sizeof wc->masks.in_port); - memset(&wc->masks.skb_priority, 0xff, sizeof wc->masks.skb_priority); - memset(&wc->masks.dl_type, 0xff, sizeof wc->masks.dl_type); - if (is_ip_any(flow)) { - wc->masks.nw_frag |= FLOW_NW_FRAG_MASK; + if (!xin->skip_wildcards) { + wc = &xout->wc; + 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; + } + if (xbridge->support.recirc) { + /* Always exactly match recirc_id when datapath supports + * recirculation. */ + wc->masks.recirc_id = UINT32_MAX; + } + if (xbridge->netflow) { + netflow_mask_wc(flow, wc); + } } is_icmp = is_icmpv4(flow) || is_icmpv6(flow); tnl_may_send = tnl_xlate_init(&ctx.base_flow, flow, wc); - if (ctx.xbridge->netflow) { - netflow_mask_wc(flow, wc); - } 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.rule_cookie = OVS_BE64_MAX; ctx.exit = false; - ctx.use_recirc = false; + ctx.was_mpls = false; + ctx.recirc_action_offset = -1; + ctx.last_unroll_offset = -1; + + ctx.action_set_has_group = false; + ofpbuf_use_stub(&ctx.action_set, + ctx.action_set_stub, sizeof ctx.action_set_stub); + + ofpbuf_use_stub(&ctx.stack, ctx.init_stack, sizeof ctx.init_stack); + + /* The in_port of the original packet before recirculation. */ + in_port = get_ofp_port(xbridge, flow->in_port.ofp_port); + + if (xin->recirc) { + const struct recirc_id_node *recirc = xin->recirc; + + if (xin->ofpacts_len > 0 || ctx.rule) { + static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 1); + + VLOG_WARN_RL(&rl, "Recirculation conflict (%s)!", + xin->ofpacts_len > 0 + ? "actions" + : "rule"); + return; + } + + /* Set the bridge for post-recirculation processing if needed. */ + if (ctx.xbridge->ofproto != recirc->ofproto) { + struct xlate_cfg *xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp); + const struct xbridge *new_bridge = xbridge_lookup(xcfg, + recirc->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."); + return; + } + 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 = recirc->table_id; + + /* 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(&recirc->metadata, flow); + + /* Restore stack, if any. */ + if (recirc->stack) { + ofpbuf_put(&ctx.stack, recirc->stack->data, recirc->stack->size); + } + + /* Restore action set, if any. */ + if (recirc->action_set_len) { + const struct ofpact *a; + + ofpbuf_put(&ctx.action_set, recirc->ofpacts, + recirc->action_set_len); + + OFPACT_FOR_EACH(a, recirc->ofpacts, recirc->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 (recirc->ofpacts_len > recirc->action_set_len) { + xin->ofpacts_len = recirc->ofpacts_len - recirc->action_set_len; + xin->ofpacts = recirc->ofpacts + + recirc->action_set_len / sizeof *recirc->ofpacts; + } + } 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); + return; + } + /* 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) { - ctx.table_id = rule_dpif_lookup(ctx.xbridge->ofproto, flow, - !xin->skip_wildcards ? wc : NULL, - &rule, ctx.xin->xcache != NULL, - ctx.xin->resubmit_stats); + rule = rule_dpif_lookup_from_table(ctx.xbridge->ofproto, + ctx.tables_version, flow, wc, + ctx.xin->xcache != NULL, + 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); } @@ -3623,6 +4933,10 @@ xlate_actions(struct xlate_in *xin, struct xlate_out *xout) entry->u.rule = rule; } ctx.rule = rule; + + if (OVS_UNLIKELY(ctx.xin->resubmit_hook)) { + ctx.xin->resubmit_hook(ctx.xin, rule, 0); + } } xout->fail_open = ctx.rule && rule_dpif_is_fail_open(ctx.rule); @@ -3630,48 +4944,24 @@ xlate_actions(struct xlate_in *xin, struct xlate_out *xout) ofpacts = xin->ofpacts; ofpacts_len = xin->ofpacts_len; } else if (ctx.rule) { - actions = rule_dpif_get_actions(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(); } - ofpbuf_use_stub(&ctx.stack, ctx.init_stack, sizeof ctx.init_stack); - ofpbuf_use_stub(&ctx.action_set, - ctx.action_set_stub, sizeof ctx.action_set_stub); - - if (mbridge_has_mirrors(ctx.xbridge->mbridge)) { + if (mbridge_has_mirrors(xbridge->mbridge)) { /* Do this conditionally because the copy is expensive enough that it * shows up in profiles. */ orig_flow = *flow; } - if (flow->nw_frag & FLOW_NW_FRAG_ANY) { - switch (ctx.xbridge->frag) { - case OFPC_FRAG_NORMAL: - /* We must pretend that transport ports are unavailable. */ - flow->tp_src = ctx.base_flow.tp_src = htons(0); - flow->tp_dst = ctx.base_flow.tp_dst = htons(0); - break; - - case OFPC_FRAG_DROP: - return; - - case OFPC_FRAG_REASM: - OVS_NOT_REACHED(); - - case OFPC_FRAG_NX_MATCH: - /* Nothing to do. */ - break; - - case OFPC_INVALID_TTL_TO_CONTROLLER: - OVS_NOT_REACHED(); - } - } - - 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) { @@ -3687,62 +4977,93 @@ xlate_actions(struct xlate_in *xin, struct xlate_out *xout) } } - special = process_special(&ctx, flow, in_port, ctx.xin->packet); - if (special) { + /* Do not perform special processing on recirculated packets, + * as recirculated packets are not really received by the bridge. */ + if (!xin->recirc && + (special = process_special(&ctx, flow, in_port, ctx.xin->packet))) { ctx.xout->slow |= special; } else { size_t sample_actions_len; if (flow->in_port.ofp_port - != vsp_realdev_to_vlandev(ctx.xbridge->ofproto, + != vsp_realdev_to_vlandev(xbridge->ofproto, flow->in_port.ofp_port, flow->vlan_tci)) { ctx.base_flow.vlan_tci = 0; } - add_sflow_action(&ctx); - add_ipfix_action(&ctx); - sample_actions_len = ofpbuf_size(&ctx.xout->odp_actions); + /* Sampling is done only for packets really received by the bridge. */ + if (!xin->recirc) { + add_sflow_action(&ctx); + add_ipfix_action(&ctx); + sample_actions_len = ctx.xout->odp_actions->size; + } else { + sample_actions_len = 0; + } if (tnl_may_send && (!in_port || may_receive(in_port, &ctx))) { do_xlate_actions(ofpacts, ofpacts_len, &ctx); /* 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)) { - ofpbuf_set_size(&ctx.xout->odp_actions, sample_actions_len); + 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; + + /* 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 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 (ofpbuf_size(&ctx.action_set)) { - xlate_action_set(&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)) { + if (!xin->recirc) { + fix_sflow_action(&ctx); + } + /* Only mirror fully processed packets. */ + if (!exit_recirculates(&ctx) + && mbridge_has_mirrors(xbridge->mbridge)) { add_mirror_actions(&ctx, &orig_flow); } } - if (nl_attr_oversized(ofpbuf_size(&ctx.xout->odp_actions))) { + if (nl_attr_oversized(ctx.xout->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)) { + COVERAGE_INC(xlate_actions_too_many_output); + ctx.xout->slow |= SLOW_ACTION; } - if (mbridge_has_mirrors(ctx.xbridge->mbridge)) { + /* Update mirror stats only for packets really received by the bridge. */ + if (!xin->recirc && mbridge_has_mirrors(xbridge->mbridge)) { if (ctx.xin->resubmit_stats) { - mirror_update_stats(ctx.xbridge->mbridge, xout->mirrors, + mirror_update_stats(xbridge->mbridge, xout->mirrors, ctx.xin->resubmit_stats->n_packets, ctx.xin->resubmit_stats->n_bytes); } @@ -3750,12 +5071,13 @@ xlate_actions(struct xlate_in *xin, struct xlate_out *xout) 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.mbridge = mbridge_ref(xbridge->mbridge); entry->u.mirror.mirrors = xout->mirrors; } } - if (ctx.xbridge->netflow) { + /* Do netflow only for packets really received by the bridge. */ + if (!xin->recirc && 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 @@ -3764,7 +5086,7 @@ xlate_actions(struct xlate_in *xin, struct xlate_out *xout) || ofpacts->type != OFPACT_CONTROLLER || ofpact_next(ofpacts) < ofpact_end(ofpacts, ofpacts_len)) { if (ctx.xin->resubmit_stats) { - netflow_flow_update(ctx.xbridge->netflow, flow, + netflow_flow_update(xbridge->netflow, flow, xout->nf_output_iface, ctx.xin->resubmit_stats); } @@ -3772,7 +5094,7 @@ xlate_actions(struct xlate_in *xin, struct xlate_out *xout) 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.netflow = netflow_ref(xbridge->netflow); entry->u.nf.flow = xmemdup(flow, sizeof *flow); entry->u.nf.iface = xout->nf_output_iface; } @@ -3782,23 +5104,29 @@ xlate_actions(struct xlate_in *xin, struct xlate_out *xout) ofpbuf_uninit(&ctx.stack); ofpbuf_uninit(&ctx.action_set); - /* 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); + if (wc) { + /* 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); + } + /* VLAN_TCI CFI bit must be matched if any of the TCI is matched. */ + if (wc->masks.vlan_tci) { + wc->masks.vlan_tci |= htons(VLAN_CFI); + } } } @@ -3806,7 +5134,7 @@ xlate_actions(struct xlate_in *xin, struct xlate_out *xout) * May modify 'packet'. * Returns 0 if successful, otherwise a positive errno value. */ int -xlate_send_packet(const struct ofport_dpif *ofport, struct ofpbuf *packet) +xlate_send_packet(const struct ofport_dpif *ofport, struct dp_packet *packet) { struct xlate_cfg *xcfg = ovsrcu_get(struct xlate_cfg *, &xcfgp); struct xport *xport; @@ -3815,7 +5143,7 @@ xlate_send_packet(const struct ofport_dpif *ofport, struct ofpbuf *packet) ofpact_init(&output.ofpact, OFPACT_OUTPUT, sizeof output); /* Use OFPP_NONE as the in_port to avoid special packet processing. */ - flow_extract(packet, NULL, &flow); + flow_extract(packet, &flow); flow.in_port.ofp_port = OFPP_NONE; xport = xport_lookup(xcfg, ofport); @@ -3888,11 +5216,16 @@ xlate_cache_normal(struct ofproto_dpif *ofproto, struct flow *flow, int vlan) /* Push stats and perform side effects of flow translation. */ void -xlate_push_stats(struct xlate_cache *xcache, bool may_learn, +xlate_push_stats(struct xlate_cache *xcache, const struct dpif_flow_stats *stats) { struct xc_entry *entry; struct ofpbuf entries = xcache->entries; + uint8_t dmac[ETH_ADDR_LEN]; + + if (!stats->n_packets) { + return; + } XC_ENTRY_FOR_EACH (entry, entries, xcache) { switch (entry->type) { @@ -3916,10 +5249,7 @@ xlate_push_stats(struct xlate_cache *xcache, bool may_learn, stats->n_packets, stats->n_bytes); break; case XC_LEARN: - if (may_learn) { - ofproto_dpif_flow_mod(entry->u.learn.ofproto, - entry->u.learn.fm); - } + ofproto_dpif_flow_mod(entry->u.learn.ofproto, entry->u.learn.fm); break; case XC_NORMAL: xlate_cache_normal(entry->u.normal.ofproto, entry->u.normal.flow, @@ -3933,6 +5263,10 @@ xlate_push_stats(struct xlate_cache *xcache, bool may_learn, 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); + break; default: OVS_NOT_REACHED(); } @@ -3956,7 +5290,6 @@ xlate_dev_unref(struct xc_entry *entry) static void xlate_cache_clear_netflow(struct netflow *netflow, struct flow *flow) { - netflow_expire(netflow, flow); netflow_flow_clear(netflow, flow); netflow_unref(netflow); free(flow); @@ -4004,6 +5337,8 @@ xlate_cache_clear(struct xlate_cache *xcache) case XC_GROUP: group_dpif_unref(entry->u.group.group); break; + case XC_TNL_ARP: + break; default: OVS_NOT_REACHED(); }