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

Accepting request 1080969 from devel:libraries:c_c++

Browse Source 
- Add 0001-test-file-verify.t-Don-t-run-over-mlock-limit-when-r.patch
  fixes test with kernel <= 5.16 (bsc#1209723)

OBS-URL: https://build.opensuse.org/request/show/1080969
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/liburing?expand=0&rev=15
This commit is contained in:
Dominique Leuenberger 2023-04-22 19:56:42 +00:00 committed by Git OBS Bridge
commit 2078fce892
3 changed files with 53 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
0001-test-file-verify.t-Don-t-run-over-mlock-limit-when-r.patch Normal file
View File

@ -0,0 +1,46 @@
From 87943e896268efbe85e15f7e59f45a042d2ba8f7 Mon Sep 17 00:00:00 2001
From: Gabriel Krisman Bertazi <krisman@suse.de>
Date: Thu, 20 Apr 2023 14:23:55 -0400
Subject: [PATCH] test/file-verify.t: Don't run over mlock limit when run as
non-root
test/file-verify tries to get 2MB of pinned memory at once, which is
higher than the default allowed for non-root users in older
kernels (64kb before v5.16, nowadays 8mb). Skip the test for non-root
users if the registration fails instead of failing the test.
Signed-off-by: Gabriel Krisman Bertazi <krisman@suse.de>
---
test/file-verify.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/test/file-verify.c b/test/file-verify.c
index f33b24a..89cbb02 100644
--- a/test/file-verify.c
+++ b/test/file-verify.c
@@ -381,9 +381,12 @@ static int test(struct io_uring *ring, const char *fname, int buffered,
v[i].iov_base = buf[i];
v[i].iov_len = CHUNK_SIZE;
}
- ret = io_uring_register_buffers(ring, v, READ_BATCH);
+ ret = t_register_buffers(ring, v, READ_BATCH);
if (ret) {
- fprintf(stderr, "Error buffer reg %d\n", ret);
+ if (ret == T_SETUP_SKIP) {
+ ret = 0;
+ goto free_bufs;
+ }
goto err;
}
}
@@ -477,6 +480,7 @@ static int test(struct io_uring *ring, const char *fname, int buffered,
done:
if (registered)
io_uring_unregister_buffers(ring);
+free_bufs:
if (vectored) {
for (j = 0; j < READ_BATCH; j++)
for (i = 0; i < nr_vecs; i++)
--
2.40.0

6
liburing.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Apr 20 20:26:32 UTC 2023 - Gabriel Krisman Bertazi <gabriel.bertazi@suse.com>
- Add 0001-test-file-verify.t-Don-t-run-over-mlock-limit-when-r.patch
fixes test with kernel <= 5.16 (bsc#1209723)
-------------------------------------------------------------------
Tue Feb 21 13:10:33 UTC 2023 - Jiri Slaby <jslaby@suse.cz>

1
liburing.spec
View File

@ -28,6 +28,7 @@ Source: https://git.kernel.dk/cgit/liburing/snapshot/%{name}-%{version}.
# PATCH-FIX-UPSTREAM: fix tests on big endian
Patch1: 0001-test-helpers-fix-socket-length-type.patch
Patch2: 0001-Do-not-always-expect-multishot-recv-to-stop-posting-.patch
Patch3: 0001-test-file-verify.t-Don-t-run-over-mlock-limit-when-r.patch
BuildRequires: gcc-c++
BuildRequires: pkgconfig
BuildRequires: procps