[ofa-general] Re: OFED-1.2-20070502-0600 on Debian
Rick Jones
rick.jones2 at hp.com
Fri May 4 10:11:28 PDT 2007
Michael S. Tsirkin wrote:
> OK.
> Apply these 2 patches after configure:
Are they already in the latest nightly?
rick jones
>
>
>
> ------------------------------------------------------------------------
>
> commit ecbb416939da77c0d107409976499724baddce7b
> Author: Alexey Kuznetsov <kuznet at ms2.inr.ac.ru>
> Date: Sat Mar 24 12:52:16 2007 -0700
>
> [NET]: Fix neighbour destructor handling.
>
> ->neigh_destructor() is killed (not used), replaced with
> ->neigh_cleanup(), which is called when neighbor entry goes to dead
> state. At this point everything is still valid: neigh->dev,
> neigh->parms etc.
>
> The device should guarantee that dead neighbor entries (neigh->dead !=
> 0) do not get private part initialized, otherwise nobody will cleanup
> it.
>
> I think this is enough for ipoib which is the only user of this thing.
> Initialization private part of neighbor entries happens in ipib
> start_xmit routine, which is not reached when device is down. But it
> would be better to add explicit test for neigh->dead in any case.
>
> Signed-off-by: David S. Miller <davem at davemloft.net>
>
> diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
> index 0741c6d..f2a40ae 100644
> --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
> +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
> @@ -814,7 +814,7 @@ static void ipoib_set_mcast_list(struct net_device *dev)
> queue_work(ipoib_workqueue, &priv->restart_task);
> }
>
> -static void ipoib_neigh_destructor(struct neighbour *n)
> +static void ipoib_neigh_cleanup(struct neighbour *n)
> {
> struct ipoib_neigh *neigh;
> struct ipoib_dev_priv *priv = netdev_priv(n->dev);
> @@ -822,7 +822,7 @@ static void ipoib_neigh_destructor(struct neighbour *n)
> struct ipoib_ah *ah = NULL;
>
> ipoib_dbg(priv,
> - "neigh_destructor for %06x " IPOIB_GID_FMT "\n",
> + "neigh_cleanup for %06x " IPOIB_GID_FMT "\n",
> IPOIB_QPN(n->ha),
> IPOIB_GID_RAW_ARG(n->ha + 4));
>
> @@ -874,7 +874,7 @@ void ipoib_neigh_free(struct net_device *dev, struct ipoib_neigh *neigh)
>
> static int ipoib_neigh_setup_dev(struct net_device *dev, struct neigh_parms *parms)
> {
> - parms->neigh_destructor = ipoib_neigh_destructor;
> + parms->neigh_cleanup = ipoib_neigh_cleanup;
>
> return 0;
> }
>
>
> ------------------------------------------------------------------------
>
> commit 43cb76d91ee85f579a69d42bc8efc08bac560278
> Author: Greg Kroah-Hartman <gregkh at suse.de>
> Date: Tue Apr 9 12:14:34 2002 -0700
>
> Network: convert network devices to use struct device instead of class_device
>
> This lets the network core have the ability to handle suspend/resume
> issues, if it wants to.
>
> Thanks to Frederik Deweerdt <frederik.deweerdt at gmail.com> for the arm
> driver fixes.
>
> Signed-off-by: Greg Kroah-Hartman <gregkh at suse.de>
>
> diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c b/drivers/infiniband/ulp/ipoib/ipoib_main.c
> index 705eb1d..af5ee2e 100644
> --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
> +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
> @@ -958,16 +958,17 @@ struct ipoib_dev_priv *ipoib_intf_alloc(const char *name)
> return netdev_priv(dev);
> }
>
> -static ssize_t show_pkey(struct class_device *cdev, char *buf)
> +static ssize_t show_pkey(struct device *dev,
> + struct device_attribute *attr, char *buf)
> {
> - struct ipoib_dev_priv *priv =
> - netdev_priv(container_of(cdev, struct net_device, class_dev));
> + struct ipoib_dev_priv *priv = netdev_priv(to_net_dev(dev));
>
> return sprintf(buf, "0x%04x\n", priv->pkey);
> }
> -static CLASS_DEVICE_ATTR(pkey, S_IRUGO, show_pkey, NULL);
> +static DEVICE_ATTR(pkey, S_IRUGO, show_pkey, NULL);
>
> -static ssize_t create_child(struct class_device *cdev,
> +static ssize_t create_child(struct device *dev,
> + struct device_attribute *attr,
> const char *buf, size_t count)
> {
> int pkey;
> @@ -985,14 +986,14 @@ static ssize_t create_child(struct class_device *cdev,
> */
> pkey |= 0x8000;
>
> - ret = ipoib_vlan_add(container_of(cdev, struct net_device, class_dev),
> - pkey);
> + ret = ipoib_vlan_add(to_net_dev(dev), pkey);
>
> return ret ? ret : count;
> }
> -static CLASS_DEVICE_ATTR(create_child, S_IWUGO, NULL, create_child);
> +static DEVICE_ATTR(create_child, S_IWUGO, NULL, create_child);
>
> -static ssize_t delete_child(struct class_device *cdev,
> +static ssize_t delete_child(struct device *dev,
> + struct device_attribute *attr,
> const char *buf, size_t count)
> {
> int pkey;
> @@ -1004,18 +1005,16 @@ static ssize_t delete_child(struct class_device *cdev,
> if (pkey < 0 || pkey > 0xffff)
> return -EINVAL;
>
> - ret = ipoib_vlan_delete(container_of(cdev, struct net_device, class_dev),
> - pkey);
> + ret = ipoib_vlan_delete(to_net_dev(dev), pkey);
>
> return ret ? ret : count;
>
> }
> -static CLASS_DEVICE_ATTR(delete_child, S_IWUGO, NULL, delete_child);
> +static DEVICE_ATTR(delete_child, S_IWUGO, NULL, delete_child);
>
> int ipoib_add_pkey_attr(struct net_device *dev)
> {
> - return class_device_create_file(&dev->class_dev,
> - &class_device_attr_pkey);
> + return device_create_file(&dev->dev, &dev_attr_pkey);
> }
>
> static struct net_device *ipoib_add_port(const char *format,
> @@ -1083,11 +1082,9 @@ static struct net_device *ipoib_add_port(const char *format,
>
> if (ipoib_add_pkey_attr(priv->dev))
> goto sysfs_failed;
> - if (class_device_create_file(&priv->dev->class_dev,
> - &class_device_attr_create_child))
> + if (device_create_file(&priv->dev->dev, &dev_attr_create_child))
> goto sysfs_failed;
> - if (class_device_create_file(&priv->dev->class_dev,
> - &class_device_attr_delete_child))
> + if (device_create_file(&priv->dev->dev, &dev_attr_delete_child))
> goto sysfs_failed;
>
> return priv->dev;
> diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
> index f887780..085eafe 100644
> --- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
> +++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
> @@ -42,15 +42,15 @@
>
> #include "ipoib.h"
>
> -static ssize_t show_parent(struct class_device *class_dev, char *buf)
> +static ssize_t show_parent(struct device *d, struct device_attribute *attr,
> + char *buf)
> {
> - struct net_device *dev =
> - container_of(class_dev, struct net_device, class_dev);
> + 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 CLASS_DEVICE_ATTR(parent, S_IRUGO, show_parent, NULL);
> +static DEVICE_ATTR(parent, S_IRUGO, show_parent, NULL);
>
> int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
> {
> @@ -118,8 +118,7 @@ int ipoib_vlan_add(struct net_device *pdev, unsigned short pkey)
> if (ipoib_add_pkey_attr(priv->dev))
> goto sysfs_failed;
>
> - if (class_device_create_file(&priv->dev->class_dev,
> - &class_device_attr_parent))
> + if (device_create_file(&priv->dev->dev, &dev_attr_parent))
> goto sysfs_failed;
>
> list_add_tail(&priv->list, &ppriv->child_intfs);
More information about the general
mailing list