X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=lib%2Fdpif-netdev.c;h=144b6b63375c91f5ff937fd013d62849f6001dd4;hb=5b289eaf9f880c5284510a45db8e13f55f4968f3;hp=e1dc725dd8874b58c1af44ac87f33178bca462c1;hpb=0cbfe35d74ab5f585033844b6513273aa16cca11;p=openvswitch diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index e1dc725d..144b6b63 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; }; @@ -113,7 +118,7 @@ struct dp_netdev_flow { long long int used; /* Last used time, in monotonic msecs. */ long long int packet_count; /* Number of packets matched. */ long long int byte_count; /* Number of bytes matched. */ - ovs_be16 tcp_ctl; /* Bitwise-OR of seen tcp_ctl values. */ + uint8_t tcp_flags; /* Bitwise-OR of seen tcp_flags values. */ /* Actions. */ struct nlattr *actions; @@ -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); } } } @@ -396,7 +410,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), @@ -627,7 +650,7 @@ get_dpif_flow_stats(struct dp_netdev_flow *flow, struct dpif_flow_stats *stats) stats->n_packets = flow->packet_count; stats->n_bytes = flow->byte_count; stats->used = flow->used; - stats->tcp_flags = TCP_FLAGS(flow->tcp_ctl); + stats->tcp_flags = flow->tcp_flags; } static int @@ -702,10 +725,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; @@ -728,7 +750,7 @@ clear_stats(struct dp_netdev_flow *flow) flow->used = 0; flow->packet_count = 0; flow->byte_count = 0; - flow->tcp_ctl = 0; + flow->tcp_flags = 0; } static int @@ -751,7 +773,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; } @@ -777,24 +800,22 @@ dpif_netdev_flow_put(struct dpif *dpif, const struct dpif_flow_put *put) } static int -dpif_netdev_flow_del(struct dpif *dpif, - const struct nlattr *nl_key, size_t nl_key_len, - struct dpif_flow_stats *stats) +dpif_netdev_flow_del(struct dpif *dpif, const struct dpif_flow_del *del) { struct dp_netdev *dp = get_dp_netdev(dpif); struct dp_netdev_flow *flow; struct flow key; int error; - error = dpif_netdev_flow_from_nlattrs(nl_key, nl_key_len, &key); + error = dpif_netdev_flow_from_nlattrs(del->key, del->key_len, &key); if (error) { return error; } flow = dp_netdev_lookup_flow(dp, &key); if (flow) { - if (stats) { - get_dpif_flow_stats(flow, stats); + if (del->stats) { + get_dpif_flow_stats(flow, del->stats); } dp_netdev_free_flow(dp, flow); return 0; @@ -937,13 +958,18 @@ find_nonempty_queue(struct dpif *dpif) } static int -dpif_netdev_recv(struct dpif *dpif, struct dpif_upcall *upcall) +dpif_netdev_recv(struct dpif *dpif, struct dpif_upcall *upcall, + struct ofpbuf *buf) { 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->buf; return 0; } else { @@ -976,10 +1002,7 @@ dp_netdev_flow_used(struct dp_netdev_flow *flow, struct flow *key, flow->used = time_msec(); flow->packet_count++; flow->byte_count += packet->size; - if (key->dl_type == htons(ETH_TYPE_IP) && key->nw_proto == IPPROTO_TCP) { - struct tcp_header *th = packet->l4; - flow->tcp_ctl |= th->tcp_ctl; - } + flow->tcp_flags |= packet_get_tcp_flags(packet, key); } static void @@ -992,7 +1015,7 @@ 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, 0, 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); @@ -1068,6 +1091,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; @@ -1077,22 +1101,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; } @@ -1242,7 +1267,7 @@ dp_netdev_execute_actions(struct dp_netdev *dp, const struct dpif_class dpif_netdev_class = { "netdev", - NULL, /* enumerate */ + dpif_netdev_enumerate, dpif_netdev_open, dpif_netdev_close, dpif_netdev_destroy,