From nobody Tue May 03 14:04:43 2022 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 898081AB9FC3; Tue, 3 May 2022 14:04:44 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kt1tM6hxJz3R05; Tue, 3 May 2022 14:04:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651586684; 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=oScyxsrn6TjMoDuW5GVTWSBLeSa0Rgcza6BUSbWKnb0=; b=mijixuSqUv77YkpMcZxqjcDqGQNmyYIxAh7Ai3B/aLLxbSg11BKhih6St6MCZfvmyuLRiq +2ozk/62f2PdVRebyeYjIvmOTH0v3RqabP4JTRanF/fy/Oo5bVqXz+TZ0tfXV+uN6tRzvi u8XrrCYYMto787BUnuViFuhUukMbN3dc6hoV8dGOMrekc6tDEdAY3BAjbxO9UwT8RgJINf csBnz1AoGbKMNRpIxuvKCES8Q5bq562tb8hvjWj++QQQBt4300ut3WiMPwuk3qQGKLkMBt WTCZRPbHBtS2a4IaTQM/afhDocC8NqIs7WASyIfNt4z3AEj6kreG0CaOo7vovw== 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 C28B11FB86; Tue, 3 May 2022 14:04:43 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 243E4hWd077905; Tue, 3 May 2022 14:04:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 243E4ho1077904; Tue, 3 May 2022 14:04:43 GMT (envelope-from git) Date: Tue, 3 May 2022 14:04:43 GMT Message-Id: <202205031404.243E4ho1077904@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: d017d1faa136 - stable/13 - Have the coredump_phnum test ask for the page size 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: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: d017d1faa1363234f3e76045fe30f6ed9321fc9c Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1651586684; 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=oScyxsrn6TjMoDuW5GVTWSBLeSa0Rgcza6BUSbWKnb0=; b=tNoe8YOIlrSKWlbiZyZFD0Lzz21AGuTNaq2xBecNHcYJbIpB4Nk//RuxsPFYSkJDT4LM3e 7wN12+KIrCqEuTgExCjuPqAylw/NqeaL8IXnQvznrVZPI36kl7pinR8/7a3RcKwseTcT4Z JkOiwzlGtsA0KBGdRUOBTZrZONi3NG8qPqz31rZihJUXeuw1844hS3FfX/wVUO/vN+UD0l +F2UWOk4SeD/QOSt3qd9sCoAyVxRYl8We4nzAPr/CEKuD9BJ714jGByXHvP2EkUCGy3z8P RKL1HbuIBlTE60RxjU2vOv/kOg8wtxnPmrAzb+p1n9SmBCXOBardrQ200n/LIQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1651586684; a=rsa-sha256; cv=none; b=OHG+hrHmKhCpBCCLkRHnAnZueAjf/E2bulFrbsw4OgW5T75DisrYRW9sPJUV7g7vp1DsUV BVWvnNk/1iGsWPG4YZ+8/MSvxiIThlQCVhuwVNkPEyKWrtQG1c6nskn5hDs9w0hmtxY/SD 34bg1qv19pTpVpLYAF/1ptk+87/iU+hORJMIQ00eoRrC+90ov6J9NNvlG+TsesOpraz2Ja HkUUwBOmYWT8MX1p4ZaP4ubjXdwAL4RLpEP2ZbuFZKZpxVcftvd+UL1jYYc22Qw7k28UR9 U6u+N/zHEmFWbwVECAUjBSDTIbApGQIFuT4kyrTjRoKxai9OKZL+/sh2GMfxYQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=d017d1faa1363234f3e76045fe30f6ed9321fc9c commit d017d1faa1363234f3e76045fe30f6ed9321fc9c Author: Andrew Turner AuthorDate: 2022-04-07 14:59:32 +0000 Commit: Andrew Turner CommitDate: 2022-05-03 14:04:04 +0000 Have the coredump_phnum test ask for the page size The page size may be dynamically selected on boot. Have the coredump_phnum test helper ask the kernel for the correct value. Sponsored by: The FreeBSD Foundation (cherry picked from commit df696a2fb640aee06b38ff487985209f97b944aa) --- tests/sys/kern/coredump_phnum_helper.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/sys/kern/coredump_phnum_helper.c b/tests/sys/kern/coredump_phnum_helper.c index 0dff59b918d9..1cdd4a4a09ec 100644 --- a/tests/sys/kern/coredump_phnum_helper.c +++ b/tests/sys/kern/coredump_phnum_helper.c @@ -33,6 +33,7 @@ #include #include #include +#include /* * This program is intended to create a bunch of segment mappings, then dump @@ -42,10 +43,11 @@ int main(int argc __unused, char **argv __unused) { void *v; - size_t i, pages; + size_t i, pages, page_size; + page_size = getpagesize(); pages = UINT16_MAX + 1000; - v = mmap(NULL, pages * PAGE_SIZE, PROT_READ | PROT_WRITE, + v = mmap(NULL, pages * page_size, PROT_READ | PROT_WRITE, MAP_ANON | MAP_PRIVATE, -1, 0); if (v == NULL) err(1, "mmap"); @@ -54,7 +56,7 @@ main(int argc __unused, char **argv __unused) * Alternate protections to interleave RW and R PT_LOAD * segments. */ - if (mprotect((char *)v + i * PAGE_SIZE, PAGE_SIZE, + if (mprotect((char *)v + i * page_size, page_size, PROT_READ) != 0) err(1, "mprotect"); }