Ability to encode vnf_type in underlay address

Author: PlagueCZ

docs/deployment/README.md

@@ -10,9 +10,22 @@ For dpservice to work properly, host IPv6 address needs to set up on `lo` instea
 
 This address must be in the form of a network prefix `/64`, i.e. the last 64 bits of the host address must be zero. This way the 64 bit suffix can be used for containers or VMs running on the host.
 
+It is suggested that `<host-prefix>:0000::/65` is used for host itself and `<host-prefix>:8000::/65` is then assigned special role, e.g. `<host-prefix>:f000::/68` for PodIPs, `<host-prefix>:d000::/68` for dpservice, etc.
+
 Dpservice will generate addresses in the range from `<host-prefix>:d000::` to `<host-prefix>:dfff::`.
 
-It is suggested that `<host-prefix>:0000::/65` is used for host itself and `<host-prefix>:8000::/65` is then assigned special role, e.g. `<host-prefix>:f000::/68` for PodIPs, `<host-prefix>:d000::/68` for dpservice, etc.
+If meson option `-Denable_address_type=true` is used, addresses are generated based on the usage type:
+
+| Use | Range |
+|-|-|
+| `<host-prefix>:d000::/80` | unused |
+| `<host-prefix>:d001::/80` | NICs |
+| `<host-prefix>:d002::/80` | VIPs |
+| `<host-prefix>:d003::/80` | NATGateways |
+| `<host-prefix>:d004::/80` | LoadBalancers |
+| `<host-prefix>:d005::/80` | LoadBalancer targets |
+| `<host-prefix>:d006::/80` | Prefixes |
+| `<host-prefix>:d0ff::/80` | Virtual services |
 
 ## Command-line tools
 All tool binaries are designed to be prefixed with `dpservice-` to enable the operator to simply type `dps<TAB>` for list of possible tools.

include/dp_ipaddr.h

