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: <ed72aa98-151a-0f1b-062b-fbea08b38f6f@suse.cz>
In-Reply-To: <ed72aa98-151a-0f1b-062b-fbea08b38f6f@suse.cz>
From:   Masahiro Yamada <masahiroy@kernel.org>
Date:   Mon, 16 Jan 2023 20:16:35 +0900
Message-ID: <CAK7LNATYbwgv89_n1RfjCpNRv20HQkpB4MPfoh_48keLzS3rrQ@mail.gmail.com>
Subject: Re: [PATCH] scripts: support GNU make 4.4 in jobserver-exec
To:     =?UTF-8?Q?Martin_Li=C5=A1ka?= <mliska@suse.cz>
Cc:     linux-kernel@vger.kernel.org, linux-block@vger.kernel.org,
        nicolas@fjasle.eu, axboe@kernel.dk, josef@toxicpanda.com,
        keescook@chromium.org
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: quoted-printable
Precedence: bulk

On Mon, Jan 16, 2023 at 7:45 PM Martin Li=C5=A1ka <mliska@suse.cz> wrote:
>
> Starting with GNU make 4.4, --jobserver-auth newly uses named
> pipe (fifo) instead of part of opened file descriptors:
> https://www.gnu.org/software/make/manual/html_node/POSIX-Jobserver.html
>
> Support also the new format.
>
> Signed-off-by: Martin Liska <mliska@suse.cz>


Applied to linux-kbuild/fixes.
Thanks.


> ---
>  scripts/jobserver-exec | 19 ++++++++++++++-----
>  1 file changed, 14 insertions(+), 5 deletions(-)
>
> diff --git a/scripts/jobserver-exec b/scripts/jobserver-exec
> index 4192855f5b8b..7eca035472d3 100755
> --- a/scripts/jobserver-exec
> +++ b/scripts/jobserver-exec
> @@ -26,11 +26,20 @@ try:
>         # If the MAKEFLAGS variable contains multiple instances of the
>         # --jobserver-auth=3D option, the last one is relevant.
>         fds =3D opts[-1].split("=3D", 1)[1]
> -       reader, writer =3D [int(x) for x in fds.split(",", 1)]
> -       # Open a private copy of reader to avoid setting nonblocking
> -       # on an unexpecting process with the same reader fd.
> -       reader =3D os.open("/proc/self/fd/%d" % (reader),
> -                        os.O_RDONLY | os.O_NONBLOCK)
> +
> +       # Starting with GNU Make 4.4, named pipes are used for reader and=
 writer.
> +       # Example argument: --jobserver-auth=3Dfifo:/tmp/GMfifo8134
> +       _, _, path =3D fds.partition('fifo:')
> +
> +       if path:
> +               reader =3D os.open(path, os.O_RDONLY | os.O_NONBLOCK)
> +               writer =3D os.open(path, os.O_WRONLY)
> +       else:
> +               reader, writer =3D [int(x) for x in fds.split(",", 1)]
> +               # Open a private copy of reader to avoid setting nonblock=
ing
> +               # on an unexpecting process with the same reader fd.
> +               reader =3D os.open("/proc/self/fd/%d" % (reader),
> +                                os.O_RDONLY | os.O_NONBLOCK)
>
>         # Read out as many jobserver slots as possible.
>         while True:
> --
> 2.39.0
>


--=20
Best Regards
Masahiro Yamada