Hi,
Le jeudi 16 avril 2015 à 16:34 +0300, Erez Shitrit a écrit :
> Currently, iflink of the parent interface was always accessed, even
> when interface didn't have a parent and hence we crashed there.
+ since commit 5aa7add8f14b ('infiniband/ipoib: implement
ndo_get_iflink').
as there was no crash here before AFAIK.
>
> Handle the interface types properly: for a child interface, return
> the ifindex of the parent, for parent interface, return its ifindex.
>
> For child devices, make sure to set the parent pointer prior to
> invoking register_netdevice(), this allows the new ndo to be called
> by the stack immediately after the child device is registered.
>
> Fixes: 5aa7add8f14b ('infiniband/ipoib: implement ndo_get_iflink')
Cc: Nicolas Dichtel <nicolas.dich...@6wind.com>
> Reported-by: Honggang Li <ho...@redhat.com>
> Signed-off-by: Erez Shitrit <ere...@mellanox.com>
> Signed-off-by: Honggang Li <ho...@redhat.com>
> ---
>
> changes from V0:
> - fixed two typos in the change-log
>
> drivers/infiniband/ulp/ipoib/ipoib_main.c | 5 +++++
> drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 3 +--
> 2 files changed, 6 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/infiniband/ulp/ipoib/ipoib_main.c
> b/drivers/infiniband/ulp/ipoib/ipoib_main.c
> index 657b89b..915ad04 100644
> --- a/drivers/infiniband/ulp/ipoib/ipoib_main.c
> +++ b/drivers/infiniband/ulp/ipoib/ipoib_main.c
> @@ -846,6 +846,11 @@ static int ipoib_get_iflink(const struct net_device *dev)
> {
> struct ipoib_dev_priv *priv = netdev_priv(dev);
>
> + /* parent interface */
> + if (!test_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags))
> + return dev->ifindex;
> +
> + /* child/vlan interface */
> return priv->parent->ifindex;
> }
>
> diff --git a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
> b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
> index 4dd1313..fca1a88 100644
> --- a/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
> +++ b/drivers/infiniband/ulp/ipoib/ipoib_vlan.c
> @@ -58,6 +58,7 @@ int __ipoib_vlan_add(struct ipoib_dev_priv *ppriv, struct
> ipoib_dev_priv *priv,
> /* 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;
> + priv->parent = ppriv->dev;
> set_bit(IPOIB_FLAG_SUBINTERFACE, &priv->flags);
>
> result = ipoib_set_dev_features(priv, ppriv->ca);
> @@ -84,8 +85,6 @@ int __ipoib_vlan_add(struct ipoib_dev_priv *ppriv, struct
> ipoib_dev_priv *priv,
> goto register_failed;
> }
>
> - priv->parent = ppriv->dev;
> -
> ipoib_create_debug_files(priv->dev);
>
> /* RTNL childs don't need proprietary sysfs entries */
Regards.
--
Yann Droneaud
OPTEYA
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
