<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=us-ascii">
</head>
<body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space;" class="">
Reviewed-by: Doug Oucharek <<a href="mailto:dougso@me.com" class="">dougso@me.com</a>>
<div class=""><br class="">
</div>
<div class="">Doug</div>
<div class=""><br class="">
<div>
<blockquote type="cite" class="">
<div class="">On Jul 24, 2018, at 4:07 PM, NeilBrown <<a href="mailto:neilb@suse.com" class="">neilb@suse.com</a>> wrote:</div>
<br class="Apple-interchange-newline">
<div class="">
<div class="">Use dev_get_by_name() and for_primary_ifa() to<br class="">
get IP address for a named device. This is more<br class="">
direct.<br class="">
<br class="">
Signed-off-by: NeilBrown <<a href="mailto:neilb@suse.com" class="">neilb@suse.com</a>><br class="">
---<br class="">
.../staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c | 48 +++++++++++++-------<br class="">
1 file changed, 30 insertions(+), 18 deletions(-)<br class="">
<br class="">
diff --git a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c<br class="">
index 9f3fef5da38c..05835cc0f0a5 100644<br class="">
--- a/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c<br class="">
+++ b/drivers/staging/lustre/lnet/klnds/o2iblnd/o2iblnd.c<br class="">
@@ -38,6 +38,7 @@<br class="">
#include <asm/div64.h><br class="">
#include <asm/page.h><br class="">
#include "o2iblnd.h"<br class="">
+#include <linux/inetdevice.h><br class="">
<br class="">
static struct lnet_lnd the_o2iblnd;<br class="">
<br class="">
@@ -2450,40 +2451,48 @@ void kiblnd_destroy_dev(struct kib_dev *dev)<br class="">
static struct kib_dev *kiblnd_create_dev(char *ifname)<br class="">
{<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span>struct net_device *netdev;<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span>struct in_device *in_dev;<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span>struct kib_dev *dev;<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span>__u32 netmask;<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span>__u32 ip;<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span>int up;<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span>int flags;<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span>int rc;<br class="">
<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span>rc = lnet_ipif_query(ifname, &up, &ip, &netmask);<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span>if (rc) {<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>CERROR("Can't query IPoIB interface %s: %d\n",<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span> ifname, rc);<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>return NULL;<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span>rtnl_lock();<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span>netdev = dev_get_by_name(&init_net, ifname);<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span>if (!netdev) {<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>CERROR("Can't find IPoIB interface %s\n",<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span> ifname);<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>goto unlock;<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span>}<br class="">
<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span>if (!up) {<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span>flags = dev_get_flags(netdev);<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span>if (!(flags & IFF_UP)) {<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span><span class="Apple-tab-span" style="white-space:pre"></span>CERROR("Can't query IPoIB interface %s: it's down\n", ifname);<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>rtnl_unlock();<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span><span class="Apple-tab-span" style="white-space:pre"></span>return NULL;<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span>}<br class="">
<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span>dev = kzalloc(sizeof(*dev), GFP_NOFS);<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span>if (!dev)<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>return NULL;<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>goto unlock;<br class="">
<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span>netdev = dev_get_by_name(&init_net, ifname);<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span>if (!netdev) {<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>dev->ibd_can_failover = 0;<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span>} else {<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>dev->ibd_can_failover = !!(netdev->flags & IFF_MASTER);<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>dev_put(netdev);<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span>}<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span>dev->ibd_can_failover = !!(flags & IFF_MASTER);<br class="">
<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span>INIT_LIST_HEAD(&dev->ibd_nets);<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span>INIT_LIST_HEAD(&dev->ibd_list); /* not yet in kib_devs */<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span>INIT_LIST_HEAD(&dev->ibd_fail_list);<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span>dev->ibd_ifip = ip;<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span>for_primary_ifa(in_dev)<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>if (strcmp(ifa->ifa_label, ifname) == 0) {<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span><span class="Apple-tab-span" style="white-space:pre"></span>dev->ibd_ifip = ifa->ifa_local;<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span><span class="Apple-tab-span" style="white-space:pre"></span>break;<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>}<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span>endfor_ifa(in_dev);<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span>rtnl_unlock();<br class="">
+<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span>if (dev->ibd_ifip == 0) {<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>CERROR("Can't initialize device: no IP address\n");<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>kfree(dev);<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>return NULL;<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span>}<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span>strcpy(&dev->ibd_ifname[0], ifname);<br class="">
<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span>/* initialize the device */<br class="">
@@ -2496,6 +2505,9 @@ static struct kib_dev *kiblnd_create_dev(char *ifname)<br class="">
<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span>list_add_tail(&dev->ibd_list, &kiblnd_data.kib_devs);<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span>return dev;<br class="">
+unlock:<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span>rtnl_unlock();<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span>return NULL;<br class="">
}<br class="">
<br class="">
static void kiblnd_base_shutdown(void)<br class="">
<br class="">
<br class="">
_______________________________________________<br class="">
lustre-devel mailing list<br class="">
<a href="mailto:lustre-devel@lists.lustre.org" class="">lustre-devel@lists.lustre.org</a><br class="">
http://lists.lustre.org/listinfo.cgi/lustre-devel-lustre.org<br class="">
</div>
</div>
</blockquote>
</div>
<br class="">
</div>
</body>
</html>