diff --git a/0001-accel-config-test-Fix-drain-descriptor-readback-addr.patch b/0001-accel-config-test-Fix-drain-descriptor-readback-addr.patch deleted file mode 100644 index 750cbf5914878359c76df3b8c34bdcb8a5a2d7c1..0000000000000000000000000000000000000000 --- a/0001-accel-config-test-Fix-drain-descriptor-readback-addr.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 4bafcd44652f95d22eb936d7b84f40392b0c022a Mon Sep 17 00:00:00 2001 -From: Tony Zhu -Date: Wed, 23 Nov 2022 15:36:11 +0800 -Subject: [PATCH] accel-config/test: Fix drain descriptor readback address - assignment - -Drain operation flag bit 16 and 17 are not set, so don't need to set the -valid source and destination address. - -Signed-off-by: Tony Zhu ---- - test/dsa_prep.c | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/test/dsa_prep.c b/test/dsa_prep.c -index d5e1ced..020ab1f 100644 ---- a/test/dsa_prep.c -+++ b/test/dsa_prep.c -@@ -29,8 +29,8 @@ void dsa_prep_drain(struct task *tsk) - if (tsk->opcode == DSA_OPCODE_MEMMOVE) - tsk->opcode = DSA_OPCODE_DRAIN; - -- acctest_prep_desc_common(tsk->desc, tsk->opcode, (uint64_t)(tsk->dst1), -- (uint64_t)(tsk->src1), 0, tsk->dflags); -+ acctest_prep_desc_common(tsk->desc, tsk->opcode, 0, -+ 0, 0, tsk->dflags); - tsk->desc->completion_addr = (uint64_t)(tsk->comp); - tsk->comp->status = 0; - } --- -2.31.1 - diff --git a/0002-fix-problem-for-k8s-use.patch b/1000-fix-problem-for-k8s-use.patch similarity index 32% rename from 0002-fix-problem-for-k8s-use.patch rename to 1000-fix-problem-for-k8s-use.patch index 8199bc7efd772b5a4a392a8e3fe822e7d0cf1d76..027ae2cf7e2f5baa77cce4bd7cfca7fb13f438b6 100644 --- a/0002-fix-problem-for-k8s-use.patch +++ b/1000-fix-problem-for-k8s-use.patch @@ -1,39 +1,18 @@ -From 99db9e5a1178ad8efd6468417ed801dbbec11067 Mon Sep 17 00:00:00 2001 -From: Xingrui Yi -Date: Fri, 22 Sep 2023 14:53:55 +0800 +From cc199aedb12d6c001a6f2c05fdbd4cbcf8597a23 Mon Sep 17 00:00:00 2001 +From: Zhao Hang +Date: Mon, 17 Feb 2025 15:49:21 +0800 Subject: [PATCH] fix problem for k8s use -Signed-off-by: Xingrui Yi +Signed-off-by: Zhao Hang --- - accfg/lib/libaccfg.c | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) + accfg/lib/libaccfg.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/accfg/lib/libaccfg.c b/accfg/lib/libaccfg.c -index ee6d1a4..438011f 100644 +index 9442533..1099152 100644 --- a/accfg/lib/libaccfg.c +++ b/accfg/lib/libaccfg.c -@@ -634,13 +634,13 @@ static void *add_device(void *parent, int id, const char *ctl_base, - return NULL; - } - -- rc = accfg_set_param(ctx, dfd, "cmd_status", "1", 1); -- /* older drivers don't support writing to cmd_status */ -- if (rc && rc != -EACCES) { -- err(ctx, "Failed resetting cmd status %d\n", rc); -- close(dfd); -- goto err_device; -- } -+// rc = accfg_set_param(ctx, dfd, "cmd_status", "1", 1); -+// /* older drivers don't support writing to cmd_status */ -+// if (rc && rc != -EACCES) { -+// err(ctx, "Failed resetting cmd status %d\n", rc); -+// close(dfd); -+// goto err_device; -+// } - - device = calloc(1, sizeof(*device)); - if (!device) { -@@ -2319,9 +2319,9 @@ ACCFG_EXPORT int accfg_wq_get_user_dev_path(struct accfg_wq *wq, char *buf, +@@ -2242,9 +2242,9 @@ ACCFG_EXPORT int accfg_wq_get_user_dev_path(struct accfg_wq *wq, char *buf, } if (n < 0) { @@ -47,5 +26,5 @@ index ee6d1a4..438011f 100644 goto ext_uacce; } -- -2.31.1 +2.43.0 diff --git a/accel-config-v3.5.1.tar.gz b/accel-config-v3.5.1.tar.gz deleted file mode 100644 index 9a7b185edf6d3e03ac6727845c3487b0dc937b35..0000000000000000000000000000000000000000 Binary files a/accel-config-v3.5.1.tar.gz and /dev/null differ diff --git a/accel-config-v4.1.8.tar.gz b/accel-config-v4.1.8.tar.gz new file mode 100644 index 0000000000000000000000000000000000000000..20d3cf948c98e8ed96b8e2a04848dca5a3105f37 Binary files /dev/null and b/accel-config-v4.1.8.tar.gz differ diff --git a/accel-config.spec b/accel-config.spec index 6cba87d88874f5ccfc9f250158c4f67c7d096bd7..b11d03b87e628934b26678b40dc6de86690b0f6e 100644 --- a/accel-config.spec +++ b/accel-config.spec @@ -1,28 +1,33 @@ -%define anolis_release 4 +%define anolis_release 1 +%global project_name idxd-config + Name: accel-config -Version: 3.5.1 +Version: 4.1.8 Release: %{anolis_release}%{?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 -Group: System Environment/Base -Source0: https://github.com/intel/idxd-config/archive/refs/tags/%{name}-v%{version}.tar.gz - -Patch1: 0001-accel-config-test-Fix-drain-descriptor-readback-addr.patch -Patch2: 0002-fix-problem-for-k8s-use.patch +License: GPL-2.0-only +URL: https://github.com/intel/%{project_name} +Source0: %{URL}/archive/%{name}-v%{version}.tar.gz +Patch1: 1000-fix-problem-for-k8s-use.patch -Requires: %{name}-libs = %{version}-%{release} +Requires: %{name}-libs%{?_isa} = %{version}-%{release} +BuildRequires: gcc BuildRequires: xmlto BuildRequires: libtool +BuildRequires: openssl-devel BuildRequires: systemd BuildRequires: asciidoc BuildRequires: pkgconfig +BuildRequires: pkgconfig(libkmod) BuildRequires: pkgconfig(uuid) BuildRequires: pkgconfig(json-c) -BuildRequires: autoconf automake -ExclusiveArch: x86_64 loongarch64 +BuildRequires: pkgconfig(libudev) +BuildRequires: pkgconfig(zlib) +BuildRequires: autoconf + +# accel-config is for configuring Intel DSA (Data-Streaming +# Accelerator) subsystem in the Linux kernel. It supports x86_64 only. +ExclusiveArch: %{ix86} x86_64 %description Accel-config is an open-source utility library for controlling and configuring @@ -65,15 +70,20 @@ optimize performance for their specific use case. %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.1and MIT and CC0 -Group: System Environment/Libraries -Requires: %{name} = %{version}-%{release} +License: LGPL-2.1-only +Requires: %{name}%{?_isa} = %{version}-%{release} %description libs Libraries for %{name}. +%package test +Summary: Tests for accel-config +License: GPL-2.0-only +Requires: %{name}-libs%{?_isa} = %{version}-%{release} + +%description test +Tests for accel-config command. + %package devel Summary: Development files for libaccfg License: LGPLv2.1 @@ -84,7 +94,6 @@ Requires: %{name}-libs = %{version}-%{release} The %{name}-devel package contains libraries and header files for developing applications that use %{name}. - %package doc Summary: Documentation files for %{name} Requires: %{name} = %{version}-%{release} @@ -99,7 +108,7 @@ The %{name}-doc package contains documentation files for %{name} %build echo %{version} > version ./autogen.sh -%configure --disable-static --disable-silent-rules +%configure --disable-static --disable-silent-rules --enable-test %make_build %install @@ -112,34 +121,40 @@ find $RPM_BUILD_ROOT -name '*.la' -exec rm -f {} ';' make check %files -%defattr(-,root,root) %dir %{abidir} -%{_bindir}/accel-config -%{_mandir}/man1/accel-config* +%{_bindir}/%{name} %{abidir}/libaccel-config.dump -%{_sysconfdir}/accel-config/contrib/configs/* %license licenses/accel-config-licenses LICENSE_GPL_2_0 %license Documentation/COPYING licenses/BSD-MIT licenses/CC0 +%{_mandir}/man1/%{name}* +%{_sysconfdir}/%{name}/contrib/configs/* %files libs -%defattr(-,root,root) -%{_libdir}/libaccel-config.so.* %license Documentation/COPYING licenses/BSD-MIT licenses/CC0 -%license licenses/libaccel-config-licenses accfg/lib/LICENSE_LGPL_2_1 +%license licenses/accel-config-licenses accfg/lib/LICENSE_LGPL_2_1 +%{_libdir}/lib%{name}.so.* %files devel -%defattr(-,root,root) -%{_includedir}/accel-config/ -%{_libdir}/libaccel-config.so -%{_libdir}/pkgconfig/libaccel-config.pc +%{_includedir}/%{name}/ +%{_libdir}/lib%{name}.so +%{_libdir}/pkgconfig/lib%{name}.pc %license Documentation/COPYING +%files test +%license Documentation/COPYING LICENSE_GPL_2_0 +%doc test/README.md +%{_libexecdir}/accel-config/test/* + %files doc %doc README.md %doc Documentation/accfg/a* %doc Documentation/manpage-base.xsl Documentation/manpage-normal.xsl %changelog +* Mon Feb 17 2025 Zhao Hang - 4.1.8-1 +- Refer to CentOS Stream accel-config-4.1.8-2 (tdawson@redhat.com) +- Update some description (xuchun.shang@linux.alibaba.com) + * Mon Sep 25 2023 Wenlong Zhang - 3.5.1-4 - Add loongarch64 support