Message-ID: <Y/JzPSYMPh/Hgjyn@1wt.eu>
Date:   Sun, 19 Feb 2023 20:06:37 +0100
From:   Willy Tarreau <w@....eu>
To:     Feiyang Chen <chris.chenfeiyang@...il.com>
Cc:     paulmck@...nel.org, Feiyang Chen <chenfeiyang@...ngson.cn>,
        arnd@...db.de, chenhuacai@...nel.org, jiaxun.yang@...goat.com,
        loongarch@...ts.linux.dev, linux-kernel@...r.kernel.org,
        Vincent Dagonneau <v@....io>
Subject: Re: [PATCH v3 2/5] tools/nolibc: Add statx() and make stat() rely on
 statx() if necessary

Hi Feiyang,

On Mon, Feb 13, 2023 at 09:06:36AM +0800, Feiyang Chen wrote:
> On Mon, 13 Feb 2023 at 05:12, Willy Tarreau <w@....eu> wrote:
> >
> > Hi Feiyang,
> >
> > On Thu, Feb 09, 2023 at 11:24:13AM +0800, chris.chenfeiyang@...il.com wrote:
> > > From: Feiyang Chen <chenfeiyang@...ngson.cn>
> > >
> > > LoongArch and RISC-V 32-bit only have statx(). ARC, Hexagon, Nios2 and
> > > OpenRISC have statx() and stat64() but not stat() or newstat(). Add
> > > statx() and make stat() rely on statx() if necessary to make them happy.
> > > We may just use statx() for all architectures in the future.
> > >
> > > Signed-off-by: Feiyang Chen <chenfeiyang@...ngson.cn>
> > > ---
> > >  tools/include/nolibc/sys.h | 56 ++++++++++++++++++++++++++++++++++++++
> > >  1 file changed, 56 insertions(+)
> > >
> > > diff --git a/tools/include/nolibc/sys.h b/tools/include/nolibc/sys.h
> > > index c4818a9c8823..70c30d457952 100644
> > > --- a/tools/include/nolibc/sys.h
> > > +++ b/tools/include/nolibc/sys.h
> > > @@ -20,6 +20,7 @@
> > >  #include <linux/time.h>
> > >  #include <linux/auxvec.h>
> > >  #include <linux/fcntl.h> // for O_* and AT_*
> > > +#include <linux/stat.h>  // for statx()
> >
> > This one causes build warnings on all archs but x86_64:
> >
> >   /f/tc/nolibc/gcc-11.3.0-nolibc/aarch64-linux/bin/aarch64-linux-gcc -Os -fno-ident -fno-asynchronous-unwind-tables  -s -o nolibc-test \
> >     -nostdlib -static -Isysroot/arm64/include nolibc-test.c -lgcc
> >   In file included from sysroot/arm64/include/sys.h:23,
> >                    from sysroot/arm64/include/nolibc.h:99,
> >                    from sysroot/arm64/include/errno.h:26,
> >                    from sysroot/arm64/include/stdio.h:14,
> >                    from nolibc-test.c:15:
> >   sysroot/arm64/include/linux/stat.h:9: warning: "S_IFMT" redefined
> >       9 | #define S_IFMT  00170000
> >         |
> >   In file included from sysroot/arm64/include/nolibc.h:98,
> >                    from sysroot/arm64/include/errno.h:26,
> >                    from sysroot/arm64/include/stdio.h:14,
> >                    from nolibc-test.c:15:
> >   sysroot/arm64/include/types.h:27: note: this is the location of the previous definition
> >
> > This is caused by the definitions for S_IF* and S_IS* in types.h. However
> > if I remove them I'm seeing x86_64 fail on S_IFCHR not defined. The root
> > cause is that the x86_64 toolchain falls back to /usr/include for the
> > include_next <limits.h> that others do not do (probably that when built
> > it thought it was a native compiler instead of a cross-compiler). I'm
> > apparently able to work around this by ifdefing out the definitions but
> > it makes me feel like I'm hiding the dust under the carpet. Instead I'm
> > thinking of reusing Vincent's work who added stdint and the definitions
> > for the various INT*MAX values that are normally found in limits.h and
> > providing our own limits.h so that this issue is globally addressed.
> >
> > I'm going to experiment a little bit about this and will propose something
> > once I'm satisfied with a solution that we can queue for 6.4. Most likely
> > it will involve merging a variant of Vincent's series first, a few changes
> > to have limits.h then your series.
> >
> 
> Hi, Willy,
> 
> OK. Thank you very much!

