Skip to content

move to kernel 7.1 #140

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
wokron merged 3 commits into from
Jun 29, 2026
+49 −67
Merged

move to kernel 7.1 #140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7230c46
move to kernel 7.1
wokron Jun 15, 2026
9265cd8
fix IORING_CQE_F_BUF_MORE check in bundle mode
wokron Jun 16, 2026
0def3bc
temporarily comment out cmd_discard tests
wokron Jun 28, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/build-and-test-latest-kernel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.2.tar.xz"

jobs:
build-and-test:
Expand Down
23 changes: 1 addition & 22 deletions include/condy/provided_buffers.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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<uint32_t>(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;
Expand Down Expand Up @@ -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<uint32_t>(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;
Expand All @@ -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;
Expand Down
91 changes: 47 additions & 44 deletions tests/test_async_operations.4.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,50 +824,53 @@ TEST_CASE("test async_operations - test ftruncate - fixed fd") {
}
#endif

#if !IO_URING_CHECK_VERSION(2, 8) // >= 2.8
TEST_CASE("test async_operations - test cmd_discard - basic") {
BlkDevice blkdev;
if (blkdev.path().empty()) {
MESSAGE("Can't create loop device, skipping");
return;
}

int fd = open(blkdev.path().c_str(), O_RDWR);
REQUIRE(fd >= 0);

auto func = [&]() -> condy::Coro<void> {
int r = co_await condy::async_cmd_discard(fd, 0, 4096);
REQUIRE(r == 0);
};
condy::sync_wait(func());
close(fd);
}
#endif

#if !IO_URING_CHECK_VERSION(2, 8) // >= 2.8
TEST_CASE("test async_operations - test cmd_discard - fixed fd") {
BlkDevice blkdev;
if (blkdev.path().empty()) {
MESSAGE("Can't create loop device, skipping");
return;
}

int fd = open(blkdev.path().c_str(), O_RDWR);
REQUIRE(fd >= 0);

auto func = [&]() -> condy::Coro<void> {
auto &fd_table = condy::current_runtime().fd_table();
fd_table.init(1);
int r = co_await condy::async_files_update(&fd, 1, 0);
REQUIRE(r == 1);

r = co_await condy::async_cmd_discard(condy::fixed(0), 0, 4096);
REQUIRE(r == 0);
};
condy::sync_wait(func());
close(fd);
}
#endif
// TODO: Kernel 7.1 regression, uncomment after fixed
// https://lore.kernel.org/linux-block/20260616155129.406057-1-yi1tang.yang@gmail.com/
//
// #if !IO_URING_CHECK_VERSION(2, 8) // >= 2.8
// TEST_CASE("test async_operations - test cmd_discard - basic") {
// BlkDevice blkdev;
// if (blkdev.path().empty()) {
// MESSAGE("Can't create loop device, skipping");
// return;
// }

// int fd = open(blkdev.path().c_str(), O_RDWR);
// REQUIRE(fd >= 0);

// auto func = [&]() -> condy::Coro<void> {
// int r = co_await condy::async_cmd_discard(fd, 0, 4096);
// REQUIRE(r == 0);
// };
// condy::sync_wait(func());
// close(fd);
// }
// #endif

// #if !IO_URING_CHECK_VERSION(2, 8) // >= 2.8
// TEST_CASE("test async_operations - test cmd_discard - fixed fd") {
// BlkDevice blkdev;
// if (blkdev.path().empty()) {
// MESSAGE("Can't create loop device, skipping");
// return;
// }

// int fd = open(blkdev.path().c_str(), O_RDWR);
// REQUIRE(fd >= 0);

// auto func = [&]() -> condy::Coro<void> {
// auto &fd_table = condy::current_runtime().fd_table();
// fd_table.init(1);
// int r = co_await condy::async_files_update(&fd, 1, 0);
// REQUIRE(r == 1);

// r = co_await condy::async_cmd_discard(condy::fixed(0), 0, 4096);
// REQUIRE(r == 0);
// };
// condy::sync_wait(func());
// close(fd);
// }
// #endif

#if !IO_URING_CHECK_VERSION(2, 7) // >= 2.7
TEST_CASE("test async_operations - test bind - basic") {
Expand Down
Loading