@@ -21,7 +21,7 @@ static_assert(sizeof(rte_be64_t) * 2 == DP_IPV6_ADDR_SIZE, "DP_IPV6_ADDR_SIZE is
 
 #define DP_UNDERLAY_FLAG_EXTERNALLY_GENERATED 0x80
 #define DP_UNDERLAY_FLAG_SECONDARY_POOL 0x40
-#define DP_UNDERLAY_KERNEL_BYTES 0xd000
+#define DP_UNDERLAY_ADDRESS_TYPE 0xd0
 
 // structure for holding IPv6 addresses
 // this way sizeof(dp_ipv6 *) is a meaningful value and passing the pointer only is safe
@@ -37,7 +37,8 @@ union dp_ipv6 {
 	} _nat64;
 	struct __rte_packed {
 		rte_be64_t	prefix;
-		rte_be16_t	kernel;
+		uint8_t		type;
+		uint8_t		subtype;
 		uint8_t		flags;
 		uint8_t		random;
 		rte_be32_t	local;
@@ -167,7 +168,7 @@ int dp_ipv4_to_str(uint32_t ipv4, char *dest, int dest_len);
 int dp_str_to_ipv4(const char *src, uint32_t *dest);
 int dp_str_to_ipv6(const char *src, union dp_ipv6 *dest);
 
-void dp_generate_ul_ipv6(union dp_ipv6 *dest);
+void dp_generate_ul_ipv6(union dp_ipv6 *dest, uint8_t addr_type);
 
 
 // structure for holding dual IP addresses

include/dp_vnf.h

@@ -23,12 +23,12 @@ struct dp_grpc_responder;
 
 enum dp_vnf_type {
 	DP_VNF_TYPE_UNDEFINED,
-	DP_VNF_TYPE_LB_ALIAS_PFX,
-	DP_VNF_TYPE_ALIAS_PFX,
-	DP_VNF_TYPE_LB,
+	DP_VNF_TYPE_INTERFACE_IP,
 	DP_VNF_TYPE_VIP,
 	DP_VNF_TYPE_NAT,
-	DP_VNF_TYPE_INTERFACE_IP,
+	DP_VNF_TYPE_LB,
+	DP_VNF_TYPE_LB_ALIAS_PFX,
+	DP_VNF_TYPE_ALIAS_PFX,
 } __rte_packed;  // for 'struct dp_flow' and 'struct flow_key'
 
 struct dp_vnf_prefix {

meson.build

@@ -56,6 +56,9 @@ endif
 if get_option('enable_tests')
   add_global_arguments('-DENABLE_PYTEST', language: ['c', 'cpp'])
 endif
+if get_option('enable_underlay_type')
+  add_global_arguments('-DENABLE_UNDERLAY_TYPE', language: ['c', 'cpp'])
+endif
 
 dpdk_dep = dependency('libdpdk', version: '>=21.11.0')
 proto_dep = dependency('protobuf')

meson_options.txt

@@ -10,3 +10,5 @@ option('compiler_suggestions', type: 'boolean', value: false, description:
        'Show various compiler suggestions (warnings)')
 option('build_dpservice_cli', type: 'boolean', value: false, description:
        'Enable building of dpservice-cli golang gRPC client')
+option('enable_underlay_type', type: 'boolean', value: false, description:
+       'Generate underlay address with vnf_type field')

src/dp_ipaddr.c

@@ -70,12 +70,18 @@ int dp_ipaddr_to_str(const struct dp_ip_address *addr, char *dest, int dest_len)
 }
 
 
-void dp_generate_ul_ipv6(union dp_ipv6 *dest)
+void dp_generate_ul_ipv6(union dp_ipv6 *dest, uint8_t addr_type)
 {
 	static uint32_t ul_counter = 0;
 
 	dest->_ul.prefix = dp_conf_get_underlay_ip()->_prefix;  // Use the same prefix as the host
-	dest->_ul.kernel = htons(DP_UNDERLAY_KERNEL_BYTES);  // Use hardcoded 2-byte kernel value
+	dest->_ul.type = DP_UNDERLAY_ADDRESS_TYPE;
+#ifdef ENABLE_UNDERLAY_TYPE
+	dest->_ul.subtype = addr_type;
+#else
+	(void)addr_type;
+	dest->_ul.subtype = 0;
+#endif
 	dest->_ul.flags = 0;
 #ifdef ENABLE_STATIC_UNDERLAY_IP
 	dest->_ul.random = 1;

src/dp_virtsvc.c

@@ -166,7 +166,8 @@ int dp_virtsvc_init(int socket_id)
 		dp_virtservices_end->virtual_port = rule->virtual_port;
 		dp_virtservices_end->service_port = rule->service_port;
 		dp_copy_ipv6(&dp_virtservices_end->service_addr, &rule->service_addr);
-		dp_generate_ul_ipv6(&dp_virtservices_end->ul_addr);
+		// TODO temporary, already made better in a branch (including ifdef ENABLE_UNDERLAY_TYPE)
+		dp_generate_ul_ipv6(&dp_virtservices_end->ul_addr, 0xff);
 		// last_assigned_port is 0 due to zmalloc()
 		snprintf(hashtable_name, sizeof(hashtable_name), "virtsvc_table_%u", i);
 		dp_virtservices_end->open_ports = dp_create_jhash_table(DP_VIRTSVC_PORTCOUNT,

src/grpc/dp_grpc_impl.c

@@ -30,7 +30,7 @@ static int dp_create_vnf_route(union dp_ipv6 *ul_addr6 /* out */,
 {
 	// if ul_addr6 already provided, try to use that one, otherwise generate it here
 	if (dp_ipv6_match(ul_addr6, &dp_empty_ipv6))
-		dp_generate_ul_ipv6(ul_addr6);
+		dp_generate_ul_ipv6(ul_addr6, type);
 	return dp_add_vnf(ul_addr6, type, port->port_id, vni, pfx_ip, prefix_len);
 }
 

src/rte_flow/dp_rte_async_flow_isolation.c

@@ -105,7 +105,7 @@ static struct rte_flow *dp_create_pf_async_isolation_rule(uint16_t port_id, stru
 	// Only allow the right IPv6 underlay prefix
 	const union dp_ipv6 ul_addr6 = {
 		._ul.prefix = dp_conf_get_underlay_ip()->_prefix,
-		._ul.kernel = htons(DP_UNDERLAY_KERNEL_BYTES),
+		._ul.type = DP_UNDERLAY_ADDRESS_TYPE,
 	};
 
 	dp_set_dst_ipv6(&ipv6_spec.hdr, &ul_addr6);

src/rte_flow/dp_rte_flow_isolation.c

@@ -30,7 +30,7 @@ int dp_install_isolated_mode(uint16_t port_id)
 	union dp_ipv6 ul_addr6;
 
 	ul_addr6._ul.prefix = dp_conf_get_underlay_ip()->_prefix;
-	ul_addr6._ul.kernel = htons(DP_UNDERLAY_KERNEL_BYTES);
+	ul_addr6._ul.type = DP_UNDERLAY_ADDRESS_TYPE;
 
 	// create match pattern: IP in IPv6 tunnel packets
 	dp_set_eth_flow_item(&pattern[pattern_cnt++], &eth_spec, htons(RTE_ETHER_TYPE_IPV6));