From nobody Sun Aug 27 07:33:13 2023 X-Original-To: dev-commits-src-all@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 4RYQQd4Pxsz4rc9d; Sun, 27 Aug 2023 07:33:13 +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 4RYQQd3rHJz4YbT; Sun, 27 Aug 2023 07:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693121593; 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=uP8EmTw0k/M/JIAzCnYXUfRseH/g3UNjRserb+8kBTk=; b=lveAu0LYmZQTiV3mfa73fVZef5Aemc1lCj83YDvJlYIa/7H+riShhfAuMnxsJsORQ9Vv2L LZbK5yrmea4iJ7bXppn3MlD4+KFT/TPz+o+csZCPFcjVenk7kpr4ASnn5CJQbAQ4jtWSOZ IvGncj4yzUiSdB/HxCEicifZtKIaiPSjQf7qgkEUjueYUVhszfcQ34dsTuVLz4EA9Bn4JW IPW8x8CGwYEDgSqzb1UXvOwUX80HCarn0ZP/UyfxUVMCGvDWlm6t7xDB1VE6EXQsYDcFCD kBMhxAV4hibYaPWmvHJl4A85t+V+4TPemUC8o7al8uFANP0xmyde0IPgDsDPMA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693121593; 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=uP8EmTw0k/M/JIAzCnYXUfRseH/g3UNjRserb+8kBTk=; b=kPO+T517Lo8JmYbriHJNGR3hsUZIAuUK1Oy089ysfyLZE2M5l6wZ+SncR5S8zuHKbAdro8 v0qZK7VuzIdMhR3FG9NevwCSS2jc8i/AmE2yBzgjZPejZxawffKArRM3TXPY3jTlkytAuS qDEMs3U50UTCinYUID63VW5OlF8f/CYxUB+E4dYxvEsalJfDwlU/pVlSeICSI2KtxNjA8y 1j+x5IF7R3MEwuEZSRE4y7pB/yjLkdIgBdO7fgYPLgOg9LO34Hfbd9sWiY/6b5UplrZas5 168wz7vF8LLtnEDvcLnO55tcbhCkebQIkCFtFGO+YkDzyTDSqKycsWl4Y0tpvw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693121593; a=rsa-sha256; cv=none; b=IjQrzI9yBRQOo21aRsbheXriGticfdZp7WoKM6JZj1mY+rKD2++hg4ajS5cn1aYF27RTvO PQTLDfQBPe4Dw+S07OQFIgVGxnJrWfpLnjI26oceJOR1QCqjAWBjRMwjIFvhlKQMsaNaSL yy5Sad4HWrqqVjYzMm1KNJidWp5jJTmB9sMlLhSast3OxZPpnNW587hsTd753XQNUnB+YH m79ayIPyPUI6mgXQxjWlp6COyXbnyfoukInpDIUAwc/55ntcJ4OlFofJ63/xzwCgDtSQZs USUUkvrzY0fRtNGOpwzHkyx91yolVFfoZvgijdh9oGr0B1xoze0VSiMyutNptw== 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 4RYQQd2tqDz3Nv; Sun, 27 Aug 2023 07:33:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37R7XDu5095922; Sun, 27 Aug 2023 07:33:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37R7XDoF095919; Sun, 27 Aug 2023 07:33:13 GMT (envelope-from git) Date: Sun, 27 Aug 2023 07:33:13 GMT Message-Id: <202308270733.37R7XDoF095919@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Dmitry Chagin Subject: git: 33d7da6ba2ab - stable/13 - tests: Add MAP_32BIT flag test List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: dchagin X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 33d7da6ba2abde7b907d8fa08b349826bb1f20fa Auto-Submitted: auto-generated The branch stable/13 has been updated by dchagin: URL: https://cgit.FreeBSD.org/src/commit/?id=33d7da6ba2abde7b907d8fa08b349826bb1f20fa commit 33d7da6ba2abde7b907d8fa08b349826bb1f20fa Author: Dmitry Chagin AuthorDate: 2023-08-01 20:23:15 +0000 Commit: Dmitry Chagin CommitDate: 2023-08-27 07:32:13 +0000 tests: Add MAP_32BIT flag test Reviewed by: kib, markj Differential Revision: https://reviews.freebsd.org/D41236 MFC after: 1 month (cherry picked from commit 5a7e48dddfb5a668ded4742b79e6f6f88b647e6a) --- tests/sys/vm/Makefile | 8 ++++++ tests/sys/vm/mmap_map_32bit_helper.c | 51 ++++++++++++++++++++++++++++++++++++ tests/sys/vm/mmap_map_32bit_test.sh | 37 ++++++++++++++++++++++++++ 3 files changed, 96 insertions(+) diff --git a/tests/sys/vm/Makefile b/tests/sys/vm/Makefile index 1454b3475f5a..4a08118bd883 100644 --- a/tests/sys/vm/Makefile +++ b/tests/sys/vm/Makefile @@ -8,4 +8,12 @@ ATF_TESTS_C+= mlock_test \ page_fault_signal \ shared_shadow_inval_test +.if ${MACHINE_ARCH} != "i386" && ${MACHINE} != "arm" && \ + (${MACHINE} != "powerpc" || ${MACHINE_ARCH} != "powerpc") + # MAP_32BIT is only available on 64-bit platforms +BINDIR= ${TESTSDIR} +ATF_TESTS_SH+= mmap_map_32bit_test +PROGS+= mmap_map_32bit_helper +.endif + .include diff --git a/tests/sys/vm/mmap_map_32bit_helper.c b/tests/sys/vm/mmap_map_32bit_helper.c new file mode 100644 index 000000000000..47d4b2c53c20 --- /dev/null +++ b/tests/sys/vm/mmap_map_32bit_helper.c @@ -0,0 +1,51 @@ +/*- + * Copyright (c) 2023 Dmitry Chagin + * + * SPDX-License-Identifier: BSD-2-Clause + */ + +#include + +#include +#include +#include +#include + +_Static_assert(sizeof(vm_offset_t) >= 8, "Test is not intended for ILP32"); +#define MAP_32BIT_MAX_ADDR ((vm_offset_t)1 << 31) + +int +main(void) +{ + size_t pagesize; + void *s32; + int fd; + + if ((pagesize = getpagesize()) <= 0) + err(1, "getpagesize"); + + fd = open("/dev/zero", O_RDONLY); + if (fd <= 0) + err(1, "open failed"); + + s32 = mmap(NULL, pagesize, PROT_READ, MAP_32BIT | MAP_PRIVATE, fd, 0); + if (s32 == MAP_FAILED) + err(1, "mmap MAP_32BIT | MAP_PRIVATE failed"); + if (((vm_offset_t)s32 + pagesize) > MAP_32BIT_MAX_ADDR) + errx(1, "mmap invalid result %p", s32); + + close(fd); + if (munmap(s32, pagesize) != 0) + err(1, "munmap failed"); + + s32 = mmap(NULL, pagesize, PROT_READ | PROT_WRITE, + MAP_32BIT | MAP_ANONYMOUS | MAP_PRIVATE, -1, 0); + if (s32 == MAP_FAILED) + err(1, "mmap MAP_32BIT | MAP_ANONYMOUS | MAP_PRIVATE failed"); + if (((vm_offset_t)s32 + pagesize) > MAP_32BIT_MAX_ADDR) + errx(1, "mmap invalid result %p", s32); + + if (munmap(s32, pagesize) != 0) + err(1, "munmap failed"); + exit(0); +} diff --git a/tests/sys/vm/mmap_map_32bit_test.sh b/tests/sys/vm/mmap_map_32bit_test.sh new file mode 100644 index 000000000000..2df53e78f1b7 --- /dev/null +++ b/tests/sys/vm/mmap_map_32bit_test.sh @@ -0,0 +1,37 @@ +# +# Copyright (c) 2022 Dmitry Chagin +# +# SPDX-License-Identifier: BSD-2-Clause +# +# Simple test of MAP_32BIT flag w/wo ASLR + +map_32bit_w_aslr_head() +{ + atf_set descr "MAP_32BIT with ASLR" + atf_set require.progs proccontrol +} + +map_32bit_w_aslr_body() +{ + atf_check -s exit:0 -x proccontrol -m aslr -s enable \ + $(atf_get_srcdir)/mmap_map_32bit_helper +} + +map_32bit_wo_aslr_head() +{ + atf_set descr "MAP_32BIT without ASLR" + atf_set require.progs proccontrol +} + +map_32bit_wo_aslr_body() +{ + atf_check -s exit:0 -x proccontrol -m aslr -s disable \ + $(atf_get_srcdir)/mmap_map_32bit_helper +} + + +atf_init_test_cases() +{ + atf_add_test_case map_32bit_w_aslr + atf_add_test_case map_32bit_wo_aslr +}