Page MenuHomeFreeBSD
Files F110649989

D25431.id74716.diff
No OneTemporary
Actions

D25431.id74716.diff
View Options

Index: head/tests/sys/kern/Makefile
===================================================================
--- head/tests/sys/kern/Makefile
+++ head/tests/sys/kern/Makefile
@@ -29,6 +29,7 @@
ATF_TESTS_SH+= sonewconn_overflow
TEST_METADATA.sonewconn_overflow+= required_programs="python"
TEST_METADATA.sonewconn_overflow+= required_user="root"
+ATF_TESTS_SH+= sendfile_test
${PACKAGE}FILES+= sonewconn_overflow.py
${PACKAGE}FILESMODE_sonewconn_overflow.py=0555
@@ -36,6 +37,7 @@
BINDIR= ${TESTSDIR}
PROGS+= coredump_phnum_helper
PROGS+= pdeathsig_helper
+PROGS+= sendfile_helper
CFLAGS.sys_getrandom+= -I${SRCTOP}/sys/contrib/zstd/lib
LIBADD.sys_getrandom+= zstd
@@ -44,6 +46,7 @@
LIBADD.ptrace_test+= pthread
LIBADD.unix_seqpacket_test+= pthread
LIBADD.kcov+= pthread
+LIBADD.sendfile_helper+= pthread
NETBSD_ATF_TESTS_C+= lockf_test
NETBSD_ATF_TESTS_C+= mqueue_test
Index: head/tests/sys/kern/sendfile_helper.c
===================================================================
--- head/tests/sys/kern/sendfile_helper.c
+++ head/tests/sys/kern/sendfile_helper.c
@@ -0,0 +1,147 @@
+/*-
+ * SPDX-License-Identifier: BSD-2-Clause
+ *
+ * Copyright (c) 2020 Netflix, Inc.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD$
+ */
+
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/sysctl.h>
+#include <sys/uio.h>
+
+#include <netinet/in.h>
+
+#include <err.h>
+#include <errno.h>
+#include <fcntl.h>
+#include <pthread.h>
+#include <stdbool.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
+
+static int ls;
+static char buf[1024*1024];
+static volatile bool accept_done = false;
+static volatile bool read_done = false;
+
+static void *
+server(void *arg)
+{
+ struct sockaddr_in sin;
+ ssize_t rv;
+ socklen_t slen;
+ int ss;
+ ssize_t readlen = (uintptr_t)arg;
+
+ slen = sizeof(sin);
+ ss = accept(ls, (void *)&sin, &slen);
+ if (ss < 0)
+ err(1, "accept ls");
+
+ accept_done = true;
+
+ do {
+ rv = read(ss, buf, sizeof(buf));
+ if (rv == -1)
+ err(2, "read receiver");
+ if (rv == 0)
+ break;
+ readlen -= rv;
+ } while (readlen != 0);
+
+ read_done = true;
+
+ return NULL;
+}
+
+int
+main(int argc, char **argv)
+{
+ pthread_t pt;
+ struct sockaddr_in sin;
+ off_t start, len;
+ socklen_t slen;
+ int fd, cs, on, flags, error;
+
+ if (argc != 5)
+ errx(1, "usage: %s <file> <start> <len> <flags>",
+ getprogname());
+
+ start = strtoull(argv[2], NULL, 0);
+ len = strtoull(argv[3], NULL, 0);
+ flags = strtoul(argv[4], NULL, 0);
+
+ fd = open(argv[1], O_RDONLY);
+ if (fd < 0)
+ err(1, "open");
+
+ ls = socket(PF_INET, SOCK_STREAM, 0);
+ if (ls < 0)
+ err(1, "socket ls");
+
+ on = 1;
+ if (setsockopt(ls, SOL_SOCKET, SO_REUSEADDR, (void *)&on,
+ (socklen_t)sizeof(on)) < 0)
+ err(1, "SO_REUSEADDR");
+
+ sin.sin_len = sizeof(sin);
+ sin.sin_family = AF_INET;
+ sin.sin_addr.s_addr = htonl(INADDR_LOOPBACK);
+ sin.sin_port = 0;
+ if (bind(ls, (void *)&sin, sizeof(sin)) < 0)
+ err(1, "bind ls");
+
+ slen = sizeof(sin);
+ if (getsockname(ls, (void *)&sin, &slen) < 0)
+ err(1, "getsockname");
+
+ if (listen(ls, 5) < 0)
+ err(1, "listen ls");
+
+ error = pthread_create(&pt, NULL, server, (void *)(uintptr_t)len);
+ if (error)
+ errc(1, error, "pthread_create");
+
+ cs = socket(PF_INET, SOCK_STREAM, 0);
+ if (cs < 0)
+ err(1, "socket cs");
+
+ if (connect(cs, (void *)&sin, sizeof(sin)) < 0)
+ err(1, "connect cs");
+
+ while (!accept_done)
+ usleep(1000);
+
+ if (sendfile(fd, cs, start, len, NULL, NULL, flags) < 0)
+ err(3, "sendfile");
+
+ while (!read_done)
+ usleep(1000);
+
+ exit(0);
+}
Index: head/tests/sys/kern/sendfile_test.sh
===================================================================
--- head/tests/sys/kern/sendfile_test.sh
+++ head/tests/sys/kern/sendfile_test.sh
@@ -0,0 +1,155 @@
+# SPDX-License-Identifier: BSD-2-Clause-FreeBSD
+#
+# Copyright (c) 2020 Netflix, Inc.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+# notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+# notice, this list of conditions and the following disclaimer in the
+# documentation and/or other materials provided with the distribution.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
+# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
+# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+# SUCH DAMAGE.
+#
+# $FreeBSD$
+
+#
+# These tests exercise a few basic cases for the sendfile() syscall:
+# - successful operation.
+# - sendfile() starts an async disk read but that async I/O fails.
+# - sendfile() fails to read an indirect block and thus cannot
+# even start an async I/O.
+#
+# In all cases we request some read ahead in addition to
+# the data to be sent to the socket.
+#
+
+MD_DEVS="md.devs"
+MNT=/mnt
+FILE=$MNT/file
+HELPER="$(atf_get_srcdir)/sendfile_helper"
+BSIZE=4096
+
+atf_test_case io_success cleanup
+io_success_head()
+{
+ atf_set "descr" "sendfile where all disk I/O succeeds"
+ atf_set "require.user" "root"
+ atf_set "timeout" 15
+}
+io_success_body()
+{
+ md=$(alloc_md)
+ common_body_setup $md
+
+ atf_check $HELPER $FILE 0 0x10000 0x10000
+}
+io_success_cleanup()
+{
+ common_cleanup
+}
+
+atf_test_case io_fail_sync cleanup
+io_fail_sync_head()
+{
+ atf_set "descr" "sendfile where we fail to start async I/O"
+ atf_set "require.user" "root"
+ atf_set "timeout" 15
+}
+io_fail_sync_body()
+{
+ md=$(alloc_md)
+ common_body_setup $md
+
+ atf_check gnop configure -r 100 -e 5 ${md}.nop
+ atf_check -s exit:3 -e ignore $HELPER $FILE $((12 * $BSIZE)) $BSIZE 0x10000
+}
+io_fail_sync_cleanup()
+{
+ common_cleanup
+}
+
+atf_test_case io_fail_async cleanup
+io_fail_async_head()
+{
+ atf_set "descr" "sendfile where an async I/O fails"
+ atf_set "require.user" "root"
+ atf_set "timeout" 15
+}
+io_fail_async_body()
+{
+ md=$(alloc_md)
+ common_body_setup $md
+
+ atf_check gnop configure -r 100 -e 5 ${md}.nop
+ atf_check -s exit:2 -e ignore $HELPER $FILE 0 $BSIZE 0x10000
+}
+io_fail_async_cleanup()
+{
+ common_cleanup
+}
+
+
+atf_init_test_cases()
+{
+ atf_add_test_case io_success
+ atf_add_test_case io_fail_sync
+ atf_add_test_case io_fail_async
+}
+
+alloc_md()
+{
+ local md
+
+ md=$(mdconfig -a -t swap -s 256M) || atf_fail "mdconfig -a failed"
+ echo ${md} >> $MD_DEVS
+ echo ${md}
+}
+
+common_body_setup()
+{
+ us=$1
+
+ atf_check -o ignore -e ignore newfs -b $BSIZE -U -j /dev/${us}
+ atf_check mount /dev/${us} $MNT
+ atf_check -e ignore dd if=/dev/zero of=$FILE bs=1m count=1
+ atf_check umount /mnt
+
+ load_gnop
+ atf_check gnop create /dev/${us}
+ atf_check mount /dev/${us}.nop $MNT
+ atf_check -o ignore ls -l $MNT/file
+}
+
+common_cleanup()
+{
+ umount -f $MNT
+ if [ -f "$MD_DEVS" ]; then
+ while read test_md; do
+ gnop destroy -f ${test_md}.nop 2>/dev/null
+ mdconfig -d -u $test_md 2>/dev/null
+ done < $MD_DEVS
+ rm $MD_DEVS
+ fi
+
+ true
+}
+
+load_gnop()
+{
+ if ! kldstat -q -m g_nop; then
+ geom nop load || atf_skip "could not load module for geom nop"
+ fi
+}

File Metadata

Mime Type
text/plain
Expires
Sat, Feb 22, 11:05 AM (1 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
16770102
Default Alt Text
D25431.id74716.diff (8 KB)

Event Timeline