Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates
 216.228.112.35 as permitted sender) receiver=protection.outlook.com;
 client-ip=216.228.112.35; helo=mail.nvidia.com;
Date:   Sun, 19 Sep 2021 08:46:39 +0300
From:   Leon Romanovsky <leonro@nvidia.com>
To:     Al Viro <viro@zeniv.linux.org.uk>, Christoph Hellwig <hch@lst.de>
CC:     <linux-kernel@vger.kernel.org>, Jason Gunthorpe <jgg@nvidia.com>,
        "Linus Torvalds" <torvalds@linux-foundation.org>
Subject: Re: [PATCH -rc] init: don't panic if mount_nodev_root failed
Message-ID: <YUbOv01OaWh9fQHp@unreal>
References: <b83c61f6ab34c8f17672d88e0853a9d324c3d48a.1631610487.git.leonro@nvidia.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <b83c61f6ab34c8f17672d88e0853a9d324c3d48a.1631610487.git.leonro@nvidia.com>
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Sep 2021 05:46:44.0979
 (UTC)
X-MS-Exchange-CrossTenant-Network-Message-Id: 8336dfa5-c8b4-43fc-769b-08d97b30dcc1
X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a
X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a;Ip=[216.228.112.35];Helo=[mail.nvidia.com]
X-MS-Exchange-CrossTenant-AuthSource: CO1NAM11FT057.eop-nam11.prod.protection.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Anonymous
X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem
X-MS-Exchange-Transport-CrossTenantHeadersStamped: BN8PR12MB2914
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Sep 14, 2021 at 12:12:10PM +0300, Leon Romanovsky wrote:
> From: Leon Romanovsky <leonro@nvidia.com>
> 
> Attempt to mount 9p file system as root gives the following kernel panic:
> 
>  9pnet_virtio: no channels available for device root
>  Kernel panic - not syncing: VFS: Unable to mount root "root" (9p), err=-2
>  CPU: 2 PID: 1 Comm: swapper/0 Not tainted 5.15.0-rc1+ #127
>  Hardware name: QEMU Standard PC (Q35 + ICH9, 2009), BIOS rel-1.13.0-0-gf21b5a4aeb02-prebuilt.qemu.org 04/01/2014
>  Call Trace:
>   dump_stack_lvl+0x45/0x59
>   panic+0x1e2/0x44b
>   ? __warn_printk+0xf3/0xf3
>   ? free_unref_page+0x2d4/0x4a0
>   ? trace_hardirqs_on+0x32/0x120
>   ? free_unref_page+0x2d4/0x4a0
>   mount_root+0x189/0x1e0
>   prepare_namespace+0x136/0x165
>   kernel_init_freeable+0x3b8/0x3cb
>   ? rest_init+0x2e0/0x2e0
>   kernel_init+0x19/0x130
>   ret_from_fork+0x1f/0x30
>  Kernel Offset: disabled
>  ---[ end Kernel panic - not syncing: VFS: Unable to mount root "root" (9p), err=-2 ]---
> 
> QEMU command line:
>  "qemu-system-x86_64 -append root=/dev/root rw rootfstype=9p rootflags=trans=virtio ..."
> 
> This error is because root_device_name is truncated in prepare_namespace() from
> being "/dev/root" to be "root" prior to call to mount_nodev_root().
> 
> As a solution, don't treat errors in mount_nodev_root() as errors that
> require panics and allow failback to the mount flow that existed before
> patch citied in Fixes tag.
> 
> Fixes: f9259be6a9e7 ("init: allow mounting arbitrary non-blockdevice filesystems as root")
> Signed-off-by: Leon Romanovsky <leonro@nvidia.com>
> ---
> I'm not sure if this is the right thing to do, but it works for me.
> ---
>  init/do_mounts.c | 3 ---
>  1 file changed, 3 deletions(-)

Hi,

I assume that after Christoph gave his ROB [1], the patch is ok.
Should I do anything else in order to progress with merging it?

Thanks

[1] https://lore.kernel.org/all/20210914150709.GA32708@lst.de/