From 4df59ccd486183082360a3bcacc015a31a7a570a Mon Sep 17 00:00:00 2001 From: Eugene Syromiatnikov Date: Fri, 1 Mar 2024 15:40:36 +0100 Subject: [PATCH] Revert upstream commit "lib: update detection of non-architectural L3CAT" --- .intel-cmt-cat.metadata | 1 + ...e-detection-of-non-architectural-L3C.patch | 68 +++++++++++++++++++ intel-cmt-cat.spec | 7 +- 3 files changed, 75 insertions(+), 1 deletion(-) create mode 100644 .intel-cmt-cat.metadata create mode 100644 0002-Revert-lib-update-detection-of-non-architectural-L3C.patch diff --git a/.intel-cmt-cat.metadata b/.intel-cmt-cat.metadata new file mode 100644 index 0000000..cb91407 --- /dev/null +++ b/.intel-cmt-cat.metadata @@ -0,0 +1 @@ +77a458ff99c6b1e8a7da76522a14f4311fbdf70f intel-cmt-cat-23.11.tar.gz diff --git a/0002-Revert-lib-update-detection-of-non-architectural-L3C.patch b/0002-Revert-lib-update-detection-of-non-architectural-L3C.patch new file mode 100644 index 0000000..710acec --- /dev/null +++ b/0002-Revert-lib-update-detection-of-non-architectural-L3C.patch @@ -0,0 +1,68 @@ +From 6546ae528c5dc50c5afceb16b946aaa949c90f87 Mon Sep 17 00:00:00 2001 +From: Eugene Syromiatnikov +Date: Fri, 1 Mar 2024 15:24:36 +0100 +Subject: [PATCH] Revert "lib: update detection of non-architectural L3CAT" + +This reverts commit 25f5155ebb5051a18c8753719b8e9f2e4246d944. +--- + lib/hw_cap.c | 28 ++++++++++++++-------------- + 1 file changed, 14 insertions(+), 14 deletions(-) + +diff --git a/lib/hw_cap.c b/lib/hw_cap.c +index 2689865..ad5a96a 100644 +--- a/lib/hw_cap.c ++++ b/lib/hw_cap.c +@@ -582,8 +582,12 @@ hw_cap_l3ca_brandstr(struct pqos_cap_l3ca *cap) + #define CPUID_LEAF_BRAND_NUM (CPUID_LEAF_BRAND_END - CPUID_LEAF_BRAND_START + 1) + #define MAX_BRAND_STRING_LEN (CPUID_LEAF_BRAND_NUM * 4 * sizeof(uint32_t)) + static const char *const supported_brands[] = { +- "E5-2658 v3", "E5-2648L v3", "E5-2628L v3", "E5-2618L v3", +- "E5-2608L v3", "E5-2658A v3", "E3-1258L v4", "E3-1278L v4"}; ++ "E5-2658 v3", "E5-2648L v3", "E5-2628L v3", "E5-2618L v3", ++ "E5-2608L v3", "E5-2658A v3", "E3-1258L v4", "E3-1278L v4", ++ /* Tiger Lake and Elkhart Lake brand strings */ ++ "i3-1115GRE", "i5-1145GRE", "i7-1185GRE", "x6212RE", "x6414RE", ++ "x6425RE", "x6427FE", "x6200FE", "W-11865MRE", "W-11865MLE", ++ "W-11555MRE", "W-11555MLE", "W-11155MRE", "W-11155MLE"}; + struct cpuid_out res; + int ret = PQOS_RETVAL_OK; + int match_found = 0; +@@ -633,6 +637,13 @@ hw_cap_l3ca_brandstr(struct pqos_cap_l3ca *cap) + LOG_WARN("Cache allocation not supported on model name '%s'!\n", + brand_str); + return PQOS_RETVAL_RESOURCE; ++ } else { ++ LOG_WARN( ++ "Detected model specific non-architectural features (L3 " ++ "CAT).\n Intel recommends validating that the feature " ++ "provides the\n performance necessary for your " ++ "use-case. Non-architectural\n features may not " ++ "behave as expected in all scenarios.\n"); + } + + /** +@@ -811,20 +822,9 @@ hw_cap_l3ca_discover(struct pqos_cap_l3ca *cap, const struct pqos_cpuinfo *cpu) + LOG_INFO("Probing msr....\n"); + ret = hw_cap_l3ca_probe(cap, cpu); + } +- if (ret == PQOS_RETVAL_OK) { ++ if (ret == PQOS_RETVAL_OK) + ret = + get_cache_info(&cpu->l3, &cap->num_ways, &l3_size); +- +- LOG_WARN("Detected model specific non-architectural " +- "features (L3 " +- "CAT).\n Intel recommends validating " +- "that the feature " +- "provides the\n performance necessary " +- "for your " +- "use-case. Non-architectural\n features " +- "may not " +- "behave as expected in all scenarios.\n"); +- } + } + + if (cap->num_ways > 0) +-- +2.13.6 + diff --git a/intel-cmt-cat.spec b/intel-cmt-cat.spec index ba01a82..e827618 100644 --- a/intel-cmt-cat.spec +++ b/intel-cmt-cat.spec @@ -38,7 +38,7 @@ Summary: Provides command line interface to CMT, MBM, CAT, CDP and MBA technologies Name: %{githubname} -Release: 1%{?dist} +Release: 2%{?dist} Version: %{githubver} License: BSD-3-Clause ExclusiveArch: x86_64 i686 i586 @@ -49,6 +49,7 @@ Source: https://github.com/intel/%{githubname}/archive/%{githubname} %endif Patch0001: 0001-allow-debian-flags-to-be-added.patch +Patch0002: 0002-Revert-lib-update-detection-of-non-architectural-L3C.patch URL: https://github.com/intel/%{githubname} BuildRequires: gcc, make @@ -206,6 +207,10 @@ install -m 0644 %{_builddir}/%{githubfull}/examples/c/PSEUDO_LOCK/tsc.h %doc %{_usrsrc}/%{githubfull}/LICENSE %changelog +* Fri Mar 01 2024 Eugene Syromiatnikov - 23.11-2 +- Revert commit "lib: update detection of non-architectural L3CAT" that removed + L3CAT detection support on Tiger Lake and Erkhart Lake CPUs (RHEL-22729) + * Mon Feb 12 2024 Eugene Syromiatnikov - 23.11-1 - Rebase to 23.11 (RHEL-22729, RHEL-25781)