Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
MIME-Version: 1.0
References: <CAOMZO5A6MoDDLmQHoFCvewjpuPhC8_nbOVrKZR9d8Fn1d+3VgQ@mail.gmail.com>
 <20230607053758.GA20425@lst.de>
In-Reply-To: <20230607053758.GA20425@lst.de>
From:   Fabio Estevam <festevam@gmail.com>
Date:   Wed, 7 Jun 2023 09:05:33 -0300
Message-ID: <CAOMZO5AmGHHs-aiBJz5rDO6bV0f2sNjOYkqQDewGPOvw_zQ=5w@mail.gmail.com>
Subject: Re: rootwait regression in linux-next
To:     Christoph Hellwig <hch@lst.de>
Cc:     Jens Axboe <axboe@kernel.dk>,
        linux-kernel <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

Hi Christoph,

On Wed, Jun 7, 2023 at 2:38=E2=80=AFAM Christoph Hellwig <hch@lst.de> wrote=
:
>
> Hi Fabio,
>
> can you try this patch?
>
> diff --git a/block/early-lookup.c b/block/early-lookup.c
> index 3ff0d2e4dcbfb8..ca3b4f494c9330 100644
> --- a/block/early-lookup.c
> +++ b/block/early-lookup.c
> @@ -174,7 +174,7 @@ static int __init devt_from_devname(const char *name,=
 dev_t *devt)
>         while (p > s && isdigit(p[-1]))
>                 p--;
>         if (p =3D=3D s || !*p || *p =3D=3D '0')
> -               return -EINVAL;
> +               return -ENOENT;

Unfortunately, it does not help.

I have added some debug prints:

--- a/block/early-lookup.c
+++ b/block/early-lookup.c
@@ -157,15 +157,21 @@ static int __init devt_from_devname(const char
*name, dev_t *devt)

        if (strlen(name) > 31)
                return -EINVAL;
+
+       pr_err("***** %s: 1\n", __func__);
        strcpy(s, name);
        for (p =3D s; *p; p++) {
                if (*p =3D=3D '/')
                        *p =3D '!';
        }
+
+       pr_err("***** %s: 2\n", __func__);

        *devt =3D blk_lookup_devt(s, 0);
        if (*devt)
                return 0;
+
+       pr_err("***** %s: 3\n", __func__);

        /*
         * Try non-existent, but valid partition, which may only exist afte=
r
@@ -174,7 +180,9 @@ static int __init devt_from_devname(const char
*name, dev_t *devt)
        while (p > s && isdigit(p[-1]))
                p--;
        if (p =3D=3D s || !*p || *p =3D=3D '0')
-               return -EINVAL;
+               return -ENOENT;
+
+       pr_err("***** %s: 4\n", __func__);

        /* try disk name without <part number> */
        part =3D simple_strtoul(p, NULL, 10);
@@ -182,14 +190,18 @@ static int __init devt_from_devname(const char
*name, dev_t *devt)
        *devt =3D blk_lookup_devt(s, part);
        if (*devt)
                return 0;
+
+       pr_err("***** %s: 5\n", __func__);

        /* try disk name without p<part number> */
        if (p < s + 2 || !isdigit(p[-2]) || p[-1] !=3D 'p')
                return -EINVAL;
+       pr_err("***** %s: 6\n", __func__);
        p[-1] =3D '\0';
        *devt =3D blk_lookup_devt(s, part);
        if (*devt)
                return 0;
+       pr_err("***** %s: 7\n", __func__);
        return -EINVAL;
 }

[    1.627144] mmc1: SDHCI controller on 30b50000.mmc [30b50000.mmc] using =
ADMA
[    1.629380] mmcblk2rpmb: mmc2:0001 DG4016 4.00 MiB, chardev (241:0)
[    1.664895] ***** devt_from_devname: 1
[    1.668681] ***** devt_from_devname: 2
[    1.672467] ***** devt_from_devname: 3
[    1.676230] ***** devt_from_devname: 4
[    1.680011] ***** devt_from_devname: 5
[    1.683778] ***** devt_from_devname: 6
[    1.687546] ***** devt_from_devname: 7
[    1.691314] Disabling rootwait; root=3D is invalid.
[    1.696842] /dev/root: Can't open blockdev
[    1.700988] VFS: Cannot open root device "/dev/mmcblk1p1" or
unknown-block(0,0): error -6

Let me know if you need me to run more debugging tests.