<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="">Note:</div>
<div class="">I did not think your changes would collide with Multi-Rail. Unfortunately, it looks like this one does. This config code was changed quite a bit by the Multi-Rail feature. However, it is ok as landing this change now will prompt the Multi-Rail
changes to utilize the better way of getting interface information. Just a heads up to Multi-Rail porters.</div>
<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="">for_each_netdev() is a more direct interface than<br class="">
lnet_ipif_enumerate(), so use it instead. Also get<br class="">
address and 'up' status directly from the device.<br class="">
<br class="">
This means we need to possible re-allocate the storage<br class="">
space if there are lots of IP addresses.<br class="">
<br class="">
However there is no need to resize the allocation down if we<br class="">
over-allocated. This is only used once, and is freed soon<br class="">
after it is allocated, so that is a false optimization.<br class="">
<br class="">
Signed-off-by: NeilBrown <<a href="mailto:neilb@suse.com" class="">neilb@suse.com</a>><br class="">
---<br class="">
drivers/staging/lustre/lnet/lnet/config.c | 78 +++++++++++++----------------<br class="">
1 file changed, 35 insertions(+), 43 deletions(-)<br class="">
<br class="">
diff --git a/drivers/staging/lustre/lnet/lnet/config.c b/drivers/staging/lustre/lnet/lnet/config.c<br class="">
index 55ecc1998b7e..136905db2746 100644<br class="">
--- a/drivers/staging/lustre/lnet/lnet/config.c<br class="">
+++ b/drivers/staging/lustre/lnet/lnet/config.c<br class="">
@@ -36,6 +36,7 @@<br class="">
#include <net/net_namespace.h><br class="">
#include <linux/ctype.h><br class="">
#include <linux/lnet/lib-lnet.h><br class="">
+#include <linux/inetdevice.h><br class="">
<br class="">
struct lnet_text_buf {<span class="Apple-tab-span" style="white-space:pre"> </span>
/* tmp struct for parsing routes */<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span>struct list_head ltb_list;<span class="Apple-tab-span" style="white-space:pre">
</span>/* stash on lists */<br class="">
@@ -1134,66 +1135,57 @@ lnet_match_networks(char **networksp, char *ip2nets, __u32 *ipaddrs, int nip)<br class="">
static int<br class="">
lnet_ipaddr_enumerate(__u32 **ipaddrsp)<br class="">
{<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>__u32 netmask;<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span>struct net_device *dev;<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span>__u32 *ipaddrs;<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span>__u32 *ipaddrs2;<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span>int nalloc = 64;<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span>int nip;<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span>char **ifnames;<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span>int nif = lnet_ipif_enumerate(&ifnames);<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span>int i;<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>if (nif <= 0)<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>return nif;<br class="">
-<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span>ipaddrs = kcalloc(nif, sizeof(*ipaddrs), GFP_KERNEL);<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span>ipaddrs = kcalloc(nalloc, sizeof(*ipaddrs), GFP_KERNEL);<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span>if (!ipaddrs) {<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 allocate ipaddrs[%d]\n", nif);<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>lnet_ipif_free_enumeration(ifnames, nif);<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 allocate ipaddrs[%d]\n", nalloc);<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span><span class="Apple-tab-span" style="white-space:pre"></span>return -ENOMEM;<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>for (i = nip = 0; i < nif; i++) {<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>if (!strcmp(ifnames[i], "lo"))<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>for_each_netdev(&init_net, dev) {<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>struct in_device *in_dev;<br class="">
+<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>if (strcmp(dev->name, "lo") == 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>continue;<br class="">
<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>rc = lnet_ipif_query(ifnames[i], &up, &ipaddrs[nip], &netmask);<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span><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><span class="Apple-tab-span" style="white-space:pre"></span>CWARN("Can't query 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><span class="Apple-tab-span" style="white-space:pre"></span> ifnames[i], rc);<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>if (!(dev_get_flags(dev) & IFF_UP)) {<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>CWARN("Ignoring interface %s: it's down\n", dev->name);<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>continue;<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span><span class="Apple-tab-span" style="white-space:pre"></span>}<br class="">
-<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>if (!up) {<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>CWARN("Ignoring interface %s: it's down\n",<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> ifnames[i]);<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>in_dev = __in_dev_get_rtnl(dev);<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>if (!in_dev) {<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>CWARN("Interface %s has no IPv4 status.\n", dev->name);<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>continue;<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span><span class="Apple-tab-span" style="white-space:pre"></span>}<br class="">
<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>nip++;<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>lnet_ipif_free_enumeration(ifnames, nif);<br class="">
-<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span>if (nip == nif) {<br class="">
-<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>*ipaddrsp = ipaddrs;<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>if (nip > 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>ipaddrs2 = kcalloc(nip, sizeof(*ipaddrs2),<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><span class="Apple-tab-span" style="white-space:pre"></span><span class="Apple-tab-span" style="white-space:pre"></span> GFP_KERNEL);<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>if (!ipaddrs2) {<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><span class="Apple-tab-span" style="white-space:pre"></span>CERROR("Can't allocate
ipaddrs[%d]\n", nip);<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><span class="Apple-tab-span" style="white-space:pre"></span>nip = -ENOMEM;<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>} else {<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><span class="Apple-tab-span" style="white-space:pre"></span>memcpy(ipaddrs2,
ipaddrs,<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><span class="Apple-tab-span" style="white-space:pre"></span> nip * sizeof(*ipaddrs));<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><span class="Apple-tab-span" style="white-space:pre"></span>*ipaddrsp = ipaddrs2;<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><span class="Apple-tab-span" style="white-space:pre"></span>rc = nip;<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span><span class="Apple-tab-span" style="white-space:pre"></span>if (nip >= nalloc) {<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>__u32 *ipaddrs2;<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>nalloc += nalloc;<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>ipaddrs2 = krealloc(ipaddrs, nalloc * sizeof(*ipaddrs2),<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><span class="Apple-tab-span" style="white-space:pre"></span><span class="Apple-tab-span" style="white-space:pre"></span> GFP_KERNEL);<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>if (ipaddrs2 == NULL) {<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><span class="Apple-tab-span" style="white-space:pre"></span>kfree(ipaddrs);<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><span class="Apple-tab-span" style="white-space:pre"></span>CERROR("Can't allocate
ipaddrs[%d]\n", nalloc);<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><span class="Apple-tab-span" style="white-space:pre"></span>return -ENOMEM;<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>}<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>ipaddrs = ipaddrs2;<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><span class="Apple-tab-span" style="white-space:pre"></span>kfree(ipaddrs);<br class="">
+<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span><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><span class="Apple-tab-span" style="white-space:pre"></span>if (strcmp(ifa->ifa_label, dev->name) == 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><span class="Apple-tab-span" style="white-space:pre"></span>ipaddrs[nip++]
= 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><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><span class="Apple-tab-span" style="white-space:pre"></span>}<br class="">
+<span class="Apple-tab-span" style="white-space:pre"> </span><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>}<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>*ipaddrsp = ipaddrs;<br class="">
<span class="Apple-tab-span" style="white-space:pre"></span>return nip;<br class="">
}<br class="">
<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>