From 05e3ba8636aa2f3623c7b948049764e9849297b6 Mon Sep 17 00:00:00 2001 From: Kamal Heib Date: Thu, 25 May 2023 11:55:14 -0400 Subject: [PATCH] Rebase to upstream release v46.0 Resolves: rhbz#2170066, rhbz#2209685, rhbz#2159635, rhbz#2167517 Signed-off-by: Kamal Heib --- .gitignore | 2 +- ...util-fix-overflow-in-remap_node_name.patch | 85 ---------------- ...-drop-unnecessary-nodedesc-local-cop.patch | 95 ------------------ ...le-providers-that-were-not-enabled-i.patch | 23 ++--- ...-printing-a-possibly-non-NUL-termina.patch | 38 ------- rdma-core.spec | 21 ++-- rxe_cfg.8.gz | Bin 0 -> 1750 bytes sources | 3 +- 8 files changed, 24 insertions(+), 243 deletions(-) delete mode 100644 0001-util-fix-overflow-in-remap_node_name.patch delete mode 100644 0002-infiniband-diags-drop-unnecessary-nodedesc-local-cop.patch delete mode 100644 0003-libibnetdisc-fix-printing-a-possibly-non-NUL-termina.patch create mode 100644 rxe_cfg.8.gz diff --git a/.gitignore b/.gitignore index e70da34..dafbd8a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ SOURCES/rdma-core-44.0.tar.gz SOURCES/rxe_cfg.8.gz /rdma-core-44.0.tar.gz -/rxe_cfg.8.gz +/rdma-core-46.0.tar.gz diff --git a/0001-util-fix-overflow-in-remap_node_name.patch b/0001-util-fix-overflow-in-remap_node_name.patch deleted file mode 100644 index 860c153..0000000 --- a/0001-util-fix-overflow-in-remap_node_name.patch +++ /dev/null @@ -1,85 +0,0 @@ -From 5075b961a29ff9c418e1fefe78432e95dd0a5fcc Mon Sep 17 00:00:00 2001 -From: Michal Schmidt -Date: Wed, 1 Feb 2023 22:41:06 +0100 -Subject: [PATCH 1/3] util: fix overflow in remap_node_name() - -The function remap_node_name() assumes the parameter 'nodedesc' is at -least IB_SMP_DATA_SIZE + 1 (i.e. 65) bytes long, because it passes it to -clean_nodedesc() that writes a nul-terminator to it at offset -IB_SMP_DATA_SIZE. Callers in infiniband-diags/saquery.c pass -a (struct ib_node_desc_t).description as the argument, which is only -IB_NODE_DESCRIPTION_SIZE (i.e. 64) bytes long. This is an overflow. - -An odd thing about remap_node_name() is that it may (but does not -always) rewrite the nodedesc in-place. Callers do not appear to -appreciate this behavior. Most of them are various print_* and dump_* -functions where rewriting the input makes no sense. Some callers make a -local copy of the nodedesc first, possibly to protect the original. -One caller (infiniband-diags/saquery.c:print_node_records()) checks if -either the original description or the remapped one matches a given -requested_name - so it looks like it prefers the original to be -not rewritten. - -Let's make remap_node_name() a bit safer and more convenient to use. -Allocate a fixed-sized copy first. Then use strncpy to copy from -'nodedesc', never reading more than IB_SMP_DATA_SIZE (64) bytes. -Apply clean_nodedesc() on the correctly-sized copy. This solves the -overflow bug. Also, the in-place rewrite of 'nodedesc' is gone and it -can become a (const char*). - -The overflow was found by a static checker (covscan). - -Fixes: d974c4e398d2 ("Fix max length of node description (ibnetdiscover and smpquery)") -Signed-off-by: Michal Schmidt ---- - util/node_name_map.c | 12 +++++++++--- - util/node_name_map.h | 3 +-- - 2 files changed, 10 insertions(+), 5 deletions(-) - -diff --git a/util/node_name_map.c b/util/node_name_map.c -index 30b73eb1448e..511cb92ef19c 100644 ---- a/util/node_name_map.c -+++ b/util/node_name_map.c -@@ -95,7 +95,7 @@ void close_node_name_map(nn_map_t * map) - free(map); - } - --char *remap_node_name(nn_map_t * map, uint64_t target_guid, char *nodedesc) -+char *remap_node_name(nn_map_t * map, uint64_t target_guid, const char *nodedesc) - { - char *rc = NULL; - name_map_item_t *item = NULL; -@@ -108,8 +108,14 @@ char *remap_node_name(nn_map_t * map, uint64_t target_guid, char *nodedesc) - rc = strdup(item->name); - - done: -- if (rc == NULL) -- rc = strdup(clean_nodedesc(nodedesc)); -+ if (rc == NULL) { -+ rc = malloc(IB_SMP_DATA_SIZE + 1); -+ if (rc) { -+ strncpy(rc, nodedesc, IB_SMP_DATA_SIZE); -+ rc[IB_SMP_DATA_SIZE] = '\0'; -+ clean_nodedesc(rc); -+ } -+ } - return (rc); - } - -diff --git a/util/node_name_map.h b/util/node_name_map.h -index e78d274b116e..d83d672782c4 100644 ---- a/util/node_name_map.h -+++ b/util/node_name_map.h -@@ -12,8 +12,7 @@ typedef struct nn_map nn_map_t; - - nn_map_t *open_node_name_map(const char *node_name_map); - void close_node_name_map(nn_map_t *map); --/* NOTE: parameter "nodedesc" may be modified here. */ --char *remap_node_name(nn_map_t *map, uint64_t target_guid, char *nodedesc); -+char *remap_node_name(nn_map_t *map, uint64_t target_guid, const char *nodedesc); - char *clean_nodedesc(char *nodedesc); - - #endif --- -2.39.1 - diff --git a/0002-infiniband-diags-drop-unnecessary-nodedesc-local-cop.patch b/0002-infiniband-diags-drop-unnecessary-nodedesc-local-cop.patch deleted file mode 100644 index 7927ba6..0000000 --- a/0002-infiniband-diags-drop-unnecessary-nodedesc-local-cop.patch +++ /dev/null @@ -1,95 +0,0 @@ -From d5723a0f69577fd3022024ca17c27e273a29695b Mon Sep 17 00:00:00 2001 -From: Michal Schmidt -Date: Wed, 1 Feb 2023 22:41:16 +0100 -Subject: [PATCH 2/3] infiniband-diags: drop unnecessary nodedesc local copies - -Now that remap_node_name() never rewrites nodedesc in-place, some -copying can be avoided. - -Signed-off-by: Michal Schmidt ---- - infiniband-diags/dump_fts.c | 14 +++----------- - 1 file changed, 3 insertions(+), 11 deletions(-) - -diff --git a/infiniband-diags/dump_fts.c b/infiniband-diags/dump_fts.c -index ce6bfb9ecc33..acef9efe692d 100644 ---- a/infiniband-diags/dump_fts.c -+++ b/infiniband-diags/dump_fts.c -@@ -109,7 +109,6 @@ static void dump_multicast_tables(ibnd_node_t *node, unsigned startl, - unsigned endl, struct ibmad_port *mad_port) - { - ib_portid_t *portid = &node->path_portid; -- char nd[IB_SMP_DATA_SIZE + 1] = { 0 }; - char str[512]; - char *s; - uint64_t nodeguid; -@@ -119,7 +118,6 @@ static void dump_multicast_tables(ibnd_node_t *node, unsigned startl, - char *mapnd = NULL; - int n = 0; - -- memcpy(nd, node->nodedesc, strlen(node->nodedesc)); - nports = node->numports; - nodeguid = node->guid; - -@@ -149,7 +147,7 @@ static void dump_multicast_tables(ibnd_node_t *node, unsigned startl, - endl = IB_MAX_MCAST_LID; - } - -- mapnd = remap_node_name(node_name_map, nodeguid, nd); -+ mapnd = remap_node_name(node_name_map, nodeguid, node->nodedesc); - - printf("Multicast mlids [0x%x-0x%x] of switch %s guid 0x%016" PRIx64 - " (%s):\n", startl, endl, portid2str(portid), nodeguid, -@@ -224,8 +222,6 @@ static int dump_lid(char *str, int str_len, int lid, int valid, - ibnd_fabric_t *fabric, int *last_port_lid, - int *base_port_lid, uint64_t *portguid) - { -- char nd[IB_SMP_DATA_SIZE + 1] = { 0 }; -- - ibnd_port_t *port = NULL; - - char ntype[50], sguid[30]; -@@ -276,14 +272,12 @@ static int dump_lid(char *str, int str_len, int lid, int valid, - baselid = port->base_lid; - lmc = port->lmc; - -- memcpy(nd, port->node->nodedesc, strlen(port->node->nodedesc)); -- - if (lmc > 0) { - *base_port_lid = baselid; - *last_port_lid = baselid + (1 << lmc) - 1; - } - -- mapnd = remap_node_name(node_name_map, nodeguid, nd); -+ mapnd = remap_node_name(node_name_map, nodeguid, port->node->nodedesc); - - rc = snprintf(str, str_len, ": (%s portguid %s: '%s')", - mad_dump_val(IB_NODE_TYPE_F, ntype, sizeof ntype, -@@ -302,7 +296,6 @@ static void dump_unicast_tables(ibnd_node_t *node, int startl, int endl, - { - ib_portid_t * portid = &node->path_portid; - char lft[IB_SMP_DATA_SIZE] = { 0 }; -- char nd[IB_SMP_DATA_SIZE + 1] = { 0 }; - char str[200]; - uint64_t nodeguid; - int block, i, e, top; -@@ -315,7 +308,6 @@ static void dump_unicast_tables(ibnd_node_t *node, int startl, int endl, - mad_decode_field(node->switchinfo, IB_SW_LINEAR_FDB_TOP_F, &top); - nodeguid = node->guid; - nports = node->numports; -- memcpy(nd, node->nodedesc, strlen(node->nodedesc)); - - if (!endl || endl > top) - endl = top; -@@ -326,7 +318,7 @@ static void dump_unicast_tables(ibnd_node_t *node, int startl, int endl, - endl = IB_MAX_UCAST_LID; - } - -- mapnd = remap_node_name(node_name_map, nodeguid, nd); -+ mapnd = remap_node_name(node_name_map, nodeguid, node->nodedesc); - - printf("Unicast lids [0x%x-0x%x] of switch %s guid 0x%016" PRIx64 - " (%s):\n", startl, endl, portid2str(portid), nodeguid, --- -2.39.1 - diff --git a/0003-CMakeLists-disable-providers-that-were-not-enabled-i.patch b/0003-CMakeLists-disable-providers-that-were-not-enabled-i.patch index 84f1b16..2777f66 100644 --- a/0003-CMakeLists-disable-providers-that-were-not-enabled-i.patch +++ b/0003-CMakeLists-disable-providers-that-were-not-enabled-i.patch @@ -1,8 +1,8 @@ -From eff6b07e92a1674818c5d8c9993651dbbeabccf4 Mon Sep 17 00:00:00 2001 +From 214c673b2a66a0ceb86a21ddb8cd7beba86cc6f3 Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Wed, 1 Feb 2023 15:24:23 +0100 -Subject: [PATCH 3/5] CMakeLists: disable providers that were not enabled in - RHEL 9.1 +Subject: [PATCH] CMakeLists: disable providers that were not enabled in RHEL + 9.1 Doing a package rebase, but don't want to enable additional drivers unless explicitly requested. @@ -11,14 +11,14 @@ Upstream Status: RHEL only Signed-off-by: Michal Schmidt --- - CMakeLists.txt | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) + CMakeLists.txt | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index bac10516bb85..b7eca65f0fe2 100644 +index 9b7462861012..cfe79bcfacf3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -711,23 +711,23 @@ add_subdirectory(providers/bnxt_re) +@@ -711,7 +711,7 @@ add_subdirectory(providers/bnxt_re) add_subdirectory(providers/cxgb4) # NO SPARSE add_subdirectory(providers/efa) add_subdirectory(providers/efa/man) @@ -26,11 +26,8 @@ index bac10516bb85..b7eca65f0fe2 100644 +#add_subdirectory(providers/erdma) add_subdirectory(providers/hns) add_subdirectory(providers/irdma) --add_subdirectory(providers/mana) --add_subdirectory(providers/mana/man) -+#add_subdirectory(providers/mana) -+#add_subdirectory(providers/mana/man) - add_subdirectory(providers/mlx4) + add_subdirectory(providers/mana) +@@ -720,14 +720,14 @@ add_subdirectory(providers/mlx4) add_subdirectory(providers/mlx4/man) add_subdirectory(providers/mlx5) add_subdirectory(providers/mlx5/man) @@ -49,5 +46,5 @@ index bac10516bb85..b7eca65f0fe2 100644 add_subdirectory(providers/rxe/man) add_subdirectory(providers/siw) -- -2.39.1 +2.40.1 diff --git a/0003-libibnetdisc-fix-printing-a-possibly-non-NUL-termina.patch b/0003-libibnetdisc-fix-printing-a-possibly-non-NUL-termina.patch deleted file mode 100644 index 2a5cc84..0000000 --- a/0003-libibnetdisc-fix-printing-a-possibly-non-NUL-termina.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 45fcc7ad41216a93bafb452f7d7a4507d52722cd Mon Sep 17 00:00:00 2001 -From: Michal Schmidt -Date: Wed, 1 Feb 2023 23:30:52 +0100 -Subject: [PATCH 3/3] libibnetdisc: fix printing a possibly non-NUL-terminated - string - -Found by a static check (covscan). - -Fixes: d974c4e398d2 ("Fix max length of node description (ibnetdiscover and smpquery)") -Signed-off-by: Michal Schmidt ---- - libibnetdisc/chassis.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libibnetdisc/chassis.c b/libibnetdisc/chassis.c -index a3ec1d82807c..bc1a8aff8acb 100644 ---- a/libibnetdisc/chassis.c -+++ b/libibnetdisc/chassis.c -@@ -597,7 +597,7 @@ static int fill_mellanox_chassis_record(ibnd_node_t * node) - int p = 0; - ibnd_port_t *port; - -- char node_desc[IB_SMP_DATA_SIZE]; -+ char node_desc[IB_SMP_DATA_SIZE + 1]; - char *system_name; - char *system_type; - char *system_slot_name; -@@ -617,6 +617,7 @@ static int fill_mellanox_chassis_record(ibnd_node_t * node) - */ - - memcpy(node_desc, node->nodedesc, IB_SMP_DATA_SIZE); -+ node_desc[IB_SMP_DATA_SIZE] = '\0'; - - IBND_DEBUG("fill_mellanox_chassis_record: node_desc:%s \n",node_desc); - --- -2.39.1 - diff --git a/rdma-core.spec b/rdma-core.spec index 1c7fae1..3ccc300 100644 --- a/rdma-core.spec +++ b/rdma-core.spec @@ -1,6 +1,6 @@ Name: rdma-core -Version: 44.0 -Release: 2%{?dist}.1 +Version: 46.0 +Release: 1%{?dist} Summary: RDMA core userspace libraries and daemons # Almost everything is licensed under the OFA dual GPLv2, 2 Clause BSD license @@ -16,10 +16,6 @@ Source1: ibdev2netdev # are extracted from libibverbs-26.0-8.el8 . Source2: rxe_cfg Source3: rxe_cfg.8.gz -# 0001-0003: https://github.com/linux-rdma/rdma-core/pull/1308 -Patch1: 0001-util-fix-overflow-in-remap_node_name.patch -Patch2: 0002-infiniband-diags-drop-unnecessary-nodedesc-local-cop.patch -Patch3: 0003-libibnetdisc-fix-printing-a-possibly-non-NUL-termina.patch # RHEL specific patch for OPA ibacm plugin Patch300: 0001-ibacm-acm.c-load-plugin-while-it-is-soft-link.patch Patch301: 0002-systemd-drop-Protect-options-not-supported-in-RHEL-8.patch @@ -149,6 +145,8 @@ Provides: libhfi1 = %{version}-%{release} Obsoletes: libhfi1 < %{version}-%{release} Provides: libirdma = %{version}-%{release} Obsoletes: libirdma < %{version}-%{release} +Provides: libmana = %{version}-%{release} +Obsoletes: libmana < %{version}-%{release} Provides: libmlx4 = %{version}-%{release} Obsoletes: libmlx4 < %{version}-%{release} %ifnarch s390 @@ -173,6 +171,7 @@ Device-specific plug-in ibverbs userspace drivers are included: - libhfi1: Intel Omni-Path HFI - libhns: HiSilicon Hip06 SoC - libirdma: Intel Ethernet Connection RDMA +- libmana: Microsoft Azure Network Adapter - libmlx4: Mellanox ConnectX-3 InfiniBand HCA - libmlx5: Mellanox Connect-IB/X-4+ InfiniBand HCA - libqedr: QLogic QL4xxx RoCE HCA @@ -265,9 +264,6 @@ easy, object-oriented access to IB verbs. %prep %setup -q -%patch1 -p1 -%patch2 -p1 -%patch3 -p1 %patch300 -p1 %patch301 -p1 %if 0%{?fedora} @@ -454,9 +450,11 @@ fi %ifnarch s390 %{_mandir}/man3/mlx5dv* %{_mandir}/man3/mlx4dv* +%{_mandir}/man3/manadv* %{_mandir}/man7/efadv* %{_mandir}/man7/mlx5dv* %{_mandir}/man7/mlx4dv* +%{_mandir}/man7/manadv* %endif %{_mandir}/man3/ibnd_* @@ -537,6 +535,7 @@ fi %ifnarch s390 %{_libdir}/libmlx5.so.* %{_libdir}/libmlx4.so.* +%{_libdir}/libmana.so.* %endif %config(noreplace) %{_sysconfdir}/libibverbs.d/*.driver %doc %{_docdir}/%{name}/libibverbs.md @@ -632,6 +631,10 @@ fi %endif %changelog +* Thu May 25 2023 Kamal Heib - 46.0-1 +- Rebase to upstream release v46.0 +- Resolves: rhbz#2170066, rhbz#2209685, rhbz#2159635, rhbz#2167517 + * Wed Feb 08 2023 Michal Schmidt - 44.0-2.1 - Do not use unsupported Protect* options in systemd unit files. - Resolves: rhbz#2141462 diff --git a/rxe_cfg.8.gz b/rxe_cfg.8.gz new file mode 100644 index 0000000000000000000000000000000000000000..499a25b9e3ac7f15747697a60fd96125eb880d34 GIT binary patch literal 1750 zcmV;{1}XU;iwFP!000021C?0Ya@#f#eb-m)=*jL#^rcCfG}8y$ksEbl*&{iZHqK-q z5|l6o0TuvltJ9C~E&$$SIZd7{g23+LoU<1?xf#Ovr!gp_^PGMSlAGZmxqb`tPm`}_ z=fA^CI6gc&8XvwGAHRa5HYuWPu#of zXlhd6iY+A%`%W`qDBf0ayA?c zlIdWk9Uok;g+;E4f~gGfXU0pzQ|5SKbpy4`!ZKM)FWV_7n2 zXvec|{Uq)5im129{5>-qL{Um!AoO9Q&chbe1b7-#Ez$UOJa)^C;t~p-RgzmE15&e$ zXQRd;{l>_fC!h;eDr|#0!MuYzW`wRRH0Z~h>ypB-Bgk}GQCN6p$)&!>AUt|kCv#N! z^<=)FoVXfv-y1C|C+8_^-7%Y>^ zIItUgkVkpgT}{rEP!gOveX8Ty#~P(Ko5t2?9t!k==kSnp34vKPG+4j zYF$(0-xGpBhLl($>IVr-9vBHBct=a#9sWIP?RUlO^??fsoKr2KCt?*>kb4xaMdpGI zOSU2Efj^|O%7j|M8ug0!d0nho+@-A*m~4R)`zstje=&mRN5>;LIy`}| zJJKeoDFd0pmk9v*3=RRSM=9B+PRA@NQRJX>t#S`Gs`pM{YBWHf{%=)nuNL;zHzS~J zlj2R1c4MZ;O{d`Y!k>oZN7Ij-#*pbcLJ^ac=G&g`g_J&(T7+UYwVC-_*DCtl^Qp)r zrZ|Sqts{xV}Y zs8*_r9^SCWx`&rJ$BU8_uVbn6QS_^2OK`v6MYp}hZLyLyN@7y$BT-ToRBpdkt%_LQ0LOBnQbBC!Mh5FL&NmGkh_&$-b> zA0p=qGDf@5AY8{liu!UtOkaca4^Dp(?0Bk&wB@dyxh}5XlQ8QtQ>Qo*-#0jF`bG$u z3{(pHs@zZkZ4!{|Vd%EXbCHU`h-7BPTOn@mB|QBW9EWwaT914rK2$2@z7)}G8%}ul zxp4M%kgY+s4H3eNCAE24H2iPu>V$T4$>#b4Y)q!TdiF2gIGP9|@7C1{4RRP40FES~StTPOf3S@^{Br=j1f}@&N z>!w$`+q^>uG?^eQ9_?mR9U9AXY>1Q(n>hS?eYI-EkDK__^3*3z6lmPo6KFU>$s6~F z>rBt)XOJ?PR?-(uRMZD1Mdn|G*=8Bo5OES9tCbS;Rnzq0U~4u#!!}RZd{0+>+{fCZ zM9{r(SY%MB$Wwo7%zZ!4brD)}M{4m0X%EF7Z1o{V_x0>~K7BW7 zK0!`DU(F}y(@$RxxJwU^%Y^zvJ&gB1#eBi08OAX*+Ux9{qP0C)o?skLy+#sLuPAP? zZbO^yH)U|xD}6&4j|qp^4nkJ;Mu|3#5o~l7+Q6{; z#XsDyL0e2FaPn?(iMXB4{eLI+e%T*|cPH2kS&3nM)A>0JB|cpa1{> literal 0 HcmV?d00001 diff --git a/sources b/sources index 224d95d..160a41f 100644 --- a/sources +++ b/sources @@ -1,2 +1 @@ -SHA512 (rdma-core-44.0.tar.gz) = f31c63aee415fb4aa721fdec2e4d9fb2bef964b1bea93f0170d30fb03b1e798cb11d46bb123db4b2a5002dec17ec16dc6e6aeaebe9f84517bf538dd114726ae1 -SHA512 (rxe_cfg.8.gz) = ea735d5fa8e1dbe02e1f1b70348deca7a4dc4c13218afcf62c65f1afaf8a44f3e7cdc654b62c3e9cdc35cbe113f5204ae8f296a955414d24fbb312c27353c29f +SHA512 (rdma-core-46.0.tar.gz) = 61130ae50c216d42f3483d032b2519c7d8d549bf5740cb96d1ab73d0fa2f5cbb22a0b72f0b90b7ce6cb479a1d82e23fc041338635303786524973b151ca9c230