| Message ID | 20191211153109.180749-1-cascardo@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [Unstable] UBUNTU: SAUCE: selftests: net: tls: remove recv_rcvbuf test | expand |
Acked-by: Marcelo Henrique Cerri <marcelo.cerri@canonical.com>
On Wed, Dec 11, 2019 at 12:31:09PM -0300, Thadeu Lima de Souza Cascardo wrote: > This test only works when [1] is applied, which was rejected. > > Basically, the errors are reported and cleared. In this particular case of tls > sockets, following reads will block. > > The test case was originally submitted with the rejected patch, but, then, was > included as part of a different patchset, possibly by mistake. > > [1] https://lore.kernel.org/netdev/20191007035323.4360-2-jakub.kicinski@netronome.com/#t The selftest came originally with this socket error change, but while the socket change never made it upstream, the selftest was pushed again[2] as part of another unrelated tls patchset - and then it percolated down via stable 5.4.2 - the same problem is present in 5.5-rc1. Acked-by: Paolo Pisati <paolo.pisati@canonical.com> 2: https://lore.kernel.org/netdev/20191127201646.25455-1-jakub.kicinski@netronome.com/
On Wed, Dec 11, 2019 at 12:31:09PM -0300, Thadeu Lima de Souza Cascardo wrote: > This test only works when [1] is applied, which was rejected. > > Basically, the errors are reported and cleared. In this particular case of tls > sockets, following reads will block. > > The test case was originally submitted with the rejected patch, but, then, was > included as part of a different patchset, possibly by mistake. > > [1] https://lore.kernel.org/netdev/20191007035323.4360-2-jakub.kicinski@netronome.com/#t > > Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> Applied to focal/master-next and unstable/master, thanks!
diff --git a/tools/testing/selftests/net/tls.c b/tools/testing/selftests/net/tls.c index 46abcae47dee..c4f608dde9bc 100644 --- a/tools/testing/selftests/net/tls.c +++ b/tools/testing/selftests/net/tls.c @@ -726,34 +726,6 @@ TEST_F(tls, recv_lowat) EXPECT_EQ(memcmp(send_mem, recv_mem + 10, 5), 0); } -TEST_F(tls, recv_rcvbuf) -{ - char send_mem[4096]; - char recv_mem[4096]; - int rcv_buf = 1024; - - memset(send_mem, 0x1c, sizeof(send_mem)); - - EXPECT_EQ(setsockopt(self->cfd, SOL_SOCKET, SO_RCVBUF, - &rcv_buf, sizeof(rcv_buf)), 0); - - EXPECT_EQ(send(self->fd, send_mem, 512, 0), 512); - memset(recv_mem, 0, sizeof(recv_mem)); - EXPECT_EQ(recv(self->cfd, recv_mem, sizeof(recv_mem), 0), 512); - EXPECT_EQ(memcmp(send_mem, recv_mem, 512), 0); - - if (self->notls) - return; - - EXPECT_EQ(send(self->fd, send_mem, 4096, 0), 4096); - memset(recv_mem, 0, sizeof(recv_mem)); - EXPECT_EQ(recv(self->cfd, recv_mem, sizeof(recv_mem), 0), -1); - EXPECT_EQ(errno, EMSGSIZE); - - EXPECT_EQ(recv(self->cfd, recv_mem, sizeof(recv_mem), 0), -1); - EXPECT_EQ(errno, EMSGSIZE); -} - TEST_F(tls, bidir) { char const *test_str = "test_read";
This test only works when [1] is applied, which was rejected. Basically, the errors are reported and cleared. In this particular case of tls sockets, following reads will block. The test case was originally submitted with the rejected patch, but, then, was included as part of a different patchset, possibly by mistake. [1] https://lore.kernel.org/netdev/20191007035323.4360-2-jakub.kicinski@netronome.com/#t Signed-off-by: Thadeu Lima de Souza Cascardo <cascardo@canonical.com> --- tools/testing/selftests/net/tls.c | 28 ---------------------------- 1 file changed, 28 deletions(-)