linux-fsdevel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Christoph Hellwig <hch@lst.de>
To: linux-kernel@vger.kernel.org
Cc: "H. Peter Anvin" <hpa@zytor.com>, Song Liu <song@kernel.org>,
	Al Viro <viro@zeniv.linux.org.uk>,
	Linus Torvalds <torvalds@linux-foundation.org>,
	linux-raid@vger.kernel.org, linux-fsdevel@vger.kernel.org
Subject: [PATCH 18/23] init: open code setting up stdin/stdout/stderr
Date: Tue, 14 Jul 2020 21:04:22 +0200	[thread overview]
Message-ID: <20200714190427.4332-19-hch@lst.de> (raw)
In-Reply-To: <20200714190427.4332-1-hch@lst.de>

Don't rely on the implicit set_fs(KERNEL_DS) for ksys_open to work, but
instead open a struct file for /dev/console and then install it as FD
0/1/2 manually.

Signed-off-by: Christoph Hellwig <hch@lst.de>
---
 init/main.c | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/init/main.c b/init/main.c
index 0ead83e86b5aa2..db0621dfbb0468 100644
--- a/init/main.c
+++ b/init/main.c
@@ -1457,15 +1457,19 @@ static int __ref kernel_init(void *unused)
 	      "See Linux Documentation/admin-guide/init.rst for guidance.");
 }
 
+/* Open /dev/console, for stdin/stdout/stderr, this should never fail */
 void console_on_rootfs(void)
 {
-	/* Open the /dev/console as stdin, this should never fail */
-	if (ksys_open((const char __user *) "/dev/console", O_RDWR, 0) < 0)
-		pr_err("Warning: unable to open an initial console.\n");
+	struct file *file = filp_open("/dev/console", O_RDWR, 0);
 
-	/* create stdout/stderr */
-	(void) ksys_dup(0);
-	(void) ksys_dup(0);
+	if (IS_ERR(file)) {
+		pr_err("Warning: unable to open an initial console.\n");
+		return;
+	}
+	get_file_rcu_many(file, 2);
+	fd_install(get_unused_fd_flags(0), file);
+	fd_install(get_unused_fd_flags(0), file);
+	fd_install(get_unused_fd_flags(0), file);
 }
 
 static noinline void __init kernel_init_freeable(void)
-- 
2.27.0


  parent reply	other threads:[~2020-07-14 19:10 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-14 19:04 decruft the early init / initrd / initramfs code v2 Christoph Hellwig
2020-07-14 19:04 ` [PATCH 01/23] fs: add a vfs_fchown helper Christoph Hellwig
2020-07-14 19:04 ` [PATCH 02/23] fs: add a vfs_fchmod helper Christoph Hellwig
2020-07-14 19:04 ` [PATCH 03/23] init: remove the bstat helper Christoph Hellwig
2020-07-15 23:14   ` NeilBrown
2020-07-14 19:04 ` [PATCH 04/23] md: move the early init autodetect code to drivers/md/ Christoph Hellwig
2020-07-14 19:04 ` [PATCH 05/23] md: replace the RAID_AUTORUN ioctl with a direct function call Christoph Hellwig
2020-07-15 23:33   ` NeilBrown
2020-07-14 19:04 ` [PATCH 06/23] md: remove the autoscan partition re-read Christoph Hellwig
2020-07-15 23:34   ` NeilBrown
2020-07-14 19:04 ` [PATCH 07/23] md: remove the kernel version of md_u.h Christoph Hellwig
2020-07-14 19:04 ` [PATCH 08/23] md: simplify md_setup_drive Christoph Hellwig
2020-07-15 23:37   ` NeilBrown
2020-07-14 19:04 ` [PATCH 09/23] md: rewrite md_setup_drive to avoid ioctls Christoph Hellwig
2020-07-15 23:50   ` NeilBrown
2020-07-16 13:38     ` Christoph Hellwig
2020-07-14 19:04 ` [PATCH 10/23] initrd: remove support for multiple floppies Christoph Hellwig
2020-07-14 19:04 ` [PATCH 11/23] initrd: remove the BLKFLSBUF call in handle_initrd Christoph Hellwig
2020-07-14 19:04 ` [PATCH 12/23] initrd: switch initrd loading to struct file based APIs Christoph Hellwig
2020-07-27  1:50   ` Al Viro
2020-07-14 19:04 ` [PATCH 13/23] initrd: mark init_linuxrc as __init Christoph Hellwig
2020-07-14 19:04 ` [PATCH 14/23] initrd: mark initrd support as deprecated Christoph Hellwig
2020-07-14 19:04 ` [PATCH 15/23] initramfs: remove the populate_initrd_image and clean_rootfs stubs Christoph Hellwig
2020-07-14 19:04 ` [PATCH 16/23] initramfs: simplify clean_rootfs Christoph Hellwig
     [not found]   ` <CGME20200717205549eucas1p13fca9a8496836faa71df515524743648@eucas1p1.samsung.com>
2020-07-17 20:55     ` Marek Szyprowski
2020-07-18 10:00       ` Christoph Hellwig
2020-07-23  9:22         ` Christoph Hellwig
2020-07-23 14:25           ` Lukasz Stelmach
2020-07-23 14:27             ` Christoph Hellwig
2020-07-27  2:41               ` Al Viro
2020-07-27  2:44                 ` Matthew Wilcox
2020-07-14 19:04 ` [PATCH 17/23] initramfs: switch initramfs unpacking to struct file based APIs Christoph Hellwig
2020-07-14 19:31   ` Linus Torvalds
2020-07-15  6:27     ` Christoph Hellwig
2020-07-27  2:55   ` Al Viro
2020-07-14 19:04 ` Christoph Hellwig [this message]
2020-07-27  3:05   ` [PATCH 18/23] init: open code setting up stdin/stdout/stderr Al Viro
2020-07-27  5:46     ` Christoph Hellwig
2020-07-27  6:03       ` Al Viro
2020-07-27  6:48         ` Christoph Hellwig
2020-07-27 15:54           ` Al Viro
2020-07-27 15:58             ` Christoph Hellwig
2020-07-27  6:20     ` hpa
2020-07-27  6:24       ` Christoph Hellwig
2020-07-27  6:36         ` hpa
2020-07-27  6:49           ` Christoph Hellwig
2020-07-14 19:04 ` [PATCH 19/23] fs: remove ksys_getdents64 Christoph Hellwig
2020-07-14 19:04 ` [PATCH 20/23] fs: remove ksys_open Christoph Hellwig
2020-07-14 19:04 ` [PATCH 21/23] fs: remove ksys_dup Christoph Hellwig
2020-07-14 19:04 ` [PATCH 22/23] fs: remove ksys_fchmod Christoph Hellwig
2020-07-14 19:04 ` [PATCH 23/23] fs: remove ksys_ioctl Christoph Hellwig
2020-07-14 19:34 ` decruft the early init / initrd / initramfs code v2 Linus Torvalds
2020-07-15  6:51   ` Christoph Hellwig
2020-07-16 15:57     ` Guoqing Jiang
2020-07-16 16:00       ` Christoph Hellwig

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200714190427.4332-19-hch@lst.de \
    --to=hch@lst.de \
    --cc=hpa@zytor.com \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-raid@vger.kernel.org \
    --cc=song@kernel.org \
    --cc=torvalds@linux-foundation.org \
    --cc=viro@zeniv.linux.org.uk \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).