From patchwork Thu Oct 19 19:36:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Ludovic_Court=C3=A8s?= X-Patchwork-Id: 55051 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 315C827BBE2; Thu, 19 Oct 2023 20:38:08 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,SPF_HELO_PASS,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id D294327BBEA for ; Thu, 19 Oct 2023 20:38:06 +0100 (BST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qtYqI-0005Oe-Kc; Thu, 19 Oct 2023 15:38:02 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtYpy-0005Kb-H1 for guix-patches@gnu.org; Thu, 19 Oct 2023 15:37:43 -0400 Received: from debbugs.gnu.org ([2001:470:142:5::43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qtYps-0000ql-UA for guix-patches@gnu.org; Thu, 19 Oct 2023 15:37:39 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1qtYqJ-0002Dl-LR for guix-patches@gnu.org; Thu, 19 Oct 2023 15:38:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#66573] [PATCH v2 06/11] gnu: ucx: Update to 1.15.0. Resent-From: Ludovic =?utf-8?q?Court=C3=A8s?= Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 19 Oct 2023 19:38:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 66573 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 66573@debbugs.gnu.org Cc: Ludovic =?utf-8?q?Court=C3=A8s?= Received: via spool by 66573-submit@debbugs.gnu.org id=B66573.16977442518424 (code B ref 66573); Thu, 19 Oct 2023 19:38:03 +0000 Received: (at 66573) by debbugs.gnu.org; 19 Oct 2023 19:37:31 +0000 Received: from localhost ([127.0.0.1]:37795 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtYpm-0002Bn-UW for submit@debbugs.gnu.org; Thu, 19 Oct 2023 15:37:31 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:59830) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1qtYpY-00029v-3B for 66573@debbugs.gnu.org; Thu, 19 Oct 2023 15:37:16 -0400 Received: from fencepost.gnu.org ([2001:470:142:3::e]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1qtYp2-0008CY-12; Thu, 19 Oct 2023 15:36:44 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=gnu.org; s=fencepost-gnu-org; h=MIME-Version:References:In-Reply-To:Date:Subject:To: From; bh=i7gIIBQZFx9kbWXMCdgISmq19WiXo/0VnCFLkXJAw1o=; b=B9EDZEG9TiFozFd2CBtb kskwXvSkP8OJBcBrLUAlc+k1mMFTrW2It1eNmtvk4xXCkqHEhsEuF8DSeyTWLQMYND4Wo/uqT8kSr cKwcegUAz0yDSUw7M/PPzwsmKmc+VT+vzWAy6x8V5UV9tP35d2alNArDPZla2p5v32H6FXqJP8bPM dEfJixa0QF4MW4twvY9nIhhOUXE0/MeeulVfK6LhQJsEdjzEnmXcHrc6IoTXioeRocM1kyhJP76Hb gJlSrVJrR6wiZE6bg7D4S1PYtpjrsLCSkRxq7vuzLExfZfct9U+ZFTnD0NRyH4sNlpmqJIWPsoVp3 9dNmSTll6iadoA==; From: Ludovic =?utf-8?q?Court=C3=A8s?= Date: Thu, 19 Oct 2023 21:36:16 +0200 Message-ID: <2b52dbcebc89d066b7c7919c24d16457d5e5c5b8.1697744099.git.ludo@gnu.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/fabric-management.scm (ucx): Update to 1.15.0. * gnu/packages/patches/ucx-tcp-iface-ioctl.patch: Update for 1.15.0. --- gnu/packages/fabric-management.scm | 4 +- .../patches/ucx-tcp-iface-ioctl.patch | 105 +++++++++++------- 2 files changed, 64 insertions(+), 45 deletions(-) diff --git a/gnu/packages/fabric-management.scm b/gnu/packages/fabric-management.scm index ccdaa0ee0a..f41b4e99ed 100644 --- a/gnu/packages/fabric-management.scm +++ b/gnu/packages/fabric-management.scm @@ -185,7 +185,7 @@ (define-public ibutils (define-public ucx (package (name "ucx") - (version "1.14.0") + (version "1.15.0") (source (origin (method git-fetch) (uri (git-reference @@ -195,7 +195,7 @@ (define-public ucx (patches (search-patches "ucx-tcp-iface-ioctl.patch")) (sha256 (base32 - "0ki2r768wqm92qv06wxrh3kv2nl2yj4ds9fz0s0b5rr2ycjiw9ir")))) + "1mk46vyfp8hsivk88s8gv0nf458jfs59fczpf66wwa3a9yp324jp")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/patches/ucx-tcp-iface-ioctl.patch b/gnu/packages/patches/ucx-tcp-iface-ioctl.patch index c441a0861a..2a0e4ce138 100644 --- a/gnu/packages/patches/ucx-tcp-iface-ioctl.patch +++ b/gnu/packages/patches/ucx-tcp-iface-ioctl.patch @@ -3,102 +3,121 @@ 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 . + diff --git a/src/uct/tcp/tcp_iface.c b/src/uct/tcp/tcp_iface.c -index cad4a2709..7c1d2c9de 100644 +index 6a6cd34fa..af32bb2e9 100644 --- a/src/uct/tcp/tcp_iface.c +++ b/src/uct/tcp/tcp_iface.c -@@ -17,6 +17,8 @@ - #include +@@ -18,6 +18,8 @@ #include #include + #include +#include +#include + #define UCT_TCP_IFACE_NETDEV_DIR "/sys/class/net" - extern ucs_class_t UCS_CLASS_DECL_NAME(uct_tcp_iface_t); -@@ -586,6 +588,68 @@ static UCS_CLASS_DEFINE_NEW_FUNC(uct_tcp_iface_t, uct_iface_t, uct_md_h, +@@ -875,6 +877,85 @@ 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_device_resource_t **tl_devices_p, -+ unsigned *num_tl_devices_p) ++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 *resources, *tmp; -+ unsigned num_resources; ++ uct_tl_device_resource_t *devices, *tmp; ++ unsigned num_devices; + ucs_status_t status; + struct ifconf conf; -+ struct ifreq reqs[10]; + -+ conf.ifc_len = sizeof reqs; -+ conf.ifc_req = reqs; ++ conf.ifc_len = 0; ++ conf.ifc_req = NULL; + -+ sock = socket(SOCK_STREAM, AF_INET, 0); -+ if (sock < 0) { -+ ucs_error("socket(2) failed: %m"); -+ status = UCS_ERR_IO_ERROR; -+ goto out; ++ 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("SIOCGIFCONF ioctl failed: %m"); -+ status = UCS_ERR_IO_ERROR; -+ goto out; ++ ucs_error("ioctl(SIOCGIFCONF) 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; ++ 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, AF_INET)) { ++ if (!ucs_netif_is_active(name, family)) { + continue; + } + -+ tmp = ucs_realloc(resources, sizeof(*resources) * (num_resources + 1), -+ "tcp resources"); ++ tmp = ucs_realloc(devices, sizeof(*devices) * (num_devices + 1), ++ "tcp devices"); + if (tmp == NULL) { -+ ucs_free(resources); ++ ucs_free(devices); + status = UCS_ERR_NO_MEMORY; -+ goto out; ++ goto out_free; + } -+ resources = tmp; ++ devices = tmp; + -+ ucs_snprintf_zero(resources[i].name, sizeof(resources[i].name), ++ ucs_snprintf_zero(devices[num_devices].name, ++ sizeof(devices[num_devices].name), + "%s", name); -+ resources[i].type = UCT_DEVICE_TYPE_NET; -+ ++num_resources; ++ devices[num_devices].type = UCT_DEVICE_TYPE_NET; ++ ++num_devices; + } + -+ *num_tl_devices_p = num_resources; -+ *tl_devices_p = resources; -+ status = UCS_OK; ++ *num_devices_p = num_devices; ++ *devices_p = devices; ++ status = UCS_OK; + ++out_free: ++ ucs_free(conf.ifc_req); +out: -+ if (sock >= 0) close(sock); ++ 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) -@@ -599,9 +663,9 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md, +@@ -893,9 +974,9 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md, dir = opendir(UCT_TCP_IFACE_NETDEV_DIR); if (dir == NULL) { - ucs_error("opendir(%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 query_devices_ioctl(md, devices_p, num_devices_p); ++ /* 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; -@@ -655,7 +719,6 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md, +@@ -963,7 +1044,6 @@ ucs_status_t uct_tcp_query_devices(uct_md_h md, out_closedir: closedir(dir);