From nobody Tue Jan 24 22:10:36 2023 X-Original-To: dev-commits-src-branches@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 4P1h4D65vYz3bf3q; Tue, 24 Jan 2023 22:10:36 +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 4P1h4D28Zlz4KcQ; Tue, 24 Jan 2023 22:10:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598236; 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=w24KJakd5ok0ikmvHwu8Lp4xWqe+yjEdb2JJX9dtYTM=; b=ujEAjGc9ixhA9rFr/JwKxLXgxFSGIcAWEV8/N5NGEomoHHN1Hk9Alyx6c+IuMR/+K+A+bd 6SYLMaWu1hPMoYxfe/j8KsUSxTl9il0KTULTxt2Z2i+6S2SqpsR1xYcVFArKEkLXAB/eKS VMf2OyTlchup4opM268C9OdboL4PS0MnKZTn+xxuv0m6s+U2h3X3aFXLaW8Kx8NOZ4nKbB +skU2GMJxj2Z5uHS66e8xzBzIUvk2e555xJEM7w7ei9kEY0h0umOVMH8IEEXiy7ND6Io5V 6NCrpimIyU9V3CCWk91o3w1JGNmK7z0uSEcG8k+ATe8pd8Bo9A5qOUHPA2D2pA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598236; 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=w24KJakd5ok0ikmvHwu8Lp4xWqe+yjEdb2JJX9dtYTM=; b=Gv6U+cA7SkXPPPAe80SBD74We2zHOdeQkV0N0MHOJ4dWKMVm/AVFapTFy3uDRHVXHMLdbn 4J+gFEsMYX3UsvM4dKgMAqjri/W3FksF/OSJBwEDROgpE6IUsgjDawMvnaj+mB9jG40yiB l0WNVFF9iarD2Ea8czSt9XBHSoCAXaL4ipSplr9aZYEg6DYRXUbMFyapLFk/PsSTSSLRrY k0zEzFb48vtXE30pB4FhLt0+8oer3CUL1e5VEfa6e+7jQ4SrJXVXDmbP5gtbmfFVApShgl 5rO+7X4mGCDX4jjKQNxsPRXwEdEzU3/gb9V4Fyuov86hKh0ZXZomw7GylmJX/A== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598236; a=rsa-sha256; cv=none; b=tAgZC3zQyNDzlAJKeBYDe/5bQV3/ux5fJYTjUmEOvjHyAyCdhDCzdy3yIGlQa3w3rPB9iF gMdIWy+csKXCx4X/USO4/XCgz/6MSiwSmk2jyK/07o/8iIKqm3hRInrJ2slGwr+ZLY8v7r zZmzbQsmyGJ8K9x3b+j5d1HxE5jbODp/8+83CmJUCmizKjNZB7eeCjdFVHphXcpv8b6uSM BZESOWci68GrBwqfhP0FFLVC2i8PNpgzIneK11mzNsxpdZvd9L40sNgGiT/4pkj8dfuM3z wlwt0ktGqbfKMGSgRYXnPAd2pqGr9lPgx2tpBqV9GJZl3OsBY17niHcH9pv+tw== 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 4P1h4D0rjNzQ1N; Tue, 24 Jan 2023 22:10:36 +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 30OMAaOV080273; Tue, 24 Jan 2023 22:10:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMAavM080272; Tue, 24 Jan 2023 22:10:36 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:10:36 GMT Message-Id: <202301242210.30OMAavM080272@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Warner Losh Subject: git: d1380cef38c4 - stable/13 - kboot: rename kexec_load to host_kexec_load List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: d1380cef38c42a8a63517651df2df64633bf6dea Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=d1380cef38c42a8a63517651df2df64633bf6dea commit d1380cef38c42a8a63517651df2df64633bf6dea Author: Warner Losh AuthorDate: 2022-06-13 17:46:48 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:21 +0000 kboot: rename kexec_load to host_kexec_load And make it match the system call more closely by passing in the proper args. Sponsored by: Netflix (cherry picked from commit d8f3ef8f544e0c22c09cfa4f7b51ccac2666b59f) --- stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c | 3 ++- stand/kboot/host_syscall.h | 2 +- stand/kboot/host_syscalls.c | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c b/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c index adbdc7fca915..7de963d4e211 100644 --- a/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c +++ b/stand/kboot/arch/powerpc64/ppc64_elf_freebsd.c @@ -39,6 +39,7 @@ __FBSDID("$FreeBSD$"); #include #include "bootstrap.h" +#include "syscall_nr.h" #include "host_syscall.h" extern char end[]; @@ -152,7 +153,7 @@ ppc64_elf_exec(struct preloaded_file *fp) panic("architecture did not provide kexec segment mapping"); archsw.arch_kexec_kseg_get(&nseg, &kseg); - error = kexec_load(trampolinebase, nseg, (uintptr_t)kseg); + error = host_kexec_load(trampolinebase, nseg, (uintptr_t)kseg, KEXEC_ARCH << 16); if (error != 0) panic("kexec_load returned error: %d", error); diff --git a/stand/kboot/host_syscall.h b/stand/kboot/host_syscall.h index b7861e1af6f1..3a640af30565 100644 --- a/stand/kboot/host_syscall.h +++ b/stand/kboot/host_syscall.h @@ -54,7 +54,7 @@ struct host_timeval { int host_close(int fd); int host_getdents(int fd, void *dirp, int count); int host_gettimeofday(struct host_timeval *a, void *b); -int kexec_load(uint32_t start, int nsegs, uint32_t segs); +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_open(const char *path, int flags, int mode); diff --git a/stand/kboot/host_syscalls.c b/stand/kboot/host_syscalls.c index 3a5cdd7d8ea4..66014462ccdd 100644 --- a/stand/kboot/host_syscalls.c +++ b/stand/kboot/host_syscalls.c @@ -26,9 +26,9 @@ host_gettimeofday(struct host_timeval *a, void *b) } int -kexec_load(uint32_t start, int nsegs, uint32_t segs) +host_kexec_load(uint32_t start, int nsegs, uint32_t segs, uint32_t flags) { - return host_syscall(SYS_kexec_load, start, nsegs, segs, KEXEC_ARCH << 16); + return host_syscall(SYS_kexec_load, start, nsegs, segs, flags); } ssize_t