mirror of
https://git.savannah.gnu.org/git/guix.git
synced 2025-01-31 06:46:50 +01:00
8ba6651d39
* gnu/packages/fabric-management.scm (ucx): Update to 1.17.0. * gnu/packages/patches/ucx-tcp-iface-ioctl.patch: Rebase. Change-Id: I2089de93da88f4f81c4b233eb03abae1f41dfe7f
127 lines
3.8 KiB
Diff
127 lines
3.8 KiB
Diff
Since /sys is unavailable in build environments, the list of available
|
|
TCP network interfaces cannot be obtained via /sys/class/net. This patch
|
|
provides alternative code that uses the SIOCGIFCONF ioctl to get the
|
|
names of the available TCP network interfaces.
|
|
|
|
Initially submitted at <https://github.com/openucx/ucx/pull/4462>.
|
|
|
|
diff --git a/src/uct/tcp/tcp_iface.c b/src/uct/tcp/tcp_iface.c
|
|
index f90d54fef..a2f74dc32 100644
|
|
--- a/src/uct/tcp/tcp_iface.c
|
|
+++ b/src/uct/tcp/tcp_iface.c
|
|
@@ -18,6 +18,8 @@
|
|
#include <netinet/tcp.h>
|
|
#include <dirent.h>
|
|
#include <float.h>
|
|
+#include <net/if.h>
|
|
+#include <sys/ioctl.h>
|
|
|
|
#define UCT_TCP_IFACE_NETDEV_DIR "/sys/class/net"
|
|
|
|
@@ -873,6 +875,85 @@ static int uct_tcp_is_bridge(const char *if_name)
|
|
return (stat(path, &st) == 0) && S_ISDIR(st.st_mode);
|
|
}
|
|
|
|
+/* Fetch information about available network devices through an ioctl. */
|
|
+static ucs_status_t uct_tcp_query_devices_ioctl(uct_md_h md,
|
|
+ uct_tl_device_resource_t **devices_p,
|
|
+ unsigned *num_devices_p)
|
|
+{
|
|
+ int sock, err, i;
|
|
+ uct_tl_device_resource_t *devices, *tmp;
|
|
+ unsigned num_devices;
|
|
+ ucs_status_t status;
|
|
+ struct ifconf conf;
|
|
+
|
|
+ conf.ifc_len = 0;
|
|
+ conf.ifc_req = NULL;
|
|
+
|
|
+ status = ucs_socket_create(AF_INET, SOCK_STREAM, &sock);
|
|
+ if (status != UCS_OK) {
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
+ err = ioctl(sock, SIOCGIFCONF, &conf);
|
|
+ if (err < 0) {
|
|
+ ucs_error("ioctl(SIOCGIFCONF) failed: %m");
|
|
+ status = UCS_ERR_IO_ERROR;
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
+ conf.ifc_req = ucs_calloc(1, conf.ifc_len, "ifreq");
|
|
+ if (conf.ifc_req == NULL) {
|
|
+ ucs_error("memory alocation failed");
|
|
+ status = UCS_ERR_NO_MEMORY;
|
|
+ goto out;
|
|
+ }
|
|
+
|
|
+ err = ioctl(sock, SIOCGIFCONF, &conf);
|
|
+ if (err < 0) {
|
|
+ ucs_error("ioctl(SIOCGIFCONF) failed: %m");
|
|
+ status = UCS_ERR_IO_ERROR;
|
|
+ goto out_free;
|
|
+ }
|
|
+
|
|
+ devices = NULL;
|
|
+ num_devices = 0;
|
|
+ for (i = 0; i < (conf.ifc_len / sizeof(struct ifreq)); i++) {
|
|
+ const char *name = conf.ifc_req[i].ifr_name;
|
|
+ sa_family_t family = conf.ifc_req[i].ifr_addr.sa_family;
|
|
+
|
|
+ if (!ucs_netif_is_active(name, family)) {
|
|
+ continue;
|
|
+ }
|
|
+
|
|
+ tmp = ucs_realloc(devices, sizeof(*devices) * (num_devices + 1),
|
|
+ "tcp devices");
|
|
+ if (tmp == NULL) {
|
|
+ ucs_free(devices);
|
|
+ status = UCS_ERR_NO_MEMORY;
|
|
+ goto out_free;
|
|
+ }
|
|
+ devices = tmp;
|
|
+
|
|
+ ucs_snprintf_zero(devices[num_devices].name,
|
|
+ sizeof(devices[num_devices].name),
|
|
+ "%s", name);
|
|
+ devices[num_devices].type = UCT_DEVICE_TYPE_NET;
|
|
+ ++num_devices;
|
|
+ }
|
|
+
|
|
+ *num_devices_p = num_devices;
|
|
+ *devices_p = devices;
|
|
+ status = UCS_OK;
|
|
+
|
|
+out_free:
|
|
+ ucs_free(conf.ifc_req);
|
|
+out:
|
|
+ if (sock >= 0) {
|
|
+ close(sock);
|
|
+ }
|
|
+ return status;
|
|
+}
|
|
+
|
|
ucs_status_t uct_tcp_query_devices(uct_md_h md,
|
|
uct_tl_device_resource_t **devices_p,
|
|
unsigned *num_devices_p)
|
|
@@ -890,9 +971,9 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md,
|
|
|
|
n = scandir(UCT_TCP_IFACE_NETDEV_DIR, &entries, NULL, alphasort);
|
|
if (n == -1) {
|
|
- ucs_error("scandir(%s) failed: %m", UCT_TCP_IFACE_NETDEV_DIR);
|
|
- status = UCS_ERR_IO_ERROR;
|
|
- goto out;
|
|
+ /* When /sys is unavailable, as can be the case in a container,
|
|
+ * resort to a good old 'ioctl'. */
|
|
+ return uct_tcp_query_devices_ioctl(md, devices_p, num_devices_p);
|
|
}
|
|
|
|
devices = NULL;
|
|
@@ -959,7 +1040,6 @@ out_release:
|
|
}
|
|
|
|
free(entries);
|
|
-out:
|
|
return status;
|
|
}
|
|
|