From a33cfc1caa46f39964a33aff817f671bd1701d5d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Tue, 7 Dec 2021 14:26:37 -0500 Subject: [PATCH] import accel-config-3.4.2-1.el9 --- .accel-config.metadata | 2 +- .gitignore | 2 +- ...g-clean-up-double-frees-in-add_group.patch | 34 +++++++++++++++++++ ...emove-redundant-assignment-in-umwait.patch | 27 +++++++++++++++ SPECS/accel-config.spec | 27 ++++++++++++--- 5 files changed, 86 insertions(+), 6 deletions(-) create mode 100644 SOURCES/0001-accel-config-clean-up-double-frees-in-add_group.patch create mode 100644 SOURCES/0003-accel-config-remove-redundant-assignment-in-umwait.patch diff --git a/.accel-config.metadata b/.accel-config.metadata index 7356309..5b8780c 100644 --- a/.accel-config.metadata +++ b/.accel-config.metadata @@ -1 +1 @@ -04bcd4aeff036c903e9d241095a9096fa6223502 SOURCES/accel-config-v3.2.tar.gz +123eb9366ba96580e4795e47f0742551d50cbf53 SOURCES/accel-config-v3.4.2.tar.gz diff --git a/.gitignore b/.gitignore index 0cb138f..097b374 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/accel-config-v3.2.tar.gz +SOURCES/accel-config-v3.4.2.tar.gz diff --git a/SOURCES/0001-accel-config-clean-up-double-frees-in-add_group.patch b/SOURCES/0001-accel-config-clean-up-double-frees-in-add_group.patch new file mode 100644 index 0000000..876b1ac --- /dev/null +++ b/SOURCES/0001-accel-config-clean-up-double-frees-in-add_group.patch @@ -0,0 +1,34 @@ +From a073b40ea293dec87af5f887bb90744ed244e0c9 Mon Sep 17 00:00:00 2001 +From: Jerry Snitselaar +Date: Mon, 18 Oct 2021 15:10:00 -0700 +Subject: [PATCH 1/3] accel-config: clean up double frees in add_group + +free(group) is called after jumping to the err_group label, +so don't call free(group) in paths jumping there. + +Signed-off-by: Jerry Snitselaar +--- + accfg/lib/libaccfg.c | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/accfg/lib/libaccfg.c b/accfg/lib/libaccfg.c +index f4fc17e5ca93..a13be34a7ef5 100644 +--- a/accfg/lib/libaccfg.c ++++ b/accfg/lib/libaccfg.c +@@ -870,13 +870,11 @@ static void *add_group(void *parent, int id, const char *group_base, + group_base_string = strdup(group_base); + if (!group_base_string) { + err(ctx, "conversion of group_base_string failed\n"); +- free(group); + close(dfd); + goto err_group; + } + if (sscanf(basename(group_base_string), + "group%" SCNu64 ".%" SCNu64, &device_id, &group_id) != 2) { +- free(group); + close(dfd); + goto err_group; + } +-- +2.33.0 + diff --git a/SOURCES/0003-accel-config-remove-redundant-assignment-in-umwait.patch b/SOURCES/0003-accel-config-remove-redundant-assignment-in-umwait.patch new file mode 100644 index 0000000..2045397 --- /dev/null +++ b/SOURCES/0003-accel-config-remove-redundant-assignment-in-umwait.patch @@ -0,0 +1,27 @@ +From dc03a40adfaaded6c3e2d9bb0bff2218b187daae Mon Sep 17 00:00:00 2001 +From: Jerry Snitselaar +Date: Mon, 18 Oct 2021 15:47:27 -0700 +Subject: [PATCH 3/3] accel-config: remove redundant assignment in umwait + +Signed-off-by: Jerry Snitselaar +--- + test/dsa.c | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/test/dsa.c b/test/dsa.c +index 5396b1b97d3a..961f5a73990e 100644 +--- a/test/dsa.c ++++ b/test/dsa.c +@@ -393,9 +393,6 @@ static inline int umwait(unsigned long timeout, unsigned int state) + uint32_t timeout_low = (uint32_t)timeout; + uint32_t timeout_high = (uint32_t)(timeout >> 32); + +- timeout_low = (uint32_t)timeout; +- timeout_high = (uint32_t)(timeout >> 32); +- + asm volatile(".byte 0xf2, 0x48, 0x0f, 0xae, 0xf1\t\n" + "setc %0\t\n" + : "=r"(r) +-- +2.33.0 + diff --git a/SPECS/accel-config.spec b/SPECS/accel-config.spec index 2e96faa..f22378b 100644 --- a/SPECS/accel-config.spec +++ b/SPECS/accel-config.spec @@ -2,8 +2,8 @@ %global debug_package %{nil} Name: accel-config -Version: 3.2 -Release: 3%{?dist} +Version: 3.4.2 +Release: 1%{?dist} Summary: Configure accelerator subsystem devices # The entire source code is under GPLv2 except for accel-config # library which is mostly LGPLv2.1, ccan/list which is BSD-MIT and @@ -11,6 +11,8 @@ Summary: Configure accelerator subsystem devices License: GPLv2 and LGPLv2+ and MIT and CC0 URL: https://github.com/intel/%{project_name} Source0: %{URL}/archive/%{name}-v%{version}.tar.gz +Patch0: 0001-accel-config-clean-up-double-frees-in-add_group.patch +Patch1: 0003-accel-config-remove-redundant-assignment-in-umwait.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} BuildRequires: gcc @@ -54,13 +56,21 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description libs Libraries for %{name}. +%package test +Summary: Tests for accel-config +License: GPLv2 +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description test +Tests for accel-config command. + %prep -%autosetup -n %{project_name}-%{name}-v%{version} +%autosetup -p1 -n %{project_name}-%{name}-v%{version} %build echo %{version} > version ./autogen.sh -%configure --disable-static --disable-silent-rules +%configure --disable-static --disable-silent-rules --enable-test=yes %make_build %install @@ -89,7 +99,16 @@ make check %{_libdir}/lib%{name}.so %{_libdir}/pkgconfig/lib%{name}.pc +%files test +%license Documentation/COPYING LICENSE_GPL_2_0 +%doc test/README.md +%{_datadir}/accel-config/test/* + %changelog +* Tue Oct 05 2021 Jerry Snitselaar - 3.4.2-1 +- Rebase to 3.4.2 release and add test subpackage. +Resolves: rhbz#1999934 + * Mon Aug 09 2021 Mohan Boddu - 3.2-3 - Rebuilt for IMA sigs, glibc 2.34, aarch64 flags Related: rhbz#1991688