Skip to content

Commit

Permalink
Merge "Fix issues when handling unkown ipv6 packets"
Browse files Browse the repository at this point in the history
  • Loading branch information
@LucProvoost
LucProvoost authored and Gerrit Code Review committed Feb 21, 2022
2 parents fa752f4 + 0a07d29 commit 834497b
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 14 deletions.
1 change: 1 addition & 0 deletions VNFs/DPPD-PROX/defaults.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -222,6 +222,7 @@ void set_port_defaults(void)
prox_port_cfg[i].tx_ring[0] = '\0';
prox_port_cfg[i].mtu = PROX_MTU;
prox_port_cfg[i].dpdk_mapping = NO_VDEV_PORT;
prox_port_cfg[i].v6_mask_length = 8;

// CRC_STRIP becoming the default behavior in DPDK 18.08, and
// DEV_RX_OFFLOAD_CRC_STRIP define has been deleted
Expand Down
27 changes: 15 additions & 12 deletions VNFs/DPPD-PROX/handle_master.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,7 +376,7 @@ static inline void build_icmp_reply_message(struct task_base *tbase, struct rte_
static inline void handle_icmp(struct task_base *tbase, struct rte_mbuf *mbuf)
{
struct task_master *task = (struct task_master *)tbase;
uint8_t port_id = mbuf->port;
uint8_t port_id = get_port(mbuf);
struct port_table *port = &task->internal_port_table[port_id];
prox_rte_ether_hdr *hdr = rte_pktmbuf_mtod(mbuf, prox_rte_ether_hdr *);
if (hdr->ether_type != ETYPE_IPv4) {
Expand Down Expand Up @@ -419,21 +419,21 @@ static inline void handle_unknown_ip6(struct task_base *tbase, struct rte_mbuf *
{
struct task_master *task = (struct task_master *)tbase;
struct ether_hdr_arp *hdr_arp = rte_pktmbuf_mtod(mbuf, struct ether_hdr_arp *);
uint8_t port = get_port(mbuf);
uint8_t port_id = get_port(mbuf);
struct ipv6_addr *ip_dst = ctrl_ring_get_ipv6_addr(mbuf);
uint16_t vlan = ctrl_ring_get_vlan(mbuf);
int ret1, ret2, i;

plogx_dbg("\tMaster trying to find MAC of external IP "IPv6_BYTES_FMT" for port %d\n", IPv6_BYTES(ip_dst->bytes), port);
if (unlikely(port >= PROX_MAX_PORTS)) {
plogx_dbg("Port %d not found", port);
plogx_dbg("\tMaster trying to find MAC of external IP "IPv6_BYTES_FMT" for port %d\n", IPv6_BYTES(ip_dst->bytes), port_id);
if (unlikely(port_id >= PROX_MAX_PORTS)) {
plogx_dbg("Port %d not found", port_id);
tx_drop(mbuf);
return;
}
struct ipv6_addr *local_ip_src = &task->internal_port_table[port].local_ipv6_addr;
struct ipv6_addr *global_ip_src = &task->internal_port_table[port].global_ipv6_addr;
struct ipv6_addr *local_ip_src = &task->internal_port_table[port_id].local_ipv6_addr;
struct ipv6_addr *global_ip_src = &task->internal_port_table[port_id].global_ipv6_addr;
struct ipv6_addr *ip_src;
if (memcmp(local_ip_src, ip_dst, 8) == 0)
if (memcmp(local_ip_src, ip_dst, prox_port_cfg[port_id].v6_mask_length) == 0)
ip_src = local_ip_src;
else if (memcmp(global_ip_src, &null_addr, 16))
ip_src = global_ip_src;
Expand All @@ -445,7 +445,7 @@ static inline void handle_unknown_ip6(struct task_base *tbase, struct rte_mbuf *
struct rte_ring *ring = task->ctrl_tx_rings[get_core(mbuf) * MAX_TASKS_PER_CORE + get_task(mbuf)];

if (ring == NULL) {
plogx_dbg("Port %d not registered", port);
plogx_dbg("Port %d not registered", port_id);
tx_drop(mbuf);
return;
}
Expand Down Expand Up @@ -476,12 +476,12 @@ static inline void handle_unknown_ip6(struct task_base *tbase, struct rte_mbuf *
task->external_ip6_table[ret2].nb_requests++;
// Only needed for first request - but avoid test and copy the same 6 bytes
// In most cases we will only have one request per IP.
//memcpy(&task->external_ip6_table[ret2].mac, &task->internal_port_table[port].mac, sizeof(prox_rte_ether_addr));
//memcpy(&task->external_ip6_table[ret2].mac, &task->internal_port_table[port_id].mac, sizeof(prox_rte_ether_addr));
}

// As timers are not handled by master, we might send an NS request even if one was just sent
// (and not yet answered) by another task
build_neighbour_sollicitation(mbuf, &task->internal_port_table[port].mac, ip_dst, ip_src, vlan);
build_neighbour_sollicitation(mbuf, &task->internal_port_table[port_id].mac, ip_dst, ip_src, vlan);
tx_ring(tbase, ring, SEND_NDP_FROM_MASTER, mbuf);
}

Expand Down Expand Up @@ -625,6 +625,7 @@ static inline void handle_ns(struct task_base *tbase, struct rte_mbuf *mbuf, pro
tx_drop(mbuf);
} else {
struct rte_ring *ring = task->internal_ip6_table[ret].ring;
if (ring == NULL) return;
build_neighbour_advertisement(tbase, mbuf, &task->internal_ip6_table[ret].mac, &key.ip6, PROX_SOLLICITED, vlan);
tx_ring(tbase, ring, SEND_NDP_FROM_MASTER, mbuf);
}
Expand Down Expand Up @@ -675,14 +676,15 @@ static inline void handle_na(struct task_base *tbase, struct rte_mbuf *mbuf, pro
}

if (target_address == NULL) {
tx_drop(mbuf);
target_address = (uint8_t *)&neighbour_advertisement->destination_address;
}
struct ether_hdr_arp *hdr_arp = rte_pktmbuf_mtod(mbuf, struct ether_hdr_arp *);
struct ipv6_addr *key = &neighbour_advertisement->destination_address;

ret = rte_hash_lookup(task->external_ip6_hash, (const void *)key);
if (unlikely(ret < 0)) {
// entry not found for this IP: we did not ask a request, delete the reply
plog_err("Unkown IP "IPv6_BYTES_FMT"", IPv6_BYTES(neighbour_advertisement->destination_address.bytes));
tx_drop(mbuf);
} else {
// entry found for this IP
Expand All @@ -697,6 +699,7 @@ static inline void handle_na(struct task_base *tbase, struct rte_mbuf *mbuf, pro
}
task->external_ip6_table[ret].nb_requests = 0;
} else {
plog_err("UNEXPECTED nb_requests == 0");
tx_drop(mbuf);
}
}
Expand Down
5 changes: 3 additions & 2 deletions VNFs/DPPD-PROX/packet_utils.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -546,15 +546,16 @@ void task_start_l3(struct task_base *tbase, struct task_args *targ)
if ((targ->local_ipv4 && port->ip_addr[0].ip) && (targ->local_prefix != port->ip_addr[0].prefix)) {
PROX_PANIC(1, "local_ipv4 prefix in core section (%d) differs from port section (%d)\n", targ->local_prefix, port->ip_addr[0].prefix);
}
if (!port->ip_addr[0].ip) {
if (!port->ip_addr[0].ip && targ->local_ipv4) {
port->ip_addr[0].ip = targ->local_ipv4;
port->ip_addr[0].prefix = targ->local_prefix;
port->n_vlans = 1;
port->vlan_tags[0] = 0;
plog_info("Setting port local_ipv4 from core %d local_ipv4 to "IPv4_BYTES_FMT"\n", tbase->l3.reachable_port_id, IP4(rte_be_to_cpu_32(port->ip_addr[0].ip)));
}
for (int vlan_id = 0; vlan_id < port->n_vlans; vlan_id++) {
register_ip_to_ctrl_plane(tbase->l3.tmaster, rte_be_to_cpu_32(port->ip_addr[vlan_id].ip), tbase->l3.reachable_port_id, targ->lconf->id, targ->id);
if (port->ip_addr[vlan_id].ip)
register_ip_to_ctrl_plane(tbase->l3.tmaster, rte_be_to_cpu_32(port->ip_addr[vlan_id].ip), tbase->l3.reachable_port_id, targ->lconf->id, targ->id);
}
if (strcmp(targ->route_table, "") != 0) {
struct lpm4 *lpm;
Expand Down
3 changes: 3 additions & 0 deletions VNFs/DPPD-PROX/prox_args.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -542,6 +542,9 @@ static int get_port_cfg(unsigned sindex, char *str, void *data)
else if (STR_EQ(str, "tx desc")) {
return parse_int(&cfg->n_txd, pkey);
}
else if (STR_EQ(str, "ipv6 mask length")) {
return parse_int(&cfg->v6_mask_length, pkey);
}
else if (STR_EQ(str, "all_rx_queues")) {
uint32_t val;
if (parse_bool(&val, pkey)) {
Expand Down
1 change: 1 addition & 0 deletions VNFs/DPPD-PROX/prox_port_cfg.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,7 @@ struct prox_port_cfg {
uint8_t virtual;
uint8_t all_rx_queues;
uint16_t n_vlans;
uint32_t v6_mask_length;
};

extern rte_atomic32_t lsc;
Expand Down

0 comments on commit 834497b

Please sign in to comment.