From nobody Fri Apr 18 15:33:19 2025 X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4ZfJgh0D73z5sygF; Fri, 18 Apr 2025 15:33:20 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZfJgg6qbGz3xF7; Fri, 18 Apr 2025 15:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744990400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3r0pSKgqUI3B0uv62MdUFS62ODRjx2RDct8EC5V+/rk=; b=bt2snuuVrqk5dF/SV7l2N+JIA1LYr89RZJJIRyxcZPOILy+V9A5e8pfltOQ6is9gNre0ki h1bIhl/EslOF6ZnM1nB8ZjxWLid4jVgY1saho/Y+akmDlADVrbkqW552nI0DBIxHNRU6i1 nUyFP2NHsF8W8gAiAIy9YS/Un/PqaunaRe5oCEvJhatXGuuY9WVaGPI2vItGhqwiv4de7z der2Iaoi3fgiCIFnPThvUrNDQEIOKdJTJ0+UTLkM7/Ppx/rOnSuhZ2JAtYAzmKFL6Noz9l S957IciQi7yNo3Wp4aL2pB5eE9DgBdq9bb65lYgTro+l/5TpJyMt1+8NM+yBYA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1744990400; a=rsa-sha256; cv=none; b=bapeNpHxAFGEgpxRTqSsUYsBJ3f7PLOcXhLKWo3o76QOjwNdjh1jYQymxeO9/2KF0WalUJ 3GCU1h3aHj/KdP9EuHw2pQ0QBBzZN9KOFxknfmDeFWsHsfKPxf4ObJ+VwWfFTTb/Vu+0vy tV9SFubiaHqQlNtfxAQh5jL2vkjmxb9JthtmgLoxJBcF02E3O5+U7Cnj4g2NpTqczSyzd0 TnFFw3PqMgbiD3mVSYXSlf0gxADyw7sCwqAAYOTS+UiZOM9anrA1N9WmSQq3UwiXtrT9ci OKqyQBIVDZYU7+BwQLu4ECZq9+2mZh5BVipFE7NhAGzJi7htV71mbzJFLpS5hQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1744990400; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=3r0pSKgqUI3B0uv62MdUFS62ODRjx2RDct8EC5V+/rk=; b=cHP/nXRiVV3Pll66wRsGILzX9kKHKfMnAkMDs8hsFyyAgtnpkHqDPaAfopj7OGjBlFlKRb o2rg6cJI7peGAzSbTm9ENAJal50qyPmN7z1QiujhABXK1Wjdv8sjxXOCA8A5t7zWMJZqPP H2m6L2CstIuBTsM1r5zjrck43A9pM/OTp8nd8xd0hcFtZeXgPcTpHs3EdX7A+QnmN1ylwS h+b4srCj8y3AKtejz73mXiRDli43UZTItnMWtFjh+A76qvwaIvBW3o2eNP8dxxtr67M7SP 4KKQrumYvAi4Xj0iHhmw6EwFcItt9CWOqGWcsy7F/wQzkCQSDA6juSY7cvspjw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZfJgg6PmBzgV4; Fri, 18 Apr 2025 15:33:19 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 53IFXJQI003993; Fri, 18 Apr 2025 15:33:19 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 53IFXJOb003990; Fri, 18 Apr 2025 15:33:19 GMT (envelope-from git) Date: Fri, 18 Apr 2025 15:33:19 GMT Message-Id: <202504181533.53IFXJOb003990@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Konstantin Belousov Subject: git: ed080d991586 - main - ptrace_test: add test for the PT_ATTACH behavior on sleeping thread List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ed080d9915869708a9ab7badc217aff17ebbef6c Auto-Submitted: auto-generated The branch main has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=ed080d9915869708a9ab7badc217aff17ebbef6c commit ed080d9915869708a9ab7badc217aff17ebbef6c Author: Konstantin Belousov AuthorDate: 2025-04-18 12:20:20 +0000 Commit: Konstantin Belousov CommitDate: 2025-04-18 15:33:12 +0000 ptrace_test: add test for the PT_ATTACH behavior on sleeping thread Reviewed by: markj Sponsored by: The FreeBSD Foundation MFC after: 2 weeks Differential revision: https://reviews.freebsd.org/D49887 --- tests/sys/kern/ptrace_test.c | 61 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 61 insertions(+) diff --git a/tests/sys/kern/ptrace_test.c b/tests/sys/kern/ptrace_test.c index de411af6bc40..5dc235eb9200 100644 --- a/tests/sys/kern/ptrace_test.c +++ b/tests/sys/kern/ptrace_test.c @@ -28,6 +28,7 @@ #include #include #include +#include #include #include #include @@ -4464,6 +4465,65 @@ ATF_TC_BODY(ptrace__reap_kill_stopped, tc) REQUIRE_EQ(-1, prk.rk_fpid); } +struct child_res { + struct timespec sleep_time; + int nanosleep_res; + int nanosleep_errno; +}; + +static const long nsec = 1000000000L; +static const struct timespec ten_sec = { + .tv_sec = 10, + .tv_nsec = 0, +}; +static const struct timespec twelve_sec = { + .tv_sec = 12, + .tv_nsec = 0, +}; + +ATF_TC_WITHOUT_HEAD(ptrace__PT_ATTACH_no_EINTR); +ATF_TC_BODY(ptrace__PT_ATTACH_no_EINTR, tc) +{ + struct child_res *shm; + struct timespec rqt, now, wake; + pid_t debuggee; + int status; + + shm = mmap(NULL, sizeof(*shm), PROT_READ | PROT_WRITE, + MAP_SHARED | MAP_ANON, -1, 0); + ATF_REQUIRE(shm != MAP_FAILED); + + ATF_REQUIRE((debuggee = fork()) != -1); + if (debuggee == 0) { + rqt.tv_sec = 10; + rqt.tv_nsec = 0; + clock_gettime(CLOCK_MONOTONIC_PRECISE, &now); + errno = 0; + shm->nanosleep_res = nanosleep(&rqt, NULL); + shm->nanosleep_errno = errno; + clock_gettime(CLOCK_MONOTONIC_PRECISE, &wake); + timespecsub(&wake, &now, &shm->sleep_time); + _exit(0); + } + + /* Give the debuggee some time to go to sleep. */ + sleep(2); + REQUIRE_EQ(ptrace(PT_ATTACH, debuggee, 0, 0), 0); + REQUIRE_EQ(waitpid(debuggee, &status, 0), debuggee); + ATF_REQUIRE(WIFSTOPPED(status)); + REQUIRE_EQ(WSTOPSIG(status), SIGSTOP); + + REQUIRE_EQ(ptrace(PT_DETACH, debuggee, 0, 0), 0); + REQUIRE_EQ(waitpid(debuggee, &status, 0), debuggee); + ATF_REQUIRE(WIFEXITED(status)); + REQUIRE_EQ(WEXITSTATUS(status), 0); + + ATF_REQUIRE(shm->nanosleep_res == 0); + ATF_REQUIRE(shm->nanosleep_errno == 0); + ATF_REQUIRE(timespeccmp(&shm->sleep_time, &ten_sec, >=)); + ATF_REQUIRE(timespeccmp(&shm->sleep_time, &twelve_sec, <=)); +} + ATF_TP_ADD_TCS(tp) { ATF_TP_ADD_TC(tp, ptrace__parent_wait_after_trace_me); @@ -4532,6 +4592,7 @@ ATF_TP_ADD_TCS(tp) ATF_TP_ADD_TC(tp, ptrace__procdesc_reparent_wait_child); ATF_TP_ADD_TC(tp, ptrace__PT_SC_REMOTE_getpid); ATF_TP_ADD_TC(tp, ptrace__reap_kill_stopped); + ATF_TP_ADD_TC(tp, ptrace__PT_ATTACH_no_EINTR); return (atf_no_error()); }