UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: fix "queues" uevent between network namespaces 

When I create a new namespace with 'ip netns add net0', or add/remove
new links in a namespace with 'ip link add/delete type veth', rx/tx
queues events can be got in all namespaces. That is because rx/tx queue
ktypes do not have namespace support, and their kobj parents are setted to
NULL. This patch is to fix it.

Reported-by: Libo Chen <chenlibo@huawei.com>
Signed-off-by: Libo Chen <chenlibo@huawei.com>
Signed-off-by: Weilong Chen <chenweilong@huawei.com>
Acked-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Weilong Chen 2014-01-16 17:24:31 +08:00 committed by David S. Miller
parent 671314a5ab
commit 82ef3d5d5f
2 changed files with 34 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/kobject_uevent.c
View File

@ -88,11 +88,17 @@ out:
#ifdef CONFIG_NET #ifdef CONFIG_NET
static int kobj_bcast_filter(struct sock *dsk, struct sk_buff *skb, void *data) static int kobj_bcast_filter(struct sock *dsk, struct sk_buff *skb, void *data)
{ {
struct kobject *kobj = data; struct kobject *kobj = data, *ksobj;
const struct kobj_ns_type_operations *ops; const struct kobj_ns_type_operations *ops;
ops = kobj_ns_ops(kobj); ops = kobj_ns_ops(kobj);
if (ops) { if (!ops && kobj->kset) {
ksobj = &kobj->kset->kobj;
if (ksobj->parent != NULL)
ops = kobj_ns_ops(ksobj->parent);
}
if (ops && ops->netlink_ns && kobj->ktype->namespace) {
const void *sock_ns, *ns; const void *sock_ns, *ns;
ns = kobj->ktype->namespace(kobj); ns = kobj->ktype->namespace(kobj);
sock_ns = ops->netlink_ns(dsk); sock_ns = ops->netlink_ns(dsk);

26
net/core/net-sysfs.c
View File

@ -744,10 +744,23 @@ static void rx_queue_release(struct kobject *kobj)
dev_put(queue->dev); dev_put(queue->dev);
} }
static const void *rx_queue_namespace(struct kobject *kobj)
{
struct netdev_rx_queue *queue = to_rx_queue(kobj);
struct device *dev = &queue->dev->dev;
const void *ns = NULL;
if (dev->class && dev->class->ns_type)
ns = dev->class->namespace(dev);
return ns;
}
static struct kobj_type rx_queue_ktype = { static struct kobj_type rx_queue_ktype = {
.sysfs_ops = &rx_queue_sysfs_ops, .sysfs_ops = &rx_queue_sysfs_ops,
.release = rx_queue_release, .release = rx_queue_release,
.default_attrs = rx_queue_default_attrs, .default_attrs = rx_queue_default_attrs,
.namespace = rx_queue_namespace
}; };
static int rx_queue_add_kobject(struct net_device *net, int index) static int rx_queue_add_kobject(struct net_device *net, int index)
@ -1093,10 +1106,23 @@ static void netdev_queue_release(struct kobject *kobj)
dev_put(queue->dev); dev_put(queue->dev);
} }
static const void *netdev_queue_namespace(struct kobject *kobj)
{
struct netdev_queue *queue = to_netdev_queue(kobj);
struct device *dev = &queue->dev->dev;
const void *ns = NULL;
if (dev->class && dev->class->ns_type)
ns = dev->class->namespace(dev);
return ns;
}
static struct kobj_type netdev_queue_ktype = { static struct kobj_type netdev_queue_ktype = {
.sysfs_ops = &netdev_queue_sysfs_ops, .sysfs_ops = &netdev_queue_sysfs_ops,
.release = netdev_queue_release, .release = netdev_queue_release,
.default_attrs = netdev_queue_default_attrs, .default_attrs = netdev_queue_default_attrs,
.namespace = netdev_queue_namespace,
}; };
static int netdev_queue_add_kobject(struct net_device *net, int index) static int netdev_queue_add_kobject(struct net_device *net, int index)