From nobody Fri Dec 2 18:22:50 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 4NP1Wt5pN6z4hryH; Fri, 2 Dec 2022 18:22:50 +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 4NP1Wt56Pcz42yP; Fri, 2 Dec 2022 18:22:50 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670005370; 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=ezja818zipF1ab65QF7mV6mmNevhy1MtaX4ZNU6wQFY=; b=rBM2aihLq+1qztbsjMLSuGLI62QngsP3n0l0CkXBLG8niR5HWhQ+zxbLF+X2DwXj0fvNm3 wL0HX2LvNOAfBio63RxXF1xao8pdHWhco6YPeQbtAH1Rmx6hJAwJqb4XDzkgNsI1oylywN TO5mx8lRjdU/lsZM8nFJ+a5oX8YrEzttAUa1wsrGsB1Bx+xT+3Jey09jqlpAGRV2T6m/Qh 7dEstJzD3CiiEbZ9a62/RnFz9Y+18gIhuZ+fen0dQGn4+bEwUVZXft3qarBYdhe/zkHGFM 0+0UlvxMs40AcmlWXJHRFbaF5r8jSgRrwr/a5BIXyoWCqtMVakOhOr/7MhIT8Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1670005370; 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=ezja818zipF1ab65QF7mV6mmNevhy1MtaX4ZNU6wQFY=; b=VjESFd55fSwvP33atj0JrkmeIt3WaBLBAedaPSqH0qfu1oMmuheKHt3djHSZTLNMo5cj1A umxJ924NCeXMXsD1LVM0AT29cwHfIcS2FMfXdG84l0n7eY1zxeayTgR190MMS//GA4AG0/ GIsMvIr6UzUsrnjKNwHGVzT4P+m6Yx8jjefjfkMKrYeHMfodAYB61gepEp+Fmi9a3W+STg xZRc+fX7BFjjdw9IKEkfYkE4bERIuQgc8lcEUxQCXPhdSKWPg+5aK+X48iEpyFB/sIzEtV Vx0PP0i62qwmozvOjrQXTJjIIsJToGkPoaZhTSdC+xEYfCEZxsSfkgqXNYXNHg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1670005370; a=rsa-sha256; cv=none; b=W0TcfgJcv7e1+GsHWziGrVax8HkKvaZwwEB4aRM3CGd807C4iEBtGCuf0RQhLnw8rl+kse ac4VYDMJQc1RbsBSf0h2/+T1ZI679W1MD1JfYPona79+a395LtoCbCI+MUgT6kVMJMJZY7 sKyacaPmkkdxf130gIrWHt/IscC7SXC5YtKgRZ6kehhp5j4i/aJMDRkCMFEzntPyrU1JW1 AAFx7EHkNoJiCTFUSMIrSZlPfLoQkShVWmKQ09Tr0blig+IN92Kk+uYDGOMJgW2cwYghxL cWVDXLdnoylnm+qX8qRbrkpOJOxccMOrgMP41FaUd9wEIgzcLZ3ytI0aWwST8w== 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 4NP1Wt46RhzQgH; Fri, 2 Dec 2022 18:22:50 +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 2B2IMooL062480; Fri, 2 Dec 2022 18:22:50 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2B2IMoMY062479; Fri, 2 Dec 2022 18:22:50 GMT (envelope-from git) Date: Fri, 2 Dec 2022 18:22:50 GMT Message-Id: <202212021822.2B2IMoMY062479@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: c51e1d7c0a79 - main - kboot: amd64 use /sys/firmware/memmap to find free memory 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: imp X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c51e1d7c0a79a4fe2774d526ad0393cd2edd3f6c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=c51e1d7c0a79a4fe2774d526ad0393cd2edd3f6c commit c51e1d7c0a79a4fe2774d526ad0393cd2edd3f6c Author: Warner Losh AuthorDate: 2022-12-02 18:10:42 +0000 Commit: Warner Losh CommitDate: 2022-12-02 18:17:28 +0000 kboot: amd64 use /sys/firmware/memmap to find free memory Use the system's firmware memory map to find a good place to put the kernel that won't stomp on anything else. While this uses obstensibly MI interfaces to get this data, arm64 doesn't have this, nor does powerpc64, so place it here. Sponsored by: Netflix --- stand/kboot/arch/amd64/load_addr.c | 127 ++++++++++++++++++++++++++++++++++++- 1 file changed, 126 insertions(+), 1 deletion(-) diff --git a/stand/kboot/arch/amd64/load_addr.c b/stand/kboot/arch/amd64/load_addr.c index cbe066d02d40..fccd17cf8d51 100644 --- a/stand/kboot/arch/amd64/load_addr.c +++ b/stand/kboot/arch/amd64/load_addr.c @@ -30,8 +30,133 @@ #include "host_syscall.h" #include "kboot.h" +/* Refactor when we do arm64 */ + +struct memory_segments +{ + uint64_t start; + uint64_t end; + uint64_t type; +}; + +enum types { + system_ram = 1, + acpi_tables, + acpi_nv_storage, + unusable, + persistent_old, + persistent, + soft_reserved, + reserved, +}; + +struct kv +{ + uint64_t type; + char * name; +} str2type_kv[] = { + { system_ram, "System RAM" }, + { acpi_tables, "ACPI Tables" }, + { acpi_nv_storage, "ACPI Non-volatile Storage" }, + { unusable, "Unusable memory" }, + { persistent_old, "Persistent Memory (legacy)" }, + { persistent, "Persistent Memory" }, + { soft_reserved, "Soft Reserved" }, + { reserved, "reserved" }, + { 0, NULL }, +}; + +#define MEMMAP "/sys/firmware/memmap" + +static bool +str2type(struct kv *kv, const char *buf, uint64_t *value) +{ + while (kv->name != NULL) { + if (strcmp(kv->name, buf) == 0) { + *value = kv->type; + return true; + } + kv++; + } + + return false; +} + +static int +read_memmap(struct memory_segments *segs, int maxseg) +{ + int n; + char name[MAXPATHLEN]; + char buf[80]; + + n = 0; + do { + snprintf(name, sizeof(name), "%s/%d/start", MEMMAP, n); + if (!file2u64(name, &segs[n].start)) + break; + snprintf(name, sizeof(name), "%s/%d/length", MEMMAP, n); + if (!file2u64(name, &segs[n].end)) + break; + snprintf(name, sizeof(name), "%s/%d/type", MEMMAP, n); + if (!file2str(name, buf, sizeof(buf))) + break; + if (!str2type(str2type_kv, buf, &segs[n].type)) + break; + n++; + } while (n < maxseg); + + return n; +} + +#define BAD_SEG ~0ULL + +#define SZ(s) (((s).end - (s).start) + 1) + +static uint64_t +find_ram(struct memory_segments *segs, int nr_seg, uint64_t minpa, uint64_t align, + uint64_t sz, uint64_t maxpa) +{ + uint64_t start; + + /* XXX assume segs are sorted in numeric order -- assumed not ensured */ + for (int i = 0; i < nr_seg; i++) { + if (segs[i].type != system_ram || + SZ(segs[i]) < sz || + minpa + sz > segs[i].end || + maxpa < segs[i].start) + continue; + start = roundup(segs[i].start, align); + if (start < minpa) /* Too small, round up and try again */ + start = (roundup(minpa, align)); + if (start + sz > segs[i].end) /* doesn't fit in seg */ + continue; + if (start > maxpa || /* Over the edge */ + start + sz > maxpa) /* on the edge */ + break; /* No hope to continue */ + return start; + } + + return BAD_SEG; +} + uint64_t kboot_get_phys_load_segment(void) { - return (~0ULL); + static uint64_t base_seg = BAD_SEG; + struct memory_segments segs[32]; + int nr_seg; + + if (base_seg != BAD_SEG) + return (base_seg); + + nr_seg = read_memmap(segs, nitems(segs)); + if (nr_seg > 0) + base_seg = find_ram(segs, nr_seg, 2ULL << 20, 2ULL << 20, + 64ULL << 20, 4ULL << 30); + if (base_seg == BAD_SEG) { + /* XXX Should fall back to using /proc/iomem maybe? */ + /* XXX PUNT UNTIL I NEED SOMETHING BETTER */ + base_seg = 42ULL * (1 << 20); /* Jam it in at the odd-ball address of 42MB so it stands out */ + } + return (base_seg); }