pool/liburing
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 1187031 from devel:libraries:c_c++

Browse Source 
OBS-URL: https://build.opensuse.org/request/show/1187031
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/liburing?expand=0&rev=21
This commit is contained in:
Ana Guerrero 2024-07-14 06:48:43 +00:00 committed by Git OBS Bridge
commit 7c3a157816
6 changed files with 29 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
liburing-2.5.tar.bz2
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:319ff9096a5655362a9741c5145b45494db810e38679a1de82e2f440c17181a6
size 217397

BIN
liburing-2.6.tar.bz2 (Stored with Git LFS) Normal file
View File

Binary file not shown.

23
liburing.changes
View File

@ -1,3 +1,26 @@
-------------------------------------------------------------------
Fri Jun 28 08:29:55 UTC 2024 - Jiri Slaby <jslaby@suse.cz>
- Update to 2.6:
* Add getsockopt and setsockopt socket commands
* Add test cases to test/hardlink
* Man page fixes
* Add futex support, and test cases
* Add waitid support, and test cases
* Add read multishot, and test cases
* Add support for IORING_SETUP_NO_SQARRAY
* Use IORING_SETUP_NO_SQARRAY as the default
* Add support for IORING_OP_FIXED_FD_INSTALL
* Add io_uring_prep_fixed_fd_install() helper
* Support for napi busy polling
* Improve/add test cases
* Man page fixes
* Add sample 'proxy' example
- Remove (they are upstream)
* test-no-mmap-inval-0-return-is-fine-too.patch
* test-recv-multishot-wait-for-the-right-amount-of-CQE.patch
- exclude buf-ring-nommap.t test (crashes)
-------------------------------------------------------------------
Wed Apr 3 08:40:14 UTC 2024 - Jiri Slaby <jslaby@suse.cz>

7
liburing.spec
View File

@ -18,15 +18,13 @@
%define lname liburing2
Name: liburing
Version: 2.5
Version: 2.6
Release: 0
Summary: Linux-native io_uring I/O access library
License: (GPL-2.0-only AND LGPL-2.1-or-later) OR MIT
Group: Development/Libraries/C and C++
URL: https://git.kernel.dk/cgit/liburing
Source: https://git.kernel.dk/cgit/liburing/snapshot/%{name}-%{version}.tar.bz2
Patch0: test-recv-multishot-wait-for-the-right-amount-of-CQE.patch
Patch1: test-no-mmap-inval-0-return-is-fine-too.patch
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: procps
@ -88,7 +86,8 @@ sh ./configure --prefix=%{_prefix} \
# io_uring syscalls not supported as of qemu 7.0.0 and would test the host
# kernel anyway not the target kernel..
%if !0%{?qemu_user_space_build}
/usr/bin/make %{?_smp_mflags} runtests
# buf-ring-nommap.t crashes with kernel 6.9
/usr/bin/make %{?_smp_mflags} runtests TEST_EXCLUDE='buf-ring-nommap.t'
%endif
%install

30
test-no-mmap-inval-0-return-is-fine-too.patch
View File

@ -1,30 +0,0 @@
From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 7 Nov 2023 08:05:52 -0700
Subject: test/no-mmap-inval: 0 return is fine too
Git-repo: git://git.kernel.dk/liburing.git
Git-commit: 9dc95a03e4a764e42b9e62990bb00feb9307ba63
Patch-mainline: 2.6
References: test_fix
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
test/no-mmap-inval.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/no-mmap-inval.c b/test/no-mmap-inval.c
index e851078d..9571fee0 100644
--- a/test/no-mmap-inval.c
+++ b/test/no-mmap-inval.c
@@ -31,7 +31,7 @@ int main(int argc, char *argv[])
if (ret == -EINVAL) {
/* kernel doesn't support SETUP_NO_MMAP */
return T_EXIT_SKIP;
- } else if (ret != -EFAULT) {
+ } else if (ret && ret != -EFAULT) {
fprintf(stderr, "Got %d, wanted -EFAULT\n", ret);
return T_EXIT_FAIL;
}
--
2.44.0

50
test-recv-multishot-wait-for-the-right-amount-of-CQE.patch
View File

@ -1,50 +0,0 @@
From: Jens Axboe <axboe@kernel.dk>
Date: Tue, 6 Feb 2024 13:17:14 -0700
Subject: test/recv-multishot: wait for the right amount of CQEs
Git-repo: git://git.kernel.dk/liburing.git
Git-commit: a1d5e4b863a60af93d0cab9d4bbf578733337a90
Patch-mainline: 2.6
References: kernel 6.9
This test assumes that all task_work is a) has already arrived, and
b) will always be fully run even though the app asked for less, which
can lead to premature checking of CQEs and hitting end-of-CQEs before
it should.
Fix it up to wait for what it needs.
Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Jiri Slaby <jslaby@suse.cz>
---
test/recv-multishot.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/test/recv-multishot.c b/test/recv-multishot.c
index f66f1319..39983e8d 100644
--- a/test/recv-multishot.c
+++ b/test/recv-multishot.c
@@ -57,7 +57,7 @@ static int test(struct args *args)
int const N = 8;
int const N_BUFFS = N * 64;
int const N_CQE_OVERFLOW = 4;
- int const min_cqes = 2;
+ int const min_cqes = args->early_error ? 2 : 8;
int const NAME_LEN = sizeof(struct sockaddr_storage);
int const CONTROL_LEN = CMSG_ALIGN(sizeof(struct sockaddr_storage))
+ sizeof(struct cmsghdr);
@@ -237,7 +237,11 @@ static int test(struct args *args)
usleep(1000);
if ((args->stream && !early_error) || recv_cqes < min_cqes) {
- ret = io_uring_wait_cqes(&ring, &cqe, 1, &timeout, NULL);
+ unsigned int to_wait = 1;
+
+ if (recv_cqes < min_cqes)
+ to_wait = min_cqes - recv_cqes;
+ ret = io_uring_wait_cqes(&ring, &cqe, to_wait, &timeout, NULL);
if (ret && ret != -ETIME) {
fprintf(stderr, "wait final failed: %d\n", ret);
ret = -1;
--
2.44.0