From mboxrd@z Thu Jan 1 00:00:00 1970 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 72E9AC433F5 for ; Mon, 7 Feb 2022 22:40:10 +0000 (UTC) Received: from localhost ([::1]:33438 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHCg5-0003YV-GI for qemu-devel@archiver.kernel.org; Mon, 07 Feb 2022 17:40:09 -0500 Received: from eggs.gnu.org ([209.51.188.92]:60882) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHCe6-00027n-AY for qemu-devel@nongnu.org; Mon, 07 Feb 2022 17:38:07 -0500 Received: from [2a00:1450:4864:20::132] (port=34485 helo=mail-lf1-x132.google.com) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1nHCe1-0005Fm-Tm for qemu-devel@nongnu.org; Mon, 07 Feb 2022 17:38:04 -0500 Received: by mail-lf1-x132.google.com with SMTP id o2so4333167lfd.1 for ; Mon, 07 Feb 2022 14:37:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=6RnMZBRXD3eZRgwOe08OxjvCIpqixaQhZIYMohOSYLk=; b=SUAA28sIxXfyL9eEaFspLdk5BrtwRRs1u1R1sjrgvO1EJl7eGAtu7JjpCZRRdHG/gg fHE2SBBlI5xetaB8AUoedTgdlopcYvmp2naGfSwbm7fQs0rdLAymo8D9v0scd2bZ4NJ4 ln2T+eInR7Pj8dHAz77kW6F6ipIAD4Z6t99JaHF3p4Vzua7MVGEW2DTXPN6GpQtMi7ls 8BNPLmL/nn1KX3r/F95QU0pi22QbW1vQK16EB/SooG7G8BWQIQKPTWHRcLSsAA7acMOV JwEFZrNB5sA3z2hJbIiarWVUf1mbPUFzMyh7Ea1GieQaBWvetL/mXklDlCGpXHfVFhPm 05eA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=6RnMZBRXD3eZRgwOe08OxjvCIpqixaQhZIYMohOSYLk=; b=YB41eFYsaBGI2qHH+N6TAYXA6Su4fqE3uuFWGXkHyJZzzhnv5Di8UDi6+F4n5XtXsR dZsR8HpOfBdqbCMmtph/W0G/7ir2QhS/oz1wX7JhDVNdZcKMcvOj8vZSBMMfRtiWB1QM JFBtGRQBjznqjDLm9D2XbHsb11H7fokRrVSqT+h2En7/NceDif/LiXhqX1zHNOukbk/J UYsuTkV1bNU9xdCAHDo58FdRIqrxm5NykY6YIJKosKgPRIkauF+7DHYUWHEKGjWK+wH2 Q+TsIhW89T+l07to5TKvu8JZaorZnN7KiZc8QKvOfhGOnBORevK0JWSF8Tc6x+2kflWp WkeA== X-Gm-Message-State: AOAM531v2GLRQUu2gfjadpuKUmxTKXMX3IAXwWuU7cXE3JWUjGgL3Eep 3osXVNx1FAyZQOYkLjm50W91qIU1hY6a30m93aA= X-Google-Smtp-Source: ABdhPJzIl1dYFNjHcL8HO6O5aHX9kSisBlHq9XO1S1vwfcGRd5bU7r/Ub1665OsIH6jnNkBMDtNuN/iRN5pLwbxPtCo= X-Received: by 2002:a05:6512:368f:: with SMTP id d15mr1030214lfs.447.1644273476789; Mon, 07 Feb 2022 14:37:56 -0800 (PST) MIME-Version: 1.0 References: <20220206200719.74464-1-wwcohen@gmail.com> <20220207114912.1efe2a27@bahia> <5204641.elYuxvqpol@silver> In-Reply-To: From: Will Cohen Date: Mon, 7 Feb 2022 17:37:45 -0500 Message-ID: Subject: Re: [PATCH v4 09/11] 9p: darwin: Implement compatibility for mknodat To: Christian Schoenebeck Content-Type: multipart/alternative; boundary="0000000000007f6a2c05d77540a9" X-Host-Lookup-Failed: Reverse DNS lookup failed for 2a00:1450:4864:20::132 (failed) Received-SPF: pass client-ip=2a00:1450:4864:20::132; envelope-from=wwcohen@gmail.com; helo=mail-lf1-x132.google.com X-Spam_score_int: -12 X-Spam_score: -1.3 X-Spam_bar: - X-Spam_report: (-1.3 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, FREEMAIL_FROM=0.001, HTML_MESSAGE=0.001, PDS_HP_HELO_NORDNS=0.001, RCVD_IN_DNSWL_NONE=-0.0001, RDNS_NONE=0.793, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=no autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Laurent Vivier , Thomas Huth , hi@alyssa.is, qemu-devel@nongnu.org, =?UTF-8?Q?Philippe_Mathieu=2DDaud=C3=A9?= , Greg Kurz , Michael Roitzsch , Vivek , Paolo Bonzini , Keno Fischer , "Dr. David Alan Gilbert" Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" --0000000000007f6a2c05d77540a9 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Mon, Feb 7, 2022 at 4:07 PM Will Cohen wrote: > On Mon, Feb 7, 2022 at 9:21 AM Christian Schoenebeck < > qemu_oss@crudebyte.com> wrote: > >> On Montag, 7. Februar 2022 11:57:25 CET Dr. David Alan Gilbert wrote: >> > * Greg Kurz (groug@kaod.org) wrote: >> > > On Mon, 7 Feb 2022 11:30:18 +0100 >> > > >> > > Philippe Mathieu-Daud=C3=A9 wrote: >> > > > On 7/2/22 09:47, Greg Kurz wrote: >> > > > > On Sun, 6 Feb 2022 20:10:23 -0500 >> > > > > >> > > > > Will Cohen wrote: >> > > > >> This patch set currently places it in 9p-util only because 9p i= s >> the >> > > > >> only >> > > > >> place where this issue seems to have come up so far and we were >> wary >> > > > >> of >> > > > >> editing files too far afield, but I have no attachment to its >> > > > >> specific >> > > > >> location! >> > > > > >> > > > > Inline comments are preferred on qemu-devel. Please don't top >> post ! >> > > > > This complicates the review a lot. >> > > > > >> > > > > This is indeed a good candidate for osdep. This being said, unle= ss >> > > > > there's >> > > > > some other user in the QEMU code base, it is acceptable to leave >> it >> > > > > under >> > > > > 9pfs. >> > > > >> > > > virtiofsd could eventually use it. >> > > >> > > Indeed but virtiofsd is for linux hosts only AFAICT and I'm not awar= e >> of >> > > any work to support any other host OS. >> > > >> > > Cc'ing virtio-fs people for inputs on this topic. >> > >> > Indeeed, there's a lot of Linux specific code in the virtiofsd - I kno= w >> > people are interested in other platforms, but I'm not sure that's the >> > right starting point. >> > >> > Dave >> >> Agreeing with Greg here: i.e. I would have placed this into osdep, but I >> would >> not insist on it either. >> >> Best regards, >> Christian Schoenebeck >> >> > This makes sense. A revised version of this patch, moving qemu_mknodat > from 9p-util to osdep and os-posix, is attached below. I'd appreciate any > feedback from those looped in here, so that the context isn't lost before > resubmitting as a v5 patch, especially since this is starting to touch > files outside of 9p. > > From c9713c87163da7c96b5357d0d85ac318ae3d3051 Mon Sep 17 00:00:00 2001 > From: Keno Fischer > Date: Sat, 16 Jun 2018 20:56:55 -0400 > Subject: [PATCH] 9p: darwin: Implement compatibility for mknodat > > Darwin does not support mknodat. However, to avoid race conditions > with later setting the permissions, we must avoid using mknod on > the full path instead. We could try to fchdir, but that would cause > problems if multiple threads try to call mknodat at the same time. > However, luckily there is a solution: Darwin includes a function > that sets the cwd for the current thread only. > This should suffice to use mknod safely. > > This function (pthread_fchdir_np) is protected by a check in > meson in a patch later in tihs series. > > Signed-off-by: Keno Fischer > Signed-off-by: Michael Roitzsch > [Will Cohen: - Adjust coding style > - Replace clang references with gcc > - Note radar filed with Apple for missing syscall > - Replace direct syscall with pthread_fchdir_np and > adjust patch notes accordingly > - Move qemu_mknodat from 9p-util to osdep and os-posix] > Signed-off-by: Will Cohen > --- > hw/9pfs/9p-local.c | 4 ++-- > include/qemu/osdep.h | 10 ++++++++++ > os-posix.c | 34 ++++++++++++++++++++++++++++++++++ > 3 files changed, 46 insertions(+), 2 deletions(-) > > diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c > index a0d08e5216..d42ce6d8b8 100644 > --- a/hw/9pfs/9p-local.c > +++ b/hw/9pfs/9p-local.c > @@ -682,7 +682,7 @@ static int local_mknod(FsContext *fs_ctx, V9fsPath > *dir_path, > > if (fs_ctx->export_flags & V9FS_SM_MAPPED || > fs_ctx->export_flags & V9FS_SM_MAPPED_FILE) { > - err =3D mknodat(dirfd, name, fs_ctx->fmode | S_IFREG, 0); > + err =3D qemu_mknodat(dirfd, name, fs_ctx->fmode | S_IFREG, 0); > if (err =3D=3D -1) { > goto out; > } > @@ -697,7 +697,7 @@ static int local_mknod(FsContext *fs_ctx, V9fsPath > *dir_path, > } > } else if (fs_ctx->export_flags & V9FS_SM_PASSTHROUGH || > fs_ctx->export_flags & V9FS_SM_NONE) { > - err =3D mknodat(dirfd, name, credp->fc_mode, credp->fc_rdev); > + err =3D qemu_mknodat(dirfd, name, credp->fc_mode, credp->fc_rdev= ); > if (err =3D=3D -1) { > goto out; > } > diff --git a/include/qemu/osdep.h b/include/qemu/osdep.h > index d1660d67fa..f3a8367ece 100644 > --- a/include/qemu/osdep.h > +++ b/include/qemu/osdep.h > @@ -810,3 +810,13 @@ static inline int > platform_does_not_support_system(const char *command) > #endif > > #endif > + > +/* > + * As long as mknodat is not available on macOS, this workaround > + * using pthread_fchdir_np is needed. qemu_mknodat is defined in > + * os-posix.c > + */ > +#ifdef CONFIG_DARWIN > +int pthread_fchdir_np(int fd); > +#endif > +int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev= ); > diff --git a/os-posix.c b/os-posix.c > index ae6c9f2a5e..95c1607065 100644 > --- a/os-posix.c > +++ b/os-posix.c > @@ -24,6 +24,7 @@ > */ > > #include "qemu/osdep.h" > +#include > #include > #include > #include > @@ -332,3 +333,36 @@ int os_mlock(void) > return -ENOSYS; > #endif > } > + > +/* > + * As long as mknodat is not available on macOS, this workaround > + * using pthread_fchdir_np is needed. > + * > + * Radar filed with Apple for implementing mknodat: > + * rdar://FB9862426 (https://openradar.appspot.com/FB9862426) > + */ > +#ifdef CONFIG_DARWIN > + > +int pthread_fchdir_np(int fd) API_AVAILABLE(macosx(10.12)); > + > +int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev= ) > +{ > + int preserved_errno, err; > + if (pthread_fchdir_np(dirfd) < 0) { > + return -1; > + } > + err =3D mknod(filename, mode, dev); > + preserved_errno =3D errno; > + /* Stop using the thread-local cwd */ > + pthread_fchdir_np(-1); > + if (err < 0) { > + errno =3D preserved_errno; > + } > + return err; > +} > +#else > +int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t dev= ) > +{ > + return mknodat(dirfd, filename, mode, dev); > +} > +#endif > -- > 2.34.1 > Noting on https://www.qemu.org/docs/master/devel/submitting-a-patch.html#when-resendi= ng-patches-add-a-version-tag that resending a single patch outside of a new entire patch series is not helpful, so I'm resubmitting with this patch substituted in as v5 shortly. --0000000000007f6a2c05d77540a9 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
On Mon, Feb 7, 2022 at 4:07 PM Will Cohen= <wwcohen@gmail.com> wrote:<= br>
On Mon, Feb 7, 2022 at 9:21 AM= Christian Schoenebeck <qemu_oss@crudebyte.com> wrote:
On Montag, 7. = Februar 2022 11:57:25 CET Dr. David Alan Gilbert wrote:
> * Greg Kurz (groug= @kaod.org) wrote:
> > On Mon, 7 Feb 2022 11:30:18 +0100
> >
> > Philippe Mathieu-Daud=C3=A9 <f4bug@amsat.org> wrote:
> > > On 7/2/22 09:47, Greg Kurz wrote:
> > > > On Sun, 6 Feb 2022 20:10:23 -0500
> > > >
> > > > Will Cohen <wwcohen@gmail.com> wrote:
> > > >> This patch set currently places it in 9p-util only = because 9p is the
> > > >> only
> > > >> place where this issue seems to have come up so far= and we were wary
> > > >> of
> > > >> editing files too far afield, but I have no attachm= ent to its
> > > >> specific
> > > >> location!
> > > >
> > > > Inline comments are preferred on qemu-devel. Please don= 't top post !
> > > > This complicates the review a lot.
> > > >
> > > > This is indeed a good candidate for osdep. This being s= aid, unless
> > > > there's
> > > > some other user in the QEMU code base, it is acceptable= to leave it
> > > > under
> > > > 9pfs.
> > >
> > > virtiofsd could eventually use it.
> >
> > Indeed but virtiofsd is for linux hosts only AFAICT and I'm n= ot aware of
> > any work to support any other host OS.
> >
> > Cc'ing virtio-fs people for inputs on this topic.
>
> Indeeed, there's a lot of Linux specific code in the virtiofsd - I= know
> people are interested in other platforms, but I'm not sure that= 9;s the
> right starting point.
>
> Dave

Agreeing with Greg here: i.e. I would have placed this into osdep, but I wo= uld
not insist on it either.

Best regards,
Christian Schoenebeck


This makes sense. A revised version of= this patch, moving qemu_mknodat from 9p-util to osdep and os-posix, is att= ached below. I'd appreciate any feedback from those looped in here, so = that the context isn't lost before resubmitting as a v5 patch, especial= ly since this is starting to touch files outside of 9p.

<= /div>
From c9713c87163da7c96b5357d0d85ac318ae3d3051 Mon Sep 17 00:00:00= 2001
From: Keno Fischer <keno@juliacomputing.com>
Date: Sat, 16 Jun 2018= 20:56:55 -0400
Subject: [PATCH] 9p: darwin: Implement compatibility for= mknodat

Darwin does not support mknodat. However, to avoid race con= ditions
with later setting the permissions, we must avoid using mknod on=
the full path instead. We could try to fchdir, but that would cause
= problems if multiple threads try to call mknodat at the same time.
Howev= er, luckily there is a solution: Darwin includes a function
that sets th= e cwd for the current thread only.
This should suffice to use mknod safe= ly.

This function (pthread_fchdir_np) is protected by a check in
= meson in a patch later in tihs series.

Signed-off-by: Keno Fischer &= lt;keno@juliac= omputing.com>
Signed-off-by: Michael Roitzsch <reactorcontrol@icloud.com>
[Will Cohen: - Adjust coding style
=C2=A0 =C2=A0 =C2=A0 =C2=A0= =C2=A0 =C2=A0 =C2=A0- Replace clang references with gcc
=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0- Note radar filed with Apple for missing= syscall
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0- Replace direc= t syscall with pthread_fchdir_np and
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0adjust patch notes accordingly
=C2=A0 =C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0- Move qemu_mknodat from 9p-util to osdep and os= -posix]
Signed-off-by: Will Cohen <wwcohen@gmail.com>
---
=C2=A0hw/9pfs/9p-l= ocal.c =C2=A0 | =C2=A04 ++--
=C2=A0include/qemu/osdep.h | 10 ++++++++++<= br>=C2=A0os-posix.c =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 | 34 +++++++++++++++= +++++++++++++++++++
=C2=A03 files changed, 46 insertions(+), 2 deletions= (-)

diff --git a/hw/9pfs/9p-local.c b/hw/9pfs/9p-local.c
index a0= d08e5216..d42ce6d8b8 100644
--- a/hw/9pfs/9p-local.c
+++ b/hw/9pfs/9p= -local.c
@@ -682,7 +682,7 @@ static int local_mknod(FsContext *fs_ctx, V= 9fsPath *dir_path,
=C2=A0
=C2=A0 =C2=A0 =C2=A0if (fs_ctx->export_f= lags & V9FS_SM_MAPPED ||
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0fs_ctx-&g= t;export_flags & V9FS_SM_MAPPED_FILE) {
- =C2=A0 =C2=A0 =C2=A0 =C2= =A0err =3D mknodat(dirfd, name, fs_ctx->fmode | S_IFREG, 0);
+ =C2=A0= =C2=A0 =C2=A0 =C2=A0err =3D qemu_mknodat(dirfd, name, fs_ctx->fmode | S= _IFREG, 0);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (err =3D=3D -1) {
= =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out;
=C2=A0 =C2=A0 = =C2=A0 =C2=A0 =C2=A0}
@@ -697,7 +697,7 @@ static int local_mknod(FsConte= xt *fs_ctx, V9fsPath *dir_path,
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0}
= =C2=A0 =C2=A0 =C2=A0} else if (fs_ctx->export_flags & V9FS_SM_PASSTH= ROUGH ||
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 fs_ctx-= >export_flags & V9FS_SM_NONE) {
- =C2=A0 =C2=A0 =C2=A0 =C2=A0err = =3D mknodat(dirfd, name, credp->fc_mode, credp->fc_rdev);
+ =C2=A0= =C2=A0 =C2=A0 =C2=A0err =3D qemu_mknodat(dirfd, name, credp->fc_mode, c= redp->fc_rdev);
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0if (err =3D=3D -1) = {
=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0goto out;
=C2=A0 = =C2=A0 =C2=A0 =C2=A0 =C2=A0}
diff --git a/include/qemu/osdep.h b/include= /qemu/osdep.h
index d1660d67fa..f3a8367ece 100644
--- a/include/qemu/= osdep.h
+++ b/include/qemu/osdep.h
@@ -810,3 +810,13 @@ static inline= int platform_does_not_support_system(const char *command)
=C2=A0#endif<= br>=C2=A0
=C2=A0#endif
+
+/*
+ * As long as mknodat is not avai= lable on macOS, this workaround
+ * using pthread_fchdir_np is needed. q= emu_mknodat is defined in
+ * os-posix.c
+ */
+#ifdef CONFIG_DARWI= N
+int pthread_fchdir_np(int fd);
+#endif
+int qemu_mknodat(int di= rfd, const char *filename, mode_t mode, dev_t dev);
diff --git a/os-posi= x.c b/os-posix.c
index ae6c9f2a5e..95c1607065 100644
--- a/os-posix.c=
+++ b/os-posix.c
@@ -24,6 +24,7 @@
=C2=A0 */
=C2=A0
=C2=A0#= include "qemu/osdep.h"
+#include <os/availability.h>
= =C2=A0#include <sys/wait.h>
=C2=A0#include <pwd.h>
=C2=A0= #include <grp.h>
@@ -332,3 +333,36 @@ int os_mlock(void)
=C2=A0= =C2=A0 =C2=A0return -ENOSYS;
=C2=A0#endif
=C2=A0}
+
+/*
+ *= As long as mknodat is not available on macOS, this workaround
+ * using= pthread_fchdir_np is needed.
+ *
+ * Radar filed with Apple for impl= ementing mknodat:
+ * rdar://FB9862426 (https://openradar.appspot.com/FB98624= 26)
+ */
+#ifdef CONFIG_DARWIN
+
+int pthread_fchdir_np(int= fd) API_AVAILABLE(macosx(10.12));
+
+int qemu_mknodat(int dirfd, con= st char *filename, mode_t mode, dev_t dev)
+{
+ =C2=A0 =C2=A0int pres= erved_errno, err;
+ =C2=A0 =C2=A0if (pthread_fchdir_np(dirfd) < 0) {<= br>+ =C2=A0 =C2=A0 =C2=A0 =C2=A0return -1;
+ =C2=A0 =C2=A0}
+ =C2=A0 = =C2=A0err =3D mknod(filename, mode, dev);
+ =C2=A0 =C2=A0preserved_errno= =3D errno;
+ =C2=A0 =C2=A0/* Stop using the thread-local cwd */
+ = =C2=A0 =C2=A0pthread_fchdir_np(-1);
+ =C2=A0 =C2=A0if (err < 0) {
= + =C2=A0 =C2=A0 =C2=A0 =C2=A0errno =3D preserved_errno;
+ =C2=A0 =C2=A0}=
+ =C2=A0 =C2=A0return err;
+}
+#else
+int qemu_mknodat(int dir= fd, const char *filename, mode_t mode, dev_t dev)
+{
+ =C2=A0 =C2=A0r= eturn mknodat(dirfd, filename, mode, dev);
+}
+#endif
--
2.34.= 1

Noting on https://www.qemu.org/docs/master/devel/su= bmitting-a-patch.html#when-resending-patches-add-a-version-tag that res= ending a single patch outside of a new entire patch series is not helpful, = so I'm resubmitting with this patch substituted in as v5 shortly.
--0000000000007f6a2c05d77540a9--