From nobody Thu Mar 2 18:18:29 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 4PSK9L13Ngz3w6Ym; Thu, 2 Mar 2023 18:18:30 +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 4PSK9L0VvPz3MMk; Thu, 2 Mar 2023 18:18:30 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781110; 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=NAVhMisvcIOChcKZ52blPMizcb+LD5P80ECqf9+dvps=; b=gYn+ee8C85Az2IHPG5lnc2x2avxyiQastx8+wyJympAqXuBGSDeKRt0oXtQXGejCxrHsYh rrWpuAFSgQB262lV4itKJKIpa+GkV1GVi17eRpBiZDOY/cWpqStin1nt3NeJN09+u8assY bouwSpOn2Qw6q0iUTjvCLkkVQ6yJIlPcrF3P0tC0QYOHILHvU9hM1dq6fytWcu636sb7wz xO0+dTp8l85A2AoWFSUxRHVdNkUS7oSrvjCCQQ4uSI5rrzzDY3V33k9GXs+66GSCPgatNa kMicH0oTNDoP9PltBFkzbqIGYif7g8scPoFgjfPqY4VnMnusaeJZ3CL36Zk1zQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1677781110; 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=NAVhMisvcIOChcKZ52blPMizcb+LD5P80ECqf9+dvps=; b=eJhBjIDXabOD93DLwDc4S8WwRrwxJXJDhsnPV8C9rbR8ceuiy/O7LO3kkmIMvJgh2WR/4p yMP7BuMmfpY/fcwnnhgDsF5LTpjoFmQidGzUD7TLqd1AODMIOmU7QhSuACfTIWW16x+vUz h5GerhbsE96/Rmzl06YRwfZZlxzcHf2K3eMV3M9oyfOiPmydhnzvAjIkFH4k+THdDOqloc 62lwzqHfb66rdWHF0JnT64R/W33ln8zLcxxljNBsrMP/dZBC3rI7lbemH3Fdmh3bdj+w6k pKlx4CrHFTUXyADtUiss3e2ji+3CWzh16MVbXI+RaWwNfbPw6WNIiNxP3tiTng== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1677781110; a=rsa-sha256; cv=none; b=SatKCTL18LzTW2UF1uHk0wizeQvVxu+hkSUELZNDqUU8tu0qazdaOYk+p0Zx0z/ByZf8u+ LulO79zLKzwoQg+heOGZ8yF/MjQxOREXpmueR5IiODej+7TW21fcl7oYRI+hW78qjXOFUw fRA4JpKT8JreAX4+S6tnVaHccLPK1v1pVdjSDQ7JqSoeGj01kotSzPx/UARp9SfVAuZr+B x9n8w/jnDtskFtslJ366mGKzgF+Ih+Y8rp0/aD+jk9AkrlQNLjYW1C2cPC44T4bNoF+2bP FDRTLW7ZQFoEEChEWUi4NEgSve3RSmcP2IjDxiKhFD2GUz3+aVsVYBMoXzdJbw== 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 4PSK9K6gPHzR9K; Thu, 2 Mar 2023 18:18:29 +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 322IIT8Y035373; Thu, 2 Mar 2023 18:18:29 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 322IITGb035372; Thu, 2 Mar 2023 18:18:29 GMT (envelope-from git) Date: Thu, 2 Mar 2023 18:18:29 GMT Message-Id: <202303021818.322IITGb035372@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Warner Losh Subject: git: 6c47abb63bd5 - main - kboot: Hack for running on FreeBSD host 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6c47abb63bd55db0f5234ed1c3c107a103e6fb85 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=6c47abb63bd55db0f5234ed1c3c107a103e6fb85 commit 6c47abb63bd55db0f5234ed1c3c107a103e6fb85 Author: Warner Losh AuthorDate: 2023-03-02 17:31:05 +0000 Commit: Warner Losh CommitDate: 2023-03-02 18:12:09 +0000 kboot: Hack for running on FreeBSD host When we're running on a FreeBSD host, we can't open /proc/iomem. So, for now, just assume that we have 32GB of ram starting at 4GB. Sponsored by: Netflix --- stand/kboot/main.c | 5 +++++ stand/kboot/seg.c | 3 +++ 2 files changed, 8 insertions(+) diff --git a/stand/kboot/main.c b/stand/kboot/main.c index f81d7b2cead4..1cc4c0531772 100644 --- a/stand/kboot/main.c +++ b/stand/kboot/main.c @@ -86,6 +86,11 @@ memory_limits(void) committed_as <<= 10; /* Units are kB */ } } + } else { + /* Otherwise, on FreeBSD host, for testing 32GB host: */ + mem_avail = 31ul << 30; /* 31GB free */ + commit_limit = mem_avail * 9 / 10; /* 90% comittable */ + committed_as = 20ul << 20; /* 20MB used */ } printf("Commit limit: %lld Committed bytes %lld Available %lld\n", (long long)commit_limit, (long long)committed_as, diff --git a/stand/kboot/seg.c b/stand/kboot/seg.c index 947aa0a2a7a3..4da53e2bc75d 100644 --- a/stand/kboot/seg.c +++ b/stand/kboot/seg.c @@ -286,6 +286,9 @@ populate_avail_from_iomem(void) fd = open("host:/proc/iomem", O_RDONLY); if (fd == -1) { printf("Can't get memory map\n"); + init_avail(); + // Hack: 32G of RAM starting at 4G + add_avail(4ull << 30, 36ull << 30, system_ram); return false; }