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 3B94CC433EF for ; Tue, 8 Feb 2022 17:42:51 +0000 (UTC) Received: from localhost ([::1]:58028 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1nHUVt-0003ml-Qa for qemu-devel@archiver.kernel.org; Tue, 08 Feb 2022 12:42:49 -0500 Received: from eggs.gnu.org ([209.51.188.92]:35774) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHS1R-0002RT-1i for qemu-devel@nongnu.org; Tue, 08 Feb 2022 10:03:13 -0500 Received: from kylie.crudebyte.com ([5.189.157.229]:54735) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1nHS1O-000546-2v for qemu-devel@nongnu.org; Tue, 08 Feb 2022 10:03:12 -0500 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=crudebyte.com; s=kylie; h=Content-Type:Content-Transfer-Encoding: MIME-Version:References:In-Reply-To:Message-ID:Date:Subject:Cc:To:From: Content-ID:Content-Description; bh=rrv2bIBFpvfayP9At54UY2aXefcnpphKPCckZHz95v4=; b=AOV9iuuh4uKNeXSC/gRoWcqqWp rckmJKvnuCNvUN7RuyxFnwzY5rIRN1GPvfw24v8HQ0DMzlXvCwziitwDp2bS/sSdITCmxozBH/HDv WLU6cT342ebAaDa50k5S7lWrA07CK4PaSHieU8aE/31K1500mbvMblnwJnkXxO6s/Dtrq8wWSYCr3 QmH51yLSm+ZI7M7rL1aHyu5WMX6vNy40IL2e891FKLaA6DP8W4C4NQtqvbFyKN0UoNKUnAXYmIhXv CCMVfXEv24ehQ2qs3NsiXIIrYQh19c4Z4K8nRyb8m5tIBQg5XxZKUM/Jc1PvbdWEJ3soq4MfoCOGY KfCIxXbf8jDHWPy/eY7793/YtdDQO2gtlJrJJbgRRdBOVvThoRcZKZ5mlp+4xNUsZ7ikgkHW+6csu XeqzxWNTcSe6XPpVs2u++CU3v23OlNWl+xvZbHs8hHXk/p+ApHmAh091UAXbD96yS9GoNqNnU6x3b 1KGzDtps+UPyMlvY7we+Z2UsRPqrNxpJFnQOmjqcLCMe8gjrEdZryytUm1xEM51ZvseGU2WqyIzm5 gNDy7G+4zCDi8EBsJWUNe7c29ozH6f1/pQGlq1Z3K09tVOnvS95oW9hhysgml/f7Xc4pgBqc1h1lv OeyEQuKyfSM8k+ktab0lZmPgjbFHkcHJorNphlyyw=; From: Christian Schoenebeck To: Will Cohen Cc: qemu-devel@nongnu.org, hi@alyssa.is, Greg Kurz , Paolo Bonzini , Thomas Huth , Laurent Vivier , Keno Fischer , Michael Roitzsch Subject: Re: [PATCH v5 09/11] 9p: darwin: Implement compatibility for mknodat Date: Tue, 08 Feb 2022 16:02:16 +0100 Message-ID: <44442748.7pOeeLDITA@silver> In-Reply-To: References: <20220207224024.87745-1-wwcohen@gmail.com> <2714656.jhBehFKKHS@silver> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Received-SPF: pass client-ip=5.189.157.229; envelope-from=qemu_oss@crudebyte.com; helo=kylie.crudebyte.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 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, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" On Dienstag, 8. Februar 2022 14:36:42 CET Will Cohen wrote: > On Mon, Feb 7, 2022 at 5:56 PM Christian Schoenebeck > > wrote: > > On Montag, 7. Februar 2022 23:40:22 CET Will Cohen wrote: > > > From: Keno Fischer > > > > > > 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 > > > --- > > > > Like already mentioned by me moments ago on previous v4 (just echoing) ... > > > > > 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 = mknodat(dirfd, name, fs_ctx->fmode | S_IFREG, 0); > > > + err = qemu_mknodat(dirfd, name, fs_ctx->fmode | S_IFREG, 0); > > > > > > if (err == -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 = mknodat(dirfd, name, credp->fc_mode, credp->fc_rdev); > > > + err = qemu_mknodat(dirfd, name, credp->fc_mode, > > > credp->fc_rdev); > > > > > > if (err == -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 > > > > I would make that: > > > > #ifdef CONFIG_DARWIN > > int pthread_fchdir_np(int fd) API_AVAILABLE(macosx(10.12)); > > #endif > > > > here and ... > > > > > +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)); > > > > ... drop the duplicate declaration of pthread_fchdir_np() here. > > Trying this out, it reminds me that this use of API_AVAILABLE in os-posix.c > relies on the added #include . > > Leaving the include out leads to: > .../include/qemu/osdep.h:820:31: error: expected function body after > function declarator > int pthread_fchdir_np(int fd) API_AVAILABLE(macosx(10.12)); > ^ > 1 error generated. > ninja: build stopped: subcommand failed. > make[1]: *** [run-ninja] Error 1 > make: *** [all] Error 2 > > The admonition against modifying osdep.h's includes too much led me to > steer away from putting it all in there. If there's no issue with adding > +#include to osdep.h, then this change makes sense to > me. If you embed that include into ifdefs, sure! #ifdef CONFIG_DARWIN /* defines API_AVAILABLE(...) */ #include #endif One more thing though ... > > > + > > > +int qemu_mknodat(int dirfd, const char *filename, mode_t mode, dev_t > > > > dev) > > > > > +{ > > > + int preserved_errno, err; pthread_fchdir_np() is weakly linked. So I guess here should be a check like: if (!pthread_fchdir_np) { return -ENOTSUPP; } Before trying to call pthread_fchdir_np() below. As already discussed with the Chromium [1] example, some do that a bit differently by using __builtin_available(): if (__builtin_available(macOS 10.12, *)) { return -ENOTSUPP; } Which makes me wonder why they are not doing a simple NULL check? [1] https://chromium.googlesource.com/chromium/src/+/lkgr/base/process/launch_mac.cc#110 > > > + if (pthread_fchdir_np(dirfd) < 0) { > > > + return -1; > > > + } > > > + err = mknod(filename, mode, dev); > > > + preserved_errno = errno; > > > + /* Stop using the thread-local cwd */ > > > + pthread_fchdir_np(-1); > > > + if (err < 0) { > > > + errno = 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