From nobody Tue Jan 24 22:11:00 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 4P1h4j2tr8z3bf4d; Tue, 24 Jan 2023 22:11:01 +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 4P1h4j1T2Mz4LxV; Tue, 24 Jan 2023 22:11:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598261; 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=I87SuzlGYMCRBugLHpo2jgWnd7UccK1HSfcxw+vn9Jw=; b=xu6kjWE/Ex1yAm8ineUysayKoTprCh/ubaIg/jXgQBCAy6ENjfL7LGI855CZrs8L8lDxpG 7sTvopjHUU+CRLj2HX1JsS58Juq7bN5XPfrfT+YdKGc3FsXRiFW0byAtU3MrvB0s6NaC+V wgAK7trmaXTtKcaTpn8A7OHscPrSrvQdhGjU/4EucCsK1PvplEaQghjFnP3dqUut9kY+BI 0Xwnb/T0Ui2Oal3sJyiArxkkO7qOIHmZHNEl3ToRoX7bCEAwU6Pmv190nYu8V6W+q3CAt4 //cRKP8br0FRFtrYZs1nzKaMPPKBkrUlMhmgx6HN7iR4tx2bc5e44y17YveXfA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674598261; 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=I87SuzlGYMCRBugLHpo2jgWnd7UccK1HSfcxw+vn9Jw=; b=rGvWpRchTrFNbLWV72xRgXWJsw9h+ULkMa9Wv/RbX9/lmAPvvRh1cbcKpNpCISg4GAsNcI t4wwFo3FS+6ah6xAFdRqhX/RNrbCRkaVz6RTZdI9TTX5ooPWSbRLnkuK/+bVmA1sDMDEUg pK6UXUkDF6BYW9xvG4R0X84faGkQV+XIDN//F8rltc2u8reqigT6W1SHQ11LLqRYuChsVy Ishq5WthwCtVcIuMvTgJx1ukwRHfiU1tj7CSLsb2soSx93rQtS4DNy378YlOpCtfkvTT82 b0COSyQdt+dO+9enJ2UJxAtnqFcZZwcb3malJG7d6b5CbCAeFzuDmtA1dJi7Ow== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674598261; a=rsa-sha256; cv=none; b=bsQq3fXdhpzjPjc25SYK/Yj6l8yWBNJw5DMzK8B/ugUF6gYJYpHrpzK9uwwGxLaig99a0R c9riz43s5/Jm2TPME/xN1HsY2MRlkuS8BEt7F34MEEP2NPYwGKlB4v0e9lySLw5L0Dpn3U nafAYHYdGZ0uMGXWjtZ3rCpKYsA3hLKt1J3yLLRXe8QksC/UMymD0D/CULctCanhmdJaC/ oKd4te16JpKs61xKvwZm3CXg6QqOtRpi7MHa793FhCSLlR+G1ht1aMAvhIXfviwtptZkby Q1X9n6BEis19C0VV9FpFoL+xPUxdTP+mY/JBuPu52RIAiXjO3RRACUi8+Wa4JA== 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 4P1h4h6RLHzQRN; Tue, 24 Jan 2023 22:11:00 +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 30OMB08x083331; Tue, 24 Jan 2023 22:11:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30OMB0nA083330; Tue, 24 Jan 2023 22:11:00 GMT (envelope-from git) Date: Tue, 24 Jan 2023 22:11:00 GMT Message-Id: <202301242211.30OMB0nA083330@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: 96ea167ec8d6 - stable/13 - kboot: Implement dup(2) 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: 96ea167ec8d66974f510ea2514f1e77d4484cf34 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by imp: URL: https://cgit.FreeBSD.org/src/commit/?id=96ea167ec8d66974f510ea2514f1e77d4484cf34 commit 96ea167ec8d66974f510ea2514f1e77d4484cf34 Author: Warner Losh AuthorDate: 2022-06-30 18:25:49 +0000 Commit: Warner Losh CommitDate: 2023-01-24 21:49:24 +0000 kboot: Implement dup(2) Early in boot, we need to create the normal stdin/out/err env for the boot loader to run in. To do that, we need to open the console and duplicate the file descriptors which requires dup(2). Implement a wrapper as host_dup. Sponsored by: Netflix (cherry picked from commit bc84de741dfd3b81cc7d332f8e6f0d84afe4eee1) --- 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 756b3e93af9a..62deefe73539 100644 --- a/stand/kboot/arch/amd64/syscall_nr.h +++ b/stand/kboot/arch/amd64/syscall_nr.h @@ -1,4 +1,5 @@ #define SYS_close 3 +#define SYS_dup 32 #define SYS_getdents 78 #define SYS_getpid 39 #define SYS_gettimeofday 96 diff --git a/stand/kboot/arch/powerpc64/syscall_nr.h b/stand/kboot/arch/powerpc64/syscall_nr.h index 13f26d80f6a3..d6678d9044d9 100644 --- a/stand/kboot/arch/powerpc64/syscall_nr.h +++ b/stand/kboot/arch/powerpc64/syscall_nr.h @@ -1,4 +1,5 @@ #define SYS_close 6 +#define SYS_dup 41 #define SYS_fstat 108 #define SYS_getdents 141 #define SYS_getpid 20 diff --git a/stand/kboot/host_syscall.h b/stand/kboot/host_syscall.h index 3b02f2e78304..10d4166514b9 100644 --- a/stand/kboot/host_syscall.h +++ b/stand/kboot/host_syscall.h @@ -92,6 +92,7 @@ struct host_timeval { * System Calls */ int host_close(int fd); +int host_dup(int fd); int host_fstat(int fd, struct host_kstat *sb); int host_getdents(int fd, void *dirp, int count); int host_getpid(void); diff --git a/stand/kboot/host_syscalls.c b/stand/kboot/host_syscalls.c index a69937a5a0e1..2fe4c599df82 100644 --- a/stand/kboot/host_syscalls.c +++ b/stand/kboot/host_syscalls.c @@ -13,6 +13,12 @@ host_close(int fd) return host_syscall(SYS_close, fd); } +int +host_dup(int fd) +{ + return host_syscall(SYS_dup, fd); +} + int host_fstat(int fd, struct host_kstat *sb) {