From nobody Fri Oct 14 15:33:41 2022 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 4Mpr5K3QDnz4fhC6; Fri, 14 Oct 2022 15:33:41 +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 4Mpr5K30X8z49MN; Fri, 14 Oct 2022 15:33:41 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665761621; 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=Jkmg3d9VXq/K1L4eT6g8C8pH9jFW8nrz+RSBLg5U3FY=; b=g5YC4yCfD31ZLWuL3ohpxUssEO4oX34HOhUmT7wJvwTOtccLwXgnHY6fwIFOO3KT0gvW4o Iukeh9S5YVN9aWdudTG0NUU9RLAHCxvnotA7eum7Wf0so5iaeojUxbcWqYHDImToWm5rHT gqMofz/cx70NhLL1gfOV9fuIo0S/xp7T47RAsUFNL2MPys2PpHldEZIcXGid+Plit6o5yD pbvxw4sz60rCwvQ1eCSLuiEjIhC2cdW8Ux2XwmJytry2eIuROwrFbNdnI+qnGrXy2gEA3C bK37hYuNsE+VNpa8ojyA2eRORgeoynpRLoDsHUc2Y7KQ1AiOvmRhHaQbTJp41A== 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 4Mpr5K23gSzptQ; Fri, 14 Oct 2022 15:33:41 +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 29EFXfT9001548; Fri, 14 Oct 2022 15:33:41 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 29EFXf5x001547; Fri, 14 Oct 2022 15:33:41 GMT (envelope-from git) Date: Fri, 14 Oct 2022 15:33:41 GMT Message-Id: <202210141533.29EFXf5x001547@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 73a78b5efa73 - main - kinst: Clarify a comment in the trampoline allocator 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: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 73a78b5efa737f53c81b37926476757b28888e54 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1665761621; 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=Jkmg3d9VXq/K1L4eT6g8C8pH9jFW8nrz+RSBLg5U3FY=; b=Ygp8KTsorlg2mQzBZQtkpdwOrqBwLl30DIDHOHOQv9kutsUzTYBeC0tx2r7AtX+bi4qxIb bAXhOesCvRCcRpxFqK4+IpB9xFuw9iOfcOrL8+yC9O7YP1kvZ98nHtKiTNwrCn27W5q5vt KKMG4S/UrgMKW/Wg7GZaYC+01q13CB/W5KuaSMzDFDvWpAKeK6zAycObtU3f6LCx81w6Dv Hj5rMvwinefzfytZy1c8JDxX5HAvylVHk3QHwJIQoMZVB02FvH7ORwWXEHeVTZXNtCkIC7 ilgeHDrRsa6bk9c4o6VOJvoIdxLgtge8neFxHE835FfWlug355umQnzdydi+uQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1665761621; a=rsa-sha256; cv=none; b=vkvdzr8fjNBiJyetivJalxPCk2FXzVLx0sGvYij53BoiUtZJhYsIVTE70Pg0A98SJHNKKG D76JWewD7K1HlXKFDpYQ2Ms8Rv9r7iDI4mwqFPMklEmT3g9am+kuJM1r3sah9wzmfVnKHs ILSLq6OKGcNFJ+EECQ0xNvAKVlH1+mZCCYCD7pNLu6UtuSl7TVBl7F1E70AmbiGanUfr84 TubzK+TGtqbvH8TiAzNPokwz/NgpZJ5krouQGfx19A07bKNGrRvWcvNigauk+xwIMPx7gK cvC8/YjoBNc/tODwGdYWl0cNoqtxE6/zaDLMz0Z2SXFd1D6m3x3pap5g7Yz1Zw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=73a78b5efa737f53c81b37926476757b28888e54 commit 73a78b5efa737f53c81b37926476757b28888e54 Author: Mark Johnston AuthorDate: 2022-10-14 15:17:12 +0000 Commit: Mark Johnston CommitDate: 2022-10-14 15:32:47 +0000 kinst: Clarify a comment in the trampoline allocator Fixes: f0bc4ed144fc ("kinst: Initial revision") --- sys/cddl/dev/kinst/trampoline.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sys/cddl/dev/kinst/trampoline.c b/sys/cddl/dev/kinst/trampoline.c index 094b055f1b14..2749fe7144a2 100644 --- a/sys/cddl/dev/kinst/trampoline.c +++ b/sys/cddl/dev/kinst/trampoline.c @@ -58,10 +58,11 @@ kinst_trampchunk_alloc(void) /* * Allocate virtual memory for the trampoline chunk. The returned - * address is saved in "trampaddr". - * - * Setting "trampaddr" to KERNBASE causes vm_map_find() to return an - * address above KERNBASE, so this satisfies both requirements. + * address is saved in "trampaddr". To simplify population of + * trampolines, we follow the amd64 kernel's code model and allocate + * them above KERNBASE, i.e., in the top 2GB of the kernel's virtual + * address space. Trampolines must be executable so max_prot must + * include VM_PROT_EXECUTE. */ trampaddr = KERNBASE; error = vm_map_find(kernel_map, NULL, 0, &trampaddr,