Message ID | 20240110220124.452746-3-john.fastabend@gmail.com (mailing list archive) |
---|---|
State | Superseded |
Delegated to: | Netdev Maintainers |
Headers | show |
Series | tls fixes for SPLICE with more hint | expand |
On Wed, 10 Jan 2024 14:01:24 -0800 John Fastabend wrote:
> + EXPECT_EQ(splice(p[0], NULL, self->fd, NULL, send_pipe, 0xe), 1);
Any reason to use 0xe rather than the SPLICE_F_* defines for flags?
Jakub Kicinski wrote: > On Wed, 10 Jan 2024 14:01:24 -0800 John Fastabend wrote: > > + EXPECT_EQ(splice(p[0], NULL, self->fd, NULL, send_pipe, 0xe), 1); > > Any reason to use 0xe rather than the SPLICE_F_* defines for flags? No reason I crafted the test first and then forgot to come back and tidy it much. I'll send a v2 with readable names.
diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/net/tls.c index 464853a7f982..a53117cee841 100644 --- a/tools/testing/selftests/net/tls.c +++ b/tools/testing/selftests/net/tls.c @@ -707,6 +707,19 @@ TEST_F(tls, splice_from_pipe) EXPECT_EQ(memcmp(mem_send, mem_recv, send_len), 0); } +TEST_F(tls, splice_more) +{ + int send_len = TLS_PAYLOAD_MAX_LEN; + char mem_send[TLS_PAYLOAD_MAX_LEN]; + int i, send_pipe = 1; + int p[2]; + + ASSERT_GE(pipe(p), 0); + EXPECT_GE(write(p[1], mem_send, send_len), 0); + for (i = 0; i < 32; i++) + EXPECT_EQ(splice(p[0], NULL, self->fd, NULL, send_pipe, 0xe), 1); +} + TEST_F(tls, splice_from_pipe2) { int send_len = 16000;
syzbot found an error with how splice() is handled with a msg greater than 32. This was fixed in previous patch, but lets add a test for it to ensure it continues to work. Signed-off-by: John Fastabend <john.fastabend@gmail.com> --- tools/testing/selftests/net/tls.c | 13 +++++++++++++ 1 file changed, 13 insertions(+)