Commit 35e43538 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'linux-kselftest-next-5.14-rc1' of... 

Merge tag 'linux-kselftest-next-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest

Pull Kselftest update from Shuah Khan:
 "Fixes to existing tests and framework:

   - migrate sgx test to kselftest harness

   - add new test cases to sgx test

   - ftrace test fix event-no-pid on 1-core machine

   - splice test adjust for handler fallback removal"

* tag 'linux-kselftest-next-5.14-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest:
  selftests/sgx: remove checks for file execute permissions
  selftests/ftrace: fix event-no-pid on 1-core machine
  selftests/sgx: Refine the test enclave to have storage
  selftests/sgx: Add EXPECT_EEXIT() macro
  selftests/sgx: Dump enclave memory map
  selftests/sgx: Migrate to kselftest harness
  selftests/sgx: Rename 'eenter' and 'sgx_call_vdso'
  selftests: timers: rtcpie: skip test if default RTC device does not exist
  selftests: lib.mk: Also install "config" and "settings"
  selftests: splice: Adjust for handler fallback removal
  selftests/tls: Add {} to avoid static checker warning
  selftests/resctrl: Fix incorrect parsing of option "-t"
parents a48ad6e7 4896df9d

tools/testing/selftests/ftrace/test.d/event/event-no-pid.tc

+7 −0
Original line number Diff line number Diff line
@@ -57,6 +57,10 @@ enable_events() { 
    echo 1 > tracing_on

}



other_task() {

    sleep .001 || usleep 1 || sleep 1

}



echo 0 > options/event-fork



do_reset
@@ -94,6 +98,9 @@ child=$! 
echo "child = $child"

wait $child



# Be sure some other events will happen for small systems (e.g. 1 core)

other_task



echo 0 > tracing_on



cnt=`count_pid $mypid`

tools/testing/selftests/lib.mk

+1 −0
Original line number Diff line number Diff line
@@ -100,6 +100,7 @@ define INSTALL_RULE 
	$(eval INSTALL_LIST = $(TEST_CUSTOM_PROGS)) $(INSTALL_SINGLE_RULE)

	$(eval INSTALL_LIST = $(TEST_GEN_PROGS_EXTENDED)) $(INSTALL_SINGLE_RULE)

	$(eval INSTALL_LIST = $(TEST_GEN_FILES)) $(INSTALL_SINGLE_RULE)

	$(eval INSTALL_LIST = $(wildcard config settings)) $(INSTALL_SINGLE_RULE)

endef



install: all

tools/testing/selftests/net/tls.c

+2 −1
Original line number Diff line number Diff line
@@ -444,8 +444,9 @@ TEST_F(tls, sendmsg_large) 
		EXPECT_EQ(sendmsg(self->cfd, &msg, 0), send_len);

	}



	while (recvs++ < sends)

	while (recvs++ < sends) {

		EXPECT_NE(recv(self->fd, mem, send_len, 0), -1);

	}



	free(mem);

}

tools/testing/selftests/resctrl/resctrl_tests.c

+2 −2
Original line number Diff line number Diff line
@@ -173,7 +173,7 @@ int main(int argc, char **argv) 


					return -1;

				}

				token = strtok(NULL, ":\t");

				token = strtok(NULL, ",");

			}

			break;

		case 'p':

tools/testing/selftests/sgx/call.S

+3 −3
Original line number Diff line number Diff line
@@ -5,8 +5,8 @@ 


	.text



	.global sgx_call_vdso

sgx_call_vdso:

	.global sgx_enter_enclave

sgx_enter_enclave:

	.cfi_startproc

	push	%r15

	.cfi_adjust_cfa_offset	8
@@ -27,7 +27,7 @@ sgx_call_vdso: 
	.cfi_adjust_cfa_offset	8

	push	0x38(%rsp)

	.cfi_adjust_cfa_offset	8

	call	*eenter(%rip)

	call	*vdso_sgx_enter_enclave(%rip)

	add	$0x10, %rsp

	.cfi_adjust_cfa_offset	-0x10

	pop	%rbx