From nobody Tue Dec 30 17:01:38 2025 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4C065C4332F for ; Mon, 13 Nov 2023 21:18:00 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231529AbjKMVSB (ORCPT ); Mon, 13 Nov 2023 16:18:01 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36972 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229715AbjKMVR7 (ORCPT ); Mon, 13 Nov 2023 16:17:59 -0500 Received: from mx0b-001b2d01.pphosted.com (mx0b-001b2d01.pphosted.com [148.163.158.5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3DCB3D5F; Mon, 13 Nov 2023 13:17:55 -0800 (PST) Received: from pps.filterd (m0360072.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3ADL5XdK027120; Mon, 13 Nov 2023 21:17:53 GMT DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ibm.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding; s=pp1; bh=DcKCsfaeL9qnBC4+oF1N2AZzZXhsJKTussTqX7apm70=; b=ldH1ADaf9loKKeYFNy3AVUatUnS9uyUsCd4mNWIqtOzLhpT4TJfIhrA5cLL/wB6aYCSk VG2bnDmkwEGMNYJwJoQcsmOS856o+Ej7+yPO4WliEuEUCYFsuo6hnzl1eq8XquaZzDsO IevHQ0GxSTizHTwcUcoSRRVezrc7gSivgG1ZJLCfJDiLFfZjDntTBJIe8QiuwLSrHYhf yXhV37dVVxuDDDD/H8bKFZW0IbMs4Wc4y8T0QLh+TSH8hh9IILzsaB6UMtA3Ch9DHMH1 hxdBCNyGo5Ow//I0EUhJRIHnZCZM0ZjhP+y/uMh2nxxltS1AicVb6XIZXDs38qowK3SO fA== Received: from ppma21.wdc07v.mail.ibm.com (5b.69.3da9.ip4.static.sl-reverse.com [169.61.105.91]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3ubu6rgg7q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 13 Nov 2023 21:17:52 +0000 Received: from pps.filterd (ppma21.wdc07v.mail.ibm.com [127.0.0.1]) by ppma21.wdc07v.mail.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3ADJYXGH014897; Mon, 13 Nov 2023 21:17:52 GMT Received: from smtprelay02.wdc07v.mail.ibm.com ([172.16.1.69]) by ppma21.wdc07v.mail.ibm.com (PPS) with ESMTPS id 3uamxn3fc5-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Mon, 13 Nov 2023 21:17:52 +0000 Received: from smtpav01.wdc07v.mail.ibm.com (smtpav01.wdc07v.mail.ibm.com [10.39.53.228]) by smtprelay02.wdc07v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3ADLHpdK12583432 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Mon, 13 Nov 2023 21:17:51 GMT Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 4764D58063; Mon, 13 Nov 2023 21:17:51 +0000 (GMT) Received: from smtpav01.wdc07v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 9F17358059; Mon, 13 Nov 2023 21:17:50 +0000 (GMT) Received: from sbct-3.pok.ibm.com (unknown [9.47.158.153]) by smtpav01.wdc07v.mail.ibm.com (Postfix) with ESMTP; Mon, 13 Nov 2023 21:17:50 +0000 (GMT) From: Stefan Berger To: linux-kernel@vger.kernel.org Cc: zohar@linux.ibm.com, gregkh@linuxfoundation.org, initramfs@vger.kernel.org, Stefan Berger , Rob Landley Subject: [PATCH] rootfs: Fix support for rootfstype= when root= is given Date: Mon, 13 Nov 2023 16:17:35 -0500 Message-ID: <20231113211735.23267-1-stefanb@linux.ibm.com> X-Mailer: git-send-email 2.41.0 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: -XsSHqKBwmkkpOf-KEmMnYmx5r2s0616 X-Proofpoint-GUID: -XsSHqKBwmkkpOf-KEmMnYmx5r2s0616 X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.272,Aquarius:18.0.987,Hydra:6.0.619,FMLib:17.11.176.26 definitions=2023-11-13_12,2023-11-09_01,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 spamscore=0 lowpriorityscore=0 suspectscore=0 mlxlogscore=999 mlxscore=0 priorityscore=1501 phishscore=0 adultscore=0 malwarescore=0 impostorscore=0 clxscore=1011 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2311060000 definitions=main-2311130164 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" Documentation/filesystems/ramfs-rootfs-initramfs.rst states: If CONFIG_TMPFS is enabled, rootfs will use tmpfs instead of ramfs by default. To force ramfs, add "rootfstype=3Dramfs" to the kernel command line. This currently does not work when root=3D is provided since then saved_root_name contains a string and initfstype=3D is ignored. Therefore, ramfs is currently always chosen when root=3D is provided. The current behavior for rootfs's filesystem is: root=3D | initfstype=3D | chosen rootfs filesystem ------------+-------------+-------------------------- unspecified | unspecified | tmpfs unspecified | tmpfs | tmpfs unspecified | ramfs | ramfs provided | ignored | ramfs initfstype=3D should be respected regardless whether root=3D is given, as shown below: root=3D | initfstype=3D | chosen rootfs filesystem ------------+-------------+-------------------------- unspecified | unspecified | tmpfs (as before) unspecified | tmpfs | tmpfs (as before) unspecified | ramfs | ramfs (as before) provided | unspecified | ramfs (compatibility with before) provided | tmpfs | tmpfs (new) provided | ramfs | ramfs (new) This table represents the new behavior. Fixes: 6e19eded3684 ("initmpfs: use initramfs if rootfstype=3D or root=3D = specified") Reviewed-by: Stefan Berger Signed-off-by: Rob Landley Signed-off-by: Stefan Berger --- init/do_mounts.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/init/do_mounts.c b/init/do_mounts.c index 5fdef94f0864..279ad28bf4fb 100644 --- a/init/do_mounts.c +++ b/init/do_mounts.c @@ -510,7 +510,10 @@ struct file_system_type rootfs_fs_type =3D { =20 void __init init_rootfs(void) { - if (IS_ENABLED(CONFIG_TMPFS) && !saved_root_name[0] && - (!root_fs_names || strstr(root_fs_names, "tmpfs"))) - is_tmpfs =3D true; + if (IS_ENABLED(CONFIG_TMPFS)) { + if (!saved_root_name[0] && !root_fs_names) + is_tmpfs =3D true; + else if (root_fs_names && !!strstr(root_fs_names, "tmpfs")) + is_tmpfs =3D true; + } } --=20 2.41.0