From nobody Sat May 3 15:20:07 2025 X-Original-To: dev-commits-src-branches@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 4ZqWgX0kGPz5vSnm; Sat, 03 May 2025 15:20:08 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZqWgW3VXRz3L1S; Sat, 03 May 2025 15:20:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746285607; 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=w/gNeSrYKiu0D4RBzHbnKUeNz6TyG69bz/2vqt+Uohk=; b=rLdoDduBEHg8VYZ3r1B3dwKCCQcfSLpKVXxpFteD3gCGrIGihzvCeqOZYMqzXxzCQsfv6/ BGyw/4GmGHZHwJ3GTijVhP2zxtcGVFEK1cq2hK9CblRZl/HPZCPgTkukban3U+VTpcgUIc OaXZRv/vk1ip0Ve1as7pPj7SZaWkWGXGGl5EEf407dJP2+HhY7nCcALMYko55D+zK9j0Di j4+XtXyM+4VckoU3B/tPXvRFFlcKYeyyeJVIwfEOjuYKlVnGUotpmNzV68l7Kh3ftfWpkQ adloL9W852QabHqn0B8tWqzYqW9BzpRlxtnNk429j2FhUr4G3Gf9C74Km75Ztg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746285607; 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=w/gNeSrYKiu0D4RBzHbnKUeNz6TyG69bz/2vqt+Uohk=; b=DOP3K/gTBHBO5NmJMYT0dBrMVpOzZGmIu+AAQurJxnFr/bzFw0faNR6IMEKmoMCQJCSZw1 3ZN3LnQ2LhZ7Sybt7QVQZusIOVk+3Fpw+/+WueI5QxwVE1a7l7ObGy4HW8MgEs2OklJiLW y64Q3eNBf9ckuxAir11SdY5oeSkH9gLgubA93wvZpLDcLzkia4JWEdD4gHw8Sv4GSSu9LC z7xpWHT5kCJ1FR9geGiETR+3bep07CHSjdf4nNPmv/usnfEndN74VZqO8U3GYmKnavu3gD 5nxssS9UgIgsQnzv8dirv5/lKmw+fDtrwFNuv4UJv75dZQQqKnaRjYa/0r5UrA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746285607; a=rsa-sha256; cv=none; b=x0aROQ2Nou+z1j0vMeB9oQnoBU8xJxU76URvDjUvmpV1aQEbvwtYKJxHId1/SilMasCvs8 1nuipHChNUxiZV8FH6ZIz31gXns7A2yPPrj4iIO2F1JRKqnflnuMfUYVuKD1TCg7WaPaz8 zkl/xjy5l2XJ8h4/iMRlGxIKkORaaPdChcfhDFwAcOgXIkbC+vgIxd5yAbhWdAORWtvVc0 KRlmH134xIZfXqFNv/Er/LQSFbQFfe2yQLGCML4+1G5uKWqHRiPvHbzeaUNI65vDvBU+Yj opbMNRwvMphHTX++jrExnOLXGJBWqKWShZHRDYfWf3ICQe9sWFHpvHSet7nY5w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4ZqWgW33wrzp53; Sat, 03 May 2025 15:20:07 +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 543FK7TF049306; Sat, 3 May 2025 15:20:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 543FK70d049302; Sat, 3 May 2025 15:20:07 GMT (envelope-from git) Date: Sat, 3 May 2025 15:20:07 GMT Message-Id: <202505031520.543FK70d049302@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6b7c520b915e - stable/14 - ptrace_test: add test for the PT_ATTACH behavior on sleeping thread List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 6b7c520b915e1df72dee494b8abbc5d0fefd30b0 Auto-Submitted: auto-generated The branch stable/14 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6b7c520b915e1df72dee494b8abbc5d0fefd30b0 commit 6b7c520b915e1df72dee494b8abbc5d0fefd30b0 Author: Konstantin Belousov AuthorDate: 2025-04-18 12:20:20 +0000 Commit: Konstantin Belousov CommitDate: 2025-05-03 15:19:41 +0000 ptrace_test: add test for the PT_ATTACH behavior on sleeping thread (cherry picked from commit ed080d9915869708a9ab7badc217aff17ebbef6c) --- 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 bc944ebf371d..50acda94642f 100644 --- a/tests/sys/kern/ptrace_test.c +++ b/tests/sys/kern/ptrace_test.c @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -4465,6 +4466,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); @@ -4533,6 +4593,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()); }