Skip to content

Commit affb5f6

Browse files
Ming Leiaxboe
authored andcommitted
selftests/ublk: add read-only buffer registration test
Add --rdonly_shmem_buf option to kublk that registers shared memory buffers with UBLK_SHMEM_BUF_READ_ONLY (read-only pinning without FOLL_WRITE) and mmaps with PROT_READ only. Add test_shmemzc_04.sh which exercises the new flag with a null target, hugetlbfs buffer, and write workload. Write I/O works because the server only reads from the shared buffer — the data flows from client to kernel to the shared pages, and the server reads them out. Signed-off-by: Ming Lei <ming.lei@redhat.com> Link: https://patch.msgid.link/20260331153207.3635125-11-ming.lei@redhat.com Signed-off-by: Jens Axboe <axboe@kernel.dk>
1 parent 1207599 commit affb5f6

4 files changed

Lines changed: 85 additions & 4 deletions

File tree

tools/testing/selftests/ublk/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ TEST_PROGS += test_part_02.sh
5555
TEST_PROGS += test_shmemzc_01.sh
5656
TEST_PROGS += test_shmemzc_02.sh
5757
TEST_PROGS += test_shmemzc_03.sh
58+
TEST_PROGS += test_shmemzc_04.sh
5859

5960
TEST_PROGS += test_stress_01.sh
6061
TEST_PROGS += test_stress_02.sh

tools/testing/selftests/ublk/kublk.c

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1219,11 +1219,13 @@ static void ublk_shmem_unregister_all(void)
12191219
shmem_count = 0;
12201220
}
12211221

