X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif-netdev.c;h=11f010c84f5877b14caa4e9977493352dd966e00;hb=0a407cd6f2129793940bfbd42dc39fe97e93e14b;hp=daa78838ad85e93c5b1a7fe0a6c586a5e229803b;hpb=24b7e19469dbd2cb3fdf8db70ef0c7b4bc851f17;p=sliver-openvswitch.git diff --git a/lib/dpif-netdev.c b/lib/dpif-netdev.c index daa78838a..11f010c84 100644 --- a/lib/dpif-netdev.c +++ b/lib/dpif-netdev.c @@ -168,8 +168,8 @@ static int dpif_netdev_open(const struct dpif_class *, const char *name, static int dp_netdev_output_userspace(struct dp_netdev *, const struct ofpbuf *, int queue_no, const struct flow *, const struct nlattr *userdata); -static void dp_netdev_execute_actions(struct dp_netdev *, - struct ofpbuf *, struct flow *, +static void dp_netdev_execute_actions(struct dp_netdev *, const struct flow *, + struct ofpbuf *, const struct nlattr *actions, size_t actions_len); static void dp_netdev_port_input(struct dp_netdev *dp, @@ -210,10 +210,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"; } @@ -241,7 +248,8 @@ choose_port(struct dp_netdev *dp, const char *name) { 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; @@ -292,7 +300,7 @@ create_dp_netdev(const char *name, const struct dpif_class *class, dp->queues[i].head = dp->queues[i].tail = 0; } dp->queue_seq = seq_create(); - classifier_init(&dp->cls); + classifier_init(&dp->cls, NULL); hmap_init(&dp->flow_table); list_init(&dp->port_list); dp->port_seq = seq_create(); @@ -1128,7 +1136,7 @@ dpif_netdev_execute(struct dpif *dpif, const struct dpif_execute *execute) flow_extract(copy, md.skb_priority, md.pkt_mark, &md.tunnel, &md.in_port, &key); ovs_mutex_lock(&dp_netdev_mutex); - dp_netdev_execute_actions(dp, copy, &key, + dp_netdev_execute_actions(dp, &key, copy, execute->actions, execute->actions_len); ovs_mutex_unlock(&dp_netdev_mutex); ofpbuf_delete(copy); @@ -1244,7 +1252,7 @@ dp_netdev_port_input(struct dp_netdev *dp, struct dp_netdev_port *port, netdev_flow = dp_netdev_lookup_flow(dp, &key); if (netdev_flow) { dp_netdev_flow_used(netdev_flow, packet); - dp_netdev_execute_actions(dp, packet, &key, + dp_netdev_execute_actions(dp, &key, packet, netdev_flow->actions, netdev_flow->actions_len); dp->n_hit++; @@ -1314,17 +1322,6 @@ dpif_netdev_wait(struct dpif *dpif) ovs_mutex_unlock(&dp_netdev_mutex); } -static void -dp_netdev_output_port(void *dp_, struct ofpbuf *packet, - const struct flow *flow OVS_UNUSED, odp_port_t out_port) -{ - struct dp_netdev *dp = dp_; - struct dp_netdev_port *p = dp->ports[odp_to_u32(out_port)]; - if (p) { - netdev_send(p->netdev, packet); - } -} - static int dp_netdev_output_userspace(struct dp_netdev *dp, const struct ofpbuf *packet, int queue_no, const struct flow *flow, @@ -1376,62 +1373,91 @@ dp_netdev_output_userspace(struct dp_netdev *dp, const struct ofpbuf *packet, } } +struct dp_netdev_execute_aux { + struct dp_netdev *dp; + const struct flow *key; +}; + +static void +dp_netdev_action_output(void *aux_, struct ofpbuf *packet, + const struct flow *flow OVS_UNUSED, + odp_port_t out_port) +{ + struct dp_netdev_execute_aux *aux = aux_; + struct dp_netdev_port *p = aux->dp->ports[odp_to_u32(out_port)]; + if (p) { + netdev_send(p->netdev, packet); + } +} + static void -dp_netdev_action_userspace(void *dp, struct ofpbuf *packet, - const struct flow *key, +dp_netdev_action_userspace(void *aux_, struct ofpbuf *packet, + const struct flow *flow OVS_UNUSED, const struct nlattr *a) { + struct dp_netdev_execute_aux *aux = aux_; const struct nlattr *userdata; userdata = nl_attr_find_nested(a, OVS_USERSPACE_ATTR_USERDATA); - dp_netdev_output_userspace(dp, packet, DPIF_UC_ACTION, key, userdata); + dp_netdev_output_userspace(aux->dp, packet, DPIF_UC_ACTION, aux->key, + userdata); } static void -dp_netdev_execute_actions(struct dp_netdev *dp, - struct ofpbuf *packet, struct flow *key, - const struct nlattr *actions, - size_t actions_len) -{ - odp_execute_actions(dp, packet, key, actions, actions_len, - dp_netdev_output_port, dp_netdev_action_userspace); -} +dp_netdev_execute_actions(struct dp_netdev *dp, const struct flow *key, + struct ofpbuf *packet, + const struct nlattr *actions, size_t actions_len) +{ + struct dp_netdev_execute_aux aux = {dp, key}; + struct flow md = *key; /* Packet metadata, may be modified by actions. */ + + odp_execute_actions(&aux, packet, &md, actions, actions_len, + dp_netdev_action_output, 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 @@ -1503,3 +1529,4 @@ dpif_dummy_register(bool override) "DP PORT NEW-NUMBER", 3, 3, dpif_dummy_change_port_number, NULL); } +