X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=lib%2Fdpif-linux.c;h=3d081aab50a67aee5ef1899dd98bdbf3d7a955d1;hb=f613a0d72c521ca3a4eeb2c29ac523f6fdf72667;hp=88707d8df2913e8e76ab73c7cbc54eb83ebc9aa2;hpb=45c8d3a189843f0f45398caa420b952d5acd1f19;p=sliver-openvswitch.git diff --git a/lib/dpif-linux.c b/lib/dpif-linux.c index 88707d8df..3d081aab5 100644 --- a/lib/dpif-linux.c +++ b/lib/dpif-linux.c @@ -47,7 +47,6 @@ #include "openvswitch/tunnel.h" #include "packets.h" #include "poll-loop.h" -#include "rtnetlink-link.h" #include "shash.h" #include "sset.h" #include "unaligned.h" @@ -138,7 +137,7 @@ struct dpif_linux { /* Change notification. */ struct sset changed_ports; /* Ports that have changed. */ - struct rtnetlink_notifier port_notifier; + struct nln_notifier port_notifier; bool change_error; /* Queue of unused ports. */ @@ -158,11 +157,12 @@ static int ovs_packet_family; /* Generic Netlink socket. */ static struct nl_sock *genl_sock; +static struct nln *nln = NULL; static int dpif_linux_init(void); static int open_dpif(const struct dpif_linux_dp *, struct dpif **); -static void dpif_linux_port_changed(const struct rtnetlink_link_change *, - void *dpif); +static bool dpif_linux_nln_parse(struct ofpbuf *, void *); +static void dpif_linux_port_changed(const void *vport, void *dpif); static void dpif_linux_vport_to_ofpbuf(const struct dpif_linux_vport *, struct ofpbuf *); @@ -257,8 +257,8 @@ open_dpif(const struct dpif_linux_dp *dp, struct dpif **dpifp) int i; dpif = xmalloc(sizeof *dpif); - error = rtnetlink_link_notifier_register(&dpif->port_notifier, - dpif_linux_port_changed, dpif); + error = nln_notifier_register(nln, &dpif->port_notifier, + dpif_linux_port_changed, dpif); if (error) { goto error_free; } @@ -293,8 +293,12 @@ static void dpif_linux_close(struct dpif *dpif_) { struct dpif_linux *dpif = dpif_linux_cast(dpif_); + + if (nln) { + nln_notifier_unregister(nln, &dpif->port_notifier); + } + nl_sock_destroy(dpif->mc_sock); - rtnetlink_link_notifier_unregister(&dpif->port_notifier); sset_destroy(&dpif->changed_ports); free(dpif->lru_bitmap); free(dpif); @@ -315,13 +319,17 @@ dpif_linux_destroy(struct dpif *dpif_) static void dpif_linux_run(struct dpif *dpif OVS_UNUSED) { - rtnetlink_link_notifier_run(); + if (nln) { + nln_notifier_run(nln); + } } static void dpif_linux_wait(struct dpif *dpif OVS_UNUSED) { - rtnetlink_link_notifier_wait(); + if (nln) { + nln_notifier_wait(nln); + } } static int @@ -455,12 +463,6 @@ dpif_linux_port_query__(const struct dpif *dpif, uint32_t port_no, dpif_port->name = xstrdup(reply.name); dpif_port->type = xstrdup(netdev_vport_get_netdev_type(&reply)); dpif_port->port_no = reply.port_no; - if (reply.stats) { - netdev_stats_from_rtnl_link_stats64(&dpif_port->stats, - reply.stats); - } else { - memset(&dpif_port->stats, 0xff, sizeof dpif_port->stats); - } ofpbuf_delete(buf); } return error; @@ -556,11 +558,6 @@ dpif_linux_port_dump_next(const struct dpif *dpif OVS_UNUSED, void *state_, dpif_port->name = (char *) vport.name; dpif_port->type = (char *) netdev_vport_get_netdev_type(&vport); dpif_port->port_no = vport.port_no; - if (vport.stats) { - netdev_stats_from_rtnl_link_stats64(&dpif_port->stats, vport.stats); - } else { - memset(&dpif_port->stats, 0xff, sizeof dpif_port->stats); - } return 0; } @@ -1105,6 +1102,8 @@ dpif_linux_init(void) static int error = -1; if (error < 0) { + unsigned int ovs_vport_mcgroup; + error = nl_lookup_genl_family(OVS_DATAPATH_FAMILY, &ovs_datapath_family); if (error) { @@ -1125,6 +1124,15 @@ dpif_linux_init(void) if (!error) { error = nl_sock_create(NETLINK_GENERIC, &genl_sock); } + if (!error) { + error = nl_lookup_genl_mcgroup(OVS_VPORT_FAMILY, OVS_VPORT_MCGROUP, + &ovs_vport_mcgroup); + } + if (!error) { + static struct dpif_linux_vport vport; + nln = nln_create(NETLINK_GENERIC, ovs_vport_mcgroup, + dpif_linux_nln_parse, &vport); + } } return error; @@ -1170,20 +1178,27 @@ dpif_linux_vport_send(int dp_ifindex, uint32_t port_no, actions.data, actions.size, &packet); } +static bool +dpif_linux_nln_parse(struct ofpbuf *buf, void *vport_) +{ + struct dpif_linux_vport *vport = vport_; + return dpif_linux_vport_from_ofpbuf(vport, buf) == 0; +} + static void -dpif_linux_port_changed(const struct rtnetlink_link_change *change, - void *dpif_) +dpif_linux_port_changed(const void *vport_, void *dpif_) { + const struct dpif_linux_vport *vport = vport_; struct dpif_linux *dpif = dpif_; - if (change) { - if (change->master_ifindex == dpif->dp_ifindex - && (change->nlmsg_type == RTM_NEWLINK - || change->nlmsg_type == RTM_DELLINK)) - { - /* Our datapath changed, either adding a new port or deleting an - * existing one. */ - sset_add(&dpif->changed_ports, change->ifname); + if (vport) { + if (vport->dp_ifindex == dpif->dp_ifindex + && (vport->cmd == OVS_VPORT_CMD_NEW + || vport->cmd == OVS_VPORT_CMD_DEL + || vport->cmd == OVS_VPORT_CMD_SET)) { + VLOG_DBG("port_changed: dpif:%s vport:%s cmd:%"PRIu8, + dpif->dpif.full_name, vport->name, vport->cmd); + sset_add(&dpif->changed_ports, vport->name); } } else { dpif->change_error = true; @@ -1205,17 +1220,15 @@ dpif_linux_vport_from_ofpbuf(struct dpif_linux_vport *vport, [OVS_VPORT_ATTR_TYPE] = { .type = NL_A_U32 }, [OVS_VPORT_ATTR_NAME] = { .type = NL_A_STRING, .max_len = IFNAMSIZ }, [OVS_VPORT_ATTR_STATS] = { .type = NL_A_UNSPEC, - .min_len = sizeof(struct rtnl_link_stats64), - .max_len = sizeof(struct rtnl_link_stats64), + .min_len = sizeof(struct ovs_vport_stats), + .max_len = sizeof(struct ovs_vport_stats), .optional = true }, [OVS_VPORT_ATTR_ADDRESS] = { .type = NL_A_UNSPEC, .min_len = ETH_ADDR_LEN, .max_len = ETH_ADDR_LEN, .optional = true }, - [OVS_VPORT_ATTR_MTU] = { .type = NL_A_U32, .optional = true }, [OVS_VPORT_ATTR_OPTIONS] = { .type = NL_A_NESTED, .optional = true }, [OVS_VPORT_ATTR_IFINDEX] = { .type = NL_A_U32, .optional = true }, - [OVS_VPORT_ATTR_IFLINK] = { .type = NL_A_U32, .optional = true }, }; struct nlattr *a[ARRAY_SIZE(ovs_vport_policy)]; @@ -1248,11 +1261,6 @@ dpif_linux_vport_from_ofpbuf(struct dpif_linux_vport *vport, if (a[OVS_VPORT_ATTR_ADDRESS]) { vport->address = nl_attr_get(a[OVS_VPORT_ATTR_ADDRESS]); } - if (a[OVS_VPORT_ATTR_MTU]) { - vport->mtu = nl_attr_get_u32(a[OVS_VPORT_ATTR_MTU]); - } else { - vport->mtu = INT_MAX; - } if (a[OVS_VPORT_ATTR_OPTIONS]) { vport->options = nl_attr_get(a[OVS_VPORT_ATTR_OPTIONS]); vport->options_len = nl_attr_get_size(a[OVS_VPORT_ATTR_OPTIONS]); @@ -1260,9 +1268,6 @@ dpif_linux_vport_from_ofpbuf(struct dpif_linux_vport *vport, if (a[OVS_VPORT_ATTR_IFINDEX]) { vport->ifindex = nl_attr_get_u32(a[OVS_VPORT_ATTR_IFINDEX]); } - if (a[OVS_VPORT_ATTR_IFLINK]) { - vport->iflink = nl_attr_get_u32(a[OVS_VPORT_ATTR_IFLINK]); - } return 0; } @@ -1302,10 +1307,6 @@ dpif_linux_vport_to_ofpbuf(const struct dpif_linux_vport *vport, vport->address, ETH_ADDR_LEN); } - if (vport->mtu && vport->mtu != INT_MAX) { - nl_msg_put_u32(buf, OVS_VPORT_ATTR_MTU, vport->mtu); - } - if (vport->options) { nl_msg_put_nested(buf, OVS_VPORT_ATTR_OPTIONS, vport->options, vport->options_len); @@ -1314,10 +1315,6 @@ dpif_linux_vport_to_ofpbuf(const struct dpif_linux_vport *vport, if (vport->ifindex) { nl_msg_put_u32(buf, OVS_VPORT_ATTR_IFINDEX, vport->ifindex); } - - if (vport->iflink) { - nl_msg_put_u32(buf, OVS_VPORT_ATTR_IFLINK, vport->iflink); - } } /* Clears 'vport' to "empty" values. */