From nobody Fri Jul 15 18:03:58 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 4Lkzkk3fHsz4TGjX; Fri, 15 Jul 2022 18:03:58 +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 4Lkzkk2x45z3RL6; Fri, 15 Jul 2022 18:03:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657908238; 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=CIADf/DyeqtumFgoXc2xsKWaK2vUwqEon/HSqoMdVRg=; b=TYwPOodcQAPslGyGC6HfuzE/0bR2li1G2OJ6Q3mPfaxS2O/s+Cxs8MzIOvnUuD16NLhGS9 DMdis3Hbz+OlJT9MZPrjUl5Vld3fwNyVX3E9c+0Rfs1v1I/uLN8qrc30FhxZjVJx//WWSj 5CjPsjCifCbmHZqdpoBSCCniEXWb7kKMQOGHs2C1UmTvNyQP29FafrmYtyv0nSVEljsX/q R7YRbrc8ORWcwi23LUNqh8mgs8DOxMhj3SXIdn2HE+Abnx/6O0XWFjW3Fu82FSVFIF2mvF YRoGHhOUWfA+NSV8vwVgB+flJkuPqiamtgYPqDpgsVpoRUdtwAZMDoMz06Gg4Q== 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 4Lkzkk22R7zrXS; Fri, 15 Jul 2022 18:03:58 +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 26FI3wIa060213; Fri, 15 Jul 2022 18:03:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 26FI3wJ8060212; Fri, 15 Jul 2022 18:03:58 GMT (envelope-from git) Date: Fri, 15 Jul 2022 18:03:58 GMT Message-Id: <202207151803.26FI3wJ8060212@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: 76949f503f00 - main - kboot: Implement munmap(2) 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: 76949f503f008b28865bd0fd026a550a3cb48619 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1657908238; 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=CIADf/DyeqtumFgoXc2xsKWaK2vUwqEon/HSqoMdVRg=; b=IBzJwJYaRQYtOJ5D7M35ARILG3hobKeOwr3YnScKVmsHSNjmlxUBHc6o7yrRTDfefsPkIT C/2QwZNUm7uC7ne1E3duvGzkKtAoKrWmbmPhcQpBTlolFJCK8UHVly/aJkZZYUDb4B5aGU h+FSCU0WuDFSwgDe5v3JK45hoDABOu95NBXht4emuzdSlsU2uVQ4sjZORj2OWmeK2mRYz1 Wbjhp29HEM4y6AY0u89tdd1KT+Niwufza8BzfoLW2SgCG0oqyAKWlP8TzGw/8ldCo6obAv oIGZ6/ikwQNFpnpnb+QKEbdtHmJoaVUGY77jMxB6inO1dm2FWWnik16kjtwflw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1657908238; a=rsa-sha256; cv=none; b=i++o7xR+cUUOI3xNa89j//PWE36D857rMkN1dDV8nt2tJpbh7j4ueuCejUOhzhojvthbhZ cvPk72Uyv5hRo2HzMM71FuPIOZxiSVRYqiUDHINXfO4YO0oC2a2+uYY2mZDSMj1scCcAO4 Sc15Kdko8qv9qxdDV/EM/lYetZi/3qD/HbXHg+dgjiT6Tc7f0JTbwuuMpPcNeSwF+X+M/j qqGZ8PebmDbSBiLqpMbWQtw/4NOsO+4KXBWnHFa64dTItJgjK7XwWvnSOKYGRjKUtcDaQd VZwR5K6QDb00CZWnCcEZGzYzbw7Qcu/Q2bMV4amGTrGKdyKzae48vRZQ2jSn1Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=76949f503f008b28865bd0fd026a550a3cb48619 commit 76949f503f008b28865bd0fd026a550a3cb48619 Author: Warner Losh AuthorDate: 2022-06-27 23:49:21 +0000 Commit: Warner Losh CommitDate: 2022-07-15 18:00:50 +0000 kboot: Implement munmap(2) Define host_munmap so we can use it in the x86 code to find things for the BIOS/CMS boot path and unmap after we find it. Sponsored by: Netflix --- stand/kboot/arch/amd64/syscall_nr.h | 1 + stand/kboot/arch/powerpc64/syscall_nr.h | 1 + stand/kboot/host_syscall.h | 1 + stand/kboot/host_syscalls.c | 6 ++++++ 4 files changed, 9 insertions(+) diff --git a/stand/kboot/arch/amd64/syscall_nr.h b/stand/kboot/arch/amd64/syscall_nr.h index c22c80ea7cb9..7813eff92890 100644 --- a/stand/kboot/arch/amd64/syscall_nr.h +++ b/stand/kboot/arch/amd64/syscall_nr.h @@ -4,6 +4,7 @@ #define SYS_kexec_load 246 #define SYS_lseek 8 #define SYS_mmap 9 +#define SYS_munmap 11 #define SYS_newfstat 5 #define SYS_newfstatat 262 #define SYS_openat 257 diff --git a/stand/kboot/arch/powerpc64/syscall_nr.h b/stand/kboot/arch/powerpc64/syscall_nr.h index aa94e6a82bb7..9471fd48ceb2 100644 --- a/stand/kboot/arch/powerpc64/syscall_nr.h +++ b/stand/kboot/arch/powerpc64/syscall_nr.h @@ -5,6 +5,7 @@ #define SYS_kexec_load 268 #define SYS_llseek 140 #define SYS_mmap 90 +#define SYS_munmap 91 #define SYS_newfstat SYS_fstat #define SYS_newfstatat 291 #define SYS_openat 286 diff --git a/stand/kboot/host_syscall.h b/stand/kboot/host_syscall.h index 6ff20f7ba393..8007f29feb9d 100644 --- a/stand/kboot/host_syscall.h +++ b/stand/kboot/host_syscall.h @@ -96,6 +96,7 @@ int host_gettimeofday(struct host_timeval *a, void *b); int host_kexec_load(uint32_t start, int nsegs, uint32_t segs, uint32_t flags); ssize_t host_llseek(int fd, int32_t offset_high, int32_t offset_lo, uint64_t *result, int whence); void *host_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t off); +int host_munmap(void *addr, size_t len); int host_open(const char *path, int flags, int mode); ssize_t host_read(int fd, void *buf, size_t nbyte); int host_reboot(int, int, int, uintptr_t); diff --git a/stand/kboot/host_syscalls.c b/stand/kboot/host_syscalls.c index 9cc6c6cd873e..3cfccdc0c718 100644 --- a/stand/kboot/host_syscalls.c +++ b/stand/kboot/host_syscalls.c @@ -57,6 +57,12 @@ host_mmap(void *addr, size_t len, int prot, int flags, int fd, off_t off) return (void *)host_syscall(SYS_mmap, (uintptr_t)addr, len, prot, flags, fd, off); } +int +host_munmap(void *addr, size_t len) +{ + return host_syscall(SYS_munmap, (uintptr_t)addr, len); +} + int host_open(const char *path, int flags, int mode) {