Skip to content

Commit e2a062a

Browse files
committed
fixup! add tests
1 parent 56d2812 commit e2a062a

2 files changed

Lines changed: 74 additions & 60 deletions

File tree

‎tests/helpers.hpp‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,15 +155,18 @@ struct ZeroHandler {
155155
int32_t r = nbytes;
156156
auto op = ublksrv_get_op(data.iod);
157157
if (op == UBLK_IO_OP_WRITE) {
158+
if (data.iod->op_flags & UBLK_IO_F_SHMEM_ZC) {
159+
shm_hits_.fetch_add(1, std::memory_order_relaxed);
160+
}
158161
co_return r;
159162
}
160163
assert(op == UBLK_IO_OP_READ);
161164
if (data.iod->op_flags & UBLK_IO_F_SHMEM_ZC) {
165+
shm_hits_.fetch_add(1, std::memory_order_relaxed);
162166
uint16_t idx = ublk::shmem_zc_index(data.iod->addr);
163167
uint32_t off = ublk::shmem_zc_offset(data.iod->addr);
164168
auto it = shm_bufs_.find(idx);
165169
assert(it != shm_bufs_.end());
166-
shm_hits_.fetch_add(1, std::memory_order_relaxed);
167170
co_await condy::async_read(
168171
zero_fd,
169172
condy::buffer(static_cast<char *>(it->second.base) + off,

‎tests/test_daemon.cpp‎

Lines changed: 70 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
#include "ublk/ublk_cmd.h"
44
#include <condy.hpp>
55
#include <doctest.h>
6+
#include <fcntl.h>
67
#include <filesystem>
78
#include <thread>
89
#include <ublk.hpp>
@@ -142,66 +143,76 @@ TEST_CASE("test daemon") {
142143
if (!(features & UBLK_F_SHMEM_ZC)) {
143144
MESSAGE("shmem zc not supported, skipping");
144145
} else {
145-
std::string sock_path = make_sock_path();
146-
std::filesystem::remove(sock_path);
147-
148-
ex::counting_scope shm_scope;
149-
auto task = ublk::daemon::run_shm_server(control_fd, dev_id,
150-
sock_path, handler, 0);
151-
ex::spawn(
152-
ex::starts_on(sched, task) |
153-
ex::upon_error([&](const std::exception_ptr &ep) noexcept {
154-
REQUIRE(false);
155-
}),
156-
shm_scope.get_token());
157-
158-
int client_fd = connect_to_server(sock_path);
159-
auto d_client =
160-
ublk::detail::defer([&]() noexcept { close(client_fd); });
161-
162-
const size_t shm_len = 4096;
163-
int memfd = create_test_memfd(shm_len);
164-
auto d_memfd =
165-
ublk::detail::defer([&]() noexcept { close(memfd); });
166-
void *shm = mmap(nullptr, shm_len, PROT_READ | PROT_WRITE,
167-
MAP_SHARED, memfd, 0);
168-
REQUIRE(shm != MAP_FAILED);
169-
auto d_shm =
170-
ublk::detail::defer([&]() noexcept { munmap(shm, shm_len); });
171-
172-
REQUIRE(send_to_server(client_fd, memfd) >= 0);
173-
174-
int32_t res = recv_result_from_server(client_fd);
175-
REQUIRE(res == 0);
176-
177-
{
178-
int ublkb_fd = open(ublkb_path.c_str(), O_RDONLY | O_DIRECT);
179-
REQUIRE(ublkb_fd >= 0);
180-
auto d =
181-
ublk::detail::defer([&]() noexcept { close(ublkb_fd); });
182-
ssize_t n = pread(ublkb_fd, shm, shm_len, 0);
183-
REQUIRE(n == static_cast<ssize_t>(shm_len));
184-
}
185-
auto hit = handler.shm_hits();
186-
REQUIRE(hit >= 1);
187-
188-
close(client_fd);
189-
190-
shm_scope.request_stop();
191-
ex::sync_wait(ex::starts_on(sched, shm_scope.join()));
192-
193-
{
194-
int ublkb_fd = open(ublkb_path.c_str(), O_RDONLY | O_DIRECT);
195-
REQUIRE(ublkb_fd >= 0);
196-
auto d =
197-
ublk::detail::defer([&]() noexcept { close(ublkb_fd); });
198-
ssize_t n = pread(ublkb_fd, shm, shm_len, 0);
199-
REQUIRE(n == static_cast<ssize_t>(shm_len));
146+
auto run_shm_server_test = [&](uint32_t flags) {
147+
std::string sock_path = make_sock_path();
148+
std::filesystem::remove(sock_path);
149+
150+
ex::counting_scope shm_scope;
151+
auto task = ublk::daemon::run_shm_server(
152+
control_fd, dev_id, sock_path, handler, flags);
153+
ex::spawn(ex::starts_on(sched, task) |
154+
ex::upon_error(
155+
[&](const std::exception_ptr &ep) noexcept {
156+
REQUIRE(false);
157+
}),
158+
shm_scope.get_token());
159+
160+
int client_fd = connect_to_server(sock_path);
161+
auto d_client =
162+
ublk::detail::defer([&]() noexcept { close(client_fd); });
163+
164+
const size_t shm_len = 4096;
165+
int memfd = create_test_memfd(shm_len);
166+
auto d_memfd =
167+
ublk::detail::defer([&]() noexcept { close(memfd); });
168+
void *shm = mmap(nullptr, shm_len, PROT_READ | PROT_WRITE,
169+
MAP_SHARED, memfd, 0);
170+
REQUIRE(shm != MAP_FAILED);
171+
auto d_shm = ublk::detail::defer(
172+
[&]() noexcept { munmap(shm, shm_len); });
173+
174+
REQUIRE(send_to_server(client_fd, memfd) >= 0);
175+
176+
int32_t res = recv_result_from_server(client_fd);
177+
REQUIRE(res == 0);
178+
179+
{
180+
int ublkb_fd =
181+
open(ublkb_path.c_str(), O_WRONLY | O_DIRECT);
182+
REQUIRE(ublkb_fd >= 0);
183+
auto d = ublk::detail::defer(
184+
[&]() noexcept { close(ublkb_fd); });
185+
ssize_t n = pwrite(ublkb_fd, shm, shm_len, 0);
186+
REQUIRE(n == static_cast<ssize_t>(shm_len));
187+
}
188+
auto hit = handler.shm_hits();
189+
REQUIRE(hit >= 1);
190+
191+
close(client_fd);
192+
193+
shm_scope.request_stop();
194+
ex::sync_wait(ex::starts_on(sched, shm_scope.join()));
195+
196+
{
197+
int ublkb_fd =
198+
open(ublkb_path.c_str(), O_WRONLY | O_DIRECT);
199+
REQUIRE(ublkb_fd >= 0);
200+
auto d = ublk::detail::defer(
201+
[&]() noexcept { close(ublkb_fd); });
202+
ssize_t n = pwrite(ublkb_fd, shm, shm_len, 0);
203+
REQUIRE(n == static_cast<ssize_t>(shm_len));
204+
}
205+
// No more shm hits after the server is stopped
206+
REQUIRE(handler.shm_hits() == hit);
207+
208+
REQUIRE(!std::filesystem::exists(sock_path));
209+
};
210+
211+
SUBCASE("shm_server basic") { run_shm_server_test(0); }
212+
213+
SUBCASE("shm_server buf read only") {
214+
run_shm_server_test(UBLK_SHMEM_BUF_READ_ONLY);
200215
}
201-
// No more shm hits after the server is stopped
202-
REQUIRE(handler.shm_hits() == hit);
203-
204-
REQUIRE(!std::filesystem::exists(sock_path));
205216
}
206217
}
207218
}

0 commit comments

Comments
 (0)