From b6222ef47b1ccf7f9a3f89208f0c30b3b5953411 Mon Sep 17 00:00:00 2001 From: eabdullin Date: Wed, 15 May 2024 07:05:45 +0000 Subject: [PATCH] Import from AlmaLinux stable repository --- .accel-config.metadata | 2 +- .gitignore | 2 +- ...t-only-configure-ats_disable-if-supp.patch | 54 +++++++++++++++++++ SPECS/accel-config.spec | 41 +++++++++----- 4 files changed, 83 insertions(+), 16 deletions(-) create mode 100644 SOURCES/0001-accel-config-test-only-configure-ats_disable-if-supp.patch diff --git a/.accel-config.metadata b/.accel-config.metadata index d539016..52b57df 100644 --- a/.accel-config.metadata +++ b/.accel-config.metadata @@ -1 +1 @@ -c2571f89e855e1054a078a4dfee1d7d6feefb7e5 SOURCES/accel-config-v3.5.0.tar.gz +786db2f554f1f092ababc722bfa5ffdec12ac15f SOURCES/accel-config-v4.1.3.tar.gz diff --git a/.gitignore b/.gitignore index 7b5083c..1be304e 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1 @@ -SOURCES/accel-config-v3.5.0.tar.gz +SOURCES/accel-config-v4.1.3.tar.gz diff --git a/SOURCES/0001-accel-config-test-only-configure-ats_disable-if-supp.patch b/SOURCES/0001-accel-config-test-only-configure-ats_disable-if-supp.patch new file mode 100644 index 0000000..fca77b2 --- /dev/null +++ b/SOURCES/0001-accel-config-test-only-configure-ats_disable-if-supp.patch @@ -0,0 +1,54 @@ +From bcc6e90baa61434568e8225a7fcdc070610dae46 Mon Sep 17 00:00:00 2001 +From: Jerry Snitselaar +Date: Thu, 30 Nov 2023 14:58:06 -0700 +Subject: [PATCH] accel-config/test: only configure ats_disable if supported +'Content-type: text/plain' + +Upstream Status: RHEL-only + +Don't try to configure ats_disable if it isn't supported. +Temporary work around until there is a complete upstream +solution, and we don't ship the testing bits just use +them for test. + +Signed-off-by: Jerry Snitselaar +--- + test/libaccfg.c | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +diff --git a/test/libaccfg.c b/test/libaccfg.c +index bfe277b996cf..4a580b2bb02e 100644 +--- a/test/libaccfg.c ++++ b/test/libaccfg.c +@@ -240,7 +240,9 @@ static int config_wq(struct accfg_ctx *ctx, struct accfg_device *device, + if (wq_param->threshold) + SET_ERR(rc, accfg_wq_set_threshold(wq, wq_param->threshold)); + +- SET_ERR(rc, accfg_wq_set_ats_disable(wq, wq_param->ats_disable)); ++ if (accfg_wq_get_ats_disable(wq) >= 0) { ++ SET_ERR(rc, accfg_wq_set_ats_disable(wq, wq_param->ats_disable)); ++ } + /* Don't fail test if per wq ats disable is not supported */ + if (rc == -EOPNOTSUPP) + rc = 0; +@@ -251,6 +253,7 @@ static int config_wq(struct accfg_ctx *ctx, struct accfg_device *device, + static int check_wq(struct accfg_ctx *ctx, struct accfg_device *device, + struct accfg_wq *wq, struct wq_parameters *wq_param) + { ++ int ats_disable = 0; + + if (wq_param->wq_size != accfg_wq_get_size(wq)) { + fprintf(stderr, "%s failed on wq_size\n", __func__); +@@ -290,7 +293,8 @@ static int check_wq(struct accfg_ctx *ctx, struct accfg_device *device, + fprintf(stderr, "%s failed on wq name\n", __func__); + return -EINVAL; + } +- if (wq_param->ats_disable != accfg_wq_get_ats_disable(wq)) { ++ ats_disable = accfg_wq_get_ats_disable(wq); ++ if (ats_disable >= 0 && (wq_param->ats_disable != ats_disable)) { + fprintf(stderr, "%s failed on ats_disable\n", __func__); + return -EINVAL; + } +-- +2.41.0 + diff --git a/SPECS/accel-config.spec b/SPECS/accel-config.spec index 806b5a8..867cad9 100644 --- a/SPECS/accel-config.spec +++ b/SPECS/accel-config.spec @@ -1,16 +1,13 @@ %global project_name idxd-config -%global debug_package %{nil} Name: accel-config -Version: 3.5.0 -Release: 1%{?dist} +Version: 4.1.3 +Release: 2%{?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 -# the rest of ccan which is CC0. -License: GPLv2 and LGPLv2+ and MIT and CC0 +License: GPL-2.0-only URL: https://github.com/intel/%{project_name} Source0: %{URL}/archive/%{name}-v%{version}.tar.gz +Patch0: 0001-accel-config-test-only-configure-ats_disable-if-supp.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} BuildRequires: gcc @@ -19,6 +16,7 @@ BuildRequires: asciidoc BuildRequires: xmlto BuildRequires: automake BuildRequires: libtool +BuildRequires: openssl-devel BuildRequires: pkgconfig BuildRequires: pkgconfig(libkmod) BuildRequires: pkgconfig(uuid) @@ -37,7 +35,7 @@ Utility library for configuring the accelerator subsystem. %package devel Summary: Development files for libaccfg -License: LGPLv2+ +License: LGPL-2.1-only Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description devel @@ -47,9 +45,7 @@ developing applications that use %{name}. %package libs Summary: Configuration library for accelerator subsystem devices -# All source code of configuration library is LGPLv2.1, except -# ccan/list which is BSD-MIT and the rest of ccan/ which is CC0. -License: LGPLv2+ and MIT and CC0 +License: LGPL-2.1-only Requires: %{name}%{?_isa} = %{version}-%{release} %description libs @@ -57,7 +53,7 @@ Libraries for %{name}. %package test Summary: Tests for accel-config -License: GPLv2 +License: GPL-2.0-only Requires: %{name}-libs%{?_isa} = %{version}-%{release} %description test @@ -101,10 +97,27 @@ make check %files test %license Documentation/COPYING LICENSE_GPL_2_0 %doc test/README.md -%{_prefix}/lib/accel-config/test/* +%{_libexecdir}/accel-config/test/* %changelog -* Tue Oct 04 2022 Jerry Snitselaar - 3.4.8-1 +* Wed Jan 17 2024 Jerry Snitselaar - 4.1.3-2 +- Fix SPDX tags +Resolves: RHEL-15610 + +* Fri Dec 01 2023 Jerry Snitselaar - 4.1.3-1 +- Rebase to 4.1.3 release +- Update License tags to SPDX identifiers +Resolves: RHEL-15610 + +* Tue Apr 18 2023 Jerry Snitselaar - 3.5.3-2 +- Remove spec file variable that blocked debuginfo build +Resolves: rhz#2153899 + +* Tue Apr 18 2023 Jerry Snitselaar - 3.5.3-1 +- Rebase to the 3.5.3 release. +Resolves: rhbz#2153899 + +* Tue Oct 04 2022 Jerry Snitselaar - 3.5.0-1 - Rebase to 3.5.0 release. Resolves: rhbz#2101609