X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif-netdev.c;h=d5060f1f549d4336c36c96a08b383a54cab4e2a1;hb=060ea9d5152b5c8cc6646ead1175484e07c583fe;hp=3d01b17aabc0c8ec97f884dd0453b747568632c9;hpb=2477924e34a9a0827a0ac0790f442d94f254117c;p=sliver-openvswitch.git diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 3d01b17aa..d5060f1f5 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2009, 2010, 2011, 2012 Nicira, Inc. + * Copyright (c) 2009, 2010, 2011, 2012, 2013 Nicira, Inc. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -17,7 +17,6 @@ #include #include "dpif.h" -#include #include #include #include @@ -41,6 +40,7 @@ #include "hmap.h" #include "list.h" #include "netdev.h" +#include "netdev-vport.h" #include "netlink.h" #include "odp-util.h" #include "ofp-print.h" @@ -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; }; @@ -101,6 +106,8 @@ struct dp_netdev_port { int 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; + struct netdev_rx *rx; char *type; /* Port type as requested by user. */ }; @@ -133,20 +140,20 @@ 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 *, uint16_t port_no, +static int get_port_by_number(struct dp_netdev *, uint32_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, uint16_t port_no); -static int do_del_port(struct dp_netdev *, uint16_t port_no); + const char *type, uint32_t port_no); +static int do_del_port(struct dp_netdev *, uint32_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 *, int queue_no, const struct flow *, - uint64_t arg); + const struct nlattr *userdata); static void dp_netdev_execute_actions(struct dp_netdev *, struct ofpbuf *, struct flow *, const struct nlattr *actions, @@ -155,7 +162,7 @@ static void dp_netdev_execute_actions(struct dp_netdev *, static struct dpif_netdev * dpif_netdev_cast(const struct dpif *dpif) { - assert(dpif->dpif_class->open == dpif_netdev_open); + ovs_assert(dpif->dpif_class->open == dpif_netdev_open); return CONTAINER_OF(dpif, struct dpif_netdev, dpif); } @@ -176,6 +183,27 @@ dpif_netdev_enumerate(struct sset *all_dps) return 0; } +static bool +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"; +} + static struct dpif * create_dpif_netdev(struct dp_netdev *dp) { @@ -192,6 +220,46 @@ create_dpif_netdev(struct dp_netdev *dp) return &dpif->dpif; } +static int +choose_port(struct dp_netdev *dp, const char *name) +{ + int port_no; + + if (dp->class != &dpif_netdev_class && + dp->class != &dpif_planetlab_class) { + const char *p; + int start_no = 0; + + /* If the port name begins with "br", start the number search at + * 100 to make writing tests easier. */ + if (!strncmp(name, "br", 2)) { + start_no = 100; + } + + /* 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. */ + for (p = name; *p != '\0'; p++) { + if (isdigit((unsigned char) *p)) { + port_no = start_no + strtol(p, NULL, 10); + if (port_no > 0 && port_no < MAX_PORTS + && !dp->ports[port_no]) { + return port_no; + } + break; + } + } + } + + for (port_no = 1; port_no < MAX_PORTS; port_no++) { + if (!dp->ports[port_no]) { + return port_no; + } + } + + return -1; +} + static int create_dp_netdev(const char *name, const struct dpif_class *class, struct dp_netdev **dpp) @@ -209,6 +277,7 @@ create_dp_netdev(const char *name, const struct dpif_class *class, } hmap_init(&dp->flow_table); list_init(&dp->port_list); + error = do_add_port(dp, name, "internal", OVSP_LOCAL); if (error) { dp_netdev_free(dp); @@ -236,7 +305,7 @@ dpif_netdev_open(const struct dpif_class *class, const char *name, if (error) { return error; } - assert(dp != NULL); + ovs_assert(dp != NULL); } } else { if (dp->class != class) { @@ -259,10 +328,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); } } } @@ -286,7 +353,7 @@ static void dpif_netdev_close(struct dpif *dpif) { struct dp_netdev *dp = get_dp_netdev(dpif); - assert(dp->open_cnt > 0); + ovs_assert(dp->open_cnt > 0); if (--dp->open_cnt == 0 && dp->destroyed) { shash_find_and_delete(&dp_netdevs, dp->name); dp_netdev_free(dp); @@ -315,10 +382,12 @@ 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, - uint16_t port_no) + uint32_t port_no) { + struct netdev_saved_flags *sf; struct dp_netdev_port *port; struct netdev *netdev; + struct netdev_rx *rx; const char *open_type; int mtu; int error; @@ -326,9 +395,7 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type, /* XXX reject devices already in some dp_netdev. */ /* Open and validate network device. */ - open_type = (strcmp(type, "internal") ? type - : dp->class != &dpif_netdev_class ? "dummy" - : "tap"); + open_type = dpif_netdev_port_open_type(dp->class, type); error = netdev_open(devname, open_type, &netdev); if (error) { return error; @@ -336,16 +403,18 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type, /* XXX reject loopback devices */ /* XXX reject non-Ethernet devices */ - error = netdev_listen(netdev); - if (error) { + error = netdev_rx_open(netdev, &rx); + 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)); netdev_close(netdev); return error; } - error = netdev_turn_flags_on(netdev, NETDEV_PROMISC, false); + error = netdev_turn_flags_on(netdev, NETDEV_PROMISC, &sf); if (error) { + netdev_rx_close(rx); netdev_close(netdev); return error; } @@ -353,10 +422,12 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type, port = xmalloc(sizeof *port); port->port_no = port_no; port->netdev = netdev; + port->sf = sf; + port->rx = rx; port->type = xstrdup(type); error = netdev_get_mtu(netdev, &mtu); - if (!error) { + if (!error && mtu > max_mtu) { max_mtu = mtu; } @@ -367,47 +438,14 @@ do_add_port(struct dp_netdev *dp, const char *devname, const char *type, return 0; } -static int -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 the port name contains a number, try to assign that port number. - * This can make writing unit tests easier because port numbers are - * predictable. */ - const char *p; - - for (p = netdev_get_name(netdev); *p != '\0'; p++) { - if (isdigit((unsigned char) *p)) { - port_no = strtol(p, NULL, 10); - if (port_no > 0 && port_no < MAX_PORTS - && !dp->ports[port_no]) { - return port_no; - } - break; - } - } - } - - for (port_no = 0; port_no < MAX_PORTS; port_no++) { - if (!dp->ports[port_no]) { - return port_no; - } - } - - return -1; -} - static int dpif_netdev_port_add(struct dpif *dpif, struct netdev *netdev, - uint16_t *port_nop) + uint32_t *port_nop) { struct dp_netdev *dp = get_dp_netdev(dpif); int port_no; - if (*port_nop != UINT16_MAX) { + if (*port_nop != UINT32_MAX) { if (*port_nop >= MAX_PORTS) { return EFBIG; } else if (dp->ports[*port_nop]) { @@ -415,32 +453,32 @@ dpif_netdev_port_add(struct dpif *dpif, struct netdev *netdev, } port_no = *port_nop; } else { - port_no = choose_port(dpif, netdev); + port_no = choose_port(dp, netdev_vport_get_dpif_port(netdev)); } if (port_no >= 0) { *port_nop = port_no; - return do_add_port(dp, netdev_get_name(netdev), + return do_add_port(dp, netdev_vport_get_dpif_port(netdev), netdev_get_type(netdev), port_no); } return EFBIG; } static int -dpif_netdev_port_del(struct dpif *dpif, uint16_t port_no) +dpif_netdev_port_del(struct dpif *dpif, uint32_t port_no) { struct dp_netdev *dp = get_dp_netdev(dpif); return port_no == OVSP_LOCAL ? EINVAL : do_del_port(dp, port_no); } static bool -is_valid_port_number(uint16_t port_no) +is_valid_port_number(uint32_t port_no) { return port_no < MAX_PORTS; } static int get_port_by_number(struct dp_netdev *dp, - uint16_t port_no, struct dp_netdev_port **portp) + uint32_t port_no, struct dp_netdev_port **portp) { if (!is_valid_port_number(port_no)) { *portp = NULL; @@ -458,7 +496,7 @@ get_port_by_name(struct dp_netdev *dp, struct dp_netdev_port *port; LIST_FOR_EACH (port, node, &dp->port_list) { - if (!strcmp(netdev_get_name(port->netdev), devname)) { + if (!strcmp(netdev_vport_get_dpif_port(port->netdev), devname)) { *portp = port; return 0; } @@ -467,10 +505,9 @@ get_port_by_name(struct dp_netdev *dp, } static int -do_del_port(struct dp_netdev *dp, uint16_t port_no) +do_del_port(struct dp_netdev *dp, uint32_t port_no) { struct dp_netdev_port *port; - char *name; int error; error = get_port_by_number(dp, port_no, &port); @@ -482,11 +519,10 @@ do_del_port(struct dp_netdev *dp, uint16_t port_no) dp->ports[port->port_no] = NULL; dp->serial++; - name = xstrdup(netdev_get_name(port->netdev)); netdev_close(port->netdev); + netdev_restore_flags(port->sf); + netdev_rx_close(port->rx); free(port->type); - - free(name); free(port); return 0; @@ -496,13 +532,13 @@ static void answer_port_query(const struct dp_netdev_port *port, struct dpif_port *dpif_port) { - dpif_port->name = xstrdup(netdev_get_name(port->netdev)); + dpif_port->name = xstrdup(netdev_vport_get_dpif_port(port->netdev)); dpif_port->type = xstrdup(port->type); dpif_port->port_no = port->port_no; } static int -dpif_netdev_port_query_by_number(const struct dpif *dpif, uint16_t port_no, +dpif_netdev_port_query_by_number(const struct dpif *dpif, uint32_t port_no, struct dpif_port *dpif_port) { struct dp_netdev *dp = get_dp_netdev(dpif); @@ -510,7 +546,7 @@ dpif_netdev_port_query_by_number(const struct dpif *dpif, uint16_t port_no, int error; error = get_port_by_number(dp, port_no, &port); - if (!error) { + if (!error && dpif_port) { answer_port_query(port, dpif_port); } return error; @@ -525,7 +561,7 @@ dpif_netdev_port_query_by_name(const struct dpif *dpif, const char *devname, int error; error = get_port_by_name(dp, devname, &port); - if (!error) { + if (!error && dpif_port) { answer_port_query(port, dpif_port); } return error; @@ -587,7 +623,7 @@ dpif_netdev_port_dump_next(const struct dpif *dpif, void *state_, struct dp_netdev_port *port = dp->ports[port_no]; if (port) { free(state->name); - state->name = xstrdup(netdev_get_name(port->netdev)); + state->name = xstrdup(netdev_vport_get_dpif_port(port->netdev)); dpif_port->name = state->name; dpif_port->type = port->type; dpif_port->port_no = port->port_no; @@ -654,7 +690,7 @@ static int dpif_netdev_flow_from_nlattrs(const struct nlattr *key, uint32_t key_len, struct flow *flow) { - if (odp_flow_key_to_flow(key, key_len, flow)) { + 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 * flow. Log the problem as an error, with enough details to enable @@ -863,7 +899,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); + odp_flow_key_from_flow(&buf, &flow->key, flow->key.in_port); *key = buf.data; *key_len = buf.size; @@ -913,7 +949,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, 0, NULL, -1, &key); error = dpif_netdev_flow_from_nlattrs(execute->key, execute->key_len, &key); if (!error) { @@ -960,13 +996,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 = *upcall->packet; - free(upcall->packet); + *buf = u->buf; return 0; } else { @@ -993,13 +1029,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 @@ -1012,16 +1047,16 @@ 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, odp_port_to_ofp_port(port->port_no), &key); + flow_extract(packet, 0, 0, NULL, 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++; } else { dp->n_missed++; - dp_netdev_output_userspace(dp, packet, DPIF_UC_MISS, &key, 0); + dp_netdev_output_userspace(dp, packet, DPIF_UC_MISS, &key, NULL); } } @@ -1041,13 +1076,14 @@ dpif_netdev_run(struct dpif *dpif) ofpbuf_clear(&packet); ofpbuf_reserve(&packet, DP_NETDEV_HEADROOM); - error = netdev_recv(port->netdev, &packet); + error = port->rx ? netdev_rx_recv(port->rx, &packet) : EOPNOTSUPP; if (!error) { dp_netdev_port_input(dp, port, &packet); } else if (error != EAGAIN && error != EOPNOTSUPP) { 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_vport_get_dpif_port(port->netdev), + strerror(error)); } } ofpbuf_uninit(&packet); @@ -1060,7 +1096,9 @@ dpif_netdev_wait(struct dpif *dpif) struct dp_netdev_port *port; LIST_FOR_EACH (port, node, &dp->port_list) { - netdev_recv_wait(port->netdev); + if (port->rx) { + netdev_rx_wait(port->rx); + } } } @@ -1075,7 +1113,7 @@ dp_netdev_set_dl(struct ofpbuf *packet, const struct ovs_key_ethernet *eth_key) static void dp_netdev_output_port(struct dp_netdev *dp, struct ofpbuf *packet, - uint16_t out_port) + uint32_t out_port) { struct dp_netdev_port *p = dp->ports[out_port]; if (p) { @@ -1085,35 +1123,51 @@ dp_netdev_output_port(struct dp_netdev *dp, struct ofpbuf *packet, static int dp_netdev_output_userspace(struct dp_netdev *dp, const struct ofpbuf *packet, - int queue_no, const struct flow *flow, uint64_t arg) + int queue_no, const struct flow *flow, + const struct nlattr *userdata) { struct dp_netdev_queue *q = &dp->queues[queue_no]; - struct dpif_upcall *upcall; - struct ofpbuf *buf; - size_t key_len; - - if (q->head - q->tail >= MAX_QUEUE_LEN) { - dp->n_lost++; - return ENOBUFS; - } + if (q->head - q->tail < MAX_QUEUE_LEN) { + struct dp_netdev_upcall *u = &q->upcalls[q->head++ & QUEUE_MASK]; + struct dpif_upcall *upcall = &u->upcall; + struct ofpbuf *buf = &u->buf; + size_t buf_size; + + upcall->type = queue_no; + + /* Allocate buffer big enough for everything. */ + buf_size = ODPUTIL_FLOW_KEY_BYTES + 2 + packet->size; + if (userdata) { + buf_size += NLA_ALIGN(userdata->nla_len); + } + ofpbuf_init(buf, buf_size); - buf = ofpbuf_new(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); + /* Put ODP flow. */ + odp_flow_key_from_flow(buf, flow, flow->in_port); + upcall->key = buf->data; + upcall->key_len = buf->size; - upcall = xzalloc(sizeof *upcall); - upcall->type = queue_no; - upcall->packet = buf; - upcall->key = buf->base; - upcall->key_len = key_len; - upcall->userdata = arg; + /* Put userdata. */ + if (userdata) { + upcall->userdata = ofpbuf_put(buf, userdata, + NLA_ALIGN(userdata->nla_len)); + } - q->upcalls[q->head++ & QUEUE_MASK] = upcall; + /* Put packet. + * + * We adjust 'data' and 'size' in 'buf' so that only the packet itself + * is visible in 'upcall->packet'. The ODP flow and (if present) + * userdata become part of the headroom. */ + ofpbuf_put_zeros(buf, 2); + buf->data = ofpbuf_put(buf, packet->data, packet->size); + buf->size = packet->size; + upcall->packet = buf; - return 0; + return 0; + } else { + dp->n_lost++; + return ENOBUFS; + } } static void @@ -1155,11 +1209,9 @@ dp_netdev_action_userspace(struct dp_netdev *dp, struct ofpbuf *packet, struct flow *key, const struct nlattr *a) { - const struct nlattr *userdata_attr; - uint64_t userdata; + const struct nlattr *userdata; - userdata_attr = nl_attr_find_nested(a, OVS_USERSPACE_ATTR_USERDATA); - userdata = userdata_attr ? nl_attr_get_u64(userdata_attr) : 0; + userdata = nl_attr_find_nested(a, OVS_USERSPACE_ATTR_USERDATA); dp_netdev_output_userspace(dp, packet, DPIF_UC_ACTION, key, userdata); } @@ -1168,13 +1220,14 @@ execute_set_action(struct ofpbuf *packet, const struct nlattr *a) { enum ovs_key_attr type = nl_attr_type(a); const struct ovs_key_ipv4 *ipv4_key; + const struct ovs_key_ipv6 *ipv6_key; const struct ovs_key_tcp *tcp_key; const struct ovs_key_udp *udp_key; switch (type) { - case OVS_KEY_ATTR_TUN_ID: case OVS_KEY_ATTR_PRIORITY: - case OVS_KEY_ATTR_IPV6: + case OVS_KEY_ATTR_SKB_MARK: + case OVS_KEY_ATTR_TUNNEL: /* not implemented */ break; @@ -1189,6 +1242,13 @@ execute_set_action(struct ofpbuf *packet, const struct nlattr *a) ipv4_key->ipv4_tos, ipv4_key->ipv4_ttl); break; + case OVS_KEY_ATTR_IPV6: + ipv6_key = nl_attr_get_unspec(a, sizeof(struct ovs_key_ipv6)); + packet_set_ipv6(packet, ipv6_key->ipv6_proto, ipv6_key->ipv6_src, + ipv6_key->ipv6_dst, ipv6_key->ipv6_tclass, + ipv6_key->ipv6_label, ipv6_key->ipv6_hlimit); + break; + case OVS_KEY_ATTR_TCP: tcp_key = nl_attr_get_unspec(a, sizeof(struct ovs_key_tcp)); packet_set_tcp_port(packet, tcp_key->tcp_src, tcp_key->tcp_dst); @@ -1199,6 +1259,10 @@ execute_set_action(struct ofpbuf *packet, const struct nlattr *a) packet_set_udp_port(packet, udp_key->udp_src, udp_key->udp_dst); break; + case OVS_KEY_ATTR_MPLS: + set_mpls_lse(packet, nl_attr_get_be32(a)); + break; + case OVS_KEY_ATTR_UNSPEC: case OVS_KEY_ATTR_ENCAP: case OVS_KEY_ATTR_ETHERTYPE: @@ -1224,7 +1288,6 @@ dp_netdev_execute_actions(struct dp_netdev *dp, unsigned int left; NL_ATTR_FOR_EACH_UNSAFE (a, left, actions, actions_len) { - const struct ovs_action_push_vlan *vlan; int type = nl_attr_type(a); switch ((enum ovs_action_attr) type) { @@ -1236,15 +1299,26 @@ dp_netdev_execute_actions(struct dp_netdev *dp, dp_netdev_action_userspace(dp, packet, key, a); break; - case OVS_ACTION_ATTR_PUSH_VLAN: - vlan = nl_attr_get(a); + case OVS_ACTION_ATTR_PUSH_VLAN: { + const struct ovs_action_push_vlan *vlan = nl_attr_get(a); eth_push_vlan(packet, vlan->vlan_tci); break; + } case OVS_ACTION_ATTR_POP_VLAN: eth_pop_vlan(packet); break; + case OVS_ACTION_ATTR_PUSH_MPLS: { + const struct ovs_action_push_mpls *mpls = nl_attr_get(a); + push_mpls(packet, mpls->mpls_ethertype, mpls->mpls_lse); + break; + } + + case OVS_ACTION_ATTR_POP_MPLS: + pop_mpls(packet, nl_attr_get_be16(a)); + break; + case OVS_ACTION_ATTR_SET: execute_set_action(packet, nl_attr_get(a)); break; @@ -1260,40 +1334,49 @@ dp_netdev_execute_actions(struct dp_netdev *dp, } } +#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_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 @@ -1326,3 +1409,4 @@ dpif_dummy_register(bool override) dpif_dummy_register__("dummy"); } +