X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fdpif-netdev.c;h=5efc8697b0c9fc3b9cce0962a740384f54fd52a6;hb=02c9ed77e316ef38d89a17a184e0b497615258fa;hp=b1e5481616ccfab00125713385d4a9a1d37f131d;hpb=693c4a01124ec5ad9253f8cfcfd99075a9d637f6;p=openvswitch diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index b1e54816..5efc8697 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -375,7 +375,7 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type, port->internal = internal; netdev_get_mtu(netdev, &mtu); - if (mtu > max_mtu) { + if (mtu != INT_MAX && mtu > max_mtu) { max_mtu = mtu; } @@ -701,43 +701,43 @@ dpif_netdev_validate_actions(const struct nlattr *actions, } switch (type) { - case ODPAT_OUTPUT: + case ODP_ACTION_ATTR_OUTPUT: if (nl_attr_get_u32(a) >= MAX_PORTS) { return EINVAL; } break; - case ODPAT_CONTROLLER: - case ODPAT_DROP_SPOOFED_ARP: + case ODP_ACTION_ATTR_CONTROLLER: + case ODP_ACTION_ATTR_DROP_SPOOFED_ARP: break; - case ODPAT_SET_DL_TCI: + case ODP_ACTION_ATTR_SET_DL_TCI: *mutates = true; if (nl_attr_get_be16(a) & htons(VLAN_CFI)) { return EINVAL; } break; - case ODPAT_SET_NW_TOS: + case ODP_ACTION_ATTR_SET_NW_TOS: *mutates = true; if (nl_attr_get_u8(a) & IP_ECN_MASK) { return EINVAL; } break; - case ODPAT_STRIP_VLAN: - case ODPAT_SET_DL_SRC: - case ODPAT_SET_DL_DST: - case ODPAT_SET_NW_SRC: - case ODPAT_SET_NW_DST: - case ODPAT_SET_TP_SRC: - case ODPAT_SET_TP_DST: + case ODP_ACTION_ATTR_STRIP_VLAN: + case ODP_ACTION_ATTR_SET_DL_SRC: + case ODP_ACTION_ATTR_SET_DL_DST: + case ODP_ACTION_ATTR_SET_NW_SRC: + case ODP_ACTION_ATTR_SET_NW_DST: + case ODP_ACTION_ATTR_SET_TP_SRC: + case ODP_ACTION_ATTR_SET_TP_DST: *mutates = true; break; - case ODPAT_SET_TUNNEL: - case ODPAT_SET_PRIORITY: - case ODPAT_POP_PRIORITY: + case ODP_ACTION_ATTR_SET_TUNNEL: + case ODP_ACTION_ATTR_SET_PRIORITY: + case ODP_ACTION_ATTR_POP_PRIORITY: default: return EOPNOTSUPP; } @@ -872,7 +872,7 @@ struct dp_netdev_flow_state { uint32_t bucket; uint32_t offset; struct nlattr *actions; - uint32_t keybuf[ODPUTIL_FLOW_KEY_U32S]; + struct odputil_keybuf keybuf; struct dpif_flow_stats stats; }; @@ -909,9 +909,8 @@ dpif_netdev_flow_dump_next(const struct dpif *dpif, void *state_, if (key) { struct ofpbuf buf; - ofpbuf_use_stack(&buf, state->keybuf, sizeof state->keybuf); + ofpbuf_use_stack(&buf, &state->keybuf, sizeof state->keybuf); odp_flow_key_from_flow(&buf, &flow->key); - assert(buf.base == state->keybuf); *key = buf.data; *key_len = buf.size; @@ -996,12 +995,8 @@ static int dpif_netdev_recv_set_mask(struct dpif *dpif, int listen_mask) { struct dpif_netdev *dpif_netdev = dpif_netdev_cast(dpif); - if (!(listen_mask & ~ODPL_ALL)) { - dpif_netdev->listen_mask = listen_mask; - return 0; - } else { - return EINVAL; - } + dpif_netdev->listen_mask = listen_mask; + return 0; } static struct dp_netdev_queue * @@ -1090,7 +1085,7 @@ dp_netdev_port_input(struct dp_netdev *dp, struct dp_netdev_port *port, dp->n_hit++; } else { dp->n_missed++; - dp_netdev_output_control(dp, packet, _ODPL_MISS_NR, &key, 0); + dp_netdev_output_control(dp, packet, DPIF_UC_MISS, &key, 0); } } @@ -1141,36 +1136,6 @@ dp_netdev_wait(void) } -/* Modify the TCI field of 'packet'. If a VLAN tag is present, its TCI field - * is replaced by 'tci'. If a VLAN tag is not present, one is added with the - * TCI field set to 'tci'. - */ -static void -dp_netdev_set_dl_tci(struct ofpbuf *packet, uint16_t tci) -{ - struct vlan_eth_header *veh; - struct eth_header *eh; - - eh = packet->l2; - if (packet->size >= sizeof(struct vlan_eth_header) - && eh->eth_type == htons(ETH_TYPE_VLAN)) { - veh = packet->l2; - veh->veth_tci = tci; - } else { - /* Insert new 802.1Q header. */ - struct vlan_eth_header tmp; - memcpy(tmp.veth_dst, eh->eth_dst, ETH_ADDR_LEN); - memcpy(tmp.veth_src, eh->eth_src, ETH_ADDR_LEN); - tmp.veth_type = htons(ETH_TYPE_VLAN); - tmp.veth_tci = tci; - tmp.veth_next_type = eh->eth_type; - - veh = ofpbuf_push_uninit(packet, VLAN_HEADER_LEN); - memcpy(veh, &tmp, sizeof tmp); - packet->l2 = (char*)packet->l2 - VLAN_HEADER_LEN; - } -} - static void dp_netdev_strip_vlan(struct ofpbuf *packet) { @@ -1219,11 +1184,11 @@ dp_netdev_set_nw_addr(struct ofpbuf *packet, const struct flow *key, uint16_t type = nl_attr_type(a); uint32_t *field; - field = type == ODPAT_SET_NW_SRC ? &nh->ip_src : &nh->ip_dst; - if (key->nw_proto == IP_TYPE_TCP && packet->l7) { + field = type == ODP_ACTION_ATTR_SET_NW_SRC ? &nh->ip_src : &nh->ip_dst; + if (key->nw_proto == IPPROTO_TCP && packet->l7) { struct tcp_header *th = packet->l4; th->tcp_csum = recalc_csum32(th->tcp_csum, *field, ip); - } else if (key->nw_proto == IP_TYPE_UDP && packet->l7) { + } else if (key->nw_proto == IPPROTO_UDP && packet->l7) { struct udp_header *uh = packet->l4; if (uh->udp_csum) { uh->udp_csum = recalc_csum32(uh->udp_csum, *field, ip); @@ -1265,12 +1230,14 @@ dp_netdev_set_tp_port(struct ofpbuf *packet, const struct flow *key, if (key->nw_proto == IPPROTO_TCP && packet->l7) { struct tcp_header *th = packet->l4; - field = type == ODPAT_SET_TP_SRC ? &th->tcp_src : &th->tcp_dst; + field = (type == ODP_ACTION_ATTR_SET_TP_SRC + ? &th->tcp_src : &th->tcp_dst); th->tcp_csum = recalc_csum16(th->tcp_csum, *field, port); *field = port; } else if (key->nw_proto == IPPROTO_UDP && packet->l7) { struct udp_header *uh = packet->l4; - field = type == ODPAT_SET_TP_SRC ? &uh->udp_src : &uh->udp_dst; + field = (type == ODP_ACTION_ATTR_SET_TP_SRC + ? &uh->udp_src : &uh->udp_dst); uh->udp_csum = recalc_csum16(uh->udp_csum, *field, port); *field = port; } else { @@ -1317,7 +1284,7 @@ dp_netdev_output_control(struct dp_netdev *dp, const struct ofpbuf *packet, upcall->key_len = key_len; upcall->userdata = arg; - q->upcalls[++q->head & QUEUE_MASK] = upcall; + q->upcalls[q->head++ & QUEUE_MASK] = upcall; return 0; } @@ -1361,46 +1328,46 @@ dp_netdev_execute_actions(struct dp_netdev *dp, NL_ATTR_FOR_EACH_UNSAFE (a, left, actions, actions_len) { switch (nl_attr_type(a)) { - case ODPAT_OUTPUT: + case ODP_ACTION_ATTR_OUTPUT: dp_netdev_output_port(dp, packet, nl_attr_get_u32(a)); break; - case ODPAT_CONTROLLER: - dp_netdev_output_control(dp, packet, _ODPL_ACTION_NR, + case ODP_ACTION_ATTR_CONTROLLER: + dp_netdev_output_control(dp, packet, DPIF_UC_ACTION, key, nl_attr_get_u64(a)); break; - case ODPAT_SET_DL_TCI: - dp_netdev_set_dl_tci(packet, nl_attr_get_be16(a)); + case ODP_ACTION_ATTR_SET_DL_TCI: + eth_set_vlan_tci(packet, nl_attr_get_be16(a)); break; - case ODPAT_STRIP_VLAN: + case ODP_ACTION_ATTR_STRIP_VLAN: dp_netdev_strip_vlan(packet); break; - case ODPAT_SET_DL_SRC: + case ODP_ACTION_ATTR_SET_DL_SRC: dp_netdev_set_dl_src(packet, nl_attr_get_unspec(a, ETH_ADDR_LEN)); break; - case ODPAT_SET_DL_DST: + case ODP_ACTION_ATTR_SET_DL_DST: dp_netdev_set_dl_dst(packet, nl_attr_get_unspec(a, ETH_ADDR_LEN)); break; - case ODPAT_SET_NW_SRC: - case ODPAT_SET_NW_DST: + case ODP_ACTION_ATTR_SET_NW_SRC: + case ODP_ACTION_ATTR_SET_NW_DST: dp_netdev_set_nw_addr(packet, key, a); break; - case ODPAT_SET_NW_TOS: + case ODP_ACTION_ATTR_SET_NW_TOS: dp_netdev_set_nw_tos(packet, key, nl_attr_get_u8(a)); break; - case ODPAT_SET_TP_SRC: - case ODPAT_SET_TP_DST: + case ODP_ACTION_ATTR_SET_TP_SRC: + case ODP_ACTION_ATTR_SET_TP_DST: dp_netdev_set_tp_port(packet, key, a); break; - case ODPAT_DROP_SPOOFED_ARP: + case ODP_ACTION_ATTR_DROP_SPOOFED_ARP: if (dp_netdev_is_spoofed_arp(packet, key)) { return 0; } @@ -1416,7 +1383,6 @@ const struct dpif_class dpif_netdev_class = { NULL, /* enumerate */ dpif_netdev_open, dpif_netdev_close, - NULL, /* get_all_names */ dpif_netdev_destroy, dpif_netdev_get_stats, dpif_netdev_get_drop_frags,