X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif-linux.c;h=1d7249c227558cd24795cca61f85af2a12d6aab1;hb=a4e47607974ee30782d7d8085a2c12a91971177e;hp=1eaba744903b9357b5b7cb15b0f7933568554ca3;hpb=ed30fb10e116856481908b3c5af23f30aa5f7ff2;p=sliver-openvswitch.git diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c index 1eaba7449..1d7249c22 100644 --- a/lib/dpif-linux.c +++ b/lib/dpif-linux.c @@ -23,22 +23,30 @@ #include #include #include +#include #include +#include #include #include #include #include +#include #include #include "dpif-provider.h" +#include "netdev.h" +#include "netdev-vport.h" #include "ofpbuf.h" +#include "openvswitch/tunnel.h" #include "poll-loop.h" #include "rtnetlink.h" +#include "rtnetlink-link.h" +#include "shash.h" #include "svec.h" #include "util.h" - #include "vlog.h" -#define THIS_MODULE VLM_dpif_linux + +VLOG_DEFINE_THIS_MODULE(dpif_linux); /* Datapath interface for the openvswitch Linux kernel module. */ struct dpif_linux { @@ -51,7 +59,7 @@ struct dpif_linux { /* Change notification. */ int local_ifindex; /* Ifindex of local port. */ - struct svec changed_ports; /* Ports that have changed. */ + struct shash changed_ports; /* Ports that have changed. */ struct rtnetlink_notifier port_notifier; bool change_error; }; @@ -65,7 +73,7 @@ static int get_openvswitch_major(void); static int create_minor(const char *name, int minor, struct dpif **dpifp); static int open_minor(int minor, struct dpif **dpifp); static int make_openvswitch_device(int minor, char **fnp); -static void dpif_linux_port_changed(const struct rtnetlink_change *, +static void dpif_linux_port_changed(const struct rtnetlink_link_change *, void *dpif); static struct dpif_linux * @@ -107,8 +115,8 @@ dpif_linux_enumerate(struct svec *all_dps) } static int -dpif_linux_open(const char *name, const char *type OVS_UNUSED, bool create, - struct dpif **dpifp) +dpif_linux_open(const struct dpif_class *class OVS_UNUSED, const char *name, + bool create, struct dpif **dpifp) { int minor; @@ -151,7 +159,7 @@ dpif_linux_open(const char *name, const char *type OVS_UNUSED, bool create, * getting the local port's name. */ memset(&port, 0, sizeof port); port.port = ODPP_LOCAL; - if (ioctl(dpif->fd, ODP_PORT_QUERY, &port)) { + if (ioctl(dpif->fd, ODP_VPORT_QUERY, &port)) { error = errno; if (error != ENODEV) { VLOG_WARN("%s: probe returned unexpected error: %s", @@ -170,8 +178,8 @@ static void dpif_linux_close(struct dpif *dpif_) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); - rtnetlink_notifier_unregister(&dpif->port_notifier); - svec_destroy(&dpif->changed_ports); + rtnetlink_link_notifier_unregister(&dpif->port_notifier); + shash_destroy(&dpif->changed_ports); free(dpif->local_ifname); close(dpif->fd); free(dpif); @@ -220,46 +228,91 @@ dpif_linux_set_drop_frags(struct dpif *dpif_, bool drop_frags) return do_ioctl(dpif_, ODP_SET_DROP_FRAGS, &drop_frags_int); } +static void +translate_vport_type_to_netdev_type(struct odp_port *port) +{ + char *type = port->type; + + if (!strcmp(type, "netdev")) { + ovs_strlcpy(type, "system", sizeof port->type); + } else if (!strcmp(type, "gre")) { + const struct tnl_port_config *config; + + config = (struct tnl_port_config *)port->config; + if (config->flags & TNL_F_IPSEC) { + ovs_strlcpy(type, "ipsec_gre", sizeof port->type); + } + } +} + +static void +translate_netdev_type_to_vport_type(struct odp_port *port) +{ + char *type = port->type; + + if (!strcmp(type, "system")) { + ovs_strlcpy(type, "netdev", sizeof port->type); + } else if (!strcmp(type, "ipsec_gre")) { + ovs_strlcpy(type, "gre", sizeof port->type); + } +} + static int -dpif_linux_port_add(struct dpif *dpif_, const char *devname, uint16_t flags, - uint16_t *port_no) +dpif_linux_port_add(struct dpif *dpif, struct netdev *netdev, + uint16_t *port_nop) { + const char *name = netdev_get_name(netdev); + const char *type = netdev_get_type(netdev); struct odp_port port; int error; memset(&port, 0, sizeof port); - strncpy(port.devname, devname, sizeof port.devname); - port.flags = flags; - error = do_ioctl(dpif_, ODP_PORT_ADD, &port); + strncpy(port.devname, name, sizeof port.devname); + strncpy(port.type, type, sizeof port.type); + netdev_vport_get_config(netdev, port.config); + translate_netdev_type_to_vport_type(&port); + + error = do_ioctl(dpif, ODP_VPORT_ATTACH, &port); if (!error) { - *port_no = port.port; + *port_nop = port.port; } + return error; } static int -dpif_linux_port_del(struct dpif *dpif_, uint16_t port_no) +dpif_linux_port_del(struct dpif *dpif_, uint16_t port_no_) +{ + int port_no = port_no_; /* Kernel expects an "int". */ + return do_ioctl(dpif_, ODP_VPORT_DETACH, &port_no); +} + +static int +dpif_linux_port_query__(const struct dpif *dpif, struct odp_port *port) { - int tmp = port_no; - return do_ioctl(dpif_, ODP_PORT_DEL, &tmp); + int error = do_ioctl(dpif, ODP_VPORT_QUERY, port); + if (!error) { + translate_vport_type_to_netdev_type(port); + } + return error; } static int -dpif_linux_port_query_by_number(const struct dpif *dpif_, uint16_t port_no, - struct odp_port *port) +dpif_linux_port_query_by_number(const struct dpif *dpif, uint16_t port_no, + struct odp_port *port) { memset(port, 0, sizeof *port); port->port = port_no; - return do_ioctl(dpif_, ODP_PORT_QUERY, port); + return dpif_linux_port_query__(dpif, port); } static int -dpif_linux_port_query_by_name(const struct dpif *dpif_, const char *devname, +dpif_linux_port_query_by_name(const struct dpif *dpif, const char *devname, struct odp_port *port) { memset(port, 0, sizeof *port); strncpy(port->devname, devname, sizeof port->devname); - return do_ioctl(dpif_, ODP_PORT_QUERY, port); + return dpif_linux_port_query__(dpif, port); } static int @@ -272,12 +325,22 @@ static int dpif_linux_port_list(const struct dpif *dpif_, struct odp_port *ports, int n) { struct odp_portvec pv; + unsigned int i; int error; pv.ports = ports; pv.n_ports = n; - error = do_ioctl(dpif_, ODP_PORT_LIST, &pv); - return error ? -error : pv.n_ports; + error = do_ioctl(dpif_, ODP_VPORT_LIST, &pv); + if (error) { + return -error; + } + + for (i = 0; i < pv.n_ports; i++) { + struct odp_port *port = &pv.ports[i]; + + translate_vport_type_to_netdev_type(port); + } + return pv.n_ports; } static int @@ -287,10 +350,11 @@ dpif_linux_port_poll(const struct dpif *dpif_, char **devnamep) if (dpif->change_error) { dpif->change_error = false; - svec_clear(&dpif->changed_ports); + shash_clear(&dpif->changed_ports); return ENOBUFS; - } else if (dpif->changed_ports.n) { - *devnamep = dpif->changed_ports.names[--dpif->changed_ports.n]; + } else if (!shash_is_empty(&dpif->changed_ports)) { + struct shash_node *node = shash_first(&dpif->changed_ports); + *devnamep = shash_steal(&dpif->changed_ports, node); return 0; } else { return EAGAIN; @@ -301,41 +365,13 @@ static void dpif_linux_port_poll_wait(const struct dpif *dpif_) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); - if (dpif->changed_ports.n || dpif->change_error) { + if (!shash_is_empty(&dpif->changed_ports) || dpif->change_error) { poll_immediate_wake(); } else { - rtnetlink_notifier_wait(); + rtnetlink_link_notifier_wait(); } } -static int -dpif_linux_port_group_get(const struct dpif *dpif_, int group, - uint16_t ports[], int n) -{ - struct odp_port_group pg; - int error; - - assert(n <= UINT16_MAX); - pg.group = group; - pg.ports = ports; - pg.n_ports = n; - error = do_ioctl(dpif_, ODP_PORT_GROUP_GET, &pg); - return error ? -error : pg.n_ports; -} - -static int -dpif_linux_port_group_set(struct dpif *dpif_, int group, - const uint16_t ports[], int n) -{ - struct odp_port_group pg; - - assert(n <= UINT16_MAX); - pg.group = group; - pg.ports = (uint16_t *) ports; - pg.n_ports = n; - return do_ioctl(dpif_, ODP_PORT_GROUP_SET, &pg); -} - static int dpif_linux_flow_get(const struct dpif *dpif_, struct odp_flow flows[], int n) { @@ -370,15 +406,14 @@ dpif_linux_flow_list(const struct dpif *dpif_, struct odp_flow flows[], int n) } static int -dpif_linux_execute(struct dpif *dpif_, uint16_t in_port, - const union odp_action actions[], int n_actions, +dpif_linux_execute(struct dpif *dpif_, + const struct nlattr *actions, size_t actions_len, const struct ofpbuf *buf) { struct odp_execute execute; memset(&execute, 0, sizeof execute); - execute.in_port = in_port; - execute.actions = (union odp_action *) actions; - execute.n_actions = n_actions; + execute.actions = (struct nlattr *) actions; + execute.actions_len = actions_len; execute.data = buf->data; execute.length = buf->size; return do_ioctl(dpif_, ODP_EXECUTE, &execute); @@ -409,6 +444,18 @@ dpif_linux_set_sflow_probability(struct dpif *dpif_, uint32_t probability) return do_ioctl(dpif_, ODP_SET_SFLOW_PROBABILITY, &probability); } +static int +dpif_linux_queue_to_priority(const struct dpif *dpif OVS_UNUSED, + uint32_t queue_id, uint32_t *priority) +{ + if (queue_id < 0xf000) { + *priority = TC_H_MAKE(1 << 16, queue_id + 1); + return 0; + } else { + return EINVAL; + } +} + static int dpif_linux_recv(struct dpif *dpif_, struct ofpbuf **bufp) { @@ -417,7 +464,7 @@ dpif_linux_recv(struct dpif *dpif_, struct ofpbuf **bufp) int retval; int error; - buf = ofpbuf_new(65536); + buf = ofpbuf_new_with_headroom(65536, DPIF_RECV_MSG_PADDING); retval = read(dpif->fd, ofpbuf_tail(buf), ofpbuf_tailroom(buf)); if (retval < 0) { error = errno; @@ -478,8 +525,6 @@ const struct dpif_class dpif_linux_class = { dpif_linux_port_list, dpif_linux_port_poll, dpif_linux_port_poll_wait, - dpif_linux_port_group_get, - dpif_linux_port_group_set, dpif_linux_flow_get, dpif_linux_flow_put, dpif_linux_flow_del, @@ -490,6 +535,7 @@ const struct dpif_class dpif_linux_class = { dpif_linux_recv_set_mask, dpif_linux_get_sflow_probability, dpif_linux_set_sflow_probability, + dpif_linux_queue_to_priority, dpif_linux_recv, dpif_linux_recv_wait, }; @@ -669,11 +715,7 @@ get_major(const char *target) return major; } } else { - static bool warned; - if (!warned) { - VLOG_WARN("%s:%d: syntax error", fn, ln); - } - warned = true; + VLOG_WARN_ONCE("%s:%d: syntax error", fn, ln); } } @@ -729,8 +771,9 @@ open_minor(int minor, struct dpif **dpifp) fd = open(fn, O_RDONLY | O_NONBLOCK); if (fd >= 0) { struct dpif_linux *dpif = xmalloc(sizeof *dpif); - error = rtnetlink_notifier_register(&dpif->port_notifier, - dpif_linux_port_changed, dpif); + error = rtnetlink_link_notifier_register(&dpif->port_notifier, + dpif_linux_port_changed, + dpif); if (!error) { char *name; @@ -742,7 +785,7 @@ open_minor(int minor, struct dpif **dpifp) dpif->local_ifname = NULL; dpif->minor = minor; dpif->local_ifindex = 0; - svec_init(&dpif->changed_ports); + shash_init(&dpif->changed_ports); dpif->change_error = false; *dpifp = &dpif->dpif; } else { @@ -758,7 +801,8 @@ open_minor(int minor, struct dpif **dpifp) } static void -dpif_linux_port_changed(const struct rtnetlink_change *change, void *dpif_) +dpif_linux_port_changed(const struct rtnetlink_link_change *change, + void *dpif_) { struct dpif_linux *dpif = dpif_; @@ -769,10 +813,7 @@ dpif_linux_port_changed(const struct rtnetlink_change *change, void *dpif_) { /* Our datapath changed, either adding a new port or deleting an * existing one. */ - if (!svec_contains(&dpif->changed_ports, change->ifname)) { - svec_add(&dpif->changed_ports, change->ifname); - svec_sort(&dpif->changed_ports); - } + shash_add_once(&dpif->changed_ports, change->ifname, NULL); } } else { dpif->change_error = true;