diff --git a/.gitignore b/.gitignore index 31596e9..108731a 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/perftest-4.5-0.20.gac7cca5.tar.gz +SOURCES/perftest-23.04.0-0.23.g63e250f.tar.gz diff --git a/.perftest.metadata b/.perftest.metadata index d378329..fdaefa4 100644 --- a/.perftest.metadata +++ b/.perftest.metadata @@ -1 +1 @@ -b8180b8e6117f1db9b7127c8a5295f4a5dfdb004 SOURCES/perftest-4.5-0.20.gac7cca5.tar.gz +6243a2bc3a506c8e2b2f738f1b63c53f0368c854 SOURCES/perftest-23.04.0-0.23.g63e250f.tar.gz diff --git a/SOURCES/0001-perftest-Add-Intel-device-names-and-inline-data-size.patch b/SOURCES/0001-perftest-Add-Intel-device-names-and-inline-data-size.patch new file mode 100644 index 0000000..98cb39e --- /dev/null +++ b/SOURCES/0001-perftest-Add-Intel-device-names-and-inline-data-size.patch @@ -0,0 +1,76 @@ +From 73f7d86b37a0b0d4e731ef62047f2ad2ba2a111f Mon Sep 17 00:00:00 2001 +From: Tatyana Nikolova +Date: Mon, 13 Mar 2023 21:40:04 -0500 +Subject: [PATCH] perftest: Add Intel device names and inline data sizes + +Add two Intel devices and their corresponding +inline data sizes. + +Signed-off-by: Tatyana Nikolova +Signed-off-by: Kamal Heib +--- + src/perftest_parameters.c | 12 ++++++++++-- + src/perftest_parameters.h | 3 ++- + 2 files changed, 12 insertions(+), 3 deletions(-) + +diff --git a/src/perftest_parameters.c b/src/perftest_parameters.c +index a587df3beb06..6b87621cea0e 100755 +--- a/src/perftest_parameters.c ++++ b/src/perftest_parameters.c +@@ -1794,7 +1794,11 @@ enum ctx_device ib_dev_name(struct ibv_context *context) + If you want Inline support in other vendor devices, please send patch to gilr@dev.mellanox.co.il + */ + } else if (attr.vendor_id == 0x8086) { +- dev_fname = INTEL_ALL; ++ switch (attr.vendor_part_id) { ++ case 14289 : dev_fname = INTEL_GEN1; break; ++ case 5522 : dev_fname = INTEL_GEN2; break; ++ default : dev_fname = INTEL_GEN2; break; ++ } + } else { + + //coverity[uninit_use] +@@ -2080,7 +2084,7 @@ static void ctx_set_max_inline(struct ibv_context *context,struct perftest_param + return; + } + #endif +- if (user_param->tst ==LAT) { ++ if (user_param->tst == LAT) { + switch(user_param->verb) { + case WRITE: user_param->inline_size = (user_param->connection_type == DC)? DEF_INLINE_DC : DEF_INLINE_WRITE; break; + case SEND : user_param->inline_size = (user_param->connection_type == DC)? DEF_INLINE_DC : (user_param->connection_type == UD)? DEF_INLINE_SEND_UD : +@@ -2097,6 +2101,10 @@ static void ctx_set_max_inline(struct ibv_context *context,struct perftest_param + user_param->inline_size = 96; + else if (current_dev == HNS) + user_param->inline_size = 32; ++ else if (current_dev == INTEL_GEN1) ++ user_param->inline_size = 48; ++ else if (current_dev == INTEL_GEN2) ++ user_param->inline_size = 101; + + } else { + user_param->inline_size = 0; +diff --git a/src/perftest_parameters.h b/src/perftest_parameters.h +index f2080fad0b6d..2f846f78f1c2 100755 +--- a/src/perftest_parameters.h ++++ b/src/perftest_parameters.h +@@ -373,7 +373,7 @@ enum ctx_device { + MLX5GENVF = 19, + BLUEFIELD = 20, + BLUEFIELD2 = 21, +- INTEL_ALL = 22, ++ INTEL_GEN1 = 22, + NETXTREME = 23, + EFA = 24, + CONNECTX6LX = 25, +@@ -383,6 +383,7 @@ enum ctx_device { + ERDMA = 29, + HNS = 30, + CONNECTX8 = 31, ++ INTEL_GEN2 = 32, + }; + + /* Units for rate limiter */ +-- +2.41.0 + diff --git a/SPECS/perftest.spec b/SPECS/perftest.spec index 853d857..050fcb9 100644 --- a/SPECS/perftest.spec +++ b/SPECS/perftest.spec @@ -3,13 +3,14 @@ Summary: IB Performance Tests # Upstream uses a dash in the version. Not valid in the Version field, so we use a dot instead. # Issue "Please avoid dashes in version": # https://github.com/linux-rdma/perftest/issues/18 -%global upstream_ver 4.5-0.20 +%global upstream_ver 23.04.0-0.23 Version: %{lua: print((string.gsub(rpm.expand("%{upstream_ver}"),"-",".")))} -Release: 4%{?dist} +Release: 2%{?dist} License: GPLv2 or BSD -Source: https://github.com/linux-rdma/perftest/releases/download/v4.5-0.20/perftest-4.5-0.20.gac7cca5.tar.gz +Source: https://github.com/linux-rdma/perftest/releases/download/23.04.0-0.23/perftest-23.04.0-0.23.g63e250f.tar.gz Source1: ib_atomic_bw.1 Url: https://github.com/linux-rdma/perftest +Patch01: 0001-perftest-Add-Intel-device-names-and-inline-data-size.patch BuildRequires: make BuildRequires: gcc @@ -31,6 +32,7 @@ RDMA networks. %setup -q -n %{name}-%{tarball_ver} find src -type f -iname '*.[ch]' -exec chmod a-x '{}' ';' +%patch01 -p1 %build %configure @@ -55,6 +57,15 @@ popd %_bindir/* %changelog +* Tue Jul 18 2023 Kamal Heib - 23.04.0.0.23-2 +- Add missing Intel Parameters +- Resolves: rhbz#2211464 + +* Mon Jun 05 2023 Kamal Heib - 23.04.0.0.23-1 +- Update to upstream release 23.04.0.0.23 +- Add gating tests +- Resolves: rhbz#2212517 + * Wed Feb 08 2023 Michal Schmidt - 4.5.0.20-4 - Rebase to upstream version 4.5-0.20 - Resolves: rhbz#2168109