X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ffib%2Ffib_types.h;h=e3aef7a58dfd182ca25042c322695ecdf8416758;hb=f068c3e;hp=c51bc9c07223d634992a1ac5bbbdd161c0846546;hpb=32e1c010b0c34fd0984f7fc45fae648a182025c5;p=vpp.git diff --git a/src/vnet/fib/fib_types.h b/src/vnet/fib/fib_types.h index c51bc9c0722..e3aef7a58df 100644 --- a/src/vnet/fib/fib_types.h +++ b/src/vnet/fib/fib_types.h @@ -20,6 +20,7 @@ #include #include #include +#include /** * A typedef of a node index. @@ -32,9 +33,9 @@ typedef u32 fib_node_index_t; * Protocol Type. packed so it consumes a u8 only */ typedef enum fib_protocol_t_ { - FIB_PROTOCOL_IP4 = 0, - FIB_PROTOCOL_IP6, - FIB_PROTOCOL_MPLS, + FIB_PROTOCOL_IP4 = DPO_PROTO_IP4, + FIB_PROTOCOL_IP6 = DPO_PROTO_IP6, + FIB_PROTOCOL_MPLS = DPO_PROTO_MPLS, } __attribute__ ((packed)) fib_protocol_t; #define FIB_PROTOCOLS { \ @@ -49,6 +50,12 @@ typedef enum fib_protocol_t_ { */ #define FIB_PROTOCOL_MAX (FIB_PROTOCOL_MPLS + 1) +/** + * Definition outside of enum so it does not need to be included in non-defaulted + * switch statements + */ +#define FIB_PROTOCOL_IP_MAX (FIB_PROTOCOL_IP6 + 1) + /** * Not part of the enum so it does not have to be handled in switch statements */ @@ -88,6 +95,10 @@ typedef enum fib_forward_chain_type_t_ { * MPLS packets */ FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS, + /** + * Contribute an object that is to be used to forward BIER packets. + */ + FIB_FORW_CHAIN_TYPE_BIER, /** * Contribute an object that is to be used to forward end-of-stack * MPLS packets. This is a convenient ID for clients. A real EOS chain @@ -105,28 +116,34 @@ typedef enum fib_forward_chain_type_t_ { FIB_FORW_CHAIN_TYPE_MCAST_IP6, /** * Contribute an object that is to be used to forward Ethernet packets. + */ + FIB_FORW_CHAIN_TYPE_ETHERNET, + /** + * Contribute an object that is to be used to forward NSH packets. * This is last in the list since it is not valid for many FIB objects, * and thus their array of per-chain-type DPOs can be sized smaller. */ - FIB_FORW_CHAIN_TYPE_ETHERNET, + FIB_FORW_CHAIN_TYPE_NSH, } __attribute__ ((packed)) fib_forward_chain_type_t; #define FIB_FORW_CHAINS { \ [FIB_FORW_CHAIN_TYPE_ETHERNET] = "ethernet", \ + [FIB_FORW_CHAIN_TYPE_BIER] = "bier", \ [FIB_FORW_CHAIN_TYPE_UNICAST_IP4] = "unicast-ip4", \ [FIB_FORW_CHAIN_TYPE_UNICAST_IP6] = "unicast-ip6", \ [FIB_FORW_CHAIN_TYPE_MCAST_IP4] = "multicast-ip4", \ [FIB_FORW_CHAIN_TYPE_MCAST_IP6] = "multicast-ip6", \ [FIB_FORW_CHAIN_TYPE_MPLS_NON_EOS] = "mpls-neos", \ [FIB_FORW_CHAIN_TYPE_MPLS_EOS] = "mpls-eos", \ + [FIB_FORW_CHAIN_TYPE_NSH] = "nsh", \ } -#define FIB_FORW_CHAIN_NUM (FIB_FORW_CHAIN_TYPE_MPLS_ETHERNET+1) +#define FIB_FORW_CHAIN_NUM (FIB_FORW_CHAIN_TYPE_NSH+1) #define FIB_FORW_CHAIN_MPLS_NUM (FIB_FORW_CHAIN_TYPE_MPLS_EOS+1) #define FOR_EACH_FIB_FORW_CHAIN(_item) \ for (_item = FIB_FORW_CHAIN_TYPE_UNICAST_IP4; \ - _item <= FIB_FORW_CHAIN_TYPE_ETHERNET; \ + _item <= FIB_FORW_CHAIN_TYPE_NSH; \ _item++) #define FOR_EACH_FIB_FORW_MPLS_CHAIN(_item) \ @@ -225,6 +242,11 @@ extern u8 * format_fib_forw_chain_type(u8 * s, va_list * args); extern dpo_proto_t fib_proto_to_dpo(fib_protocol_t fib_proto); extern fib_protocol_t dpo_proto_to_fib(dpo_proto_t dpo_proto); +/** + * Convert from BIER next-hop proto to FIB proto + */ +extern fib_protocol_t bier_hdr_proto_to_fib(bier_hdr_proto_id_t bproto); + /** * Enurmeration of special path/entry types */ @@ -256,8 +278,8 @@ typedef enum fib_special_type_t_ { for (_item = FIB_TYPE_SPEICAL_FIRST; \ _item <= FIB_SPEICAL_TYPE_LAST; _item++) -extern u8 * format_fib_protocol(u8 * s, va_list ap); -extern u8 * format_vnet_link(u8 *s, va_list ap); +extern u8 * format_fib_protocol(u8 * s, va_list *ap); +extern u8 * format_vnet_link(u8 *s, va_list *ap); /** * Path flags from the control plane @@ -277,8 +299,68 @@ typedef enum fib_route_path_flags_t_ * A for-us/local path */ FIB_ROUTE_PATH_LOCAL = (1 << 2), + /** + * Attached path + */ + FIB_ROUTE_PATH_ATTACHED = (1 << 3), + /** + * A Drop path - resolve the path on the drop DPO + */ + FIB_ROUTE_PATH_DROP = (1 << 4), + /** + * Don't resolve the path, use the DPO the client provides + */ + FIB_ROUTE_PATH_EXCLUSIVE = (1 << 5), + /** + * A path that result in received traffic being recieved/recirculated + * so that it appears to have arrived on the new interface + */ + FIB_ROUTE_PATH_INTF_RX = (1 << 6), + /** + * A local path with a RPF-ID => multicast traffic + */ + FIB_ROUTE_PATH_RPF_ID = (1 << 7), + /** + * A deag path using the packet's source not destination address. + */ + FIB_ROUTE_PATH_SOURCE_LOOKUP = (1 << 8), + /** + * A path via a UDP encap object. + */ + FIB_ROUTE_PATH_UDP_ENCAP = (1 << 9), + /** + * A path that resolves via a BIER F-Mask + */ + FIB_ROUTE_PATH_BIER_FMASK = (1 << 10), + /** + * A path that resolves via a BIER [ECMP] Table + */ + FIB_ROUTE_PATH_BIER_TABLE = (1 << 11), + /** + * A path that resolves via a BIER impostion object + */ + FIB_ROUTE_PATH_BIER_IMP = (1 << 12), + /** + * A path that resolves via another table + */ + FIB_ROUTE_PATH_DEAG = (1 << 13), + /** + * A path that resolves via a DVR DPO + */ + FIB_ROUTE_PATH_DVR = (1 << 14), } fib_route_path_flags_t; +/** + * An RPF-ID is numerical value that is used RPF validate. An entry + * has-a RPF-ID, when a packet egress from (e.g. an LSP) it gains an + * RPF-ID, these two are compared for the RPF check. + * This replaces the interfce based chack (since the LSP has no associated + * interface. + */ +typedef u32 fib_rpf_id_t; + +#define MFIB_RPF_ID_NONE (0) + /** * @brief * A representation of a path as described by a route producer. @@ -301,47 +383,106 @@ typedef struct fib_route_path_t_ { * The protocol of the address below. We need this since the all * zeros address is ambiguous. */ - fib_protocol_t frp_proto; + dpo_proto_t frp_proto; union { - /** - * The next-hop address. - * Will be NULL for attached paths. - * Will be all zeros for attached-next-hop paths on a p2p interface - * Will be all zeros for a deag path. - */ - ip46_address_t frp_addr; - - /** - * The MPLS local Label to reursively resolve through. - * This is valid when the path type is MPLS. - */ - mpls_label_t frp_local_label; + struct { + union { + /** + * The next-hop address. + * Will be NULL for attached paths. + * Will be all zeros for attached-next-hop paths on a p2p interface + * Will be all zeros for a deag path. + */ + ip46_address_t frp_addr; + + struct { + /** + * The MPLS local Label to reursively resolve through. + * This is valid when the path type is MPLS. + */ + mpls_label_t frp_local_label; + /** + * EOS bit for the resolving label + */ + mpls_eos_bit_t frp_eos; + }; + }; + union { + /** + * The interface. + * Will be invalid for recursive paths. + */ + u32 frp_sw_if_index; + /** + * The RPF-ID + */ + fib_rpf_id_t frp_rpf_id; + }; + union { + /** + * The FIB index to lookup the nexthop + * Only valid for recursive paths. + */ + u32 frp_fib_index; + /** + * The BIER table to resolve the fmask in + */ + u32 frp_bier_fib_index; + }; + /** + * The outgoing MPLS label Stack. NULL implies no label. + */ + mpls_label_t *frp_label_stack; + }; + /** + * A path that resolves via a BIER Table. + * This would be for a MPLS label at a BIER midpoint or tail + */ + bier_table_id_t frp_bier_tbl; + + /** + * A path via a BIER imposition object. + * Present in an mfib path list + */ + index_t frp_bier_imp; + + /** + * UDP encap ID + */ + u32 frp_udp_encap_id; + + /** + * Resolving via a BIER Fmask + */ + index_t frp_bier_fmask; }; /** - * The interface. - * Will be invalid for recursive paths. - */ - u32 frp_sw_if_index; - /** - * The FIB index to lookup the nexthop - * Only valid for recursive paths. + * [un]equal cost path weight */ - u32 frp_fib_index; + u8 frp_weight; /** - * [un]equal cost path weight + * A path preference. 0 is the best. + * Only paths of the best preference, that are 'up', are considered + * for forwarding. */ - u32 frp_weight; + u8 frp_preference; /** * flags on the path */ fib_route_path_flags_t frp_flags; - /** - * The outgoing MPLS label Stack. NULL implies no label. - */ - mpls_label_t *frp_label_stack; } fib_route_path_t; +/** + * Unformat a fib_route_path_t from CLI input + */ +extern uword unformat_fib_route_path(unformat_input_t * input, va_list * args); + +/** + * A help string to list the FIB path options + */ +#define FIB_ROUTE_PATH_HELP "[next-hop-address] [next-hop-interface] [next-hop-table ] [weight ] [preference ] [udp-encap-id ] [ip4-lookup-in-table ] [ip6-lookup-in-table ] [mpls-lookup-in-table ] [resolve-via-host] [resolve-via-connected] [rx-ip4 ] [out-labels ]" + /** * @brief * A representation of a fib path for fib_path_encode to convey the information to the caller @@ -351,4 +492,21 @@ typedef struct fib_route_path_encode_t_ { dpo_id_t dpo; } fib_route_path_encode_t; +/** + * return code to control pat-hlist walk + */ +typedef enum fib_path_list_walk_rc_t_ +{ + FIB_PATH_LIST_WALK_STOP, + FIB_PATH_LIST_WALK_CONTINUE, +} fib_path_list_walk_rc_t; + +/** + * A list of path-extensions + */ +typedef struct fib_path_ext_list_t_ +{ + struct fib_path_ext_t_ *fpel_exts; +} fib_path_ext_list_t; + #endif