Sync from SUSE:SLFO:Main liburing revision 9d432c42c72232a683f96666e0a853ad

This commit is contained in:
Adrian Schröter 2024-08-12 18:29:32 +02:00
parent 731422ab6c
commit 0a16b1f169
3 changed files with 36 additions and 0 deletions

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Thu Aug 8 10:21:50 UTC 2024 - Valentin Lefebvre <valentin.lefebvre@suse.com>
- Skip test buf-ring-nommap.t if ENOMEM appears (happens in ppc64le arch).
* test-buf-ring-nommap-skip-the-test-on-queue-init-ENO.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Jul 12 16:49:22 UTC 2024 - David Disseldorp <ddiss@suse.com> Fri Jul 12 16:49:22 UTC 2024 - David Disseldorp <ddiss@suse.com>

View File

@ -26,6 +26,8 @@ Group: Development/Libraries/C and C++
URL: https://git.kernel.dk/cgit/liburing URL: https://git.kernel.dk/cgit/liburing
Source: https://git.kernel.dk/cgit/liburing/snapshot/%{name}-%{version}.tar.bz2 Source: https://git.kernel.dk/cgit/liburing/snapshot/%{name}-%{version}.tar.bz2
Patch0: test-buf-ring-nommap-zero-the-ringbuf-memory.patch Patch0: test-buf-ring-nommap-zero-the-ringbuf-memory.patch
# PATCH-FIX-UPSTREAM f11c1ab393185aecedc3f1445b0dff5b187f58c1
Patch1: test-buf-ring-nommap-skip-the-test-on-queue-init-ENO.patch
BuildRequires: gcc-c++ BuildRequires: gcc-c++
BuildRequires: pkgconfig BuildRequires: pkgconfig
BuildRequires: procps BuildRequires: procps

View File

@ -0,0 +1,28 @@
From f11c1ab393185aecedc3f1445b0dff5b187f58c1 Mon Sep 17 00:00:00 2001
From: Jens Axboe <axboe@kernel.dk>
Date: Thu, 8 Aug 2024 07:34:46 -0600
Subject: [PATCH] test/buf-ring-nommap: skip the test on queue init ENOMEM
failure
Fixes: https://github.com/axboe/liburing/issues/1200
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---
test/buf-ring-nommap.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/test/buf-ring-nommap.c b/test/buf-ring-nommap.c
index 17c1495..32a372c 100644
--- a/test/buf-ring-nommap.c
+++ b/test/buf-ring-nommap.c
@@ -46,7 +46,7 @@ int main(int argc, char *argv[])
p.flags = IORING_SETUP_NO_MMAP;
ret = io_uring_queue_init_mem(1, &ring, &p, ring_mem, 16384);
if (ret < 0) {
- if (ret == -EINVAL)
+ if (ret == -EINVAL || ret == -ENOMEM)
return T_EXIT_SKIP;
fprintf(stderr, "queue init failed %d\n", ret);
return T_EXIT_FAIL;
--
2.45.2