From fe9dcda743bbd9e9e1e23a01fb8bcc64a57213780a240f433eddfd6422513155 Mon Sep 17 00:00:00 2001 From: David Disseldorp Date: Fri, 15 Sep 2023 09:24:03 +0000 Subject: [PATCH] Accepting request 1111428 from home:jirislaby:branches:devel:libraries:c_c++ - tests-don-t-expect-multishot-recv-overflow-backloggi.patch (bsc#1215332) OBS-URL: https://build.opensuse.org/request/show/1111428 OBS-URL: https://build.opensuse.org/package/show/devel:libraries:c_c++/liburing?expand=0&rev=37 --- liburing.changes | 5 +++ liburing.spec | 1 + ...ct-multishot-recv-overflow-backloggi.patch | 34 +++++++++++++++++++ 3 files changed, 40 insertions(+) create mode 100644 tests-don-t-expect-multishot-recv-overflow-backloggi.patch diff --git a/liburing.changes b/liburing.changes index d9e2558..7268ff4 100644 --- a/liburing.changes +++ b/liburing.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Fri Sep 15 05:28:44 UTC 2023 - Jiri Slaby + +- tests-don-t-expect-multishot-recv-overflow-backloggi.patch (bsc#1215332) + ------------------------------------------------------------------- Thu Sep 14 08:37:29 UTC 2023 - Jiri Slaby diff --git a/liburing.spec b/liburing.spec index b8f9a1a..b2c4539 100644 --- a/liburing.spec +++ b/liburing.spec @@ -26,6 +26,7 @@ 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-io_uring_register-fix-errno-confusion-and-new-e.patch +Patch1: tests-don-t-expect-multishot-recv-overflow-backloggi.patch BuildRequires: gcc-c++ BuildRequires: pkgconfig BuildRequires: procps diff --git a/tests-don-t-expect-multishot-recv-overflow-backloggi.patch b/tests-don-t-expect-multishot-recv-overflow-backloggi.patch new file mode 100644 index 0000000..4073b4b --- /dev/null +++ b/tests-don-t-expect-multishot-recv-overflow-backloggi.patch @@ -0,0 +1,34 @@ +From: Pavel Begunkov +Date: Fri, 11 Aug 2023 13:58:30 +0100 +Subject: tests: don't expect multishot recv overflow backlogging +Patch-mainline: 2.5 +Git-commit: b73e940c9dd4ffa8ac121db046c0788376691b99 +References: kernel 6.5 + +Multishots may and are likely to complete when there is no space in CQ, +don't rely on overflows. + +Signed-off-by: Pavel Begunkov +Link: https://lore.kernel.org/r/d078c0f797322bd01d8c91743d652b734e83e9ba.1691758633.git.asml.silence@gmail.com +Signed-off-by: Jens Axboe +Signed-off-by: Jiri Slaby (SUSE) +--- + test/recv-multishot.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/recv-multishot.c b/test/recv-multishot.c +index e4a07ce976cc..f66f13198dde 100644 +--- a/test/recv-multishot.c ++++ b/test/recv-multishot.c +@@ -271,7 +271,7 @@ static int test(struct args *args) + */ + bool const early_last = args->early_error == ERROR_EARLY_OVERFLOW && + !args->wait_each && +- i == N_CQE_OVERFLOW && ++ i >= N_CQE_OVERFLOW && + !(cqe->flags & IORING_CQE_F_MORE); + + bool const should_be_last = +-- +2.42.0 +