X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Fvnet%2Ffib%2Ffib_types.h;h=b5a58e7b67420c5b765792590c64b28f51c57c9c;hb=e2fe09742;hp=a7a23d74add81f8bbdbdf86328b84d5bb5b665dd;hpb=57b5860f013953ce161d05302e05370db9cd6ee2;p=vpp.git diff --git a/src/vnet/fib/fib_types.h b/src/vnet/fib/fib_types.h index a7a23d74add..b5a58e7b674 100644 --- a/src/vnet/fib/fib_types.h +++ b/src/vnet/fib/fib_types.h @@ -16,10 +16,11 @@ #ifndef __FIB_TYPES_H__ #define __FIB_TYPES_H__ -#include -#include +#include +#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 */ @@ -64,6 +71,26 @@ typedef enum fib_protocol_t_ { _item <= FIB_PROTOCOL_IP6; \ _item++) +/** + * @brief Convert from boolean is_ip6 to FIB protocol. + * Drop MPLS on the floor in favor of IPv4. + */ +static inline fib_protocol_t +fib_ip_proto(bool is_ip6) +{ + return (is_ip6) ? FIB_PROTOCOL_IP6 : FIB_PROTOCOL_IP4; +} + +/** + * @brief Convert from fib_protocol to ip46_type + */ +extern ip46_type_t fib_proto_to_ip46(fib_protocol_t fproto); + +/** + * @brief Convert from ip46_type to fib_protocol + */ +extern fib_protocol_t fib_proto_from_ip46(ip46_type_t iproto); + /** * @brief Convert from a protocol to a link type */ @@ -88,6 +115,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 @@ -117,6 +148,7 @@ typedef enum 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", \ @@ -140,22 +172,32 @@ typedef enum fib_forward_chain_type_t_ { _item++) /** - * @brief Convert from a chain type to the adjacencies link type + * @brief Convert from a chain type to the adjacency's link type */ extern vnet_link_t fib_forw_chain_type_to_link_type(fib_forward_chain_type_t fct); +/** + * @brief Convert from a adjacency's link type to chain type + */ +extern fib_forward_chain_type_t fib_forw_chain_type_from_link_type(vnet_link_t lt); + /** * @brief Convert from a payload-protocol to a chain type. */ extern fib_forward_chain_type_t fib_forw_chain_type_from_dpo_proto(dpo_proto_t proto); +/** + * @brief Convert from a fib-protocol to a chain type. + */ +extern fib_forward_chain_type_t fib_forw_chain_type_from_fib_proto(fib_protocol_t proto); + /** * @brief Convert from a chain type to the DPO proto it will install */ extern dpo_proto_t fib_forw_chain_type_to_dpo_proto(fib_forward_chain_type_t fct); /** - * Aggregrate type for a prefix + * Aggregate type for a prefix */ typedef struct fib_prefix_t_ { /** @@ -204,6 +246,12 @@ STATIC_ASSERT(STRUCT_OFFSET_OF(fib_prefix_t, fp_addr) == 4, extern int fib_prefix_cmp(const fib_prefix_t *p1, const fib_prefix_t *p2); +/** + * \brief Copy a prefix + */ +extern void fib_prefix_copy(fib_prefix_t *dst, + const fib_prefix_t *src); + /** * \brief Compare two prefixes for covering relationship * @@ -216,7 +264,14 @@ extern int fib_prefix_is_cover(const fib_prefix_t *p1, * \brief Return true is the prefix is a host prefix */ extern int fib_prefix_is_host(const fib_prefix_t *p); +extern u8 fib_prefix_get_host_length (fib_protocol_t proto); +/** + * normalise a prefix (i.e. mask the host bits according to the + * prefix length) + */ +extern void fib_prefix_normalize(const fib_prefix_t *p, + fib_prefix_t *out); /** * \brief Host prefix from ip @@ -230,6 +285,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 */ @@ -261,8 +321,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 @@ -303,8 +363,54 @@ typedef enum fib_route_path_flags_t_ * 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_ICMP_UNREACH = (1 << 15), + FIB_ROUTE_PATH_ICMP_PROHIBIT = (1 << 16), + FIB_ROUTE_PATH_CLASSIFY = (1 << 17), + + /** + * Pop a Psuedo Wire Control Word + */ + FIB_ROUTE_PATH_POP_PW_CW = (1 << 18), + /** + * A path that resolves via a glean adjacency + */ + FIB_ROUTE_PATH_GLEAN = (1 << 19), } fib_route_path_flags_t; +/** + * Format route path flags + */ +extern u8 * format_fib_route_path_flags(u8 *s, va_list *ap); + /** * 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 @@ -316,6 +422,64 @@ typedef u32 fib_rpf_id_t; #define MFIB_RPF_ID_NONE (0) +/** + * MPLS LSP mode - only valid at the head and tail + */ +typedef enum fib_mpls_lsp_mode_t_ +{ + /** + * Pipe Mode - the default. + * TTL and DSCP markings are not carried between the layers + */ + FIB_MPLS_LSP_MODE_PIPE, + /** + * Uniform mode. + * TTL and DSCP are copied between the layers + */ + FIB_MPLS_LSP_MODE_UNIFORM, +} __attribute__((packed)) fib_mpls_lsp_mode_t; + +#define FIB_MPLS_LSP_MODES { \ + [FIB_MPLS_LSP_MODE_PIPE] = "pipe", \ + [FIB_MPLS_LSP_MODE_UNIFORM] = "uniform", \ +} + +/** + * Format an LSP mode type + */ +extern u8 * format_fib_mpls_lsp_mode(u8 *s, va_list *ap); + +/** + * Configuration for each label value in the output-stack + */ +typedef struct fib_mpls_label_t_ +{ + /** + * The label value + */ + mpls_label_t fml_value; + + /** + * The LSP mode + */ + fib_mpls_lsp_mode_t fml_mode; + + /** + * TTL. valid only at imposition. + */ + u8 fml_ttl; + + /** + * EXP bits; valid only at imposition. + */ + u8 fml_exp; +} fib_mpls_label_t; + +/** + * Format an MPLS label + */ +extern u8 * format_fib_mpls_label(u8 *s, va_list *ap); + /** * @brief * A representation of a path as described by a route producer. @@ -338,73 +502,133 @@ 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; - 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; + }; + /** + * A path via a BIER imposition object. + * Present in an mfib path list + */ + index_t frp_bier_imp; + + /** + * Glean prefix on a glean path + */ + fib_prefix_t frp_connected; + }; + /** - * The MPLS local Label to reursively resolve through. - * This is valid when the path type is MPLS. + * The interface. + * Will be invalid for recursive paths. */ - mpls_label_t frp_local_label; + 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. + */ + fib_mpls_label_t *frp_label_stack; + /** + * Exclusive DPO + */ + dpo_id_t dpo; /** - * EOS bit for the resolving label + * MFIB interface flags */ - mpls_eos_bit_t frp_eos; + u32 frp_mitf_flags; }; - }; - union { /** - * The interface. - * Will be invalid for recursive paths. + * 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; + + /** + * UDP encap ID + */ + u32 frp_udp_encap_id; + + /** + * Classify table ID */ - u32 frp_sw_if_index; + u32 frp_classify_table_id; + + /** + * Resolving via a BIER Fmask + */ + index_t frp_bier_fmask; + /** - * The RPF-ID + * The DPO for use with exclusive paths */ - fib_rpf_id_t frp_rpf_id; + dpo_id_t frp_dpo; }; - /** - * The FIB index to lookup the nexthop - * Only valid for recursive paths. - */ - u32 frp_fib_index; /** * [un]equal cost path weight */ - u16 frp_weight; + u8 frp_weight; /** * A path preference. 0 is the best. * Only paths of the best preference, that are 'up', are considered * for forwarding. */ - u16 frp_preference; + 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; /** - * @brief - * A representation of a fib path for fib_path_encode to convey the information to the caller + * Unformat a fib_route_path_t from CLI input + */ +extern uword unformat_fib_route_path(unformat_input_t * input, va_list * args); + +/** + * Format route path flags + */ +extern u8 * format_fib_route_path(u8 *s, va_list *ap); + +/** + * A help string to list the FIB path options */ -typedef struct fib_route_path_encode_t_ { - fib_route_path_t rpath; - dpo_id_t dpo; -} fib_route_path_encode_t; +#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 ]" /** * return code to control pat-hlist walk