Commit f5ea0768 authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Paolo Abeni
Browse files

selftest: af_unix: Add non-TCP-compliant test cases in msg_oob.c. 



While testing, I found some weird behaviour on the TCP side as well.

For example, TCP drops the preceding OOB data when queueing a new
OOB data if the old OOB data is at the head of recvq.

  #  RUN           msg_oob.no_peek.ex_oob_drop ...
  # msg_oob.c:146:ex_oob_drop:AF_UNIX :x
  # msg_oob.c:147:ex_oob_drop:TCP     :Resource temporarily unavailable
  # msg_oob.c:146:ex_oob_drop:AF_UNIX :y
  # msg_oob.c:147:ex_oob_drop:TCP     :Invalid argument
  #            OK  msg_oob.no_peek.ex_oob_drop
  ok 9 msg_oob.no_peek.ex_oob_drop

  #  RUN           msg_oob.no_peek.ex_oob_drop_2 ...
  # msg_oob.c:146:ex_oob_drop_2:AF_UNIX :x
  # msg_oob.c:147:ex_oob_drop_2:TCP     :Resource temporarily unavailable
  #            OK  msg_oob.no_peek.ex_oob_drop_2
  ok 10 msg_oob.no_peek.ex_oob_drop_2

This patch allows AF_UNIX's MSG_OOB implementation to produce different
results from TCP when operations are guarded with tcp_incompliant{}.

Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 93c99f21

tools/testing/selftests/net/af_unix/msg_oob.c

+44 −5
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ FIXTURE(msg_oob) 
				 * 2: TCP sender

				 * 3: TCP receiver

				 */

	bool tcp_compliant;

};



FIXTURE_VARIANT(msg_oob)
@@ -88,6 +89,8 @@ FIXTURE_SETUP(msg_oob) 
{

	create_unix_socketpair(_metadata, self);

	create_tcp_socketpair(_metadata, self);



	self->tcp_compliant = true;

}



FIXTURE_TEARDOWN(msg_oob)
@@ -115,6 +118,7 @@ static void __recvpair(struct __test_metadata *_metadata, 
{

	int i, ret[2], recv_errno[2], expected_errno = 0;

	char recv_buf[2][BUF_SZ] = {};

	bool printed = false;



	ASSERT_GE(BUF_SZ, buf_len);
@@ -142,9 +146,13 @@ static void __recvpair(struct __test_metadata *_metadata, 
		TH_LOG("AF_UNIX :%s", ret[0] < 0 ? strerror(recv_errno[0]) : recv_buf[0]);

		TH_LOG("TCP     :%s", ret[1] < 0 ? strerror(recv_errno[1]) : recv_buf[1]);



		printed = true;



		if (self->tcp_compliant) {

			ASSERT_EQ(ret[0], ret[1]);

			ASSERT_EQ(recv_errno[0], recv_errno[1]);

		}

	}



	if (expected_len >= 0) {

		int cmp;
@@ -159,9 +167,12 @@ static void __recvpair(struct __test_metadata *_metadata, 


		cmp = strncmp(recv_buf[0], recv_buf[1], expected_len);

		if (cmp) {

			if (!printed) {

				TH_LOG("AF_UNIX :%s", ret[0] < 0 ? strerror(recv_errno[0]) : recv_buf[0]);

				TH_LOG("TCP     :%s", ret[1] < 0 ? strerror(recv_errno[1]) : recv_buf[1]);

			}



			if (self->tcp_compliant)

				ASSERT_EQ(cmp, 0);

		}

	}
@@ -180,6 +191,11 @@ static void __recvpair(struct __test_metadata *_metadata, 
			   expected_buf, expected_len, buf_len, flags);	\

	} while (0)



#define tcp_incompliant							\

	for (self->tcp_compliant = false;				\

	     self->tcp_compliant == false;				\

	     self->tcp_compliant = true)



TEST_F(msg_oob, non_oob)

{

	sendpair("x", 1, 0);
@@ -249,4 +265,27 @@ TEST_F(msg_oob, ex_oob_break) 
	recvpair("ld", 2, 2, 0);

}



TEST_F(msg_oob, ex_oob_drop)

{

	sendpair("x", 1, MSG_OOB);

	sendpair("y", 1, MSG_OOB);		/* TCP drops "x" at this moment. */



	tcp_incompliant {

		recvpair("x", 1, 1, 0);		/* TCP drops "y" by passing through it. */

		recvpair("y", 1, 1, MSG_OOB);	/* TCP returns -EINVAL. */

	}

}



TEST_F(msg_oob, ex_oob_drop_2)

{

	sendpair("x", 1, MSG_OOB);

	sendpair("y", 1, MSG_OOB);		/* TCP drops "x" at this moment. */



	recvpair("y", 1, 1, MSG_OOB);



	tcp_incompliant {

		recvpair("x", 1, 1, 0);		/* TCP returns -EAGAIN. */

	}

}



TEST_HARNESS_MAIN