From 4ebd4a58ce307874b18c30ffcd4852440e475ad5 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Mon, 17 May 2021 20:54:28 +0200 Subject: gnu: ucx: Update to 1.9.0. * gnu/packages/patches/ucx-tcp-iface-ioctl.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Adjust accordingly. * gnu/packages/fabric-management.scm (ucx): Update to 1.9.0. [source](patches): Remove. --- gnu/local.mk | 1 - gnu/packages/fabric-management.scm | 5 +- gnu/packages/patches/ucx-tcp-iface-ioctl.patch | 109 ------------------------- 3 files changed, 2 insertions(+), 113 deletions(-) delete mode 100644 gnu/packages/patches/ucx-tcp-iface-ioctl.patch (limited to 'gnu') diff --git a/gnu/local.mk b/gnu/local.mk index 0e3e4eecf0..e502a6519a 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1747,7 +1747,6 @@ dist_patch_DATA = \ %D%/packages/patches/twinkle-bcg729.patch \ %D%/packages/patches/u-boot-rockchip-inno-usb.patch \ %D%/packages/patches/u-boot-riscv64-fix-extlinux.patch \ - %D%/packages/patches/ucx-tcp-iface-ioctl.patch \ %D%/packages/patches/udiskie-no-appindicator.patch \ %D%/packages/patches/ungoogled-chromium-extension-search-path.patch \ %D%/packages/patches/unison-fix-ocaml-4.08.patch \ diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm index 0e8b388cd1..e0ea3c2bf1 100644 --- a/gnu/packages/fabric-management.scm +++ b/gnu/packages/fabric-management.scm @@ -181,7 +181,7 @@ testing InfiniBand networks.") (define-public ucx (package (name "ucx") - (version "1.6.1") + (version "1.9.0") (source (origin (method git-fetch) (uri (git-reference @@ -190,8 +190,7 @@ testing InfiniBand networks.") (file-name (git-file-name name version)) (sha256 (base32 - "0x3clvy716i7va4m4adgx6ihjsfnzrkdizhxz5v52944dkglpc8n")) - (patches (search-patches "ucx-tcp-iface-ioctl.patch")))) + "0i0ji5ivzxjqh3ys1m517ghw3am7cw1hvf40ma7hsq3wznsyx5s1")))) (build-system gnu-build-system) (arguments '( ;; These are some of the flags found in 'contrib/configure-release'. diff --git a/gnu/packages/patches/ucx-tcp-iface-ioctl.patch b/gnu/packages/patches/ucx-tcp-iface-ioctl.patch deleted file mode 100644 index d5df7047bc..0000000000 --- a/gnu/packages/patches/ucx-tcp-iface-ioctl.patch +++ /dev/null @@ -1,109 +0,0 @@ -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. - -diff --git a/src/uct/tcp/tcp_iface.c b/src/uct/tcp/tcp_iface.c -index 81ad459..10024a6 100644 ---- a/src/uct/tcp/tcp_iface.c -+++ b/src/uct/tcp/tcp_iface.c -@@ -12,6 +12,8 @@ - #include - #include - #include -+#include -+#include - - static ucs_config_field_t uct_tcp_iface_config_table[] = { - {"", "MAX_SHORT=8k", NULL, -@@ -483,6 +485,70 @@ static UCS_CLASS_DEFINE_NEW_FUNC(uct_tcp_iface_t, uct_iface_t, uct_md_h, - uct_worker_h, const uct_iface_params_t*, - const uct_iface_config_t*); - -+/* Fetch information about available network devices through an ioctl. */ -+static ucs_status_t query_devices_ioctl(uct_md_h md, -+ uct_tl_resource_desc_t **resource_p, -+ unsigned *num_resources_p) -+{ -+ int sock, err, i; -+ uct_tl_resource_desc_t *resources, *tmp; -+ unsigned num_resources; -+ ucs_status_t status; -+ struct ifconf conf; -+ struct ifreq reqs[10]; -+ -+ conf.ifc_len = sizeof reqs; -+ conf.ifc_req = reqs; -+ -+ sock = socket(SOCK_STREAM, AF_INET, 0); -+ if (sock < 0) { -+ ucs_error("socket(2) failed: %m"); -+ status = UCS_ERR_IO_ERROR; -+ goto out; -+ } -+ -+ err = ioctl(sock, SIOCGIFCONF, &conf); -+ if (err < 0) { -+ ucs_error("SIOCGIFCONF ioctl failed: %m"); -+ status = UCS_ERR_IO_ERROR; -+ goto out; -+ } -+ -+ resources = NULL; -+ num_resources = 0; -+ for (i = 0; i < conf.ifc_len / sizeof(struct ifreq); i++) { -+ const char *name = reqs[i].ifr_name; -+ -+ if (!ucs_netif_is_active(name)) { -+ continue; -+ } -+ -+ tmp = ucs_realloc(resources, sizeof(*resources) * (num_resources + 1), -+ "tcp resources"); -+ if (tmp == NULL) { -+ ucs_free(resources); -+ status = UCS_ERR_NO_MEMORY; -+ goto out; -+ } -+ resources = tmp; -+ -+ ucs_snprintf_zero(resources[i].tl_name, sizeof(resources[i].tl_name), -+ "%s", UCT_TCP_NAME); -+ ucs_snprintf_zero(resources[i].dev_name, sizeof(resources[i].dev_name), -+ "%s", name); -+ resources[i].dev_type = UCT_DEVICE_TYPE_NET; -+ ++num_resources; -+ } -+ -+ *num_resources_p = num_resources; -+ *resource_p = resources; -+ status = UCS_OK; -+ -+out: -+ if (sock >= 0) close(sock); -+ return status; -+} -+ - static ucs_status_t uct_tcp_query_tl_resources(uct_md_h md, - uct_tl_resource_desc_t **resource_p, - unsigned *num_resources_p) -@@ -496,9 +562,9 @@ static ucs_status_t uct_tcp_query_tl_resources(uct_md_h md, - - dir = opendir(netdev_dir); - if (dir == NULL) { -- ucs_error("opendir(%s) failed: %m", 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 query_devices_ioctl(md, resource_p, num_resources_p); - } - - resources = NULL; -@@ -543,6 +609,5 @@ static ucs_status_t uct_tcp_query_tl_resources(uct_md_h md, - - out_closedir: - closedir(dir); --out: - return status; - } -- cgit 1.4.1