X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif-netdev.c;h=d5060f1f549d4336c36c96a08b383a54cab4e2a1;hb=060ea9d5152b5c8cc6646ead1175484e07c583fe;hp=6e7a5cca0198f50a0c217e54569d56afac28ac6c;hpb=d1673b006d53fdea72c0744e835362ed1917f879;p=sliver-openvswitch.git diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index 6e7a5cca0..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. @@ -40,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" @@ -105,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. */ }; @@ -150,7 +153,7 @@ 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, @@ -180,20 +183,25 @@ dpif_netdev_enumerate(struct sset *all_dps) return 0; } -static const char * -dpif_netdev_port_open_type(const struct dpif_class *class, const char *type) +static bool +dpif_netdev_class_is_dummy(const struct dpif_class *class) { - return strcmp(type, "internal") ? type - : class != &dpif_netdev_class ? "dummy" - : "tap"; + 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_planetlab_port_open_type(const struct dpif_class *class, const char *type) +dpif_netdev_port_open_type(const struct dpif_class *class, const char *type) { return strcmp(type, "internal") ? type - : class != &dpif_planetlab_class ? "dummy" - : "pltap"; + : dpif_netdev_class_is_planetlab(class) ? "pltap" + : dpif_netdev_class_is_dummy(class) ? "dummy" + : "tap"; } static struct dpif * @@ -376,8 +384,10 @@ static int do_add_port(struct dp_netdev *dp, const char *devname, const char *type, 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; @@ -393,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; } @@ -410,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; } @@ -439,11 +453,11 @@ dpif_netdev_port_add(struct dpif *dpif, struct netdev *netdev, } port_no = *port_nop; } else { - port_no = choose_port(dp, netdev_get_name(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; @@ -482,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; } @@ -494,7 +508,6 @@ static int 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); @@ -506,11 +519,10 @@ do_del_port(struct dp_netdev *dp, uint32_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; @@ -520,7 +532,7 @@ 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; } @@ -611,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; @@ -1044,7 +1056,7 @@ dp_netdev_port_input(struct dp_netdev *dp, struct dp_netdev_port *port, 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); } } @@ -1064,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); @@ -1083,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); + } } } @@ -1108,37 +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 dp_netdev_upcall *u; - 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); - u = &q->upcalls[q->head++ & QUEUE_MASK]; + /* Put ODP flow. */ + odp_flow_key_from_flow(buf, flow, flow->in_port); + upcall->key = buf->data; + upcall->key_len = buf->size; - buf = &u->buf; - ofpbuf_init(buf, ODPUTIL_FLOW_KEY_BYTES + 2 + packet->size); - odp_flow_key_from_flow(buf, flow, flow->in_port); - key_len = buf->size; - ofpbuf_pull(buf, key_len); - ofpbuf_reserve(buf, 2); - ofpbuf_put(buf, packet->data, packet->size); + /* Put userdata. */ + if (userdata) { + upcall->userdata = ofpbuf_put(buf, userdata, + NLA_ALIGN(userdata->nla_len)); + } - upcall = &u->upcall; - upcall->type = queue_no; - upcall->packet = buf; - upcall->key = buf->base; - upcall->key_len = key_len; - upcall->userdata = arg; + /* 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 @@ -1180,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); } @@ -1198,7 +1225,6 @@ execute_set_action(struct ofpbuf *packet, const struct nlattr *a) const struct ovs_key_udp *udp_key; switch (type) { - case OVS_KEY_ATTR_TUN_ID: case OVS_KEY_ATTR_PRIORITY: case OVS_KEY_ATTR_SKB_MARK: case OVS_KEY_ATTR_TUNNEL: @@ -1233,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: @@ -1279,6 +1309,16 @@ dp_netdev_execute_actions(struct dp_netdev *dp, 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; @@ -1294,9 +1334,9 @@ dp_netdev_execute_actions(struct dp_netdev *dp, } } -#define DPIF_NETDEV_CLASS_FUNCTIONS(PORT_OPEN_TYPE) \ +#define DPIF_NETDEV_CLASS_FUNCTIONS \ dpif_netdev_enumerate, \ - PORT_OPEN_TYPE, \ + dpif_netdev_port_open_type, \ dpif_netdev_open, \ dpif_netdev_close, \ dpif_netdev_destroy, \ @@ -1331,12 +1371,12 @@ dp_netdev_execute_actions(struct dp_netdev *dp, const struct dpif_class dpif_netdev_class = { "netdev", - DPIF_NETDEV_CLASS_FUNCTIONS(dpif_netdev_port_open_type) + DPIF_NETDEV_CLASS_FUNCTIONS }; const struct dpif_class dpif_planetlab_class = { "planetlab", - DPIF_NETDEV_CLASS_FUNCTIONS(dpif_planetlab_port_open_type) + DPIF_NETDEV_CLASS_FUNCTIONS }; static void