From 89e977c36ae64dfdc9433fdd58af6a0f1f19c8e5 Mon Sep 17 00:00:00 2001 From: wokron Date: Mon, 15 Jun 2026 22:31:37 +0800 Subject: [PATCH 1/2] move to kernel 7.1 --- .github/workflows/build-and-test-latest-kernel.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build-and-test-latest-kernel.yml b/.github/workflows/build-and-test-latest-kernel.yml index 076000aa..7c74a3a0 100644 --- a/.github/workflows/build-and-test-latest-kernel.yml +++ b/.github/workflows/build-and-test-latest-kernel.yml @@ -13,7 +13,7 @@ on: - "**.md" env: - KERNEL_ARCHIVE_URL: "https://cdn.kernel.org/pub/linux/kernel/v7.x/linux-7.0.3.tar.xz" + KERNEL_ARCHIVE_URL: "https://cdn.kernel.org/pub/linux/kernel/v7.x/linux-7.1.tar.xz" jobs: build-and-test: From 46fda738397c52e182155ed61a5d074e88381efc Mon Sep 17 00:00:00 2001 From: wokron Date: Tue, 16 Jun 2026 12:13:37 +0800 Subject: [PATCH 2/2] fix IORING_CQE_F_BUF_MORE check in bundle mode --- include/condy/provided_buffers.hpp | 23 +---------------------- 1 file changed, 1 insertion(+), 22 deletions(-) diff --git a/include/condy/provided_buffers.hpp b/include/condy/provided_buffers.hpp index 9622417f..16f55933 100644 --- a/include/condy/provided_buffers.hpp +++ b/include/condy/provided_buffers.hpp @@ -153,14 +153,6 @@ class BundledProvidedBufferQueue { .num_buffers = 0, }; -#if !IO_URING_CHECK_VERSION(2, 8) // >= 2.8 - if (flags & IORING_CQE_F_BUF_MORE) { - assert(buf_lens_[result.bid] > static_cast(res)); - buf_lens_[result.bid] -= res; - return result; - } -#endif - bool is_incr = false; #if !IO_URING_CHECK_VERSION(2, 8) // >= 2.8 is_incr = br_flags_ & IOU_PBUF_RING_INC; @@ -335,19 +327,6 @@ class BundledProvidedBufferPool { assert(res > 0); - uint16_t bid = flags >> IORING_CQE_BUFFER_SHIFT; - -#if !IO_URING_CHECK_VERSION(2, 8) // >= 2.8 - if (flags & IORING_CQE_F_BUF_MORE) { - char *data = get_buffer_(bid) + (buffer_size_ - curr_buf_len_); - buffers.emplace_back(data, res, nullptr); - assert(static_cast(res) < curr_buf_len_); - curr_buf_len_ -= res; - return buffers; - } -#endif - assert(bid == curr_io_uring_buf_()->bid); - bool is_incr = false; #if !IO_URING_CHECK_VERSION(2, 8) // >= 2.8 is_incr = br_flags_ & IOU_PBUF_RING_INC; @@ -356,7 +335,7 @@ class BundledProvidedBufferPool { int64_t bytes = res; while (bytes > 0) { auto *buf_ptr = curr_io_uring_buf_(); - bid = buf_ptr->bid; + uint16_t bid = buf_ptr->bid; char *data = get_buffer_(bid) + (buffer_size_ - curr_buf_len_); uint32_t buf_len;