X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif-netdev.c;h=9a29b7eb3b76466a6d521808254f67e6fb5a1ab7;hb=cc36576070df622d0fc7a6e26ce01027e12b5b59;hp=5a54627efb56c85ef9e1e9a4fc0ba8cc818fe664;hpb=e6cc0babc25de1800aeffad66d2804e64e5bd602;p=sliver-openvswitch.git diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 5a54627ef..9a29b7eb3 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -87,6 +87,7 @@ struct dp_netdev { char *name; int open_cnt; bool destroyed; + int max_mtu; /* Maximum MTU of any port added so far. */ struct dp_netdev_queue queues[N_QUEUES]; struct hmap flow_table; /* Flow table. */ @@ -104,7 +105,7 @@ struct dp_netdev { /* A port in a netdev-based datapath. */ struct dp_netdev_port { - int port_no; /* Index into dp_netdev's 'ports'. */ + odp_port_t port_no; /* Index into dp_netdev's 'ports'. */ struct list node; /* Element in dp_netdev's 'port_list'. */ struct netdev *netdev; struct netdev_saved_flags *sf; @@ -138,18 +139,15 @@ struct dpif_netdev { /* All netdev-based datapaths. */ static struct shash dp_netdevs = SHASH_INITIALIZER(&dp_netdevs); -/* Maximum port MTU seen so far. */ -static int max_mtu = ETH_PAYLOAD_MAX; - -static int get_port_by_number(struct dp_netdev *, uint32_t port_no, +static int get_port_by_number(struct dp_netdev *, odp_port_t port_no, struct dp_netdev_port **portp); static int get_port_by_name(struct dp_netdev *, const char *devname, struct dp_netdev_port **portp); static void dp_netdev_free(struct dp_netdev *); static void dp_netdev_flow_flush(struct dp_netdev *); static int do_add_port(struct dp_netdev *, const char *devname, - const char *type, uint32_t port_no); -static int do_del_port(struct dp_netdev *, uint32_t port_no); + const char *type, odp_port_t port_no); +static int do_del_port(struct dp_netdev *, odp_port_t port_no); static int dpif_netdev_open(const struct dpif_class *, const char *name, bool create, struct dpif **); static int dp_netdev_output_userspace(struct dp_netdev *, const struct ofpbuf *, @@ -194,10 +192,17 @@ dpif_netdev_class_is_dummy(const struct dpif_class *class) return class != &dpif_netdev_class; } +static bool +dpif_netdev_class_is_planetlab(const struct dpif_class *class) +{ + return class == &dpif_planetlab_class; +} + static const char * dpif_netdev_port_open_type(const struct dpif_class *class, const char *type) { return strcmp(type, "internal") ? type + : dpif_netdev_class_is_planetlab(class) ? "pltap" : dpif_netdev_class_is_dummy(class) ? "dummy" : "tap"; } @@ -218,12 +223,15 @@ create_dpif_netdev(struct dp_netdev *dp) return &dpif->dpif; } -static int +/* Choose an unused, non-zero port number and return it on success. + * Return ODPP_NONE on failure. */ +static odp_port_t choose_port(struct dp_netdev *dp, const char *name) { - int port_no; + uint32_t port_no; - if (dp->class != &dpif_netdev_class) { + if (dp->class != &dpif_netdev_class && + dp->class != &dpif_planetlab_class) { const char *p; int start_no = 0; @@ -241,7 +249,7 @@ choose_port(struct dp_netdev *dp, const char *name) port_no = start_no + strtol(p, NULL, 10); if (port_no > 0 && port_no < MAX_PORTS && !dp->ports[port_no]) { - return port_no; + return u32_to_odp(port_no); } break; } @@ -250,11 +258,11 @@ choose_port(struct dp_netdev *dp, const char *name) for (port_no = 1; port_no < MAX_PORTS; port_no++) { if (!dp->ports[port_no]) { - return port_no; + return u32_to_odp(port_no); } } - return -1; + return ODPP_NONE; } static int @@ -269,13 +277,14 @@ create_dp_netdev(const char *name, const struct dpif_class *class, dp->class = class; dp->name = xstrdup(name); dp->open_cnt = 0; + dp->max_mtu = ETH_PAYLOAD_MAX; for (i = 0; i < N_QUEUES; i++) { dp->queues[i].head = dp->queues[i].tail = 0; } hmap_init(&dp->flow_table); list_init(&dp->port_list); - error = do_add_port(dp, name, "internal", OVSP_LOCAL); + error = do_add_port(dp, name, "internal", ODPP_LOCAL); if (error) { dp_netdev_free(dp); return error; @@ -379,7 +388,7 @@ dpif_netdev_get_stats(const struct dpif *dpif, struct dpif_dp_stats *stats) static int do_add_port(struct dp_netdev *dp, const char *devname, const char *type, - uint32_t port_no) + odp_port_t port_no) { struct netdev_saved_flags *sf; struct dp_netdev_port *port; @@ -404,7 +413,7 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type, if (error && !(error == EOPNOTSUPP && dpif_netdev_class_is_dummy(dp->class))) { VLOG_ERR("%s: cannot receive packets on this network device (%s)", - devname, strerror(errno)); + devname, ovs_strerror(errno)); netdev_close(netdev); return error; } @@ -424,12 +433,12 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type, port->type = xstrdup(type); error = netdev_get_mtu(netdev, &mtu); - if (!error && mtu > max_mtu) { - max_mtu = mtu; + if (!error && mtu > dp->max_mtu) { + dp->max_mtu = mtu; } list_push_back(&dp->port_list, &port->node); - dp->ports[port_no] = port; + dp->ports[odp_to_u32(port_no)] = port; dp->serial++; return 0; @@ -437,25 +446,26 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type, static int dpif_netdev_port_add(struct dpif *dpif, struct netdev *netdev, - uint32_t *port_nop) + odp_port_t *port_nop) { struct dp_netdev *dp = get_dp_netdev(dpif); char namebuf[NETDEV_VPORT_NAME_BUFSIZE]; const char *dpif_port; - int port_no; + odp_port_t port_no; dpif_port = netdev_vport_get_dpif_port(netdev, namebuf, sizeof namebuf); - if (*port_nop != UINT32_MAX) { - if (*port_nop >= MAX_PORTS) { + if (*port_nop != ODPP_NONE) { + uint32_t port_idx = odp_to_u32(*port_nop); + if (port_idx >= MAX_PORTS) { return EFBIG; - } else if (dp->ports[*port_nop]) { + } else if (dp->ports[port_idx]) { return EBUSY; } port_no = *port_nop; } else { port_no = choose_port(dp, dpif_port); } - if (port_no >= 0) { + if (port_no != ODPP_NONE) { *port_nop = port_no; return do_add_port(dp, dpif_port, netdev_get_type(netdev), port_no); } @@ -463,27 +473,28 @@ dpif_netdev_port_add(struct dpif *dpif, struct netdev *netdev, } static int -dpif_netdev_port_del(struct dpif *dpif, uint32_t port_no) +dpif_netdev_port_del(struct dpif *dpif, odp_port_t port_no) { struct dp_netdev *dp = get_dp_netdev(dpif); - return port_no == OVSP_LOCAL ? EINVAL : do_del_port(dp, port_no); + return (port_no == ODPP_LOCAL ? + EINVAL : do_del_port(dp, port_no)); } static bool -is_valid_port_number(uint32_t port_no) +is_valid_port_number(odp_port_t port_no) { - return port_no < MAX_PORTS; + return odp_to_u32(port_no) < MAX_PORTS; } static int get_port_by_number(struct dp_netdev *dp, - uint32_t port_no, struct dp_netdev_port **portp) + odp_port_t port_no, struct dp_netdev_port **portp) { if (!is_valid_port_number(port_no)) { *portp = NULL; return EINVAL; } else { - *portp = dp->ports[port_no]; + *portp = dp->ports[odp_to_u32(port_no)]; return *portp ? 0 : ENOENT; } } @@ -504,7 +515,7 @@ get_port_by_name(struct dp_netdev *dp, } static int -do_del_port(struct dp_netdev *dp, uint32_t port_no) +do_del_port(struct dp_netdev *dp, odp_port_t port_no) { struct dp_netdev_port *port; int error; @@ -515,7 +526,7 @@ do_del_port(struct dp_netdev *dp, uint32_t port_no) } list_remove(&port->node); - dp->ports[port->port_no] = NULL; + dp->ports[odp_to_u32(port_no)] = NULL; dp->serial++; netdev_close(port->netdev); @@ -537,7 +548,7 @@ answer_port_query(const struct dp_netdev_port *port, } static int -dpif_netdev_port_query_by_number(const struct dpif *dpif, uint32_t port_no, +dpif_netdev_port_query_by_number(const struct dpif *dpif, odp_port_t port_no, struct dpif_port *dpif_port) { struct dp_netdev *dp = get_dp_netdev(dpif); @@ -566,10 +577,10 @@ dpif_netdev_port_query_by_name(const struct dpif *dpif, const char *devname, return error; } -static int +static odp_port_t dpif_netdev_get_max_ports(const struct dpif *dpif OVS_UNUSED) { - return MAX_PORTS; + return u32_to_odp(MAX_PORTS); } static void @@ -599,7 +610,7 @@ dpif_netdev_flow_flush(struct dpif *dpif) } struct dp_netdev_port_state { - uint32_t port_no; + odp_port_t port_no; char *name; }; @@ -616,17 +627,18 @@ dpif_netdev_port_dump_next(const struct dpif *dpif, void *state_, { struct dp_netdev_port_state *state = state_; struct dp_netdev *dp = get_dp_netdev(dpif); - uint32_t port_no; + uint32_t port_idx; - for (port_no = state->port_no; port_no < MAX_PORTS; port_no++) { - struct dp_netdev_port *port = dp->ports[port_no]; + for (port_idx = odp_to_u32(state->port_no); + port_idx < MAX_PORTS; port_idx++) { + struct dp_netdev_port *port = dp->ports[port_idx]; if (port) { free(state->name); state->name = xstrdup(netdev_get_name(port->netdev)); dpif_port->name = state->name; dpif_port->type = port->type; dpif_port->port_no = port->port_no; - state->port_no = port_no + 1; + state->port_no = u32_to_odp(port_idx + 1); return 0; } } @@ -689,6 +701,8 @@ static int dpif_netdev_flow_from_nlattrs(const struct nlattr *key, uint32_t key_len, struct flow *flow) { + odp_port_t in_port; + if (odp_flow_key_to_flow(key, key_len, flow) != ODP_FIT_PERFECT) { /* This should not happen: it indicates that odp_flow_key_from_flow() * and odp_flow_key_to_flow() disagree on the acceptable form of a @@ -708,9 +722,8 @@ dpif_netdev_flow_from_nlattrs(const struct nlattr *key, uint32_t key_len, return EINVAL; } - if (flow->in_port < OFPP_MAX - ? flow->in_port >= MAX_PORTS - : flow->in_port != OFPP_LOCAL && flow->in_port != OFPP_NONE) { + in_port = flow->in_port.odp_port; + if (!is_valid_port_number(in_port) && in_port != ODPP_NONE) { return EINVAL; } @@ -899,7 +912,7 @@ dpif_netdev_flow_dump_next(const struct dpif *dpif, void *state_, struct ofpbuf buf; ofpbuf_use_stack(&buf, &state->keybuf, sizeof state->keybuf); - odp_flow_key_from_flow(&buf, &flow->key, flow->key.in_port); + odp_flow_key_from_flow(&buf, &flow->key, flow->key.in_port.odp_port); *key = buf.data; *key_len = buf.size; @@ -954,7 +967,7 @@ dpif_netdev_execute(struct dpif *dpif, const struct dpif_execute *execute) ofpbuf_reserve(©, DP_NETDEV_HEADROOM); ofpbuf_put(©, execute->packet->data, execute->packet->size); - flow_extract(©, 0, 0, NULL, -1, &key); + flow_extract(©, 0, 0, NULL, NULL, &key); error = dpif_netdev_flow_from_nlattrs(execute->key, execute->key_len, &key); if (!error) { @@ -1049,11 +1062,13 @@ dp_netdev_port_input(struct dp_netdev *dp, struct dp_netdev_port *port, { struct dp_netdev_flow *flow; struct flow key; + union flow_in_port in_port_; if (packet->size < ETH_HEADER_LEN) { return; } - flow_extract(packet, skb_priority, skb_mark, tnl, port->port_no, &key); + in_port_.odp_port = port->port_no; + flow_extract(packet, skb_priority, skb_mark, tnl, &in_port_, &key); flow = dp_netdev_lookup_flow(dp, &key); if (flow) { dp_netdev_flow_used(flow, packet); @@ -1073,7 +1088,8 @@ dpif_netdev_run(struct dpif *dpif) struct dp_netdev_port *port; struct ofpbuf packet; - ofpbuf_init(&packet, DP_NETDEV_HEADROOM + VLAN_ETH_HEADER_LEN + max_mtu); + ofpbuf_init(&packet, + DP_NETDEV_HEADROOM + VLAN_ETH_HEADER_LEN + dp->max_mtu); LIST_FOR_EACH (port, node, &dp->port_list) { int error; @@ -1089,7 +1105,7 @@ dpif_netdev_run(struct dpif *dpif) static struct vlog_rate_limit rl = VLOG_RATE_LIMIT_INIT(1, 5); VLOG_ERR_RL(&rl, "error receiving data from %s: %s", - netdev_get_name(port->netdev), strerror(error)); + netdev_get_name(port->netdev), ovs_strerror(error)); } } ofpbuf_uninit(&packet); @@ -1140,7 +1156,7 @@ dp_netdev_output_userspace(struct dp_netdev *dp, const struct ofpbuf *packet, ofpbuf_init(buf, buf_size); /* Put ODP flow. */ - odp_flow_key_from_flow(buf, flow, flow->in_port); + odp_flow_key_from_flow(buf, flow, flow->in_port.odp_port); upcall->key = buf->data; upcall->key_len = buf->size; @@ -1185,41 +1201,49 @@ dp_netdev_execute_actions(struct dp_netdev *dp, dp_netdev_output_port, dp_netdev_action_userspace); } +#define DPIF_NETDEV_CLASS_FUNCTIONS \ + dpif_netdev_enumerate, \ + dpif_netdev_port_open_type, \ + dpif_netdev_open, \ + dpif_netdev_close, \ + dpif_netdev_destroy, \ + dpif_netdev_run, \ + dpif_netdev_wait, \ + dpif_netdev_get_stats, \ + dpif_netdev_port_add, \ + dpif_netdev_port_del, \ + dpif_netdev_port_query_by_number, \ + dpif_netdev_port_query_by_name, \ + dpif_netdev_get_max_ports, \ + NULL, /* port_get_pid */ \ + dpif_netdev_port_dump_start, \ + dpif_netdev_port_dump_next, \ + dpif_netdev_port_dump_done, \ + dpif_netdev_port_poll, \ + dpif_netdev_port_poll_wait, \ + dpif_netdev_flow_get, \ + dpif_netdev_flow_put, \ + dpif_netdev_flow_del, \ + dpif_netdev_flow_flush, \ + dpif_netdev_flow_dump_start, \ + dpif_netdev_flow_dump_next, \ + dpif_netdev_flow_dump_done, \ + dpif_netdev_execute, \ + NULL, /* operate */ \ + dpif_netdev_recv_set, \ + dpif_netdev_queue_to_priority, \ + dpif_netdev_recv, \ + dpif_netdev_recv_wait, \ + dpif_netdev_recv_purge, \ + const struct dpif_class dpif_netdev_class = { "netdev", - dpif_netdev_enumerate, - dpif_netdev_port_open_type, - dpif_netdev_open, - dpif_netdev_close, - dpif_netdev_destroy, - dpif_netdev_run, - dpif_netdev_wait, - dpif_netdev_get_stats, - dpif_netdev_port_add, - dpif_netdev_port_del, - dpif_netdev_port_query_by_number, - dpif_netdev_port_query_by_name, - dpif_netdev_get_max_ports, - NULL, /* port_get_pid */ - dpif_netdev_port_dump_start, - dpif_netdev_port_dump_next, - dpif_netdev_port_dump_done, - dpif_netdev_port_poll, - dpif_netdev_port_poll_wait, - dpif_netdev_flow_get, - dpif_netdev_flow_put, - dpif_netdev_flow_del, - dpif_netdev_flow_flush, - dpif_netdev_flow_dump_start, - dpif_netdev_flow_dump_next, - dpif_netdev_flow_dump_done, - dpif_netdev_execute, - NULL, /* operate */ - dpif_netdev_recv_set, - dpif_netdev_queue_to_priority, - dpif_netdev_recv, - dpif_netdev_recv_wait, - dpif_netdev_recv_purge, + DPIF_NETDEV_CLASS_FUNCTIONS +}; + +const struct dpif_class dpif_planetlab_class = { + "planetlab", + DPIF_NETDEV_CLASS_FUNCTIONS }; static void @@ -1252,3 +1276,4 @@ dpif_dummy_register(bool override) dpif_dummy_register__("dummy"); } +