X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif-netdev.c;h=9f7bb6edad99713d42167de59292be19baf37e63;hb=7a97619ae4484604c15b846ce7268094e048729a;hp=c71bd6eeea4419586a88bf247c3222edc5ccce70;hpb=b41935956f966080063bc3d9cb2e347b3067445e;p=sliver-openvswitch.git diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index c71bd6eee..9f7bb6eda 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012 Nicira Networks. + * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -70,8 +70,13 @@ enum { MAX_QUEUE_LEN = 128 }; /* Maximum number of packets per queue. */ enum { QUEUE_MASK = MAX_QUEUE_LEN - 1 }; BUILD_ASSERT_DECL(IS_POW2(MAX_QUEUE_LEN)); +struct dp_netdev_upcall { + struct dpif_upcall upcall; /* Queued upcall information. */ + struct ofpbuf buf; /* ofpbuf instance for upcall.packet. */ +}; + struct dp_netdev_queue { - struct dpif_upcall *upcalls[MAX_QUEUE_LEN]; + struct dp_netdev_upcall upcalls[MAX_QUEUE_LEN]; unsigned int head, tail; }; @@ -165,6 +170,17 @@ get_dp_netdev(const struct dpif *dpif) return dpif_netdev_cast(dpif)->dp; } +static int +dpif_netdev_enumerate(struct sset *all_dps) +{ + struct shash_node *node; + + SHASH_FOR_EACH(node, &dp_netdevs) { + sset_add(all_dps, node->name); + } + return 0; +} + static struct dpif * create_dpif_netdev(struct dp_netdev *dp) { @@ -248,10 +264,8 @@ dp_netdev_purge_queues(struct dp_netdev *dp) struct dp_netdev_queue *q = &dp->queues[i]; while (q->tail != q->head) { - struct dpif_upcall *upcall = q->upcalls[q->tail++ & QUEUE_MASK]; - - ofpbuf_delete(upcall->packet); - free(upcall); + struct dp_netdev_upcall *u = &q->upcalls[q->tail++ & QUEUE_MASK]; + ofpbuf_uninit(&u->buf); } } } @@ -306,6 +320,8 @@ static const char* internal_port_type(const struct dp_netdev* dp) { if (dp->class == &dpif_netdev_class) return "tap"; + if (dp->class == &dpif_planetlab_class) + return "pltap"; return "dummy"; } @@ -367,7 +383,9 @@ choose_port(struct dpif *dpif, struct netdev *netdev) struct dp_netdev *dp = get_dp_netdev(dpif); int port_no; - if (dpif->dpif_class != &dpif_netdev_class) { + if (dpif->dpif_class != &dpif_netdev_class && + dpif->dpif_class != &dpif_planetlab_class) + { /* If the port name contains a number, try to assign that port number. * This can make writing unit tests easier because port numbers are * predictable. */ @@ -401,7 +419,16 @@ dpif_netdev_port_add(struct dpif *dpif, struct netdev *netdev, struct dp_netdev *dp = get_dp_netdev(dpif); int port_no; - port_no = choose_port(dpif, netdev); + if (*port_nop != UINT16_MAX) { + if (*port_nop >= MAX_PORTS) { + return EFBIG; + } else if (dp->ports[*port_nop]) { + return EBUSY; + } + port_no = *port_nop; + } else { + port_no = choose_port(dpif, netdev); + } if (port_no >= 0) { *port_nop = port_no; return do_add_port(dp, netdev_get_name(netdev), @@ -707,10 +734,9 @@ set_flow_actions(struct dp_netdev_flow *flow, } static int -add_flow(struct dpif *dpif, const struct flow *key, - const struct nlattr *actions, size_t actions_len) +dp_netdev_flow_add(struct dp_netdev *dp, const struct flow *key, + const struct nlattr *actions, size_t actions_len) { - struct dp_netdev *dp = get_dp_netdev(dpif); struct dp_netdev_flow *flow; int error; @@ -756,7 +782,8 @@ dpif_netdev_flow_put(struct dpif *dpif, const struct dpif_flow_put *put) if (put->stats) { memset(put->stats, 0, sizeof *put->stats); } - return add_flow(dpif, &key, put->actions, put->actions_len); + return dp_netdev_flow_add(dp, &key, put->actions, + put->actions_len); } else { return EFBIG; } @@ -898,7 +925,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, -1, &key); + flow_extract(©, 0, NULL, -1, &key); error = dpif_netdev_flow_from_nlattrs(execute->key, execute->key_len, &key); if (!error) { @@ -945,12 +972,13 @@ dpif_netdev_recv(struct dpif *dpif, struct dpif_upcall *upcall, { struct dp_netdev_queue *q = find_nonempty_queue(dpif); if (q) { - struct dpif_upcall *u = q->upcalls[q->tail++ & QUEUE_MASK]; - *upcall = *u; - free(u); + struct dp_netdev_upcall *u = &q->upcalls[q->tail++ & QUEUE_MASK]; + + *upcall = u->upcall; + upcall->packet = buf; ofpbuf_uninit(buf); - *buf = *u->packet; + *buf = u->buf; return 0; } else { @@ -977,13 +1005,12 @@ dpif_netdev_recv_purge(struct dpif *dpif) } static void -dp_netdev_flow_used(struct dp_netdev_flow *flow, struct flow *key, - const struct ofpbuf *packet) +dp_netdev_flow_used(struct dp_netdev_flow *flow, const struct ofpbuf *packet) { flow->used = time_msec(); flow->packet_count++; flow->byte_count += packet->size; - flow->tcp_flags |= packet_get_tcp_flags(packet, key); + flow->tcp_flags |= packet_get_tcp_flags(packet, &flow->key); } static void @@ -996,10 +1023,10 @@ dp_netdev_port_input(struct dp_netdev *dp, struct dp_netdev_port *port, if (packet->size < ETH_HEADER_LEN) { return; } - flow_extract(packet, 0, 0, port->port_no, &key); + flow_extract(packet, 0, NULL, odp_port_to_ofp_port(port->port_no), &key); flow = dp_netdev_lookup_flow(dp, &key); if (flow) { - dp_netdev_flow_used(flow, &key, packet); + dp_netdev_flow_used(flow, packet); dp_netdev_execute_actions(dp, packet, &key, flow->actions, flow->actions_len); dp->n_hit++; @@ -1072,6 +1099,7 @@ dp_netdev_output_userspace(struct dp_netdev *dp, const struct ofpbuf *packet, int queue_no, const struct flow *flow, uint64_t arg) { struct dp_netdev_queue *q = &dp->queues[queue_no]; + struct dp_netdev_upcall *u; struct dpif_upcall *upcall; struct ofpbuf *buf; size_t key_len; @@ -1081,22 +1109,23 @@ dp_netdev_output_userspace(struct dp_netdev *dp, const struct ofpbuf *packet, return ENOBUFS; } - buf = ofpbuf_new(ODPUTIL_FLOW_KEY_BYTES + 2 + packet->size); + u = &q->upcalls[q->head++ & QUEUE_MASK]; + + buf = &u->buf; + ofpbuf_init(buf, ODPUTIL_FLOW_KEY_BYTES + 2 + packet->size); odp_flow_key_from_flow(buf, flow); key_len = buf->size; ofpbuf_pull(buf, key_len); ofpbuf_reserve(buf, 2); ofpbuf_put(buf, packet->data, packet->size); - upcall = xzalloc(sizeof *upcall); + upcall = &u->upcall; upcall->type = queue_no; upcall->packet = buf; upcall->key = buf->base; upcall->key_len = key_len; upcall->userdata = arg; - q->upcalls[q->head++ & QUEUE_MASK] = upcall; - return 0; } @@ -1159,6 +1188,7 @@ execute_set_action(struct ofpbuf *packet, const struct nlattr *a) case OVS_KEY_ATTR_TUN_ID: case OVS_KEY_ATTR_PRIORITY: case OVS_KEY_ATTR_IPV6: + case OVS_KEY_ATTR_IPV4_TUNNEL: /* not implemented */ break; @@ -1245,7 +1275,7 @@ dp_netdev_execute_actions(struct dp_netdev *dp, } #define DPIF_NETDEV_CLASS_FUNCTIONS \ - NULL, /* enumerate */ \ + dpif_netdev_enumerate, \ dpif_netdev_open, \ dpif_netdev_close, \ dpif_netdev_destroy, \ @@ -1283,6 +1313,11 @@ const struct dpif_class dpif_netdev_class = { DPIF_NETDEV_CLASS_FUNCTIONS }; +const struct dpif_class dpif_planetlab_class = { + "planetlab", + DPIF_NETDEV_CLASS_FUNCTIONS +}; + static void dpif_dummy_register__(const char *type) {