mirror of
https://github.com/torvalds/linux.git
synced 2024-12-27 13:22:23 +00:00
862096a8bb
Add the rtnl_link_ops changelink and fill_info callbacks, through which the admin can now set/get the driver mode, etc policies. Maintain the proprietary sysfs entries only for legacy childs. For child devices, set dev->iflink to point to the parent device ifindex, such that user space tools can now correctly show the uplink relation as done for vlan, macvlan, etc devices. Pointed out by Patrick McHardy <kaber@trash.net> Signed-off-by: Or Gerlitz <ogerlitz@mellanox.com> Signed-off-by: David S. Miller <davem@davemloft.net>
208 lines
5.2 KiB
C
208 lines
5.2 KiB
C
/*
|
|
* Copyright (c) 2004 Topspin Communications. All rights reserved.
|
|
*
|
|
* This software is available to you under a choice of one of two
|
|
* licenses. You may choose to be licensed under the terms of the GNU
|
|
* General Public License (GPL) Version 2, available from the file
|
|
* COPYING in the main directory of this source tree, or the
|
|
* OpenIB.org BSD license below:
|
|
*
|
|
* Redistribution and use in source and binary forms, with or
|
|
* without modification, are permitted provided that the following
|
|
* conditions are met:
|
|
*
|
|
* - Redistributions of source code must retain the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer.
|
|
*
|
|
* - Redistributions in binary form must reproduce the above
|
|
* copyright notice, this list of conditions and the following
|
|
* disclaimer in the documentation and/or other materials
|
|
* provided with the distribution.
|
|
*
|
|
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
|
|
* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
|
|
* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
|
|
* NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
|
|
* BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
|
|
* ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
|
|
* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
|
|
* SOFTWARE.
|
|
*/
|
|
|
|
#include <linux/module.h>
|
|
|
|
#include <linux/init.h>
|
|
#include <linux/seq_file.h>
|
|
|
|
#include <asm/uaccess.h>
|
|
|
|
#include "ipoib.h"
|
|
|
|
static ssize_t show_parent(struct device *d, struct device_attribute *attr,
|
|
char *buf)
|
|
{
|
|
struct net_device *dev = to_net_dev(d);
|
|
struct ipoib_dev_priv *priv = netdev_priv(dev);
|
|
|
|
return sprintf(buf, "%s\n", priv->parent->name);
|
|
}
|
|
static DEVICE_ATTR(parent, S_IRUGO, show_parent, NULL);
|
|
|
|
int __ipoib_vlan_add(struct ipoib_dev_priv *ppriv, struct ipoib_dev_priv *priv,
|
|
u16 pkey, int type)
|
|
{
|
|
int result;
|
|
|
|
priv->max_ib_mtu = ppriv->max_ib_mtu;
|
|
/* MTU will be reset when mcast join happens */
|
|
priv->dev->mtu = IPOIB_UD_MTU(priv->max_ib_mtu);
|
|
priv->mcast_mtu = priv->admin_mtu = priv->dev->mtu;
|
|
set_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags);
|
|
|
|
result = ipoib_set_dev_features(priv, ppriv->ca);
|
|
if (result)
|
|
goto err;
|
|
|
|
priv->pkey = pkey;
|
|
|
|
memcpy(priv->dev->dev_addr, ppriv->dev->dev_addr, INFINIBAND_ALEN);
|
|
priv->dev->broadcast[8] = pkey >> 8;
|
|
priv->dev->broadcast[9] = pkey & 0xff;
|
|
|
|
result = ipoib_dev_init(priv->dev, ppriv->ca, ppriv->port);
|
|
if (result < 0) {
|
|
ipoib_warn(ppriv, "failed to initialize subinterface: "
|
|
"device %s, port %d",
|
|
ppriv->ca->name, ppriv->port);
|
|
goto err;
|
|
}
|
|
|
|
result = register_netdevice(priv->dev);
|
|
if (result) {
|
|
ipoib_warn(priv, "failed to initialize; error %i", result);
|
|
goto register_failed;
|
|
}
|
|
|
|
priv->parent = ppriv->dev;
|
|
|
|
ipoib_create_debug_files(priv->dev);
|
|
|
|
/* RTNL childs don't need proprietary sysfs entries */
|
|
if (type == IPOIB_LEGACY_CHILD) {
|
|
if (ipoib_cm_add_mode_attr(priv->dev))
|
|
goto sysfs_failed;
|
|
if (ipoib_add_pkey_attr(priv->dev))
|
|
goto sysfs_failed;
|
|
if (ipoib_add_umcast_attr(priv->dev))
|
|
goto sysfs_failed;
|
|
|
|
if (device_create_file(&priv->dev->dev, &dev_attr_parent))
|
|
goto sysfs_failed;
|
|
}
|
|
|
|
priv->child_type = type;
|
|
priv->dev->iflink = ppriv->dev->ifindex;
|
|
list_add_tail(&priv->list, &ppriv->child_intfs);
|
|
|
|
return 0;
|
|
|
|
sysfs_failed:
|
|
result = -ENOMEM;
|
|
ipoib_delete_debug_files(priv->dev);
|
|
unregister_netdevice(priv->dev);
|
|
|
|
register_failed:
|
|
ipoib_dev_cleanup(priv->dev);
|
|
|
|
err:
|
|
return result;
|
|
}
|
|
|
|
int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
|
|
{
|
|
struct ipoib_dev_priv *ppriv, *priv;
|
|
char intf_name[IFNAMSIZ];
|
|
struct ipoib_dev_priv *tpriv;
|
|
int result;
|
|
|
|
if (!capable(CAP_NET_ADMIN))
|
|
return -EPERM;
|
|
|
|
ppriv = netdev_priv(pdev);
|
|
|
|
snprintf(intf_name, sizeof intf_name, "%s.%04x",
|
|
ppriv->dev->name, pkey);
|
|
priv = ipoib_intf_alloc(intf_name);
|
|
if (!priv)
|
|
return -ENOMEM;
|
|
|
|
if (!rtnl_trylock())
|
|
return restart_syscall();
|
|
|
|
mutex_lock(&ppriv->vlan_mutex);
|
|
|
|
/*
|
|
* First ensure this isn't a duplicate. We check the parent device and
|
|
* then all of the legacy child interfaces to make sure the Pkey
|
|
* doesn't match.
|
|
*/
|
|
if (ppriv->pkey == pkey) {
|
|
result = -ENOTUNIQ;
|
|
goto out;
|
|
}
|
|
|
|
list_for_each_entry(tpriv, &ppriv->child_intfs, list) {
|
|
if (tpriv->pkey == pkey &&
|
|
tpriv->child_type == IPOIB_LEGACY_CHILD) {
|
|
result = -ENOTUNIQ;
|
|
goto out;
|
|
}
|
|
}
|
|
|
|
result = __ipoib_vlan_add(ppriv, priv, pkey, IPOIB_LEGACY_CHILD);
|
|
|
|
out:
|
|
mutex_unlock(&ppriv->vlan_mutex);
|
|
|
|
if (result)
|
|
free_netdev(priv->dev);
|
|
|
|
rtnl_unlock();
|
|
|
|
return result;
|
|
}
|
|
|
|
int ipoib_vlan_delete(struct net_device *pdev, unsigned short pkey)
|
|
{
|
|
struct ipoib_dev_priv *ppriv, *priv, *tpriv;
|
|
struct net_device *dev = NULL;
|
|
|
|
if (!capable(CAP_NET_ADMIN))
|
|
return -EPERM;
|
|
|
|
ppriv = netdev_priv(pdev);
|
|
|
|
if (!rtnl_trylock())
|
|
return restart_syscall();
|
|
mutex_lock(&ppriv->vlan_mutex);
|
|
list_for_each_entry_safe(priv, tpriv, &ppriv->child_intfs, list) {
|
|
if (priv->pkey == pkey &&
|
|
priv->child_type == IPOIB_LEGACY_CHILD) {
|
|
unregister_netdevice(priv->dev);
|
|
list_del(&priv->list);
|
|
dev = priv->dev;
|
|
break;
|
|
}
|
|
}
|
|
mutex_unlock(&ppriv->vlan_mutex);
|
|
rtnl_unlock();
|
|
|
|
if (dev) {
|
|
free_netdev(dev);
|
|
return 0;
|
|
}
|
|
|
|
return -ENODEV;
|
|
}
|