You're welcome. I finally figured the root cause of the problem. As
mentioned above, the cross-compiler mistakenly includes some glibc
entries (regardless of me defining limits.h), and linux/stat.h sees
glibc defined so it refrains from defining S_I* because this conflict
was apparently already identified in the past. In order to work around
the problem without touching the uapi headers, I preferred to modify
the nolibc one to add a similar test and detect whether linux/stat.h
had already provided them (see patch below). This way it remains simple
to understand and still pretty effective. And now your patchset works
fine with no modification.

I'll send all of this to Paul next week-end once he's back.

Thanks,
Willy

--

>From 39843ae4a006c37cf09febaf286c438a9793f9a1 Mon Sep 17 00:00:00 2001
From: Willy Tarreau <w@....eu>
Date: Sun, 19 Feb 2023 18:51:59 +0100
Subject: [PATCH] tools/nolibc: check for S_I* macros before defining them

Defining S_I* flags in types.h can cause some build failures if
linux/stat.h is included prior to it. But if not defined, some toolchains
that include some glibc parts will in turn fail because linux/stat.h
already takes care of avoiding these definitions when glibc is present.

Let's preserve the macros here but first include linux/stat.h and check
for their definition before doing so. We also define the previously
missing permission macros so that we don't get a different behavior
depending on the first include found.

Cc: Feiyang Chen <chenfeiyang@...ngson.cn>
Signed-off-by: Willy Tarreau <w@....eu>
---
 tools/include/nolibc/types.h | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/tools/include/nolibc/types.h b/tools/include/nolibc/types.h
index fbbc0e68c001..47a0997d2d74 100644
--- a/tools/include/nolibc/types.h
+++ b/tools/include/nolibc/types.h
@@ -9,6 +9,7 @@
 
 #include "std.h"
 #include <linux/time.h>
+#include <linux/stat.h>
 
 
 /* Only the generic macros and types may be defined here. The arch-specific
@@ -16,7 +17,11 @@
  * the layout of sys_stat_struct must not be defined here.
  */
 
-/* stat flags (WARNING, octal here) */
+/* stat flags (WARNING, octal here). We need to check for an existing
+ * definition because linux/stat.h may omit to define those if it finds
+ * that any glibc header was already included.
+ */
+#if !defined(S_IFMT)
 #define S_IFDIR        0040000
 #define S_IFCHR        0020000
 #define S_IFBLK        0060000
@@ -34,6 +39,22 @@
 #define S_ISLNK(mode)  (((mode) & S_IFMT) == S_IFLNK)
 #define S_ISSOCK(mode) (((mode) & S_IFMT) == S_IFSOCK)
 
+#define S_IRWXU 00700
+#define S_IRUSR 00400
+#define S_IWUSR 00200
+#define S_IXUSR 00100
+
+#define S_IRWXG 00070
+#define S_IRGRP 00040
+#define S_IWGRP 00020
+#define S_IXGRP 00010
+
+#define S_IRWXO 00007
+#define S_IROTH 00004
+#define S_IWOTH 00002
+#define S_IXOTH 00001
+#endif
+
 /* dirent types */
 #define DT_UNKNOWN     0x0
 #define DT_FIFO        0x1
-- 
2.35.3


View attachment "0001-tools-nolibc-check-for-S_I-macros-before-defining-th.patch" of type "text/plain" (2241 bytes)

Powered by blists - more mailing lists