rpms
/
accel-config
7
0
Fork 0
Code Issues Pull Requests Releases Activity

import accel-config-3.4.6.3-1.el8

This commit is contained in:
CentOS Sources 2022-11-08 01:54:42 -05:00 committed by root
parent f8df2ee7a7
commit a9d9060563
6 changed files with 17 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.accel-config.metadata
View File

@ -1 +1 @@
123eb9366ba96580e4795e47f0742551d50cbf53 SOURCES/accel-config-v3.4.2.tar.gz
21e70c79f2e53c5cdbc941390f14b020f286a36d SOURCES/accel-config-v3.4.6.3.tar.gz

2
.gitignore vendored
View File

@ -1 +1 @@
SOURCES/accel-config-v3.4.2.tar.gz
SOURCES/accel-config-v3.4.6.3.tar.gz

34
SOURCES/0001-accel-config-clean-up-double-frees-in-add_group.patch
View File

@ -1,34 +0,0 @@
From a073b40ea293dec87af5f887bb90744ed244e0c9 Mon Sep 17 00:00:00 2001
From: Jerry Snitselaar <jsnitsel@redhat.com>
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 <jsnitsel@redhat.com>
---
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

16
SOURCES/0001-testing-vercheck.patch
View File

@ -1,6 +1,6 @@
diff -ur idxd-config-accel-config-v3.4.2/test/dsa_user_test_runner.sh idxd-config-accel-config-v3.4.2-new/test/dsa_user_test_runner.sh
--- idxd-config-accel-config-v3.4.2/test/dsa_user_test_runner.sh 2021-09-28 16:03:05.000000000 -0700
+++ idxd-config-accel-config-v3.4.2-new/test/dsa_user_test_runner.sh 2021-10-13 08:26:34.098233734 -0700
diff -ur idxd-config-accel-config-v3.4.6.2/test/dsa_user_test_runner.sh idxd-config-accel-config-v3.4.6.2-new/test/dsa_user_test_runner.sh
--- idxd-config-accel-config-v3.4.6.2/test/dsa_user_test_runner.sh 2022-03-22 16:13:44.000000000 -0700
+++ idxd-config-accel-config-v3.4.6.2-new/test/dsa_user_test_runner.sh 2022-04-04 22:36:15.080120329 -0700
@@ -14,7 +14,7 @@
[ ! -f "$DSATEST" ] && echo "fail: $LINENO" && exit 1
@ -10,12 +10,12 @@ diff -ur idxd-config-accel-config-v3.4.2/test/dsa_user_test_runner.sh idxd-confi
# skip if no pasid support as dsa_test does not support operation w/o pasid yet.
[ ! -f "/sys/bus/dsa/devices/$DSA/pasid_enabled" ] && echo "No SVM support" && exit "$EXIT_SKIP"
diff -ur idxd-config-accel-config-v3.4.2/test/libaccfg.c idxd-config-accel-config-v3.4.2-new/test/libaccfg.c
--- idxd-config-accel-config-v3.4.2/test/libaccfg.c 2021-09-28 16:03:05.000000000 -0700
+++ idxd-config-accel-config-v3.4.2-new/test/libaccfg.c 2021-10-13 08:27:08.099387351 -0700
@@ -1003,7 +1003,7 @@
struct kmod_module *mod, *mdev_mod;
diff -ur idxd-config-accel-config-v3.4.6.2/test/libaccfg.c idxd-config-accel-config-v3.4.6.2-new/test/libaccfg.c
--- idxd-config-accel-config-v3.4.6.2/test/libaccfg.c 2022-03-22 16:13:44.000000000 -0700
+++ idxd-config-accel-config-v3.4.6.2-new/test/libaccfg.c 2022-04-04 22:36:26.861224525 -0700
@@ -966,7 +966,7 @@
struct accfg_device *device;
struct log_ctx log_ctx;
- if (!accfg_test_attempt(test, KERNEL_VERSION(5, 6, 0)))
+ if (!accfg_test_attempt(test, KERNEL_VERSION(4, 18, 0)))

27
SOURCES/0003-accel-config-remove-redundant-assignment-in-umwait.patch
View File

@ -1,27 +0,0 @@
From dc03a40adfaaded6c3e2d9bb0bff2218b187daae Mon Sep 17 00:00:00 2001
From: Jerry Snitselaar <jsnitsel@redhat.com>
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 <jsnitsel@redhat.com>
---
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

11
SPECS/accel-config.spec
View File

@ -1,7 +1,7 @@
%global project_name idxd-config
Name: accel-config
Version: 3.4.2
Version: 3.4.6.3
Release: 1%{?dist}
Summary: Configure accelerator subsystem devices
# The entire source code is under GPLv2 except for accel-config
@ -11,8 +11,6 @@ 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-testing-vercheck.patch
Patch1: 0001-accel-config-clean-up-double-frees-in-add_group.patch
Patch2: 0003-accel-config-remove-redundant-assignment-in-umwait.patch
Requires: %{name}-libs%{?_isa} = %{version}-%{release}
BuildRequires: gcc
@ -85,6 +83,7 @@ make check
%{_bindir}/%{name}
%{_mandir}/man1/%{name}*
%{_sysconfdir}/%{name}/%{name}.conf.sample
%{_datadir}/%{name}/contrib/*
%files libs
%doc README.md
@ -101,9 +100,13 @@ make check
%files test
%license Documentation/COPYING LICENSE_GPL_2_0
#%doc test/README.md
%{_datadir}/accel-config/test/*
%{_datadir}/%{name}/test/*
%changelog
* Sun Apr 03 2022 Jerry Snitselaar <jsnitsel@redhat.com> - 3.4.6.3-1
- Rebase to 3.4.6.3 release.
resolves: rhbz#2040076
* Thu Sep 09 2021 Jerry Snitselaar <jsnitsel@redhat.com> - 3.4.2-1
- Rebase to 3.4.2 and add test subpackage.
resolves: rhbz#1971910