X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=datapath%2Fbrcompat.c;h=f68b698c47b4d8d95228a1fe42293a9585910ff2;hb=d295e8e97acae13552a5b220d3fbcff8201064a2;hp=46e7f2b0866170450232dcc1128fdd07632b5fb6;hpb=2e7dd8eca88d131112a76301da24709b0472e381;p=openvswitch diff --git a/datapath/brcompat.c b/datapath/brcompat.c index 46e7f2b0..f68b698c 100644 --- a/datapath/brcompat.c +++ b/datapath/brcompat.c @@ -9,10 +9,8 @@ #include #include #include -#include #include #include -#include #include #include #include @@ -20,9 +18,7 @@ #include "compat.h" #include "openvswitch/brcompat-netlink.h" #include "brc_procfs.h" -#include "brc_sysfs.h" #include "datapath.h" -#include "dp_dev.h" static struct genl_family brc_genl_family; static struct genl_multicast_group brc_mc_group; @@ -46,45 +42,16 @@ static u32 brc_seq; /* Sequence number for current op. */ static struct sk_buff *brc_send_command(struct sk_buff *, struct nlattr **attrs); static int brc_send_simple_command(struct sk_buff *); -static int -get_dp_ifindices(int *indices, int num) -{ - int i, index = 0; - - rcu_read_lock(); - for (i=0; i < ODP_MAX && index < num; i++) { - struct datapath *dp = get_dp(i); - if (!dp) - continue; - indices[index++] = dp->ports[ODPP_LOCAL]->dev->ifindex; - } - rcu_read_unlock(); - - return index; -} - -static void -get_port_ifindices(struct datapath *dp, int *ifindices, int num) -{ - struct net_bridge_port *p; - - rcu_read_lock(); - list_for_each_entry_rcu (p, &dp->port_list, node) { - if (p->port_no < num) - ifindices[p->port_no] = p->dev->ifindex; - } - rcu_read_unlock(); -} - -static struct sk_buff * -brc_make_request(int op, const char *bridge, const char *port) +static struct sk_buff *brc_make_request(int op, const char *bridge, + const char *port) { struct sk_buff *skb = genlmsg_new(NLMSG_GOODSIZE, GFP_KERNEL); if (!skb) goto error; genlmsg_put(skb, 0, 0, &brc_genl_family, 0, op); - NLA_PUT_STRING(skb, BRC_GENL_A_DP_NAME, bridge); + if (bridge) + NLA_PUT_STRING(skb, BRC_GENL_A_DP_NAME, bridge); if (port) NLA_PUT_STRING(skb, BRC_GENL_A_PORT_NAME, port); return skb; @@ -127,29 +94,59 @@ static int brc_add_del_bridge(char __user *uname, int add) return brc_send_simple_command(request); } -static int brc_get_bridges(int __user *uindices, int n) +static int brc_get_indices(int op, const char *br_name, + int __user *uindices, int n) { + struct nlattr *attrs[BRC_GENL_A_MAX + 1]; + struct sk_buff *request, *reply; int *indices; int ret; + int len; + if (n < 0) + return -EINVAL; if (n >= 2048) return -ENOMEM; - indices = kcalloc(n, sizeof(int), GFP_KERNEL); - if (indices == NULL) + request = brc_make_request(op, br_name, NULL); + if (!request) return -ENOMEM; - n = get_dp_ifindices(indices, n); + reply = brc_send_command(request, attrs); + ret = PTR_ERR(reply); + if (IS_ERR(reply)) + goto exit; + + ret = -nla_get_u32(attrs[BRC_GENL_A_ERR_CODE]); + if (ret < 0) + goto exit_free_skb; + + ret = -EINVAL; + if (!attrs[BRC_GENL_A_IFINDEXES]) + goto exit_free_skb; + + len = nla_len(attrs[BRC_GENL_A_IFINDEXES]); + indices = nla_data(attrs[BRC_GENL_A_IFINDEXES]); + if (len % sizeof(int)) + goto exit_free_skb; + n = min_t(int, n, len / sizeof(int)); ret = copy_to_user(uindices, indices, n * sizeof(int)) ? -EFAULT : n; - kfree(indices); +exit_free_skb: + kfree_skb(reply); +exit: return ret; } +/* Called with br_ioctl_mutex. */ +static int brc_get_bridges(int __user *uindices, int n) +{ + return brc_get_indices(BRC_GENL_C_GET_BRIDGES, NULL, uindices, n); +} + /* Legacy deviceless bridge ioctl's. Called with br_ioctl_mutex. */ -static int -old_deviceless(void __user *uarg) +static int old_deviceless(void __user *uarg) { unsigned long args[3]; @@ -191,8 +188,7 @@ brc_ioctl_deviceless_stub(struct net *net, unsigned int cmd, void __user *uarg) return -EOPNOTSUPP; } -static int -brc_add_del_port(struct net_device *dev, int port_ifindex, int add) +static int brc_add_del_port(struct net_device *dev, int port_ifindex, int add) { struct sk_buff *request; struct net_device *port; @@ -216,8 +212,8 @@ brc_add_del_port(struct net_device *dev, int port_ifindex, int add) return err; } -static int -brc_get_bridge_info(struct net_device *dev, struct __bridge_info __user *ub) +static int brc_get_bridge_info(struct net_device *dev, + struct __bridge_info __user *ub) { struct __bridge_info b; u64 id = 0; @@ -236,29 +232,17 @@ brc_get_bridge_info(struct net_device *dev, struct __bridge_info __user *ub) return 0; } -static int -brc_get_port_list(struct net_device *dev, int __user *uindices, int num) +static int brc_get_port_list(struct net_device *dev, int __user *uindices, + int num) { - struct dp_dev *dp_dev = netdev_priv(dev); - struct datapath *dp = dp_dev->dp; - int *indices; - - if (num < 0) - return -EINVAL; - if (num == 0) - num = 256; - if (num > DP_MAX_PORTS) - num = DP_MAX_PORTS; + int retval; - indices = kcalloc(num, sizeof(int), GFP_KERNEL); - if (indices == NULL) - return -ENOMEM; + rtnl_unlock(); + retval = brc_get_indices(BRC_GENL_C_GET_PORTS, dev->name, + uindices, num); + rtnl_lock(); - get_port_ifindices(dp, indices, num); - if (copy_to_user(uindices, indices, num * sizeof(int))) - num = -EFAULT; - kfree(indices); - return num; + return retval; } /* @@ -268,7 +252,7 @@ brc_get_port_list(struct net_device *dev, int __user *uindices, int num) * (limited to a page for sanity) * offset -- number of records to skip */ -static int brc_get_fdb_entries(struct net_device *dev, void __user *userbuf, +static int brc_get_fdb_entries(struct net_device *dev, void __user *userbuf, unsigned long maxnum, unsigned long offset) { struct nlattr *attrs[BRC_GENL_A_MAX + 1]; @@ -320,8 +304,7 @@ nla_put_failure: } /* Legacy ioctl's through SIOCDEVPRIVATE. Called with rtnl_lock. */ -static int -old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) +static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { unsigned long args[4]; @@ -349,8 +332,7 @@ old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) } /* Called with the rtnl_lock. */ -static int -brc_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) +static int brc_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) { int err; @@ -388,7 +370,7 @@ static int brc_genl_query(struct sk_buff *skb, struct genl_info *info) void *data; ans_skb = nlmsg_new(NLMSG_DEFAULT_SIZE, GFP_KERNEL); - if (!ans_skb) + if (!ans_skb) return -ENOMEM; data = genlmsg_put_reply(ans_skb, info, &brc_genl_family, @@ -427,8 +409,7 @@ static struct nla_policy brc_genl_policy[BRC_GENL_A_MAX + 1] = { [BRC_GENL_A_FDB_DATA] = { .type = NLA_UNSPEC }, }; -static int -brc_genl_dp_result(struct sk_buff *skb, struct genl_info *info) +static int brc_genl_dp_result(struct sk_buff *skb, struct genl_info *info) { unsigned long int flags; int err; @@ -444,8 +425,7 @@ brc_genl_dp_result(struct sk_buff *skb, struct genl_info *info) if (brc_seq == info->snd_seq) { brc_seq++; - if (brc_reply) - kfree_skb(brc_reply); + kfree_skb(brc_reply); brc_reply = skb; complete(&brc_done); @@ -475,7 +455,8 @@ static struct genl_ops brc_genl_ops_set_proc = { .dumpit = NULL }; -static struct sk_buff *brc_send_command(struct sk_buff *request, struct nlattr **attrs) +static struct sk_buff *brc_send_command(struct sk_buff *request, + struct nlattr **attrs) { unsigned long int flags; struct sk_buff *reply; @@ -499,8 +480,10 @@ static struct sk_buff *brc_send_command(struct sk_buff *request, struct nlattr * /* Wait for reply. */ error = -ETIMEDOUT; - if (!wait_for_completion_timeout(&brc_done, BRC_TIMEOUT)) + if (!wait_for_completion_timeout(&brc_done, BRC_TIMEOUT)) { + printk(KERN_WARNING "brcompat: timed out waiting for userspace\n"); goto error; + } /* Grab reply. */ spin_lock_irqsave(&brc_lock, flags); @@ -523,24 +506,12 @@ error: return ERR_PTR(error); } -static int -__init brc_init(void) +static int __init brc_init(void) { - int i; int err; printk("Open vSwitch Bridge Compatibility, built "__DATE__" "__TIME__"\n"); - rcu_read_lock(); - for (i=0; i