1222-
static int ublk_ctrl_reg_buf(struct ublk_dev *dev, void *addr, size_t size)
1222+
static int ublk_ctrl_reg_buf(struct ublk_dev *dev, void *addr, size_t size,
1223+
__u32 flags)
12231224
{
12241225
struct ublk_shmem_buf_reg buf_reg = {
12251226
.addr = (unsigned long)addr,
12261227
.len = size,
1228+
.flags = flags,
12271229
};
12281230
struct ublk_ctrl_cmd_data data = {
12291231
.cmd_op = UBLK_U_CMD_REG_BUF,
@@ -1272,7 +1274,7 @@ static void ublk_shmem_handle_client(int sock_fd, struct ublk_dev *dev)
12721274
}
12731275

12741276
/* Register server's VA range with kernel for PFN matching */
1275-
ret = ublk_ctrl_reg_buf(dev, base, size);
1277+
ret = ublk_ctrl_reg_buf(dev, base, size, 0);
12761278
if (ret < 0) {
12771279
ublk_dbg(UBLK_DBG_DEV,
12781280
"shmem_zc: kernel reg failed %d\n", ret);
@@ -1357,15 +1359,17 @@ static int ublk_shmem_htlb_setup(const struct dev_ctx *ctx,
13571359
return -EINVAL;
13581360
}
13591361

1360-
base = mmap(NULL, st.st_size, PROT_READ | PROT_WRITE,
1362+
base = mmap(NULL, st.st_size,
1363+
ctx->rdonly_shmem_buf ? PROT_READ : PROT_READ | PROT_WRITE,
13611364
MAP_SHARED | MAP_POPULATE, fd, 0);
13621365
if (base == MAP_FAILED) {
13631366
ublk_err("htlb: mmap failed\n");
13641367
close(fd);
13651368
return -ENOMEM;
13661369
}
13671370

1368-
ret = ublk_ctrl_reg_buf(dev, base, st.st_size);
1371+
ret = ublk_ctrl_reg_buf(dev, base, st.st_size,
1372+
ctx->rdonly_shmem_buf ? UBLK_SHMEM_BUF_READ_ONLY : 0);
13691373
if (ret < 0) {
13701374
ublk_err("htlb: reg_buf failed: %d\n", ret);
13711375
munmap(base, st.st_size);
@@ -2129,6 +2133,7 @@ int main(int argc, char *argv[])
21292133
{ "no_auto_part_scan", 0, NULL, 0 },
21302134
{ "shmem_zc", 0, NULL, 0 },
21312135
{ "htlb", 1, NULL, 0 },
2136+
{ "rdonly_shmem_buf", 0, NULL, 0 },
21322137
{ 0, 0, 0, 0 }
21332138
};
21342139
const struct ublk_tgt_ops *ops = NULL;
@@ -2248,6 +2253,8 @@ int main(int argc, char *argv[])
22482253
ctx.flags |= UBLK_F_SHMEM_ZC;
22492254
if (!strcmp(longopts[option_idx].name, "htlb"))
22502255
ctx.htlb_path = strdup(optarg);
2256+
if (!strcmp(longopts[option_idx].name, "rdonly_shmem_buf"))
2257+
ctx.rdonly_shmem_buf = 1;
22512258
break;
22522259
case '?':
22532260
/*

tools/testing/selftests/ublk/kublk.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,7 @@ struct dev_ctx {
8181
unsigned int no_ublk_fixed_fd:1;
8282
unsigned int safe_stop:1;
8383
unsigned int no_auto_part_scan:1;
84+
unsigned int rdonly_shmem_buf:1;
8485
__u32 integrity_flags;
8586
__u8 metadata_size;
8687
__u8 pi_offset;
Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
#!/bin/bash
2+
# SPDX-License-Identifier: GPL-2.0
3+
# Test: shmem_zc with read-only buffer registration on null target
4+
#
5+
# Same as test_shmemzc_01 but with --rdonly_shmem_buf: pages are pinned
6+
# without FOLL_WRITE (UBLK_BUF_F_READ). Write I/O works because
7+
# the server only reads from the shared buffer.
8+
9+
. "$(cd "$(dirname "$0")" && pwd)"/test_common.sh
10+
11+
ERR_CODE=0
12+
13+
_prep_test "shmem_zc" "null target hugetlbfs shmem zero-copy rdonly_buf test"
14+
15+
if ! _have_program fio; then
16+
echo "SKIP: fio not available"
17+
exit "$UBLK_SKIP_CODE"
18+
fi
19+
20+
if ! grep -q hugetlbfs /proc/filesystems; then
21+
echo "SKIP: hugetlbfs not supported"
22+
exit "$UBLK_SKIP_CODE"
23+
fi
24+
25+
# Allocate hugepages
26+
OLD_NR_HP=$(cat /proc/sys/vm/nr_hugepages)
27+
echo 10 > /proc/sys/vm/nr_hugepages
28+
NR_HP=$(cat /proc/sys/vm/nr_hugepages)
29+
if [ "$NR_HP" -lt 2 ]; then
30+
echo "SKIP: cannot allocate hugepages"
31+
echo "$OLD_NR_HP" > /proc/sys/vm/nr_hugepages
32+
exit "$UBLK_SKIP_CODE"
33+
fi
34+
35+
# Mount hugetlbfs
36+
HTLB_MNT=$(mktemp -d "${UBLK_TEST_DIR}/htlb_mnt_XXXXXX")
37+
if ! mount -t hugetlbfs none "$HTLB_MNT"; then
38+
echo "SKIP: cannot mount hugetlbfs"
39+
rmdir "$HTLB_MNT"
40+
echo "$OLD_NR_HP" > /proc/sys/vm/nr_hugepages
41+
exit "$UBLK_SKIP_CODE"
42+
fi
43+
44+
HTLB_FILE="$HTLB_MNT/ublk_buf"
45+
fallocate -l 4M "$HTLB_FILE"
46+
47+
dev_id=$(_add_ublk_dev -t null --shmem_zc --htlb "$HTLB_FILE" --rdonly_shmem_buf)
48+
_check_add_dev $TID $?
49+
50+
fio --name=htlb_zc_rdonly \
51+
--filename=/dev/ublkb"${dev_id}" \
52+
--ioengine=io_uring \
53+
--rw=randwrite \
54+
--direct=1 \
55+
--bs=4k \
56+
--size=4M \
57+
--iodepth=32 \
58+
--mem=mmaphuge:"$HTLB_FILE" \
59+
> /dev/null 2>&1
60+
ERR_CODE=$?
61+
62+
# Delete device first so daemon releases the htlb mmap
63+
_ublk_del_dev "${dev_id}"
64+
65+
rm -f "$HTLB_FILE"
66+
umount "$HTLB_MNT"
67+
rmdir "$HTLB_MNT"
68+
echo "$OLD_NR_HP" > /proc/sys/vm/nr_hugepages
69+
70+
_cleanup_test "shmem_zc"
71+
72+
_show_result $TID $ERR_CODE

0 commit comments

Comments
 (0)