Re: [PATCH] uapi: fix linux/tls.h userspace compilation error
On Tue, Nov 14, 2017 at 06:30:11AM +0300, Dmitry V. Levin wrote:
> Move inclusion of a private kernel header
> from uapi/linux/tls.h to its only user - net/tls.h,
> to fix the following linux/tls.h userspace compilation error:
>
> /usr/include/linux/tls.h:41:21: fatal error: net/tcp.h: No such file or
> directory
>
> As to this point uapi/linux/tls.h was totaly unusuable for userspace,
> cleanup this header file further by moving other redundant includes
> to net/tls.h.
>
> Fixes: 3c4d7559159b ("tls: kernel TLS support")
> Cc: <sta...@vger.kernel.org> # v4.13+
> Signed-off-by: Dmitry V. Levin <l...@altlinux.org>
Acked-by: Mikko Rapeli <mikko.rap...@iki.fi>
> ---
> include/net/tls.h| 4
> include/uapi/linux/tls.h | 4
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/include/net/tls.h b/include/net/tls.h
> index b89d397dd62f..c06db1eadac2 100644
> --- a/include/net/tls.h
> +++ b/include/net/tls.h
> @@ -35,6 +35,10 @@
> #define _TLS_OFFLOAD_H
>
> #include
> +#include
> +#include
> +#include
> +#include
>
> #include
>
> diff --git a/include/uapi/linux/tls.h b/include/uapi/linux/tls.h
> index d5e0682ab837..293b2cdad88d 100644
> --- a/include/uapi/linux/tls.h
> +++ b/include/uapi/linux/tls.h
> @@ -35,10 +35,6 @@
> #define _UAPI_LINUX_TLS_H
>
> #include
> -#include
> -#include
> -#include
> -#include
>
> /* TLS socket options */
> #define TLS_TX 1 /* Set transmit parameters */
>
> --
> ldv
Re: [PATCH] uapi: fix linux/tls.h userspace compilation error
On Tue, Nov 14, 2017 at 06:30:11AM +0300, Dmitry V. Levin wrote:
> Move inclusion of a private kernel header
> from uapi/linux/tls.h to its only user - net/tls.h,
> to fix the following linux/tls.h userspace compilation error:
>
> /usr/include/linux/tls.h:41:21: fatal error: net/tcp.h: No such file or
> directory
>
> As to this point uapi/linux/tls.h was totaly unusuable for userspace,
> cleanup this header file further by moving other redundant includes
> to net/tls.h.
>
> Fixes: 3c4d7559159b ("tls: kernel TLS support")
> Cc: # v4.13+
> Signed-off-by: Dmitry V. Levin
Acked-by: Mikko Rapeli
> ---
> include/net/tls.h| 4
> include/uapi/linux/tls.h | 4
> 2 files changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/include/net/tls.h b/include/net/tls.h
> index b89d397dd62f..c06db1eadac2 100644
> --- a/include/net/tls.h
> +++ b/include/net/tls.h
> @@ -35,6 +35,10 @@
> #define _TLS_OFFLOAD_H
>
> #include
> +#include
> +#include
> +#include
> +#include
>
> #include
>
> diff --git a/include/uapi/linux/tls.h b/include/uapi/linux/tls.h
> index d5e0682ab837..293b2cdad88d 100644
> --- a/include/uapi/linux/tls.h
> +++ b/include/uapi/linux/tls.h
> @@ -35,10 +35,6 @@
> #define _UAPI_LINUX_TLS_H
>
> #include
> -#include
> -#include
> -#include
> -#include
>
> /* TLS socket options */
> #define TLS_TX 1 /* Set transmit parameters */
>
> --
> ldv
Re: [PATCH v06 35/36] uapi linux/tls.h: don't include in user space
On Mon, Sep 04, 2017 at 07:15:11PM +0300, Dmitry V. Levin wrote: > On Wed, Aug 09, 2017 at 02:25:54AM +0300, Dmitry V. Levin wrote: > > On Sun, Aug 06, 2017 at 06:44:26PM +0200, Mikko Rapeli wrote: > > > It is not needed and not part of uapi headers, but causes > > > user space compilation error: > > > > > > fatal error: net/tcp.h: No such file or directory > > > #include > > > ^ > > > > > > Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi> > > > Cc: Dave Watson <davejwat...@fb.com> > > > Cc: Ilya Lesokhin <il...@mellanox.com> > > > Cc: Aviad Yehezkel <avia...@mellanox.com> > > > --- > > > include/uapi/linux/tls.h | 2 ++ > > > 1 file changed, 2 insertions(+) > > > > > > diff --git a/include/uapi/linux/tls.h b/include/uapi/linux/tls.h > > > index cc1d21db35d8..d87c698623f2 100644 > > > --- a/include/uapi/linux/tls.h > > > +++ b/include/uapi/linux/tls.h > > > @@ -37,7 +37,9 @@ > > > #include > > > #include > > > #include > > > +#ifdef __KERNEL__ > > > #include > > > +#endif > > > > Let's move it to include/net/tls.h instead. > > So everybody ignored this and *new* uapi header was released > in a totally unusable form along with v4.13. Should issues like these be filed into bugzilla instead? Maybe emails are easier to ignore than bugzilla tickets. -Mikko
Re: [PATCH v06 35/36] uapi linux/tls.h: don't include in user space
On Mon, Sep 04, 2017 at 07:15:11PM +0300, Dmitry V. Levin wrote: > On Wed, Aug 09, 2017 at 02:25:54AM +0300, Dmitry V. Levin wrote: > > On Sun, Aug 06, 2017 at 06:44:26PM +0200, Mikko Rapeli wrote: > > > It is not needed and not part of uapi headers, but causes > > > user space compilation error: > > > > > > fatal error: net/tcp.h: No such file or directory > > > #include > > > ^ > > > > > > Signed-off-by: Mikko Rapeli > > > Cc: Dave Watson > > > Cc: Ilya Lesokhin > > > Cc: Aviad Yehezkel > > > --- > > > include/uapi/linux/tls.h | 2 ++ > > > 1 file changed, 2 insertions(+) > > > > > > diff --git a/include/uapi/linux/tls.h b/include/uapi/linux/tls.h > > > index cc1d21db35d8..d87c698623f2 100644 > > > --- a/include/uapi/linux/tls.h > > > +++ b/include/uapi/linux/tls.h > > > @@ -37,7 +37,9 @@ > > > #include > > > #include > > > #include > > > +#ifdef __KERNEL__ > > > #include > > > +#endif > > > > Let's move it to include/net/tls.h instead. > > So everybody ignored this and *new* uapi header was released > in a totally unusable form along with v4.13. Should issues like these be filed into bugzilla instead? Maybe emails are easier to ignore than bugzilla tickets. -Mikko
Re: [PATCH v06 05/36] uapi linux/sysctl.h: use __kernel_size_t instead of size_t
Hi Dmitry and thanks for the comments. I have only one question: why haven't your patches been applied yet? -Mikko
Re: [PATCH v06 05/36] uapi linux/sysctl.h: use __kernel_size_t instead of size_t
Hi Dmitry and thanks for the comments. I have only one question: why haven't your patches been applied yet? -Mikko
Re: [PATCH v06 04/36] uapi scsi/scsi_netlink_fc.h: use __u16, __u32 and __u64 from linux/types.h
On Sun, Aug 06, 2017 at 03:09:21PM -0700, James Bottomley wrote: > On Sun, 2017-08-06 at 23:42 +0300, Mikko Rapeli wrote: > > Hi, > > > > On Sun, Aug 06, 2017 at 11:22:53AM -0700, James Bottomley wrote: > > > > > > On Sun, 2017-08-06 at 18:43 +0200, Mikko Rapeli wrote: > > > > > > > > Fixes userspace compilation errors like: > > > > > > > > scsi/scsi_netlink_fc.h:60:2: error: expected specifier-qualifier- > > > > list before ‘uint64_t’ > > > > > > Rather than patching the kernel, why not #include in > > > your userspace programme? > > > > The userspace program is actually a test which checks that uapi > > headers compile alone because several headers are not compiling at > > all and/or require special tricks. The test is available here: > > > > http://marc.info/?l=linux-kernel=150203944104544=2 > > But you don't seem to be detecting or fixing an existing problem. > These types are width unambiguous and all current consumers of these > headers include stdint.h so you're churning the kernel for a problem > which doesn't currently exist for any consumer of this header. The header file dependencies of scsi/scsi_netlink_fc.h are not explicit. I will propose a patch which includes in userspace then. > I can agree not adding any more external uint_t types for newly > exported headers so new consumers don't depend on an external standard > is reasonable, so checkpatch should warn if someone tries to add them; > I just don't see the benefit of going over the whole kernel changing > stuff that has worked fine for years. Now if you can tell me there's > an actual bug somewhere, that's different ... Tools parsing and checking uapi headers need to be able to compile them and thus need the explicit list of dependencies. If is a required dependency, then scsi/scsi_netlink_fc.h should include it. scsi/scsi_netlink_fc.h is one of 42 problematic headers left in current kernel and I want to fix it one way or the other. -Mikko
Re: [PATCH v06 04/36] uapi scsi/scsi_netlink_fc.h: use __u16, __u32 and __u64 from linux/types.h
On Sun, Aug 06, 2017 at 03:09:21PM -0700, James Bottomley wrote: > On Sun, 2017-08-06 at 23:42 +0300, Mikko Rapeli wrote: > > Hi, > > > > On Sun, Aug 06, 2017 at 11:22:53AM -0700, James Bottomley wrote: > > > > > > On Sun, 2017-08-06 at 18:43 +0200, Mikko Rapeli wrote: > > > > > > > > Fixes userspace compilation errors like: > > > > > > > > scsi/scsi_netlink_fc.h:60:2: error: expected specifier-qualifier- > > > > list before ‘uint64_t’ > > > > > > Rather than patching the kernel, why not #include in > > > your userspace programme? > > > > The userspace program is actually a test which checks that uapi > > headers compile alone because several headers are not compiling at > > all and/or require special tricks. The test is available here: > > > > http://marc.info/?l=linux-kernel=150203944104544=2 > > But you don't seem to be detecting or fixing an existing problem. > These types are width unambiguous and all current consumers of these > headers include stdint.h so you're churning the kernel for a problem > which doesn't currently exist for any consumer of this header. The header file dependencies of scsi/scsi_netlink_fc.h are not explicit. I will propose a patch which includes in userspace then. > I can agree not adding any more external uint_t types for newly > exported headers so new consumers don't depend on an external standard > is reasonable, so checkpatch should warn if someone tries to add them; > I just don't see the benefit of going over the whole kernel changing > stuff that has worked fine for years. Now if you can tell me there's > an actual bug somewhere, that's different ... Tools parsing and checking uapi headers need to be able to compile them and thus need the explicit list of dependencies. If is a required dependency, then scsi/scsi_netlink_fc.h should include it. scsi/scsi_netlink_fc.h is one of 42 problematic headers left in current kernel and I want to fix it one way or the other. -Mikko
Re: [PATCH v06 18/36] uapi linux/errqueue.h: include linux/time.h in user space
On Sun, Aug 06, 2017 at 05:42:13PM -0400, Willem de Bruijn wrote: > On Sun, Aug 6, 2017 at 5:33 PM, Mikko Rapeli <mikko.rap...@iki.fi> wrote: > > On Sun, Aug 06, 2017 at 05:24:20PM -0400, Willem de Bruijn wrote: > >> >> > +#ifdef __KERNEL__ > >> >> > +#include > >> >> > +#else > >> >> > +#include > >> >> > +#endif /* __KERNEL__ */ > >> >> > >> >> This will break applications that include manually. > >> >> I previously sent a patch to use libc-compat to make compilation succeed > >> >> when both are included in the case where is included > >> >> after > >> >> . > >> >> > >> >> https://lkml.org/lkml/2016/9/12/872 > >> >> > >> >> The inverse will require changes to the libc header to avoid redefining > >> >> symbols already defined by > >> >> > >> >> The second patch in that 2-patch set included > >> >> unconditionally after the fix. This broke builds that also included > >> >> in the wrong order. I did not resubmit the first patch as a > >> >> stand-alone, as it is not sufficient to avoid breakage. > >> > > >> > I wasn't aware of your change, but I was about to send this to fix the > >> > case when glibc is included before : > >> > > >> > https://github.com/mcfrisk/linux/commit/f3952a27b8a21c6478d26e6246055383483f6a66 > >> > >> There are a few differences between the two. Including does not > >> unconditionally define all the symbols. Some are conditional on additional > >> state, such as __timespec_defined. > > > > Yep, your patch seems better for libc-compat.h. Could you send it again? > > Okay. Or feel free to include it in the patchset if that helps resolve > dependencies. If you don't have the time, I will send tomorrow a new version of this patch which fixes the commit topic and before that your libc-compat.h change so both could be applied together. Feel free to be faster :) > >> > I don't like leaving a few dozen non-compiling header files into uapi. > >> > >> I agree, but I do not see a simple solution. > >> > >> Unless libc has the analogous change, including either or > >> in userspace can unfortunately cause breakage. > >> > >> The added include if __KERNEL__ is defined should be safe, though. > > > > Yes, for the kernel side, but your libc-compat change would nice for > > userspace, where something will break for sure, but providing source > > API compatibility is sometimes impossible. > > > > To summarize, this change from me, and your libc-compat.c for time.h, or? > > I'm still afraid that this patch as is will break builds that include > first. I agree, but I also want uapi headers to cleanly compile. I know this might break stuff on userspace side which rely on these broken header file dependencies, but if the fix to just re-order include statements I'm fine with it, also when the complaints hit my inbox. If I had the CPU time, memory and disk space, I'd do a full yocto distro build to see how badly userspace could break but I don't at home. -Mikko
Re: [PATCH v06 18/36] uapi linux/errqueue.h: include linux/time.h in user space
On Sun, Aug 06, 2017 at 05:42:13PM -0400, Willem de Bruijn wrote: > On Sun, Aug 6, 2017 at 5:33 PM, Mikko Rapeli wrote: > > On Sun, Aug 06, 2017 at 05:24:20PM -0400, Willem de Bruijn wrote: > >> >> > +#ifdef __KERNEL__ > >> >> > +#include > >> >> > +#else > >> >> > +#include > >> >> > +#endif /* __KERNEL__ */ > >> >> > >> >> This will break applications that include manually. > >> >> I previously sent a patch to use libc-compat to make compilation succeed > >> >> when both are included in the case where is included > >> >> after > >> >> . > >> >> > >> >> https://lkml.org/lkml/2016/9/12/872 > >> >> > >> >> The inverse will require changes to the libc header to avoid redefining > >> >> symbols already defined by > >> >> > >> >> The second patch in that 2-patch set included > >> >> unconditionally after the fix. This broke builds that also included > >> >> in the wrong order. I did not resubmit the first patch as a > >> >> stand-alone, as it is not sufficient to avoid breakage. > >> > > >> > I wasn't aware of your change, but I was about to send this to fix the > >> > case when glibc is included before : > >> > > >> > https://github.com/mcfrisk/linux/commit/f3952a27b8a21c6478d26e6246055383483f6a66 > >> > >> There are a few differences between the two. Including does not > >> unconditionally define all the symbols. Some are conditional on additional > >> state, such as __timespec_defined. > > > > Yep, your patch seems better for libc-compat.h. Could you send it again? > > Okay. Or feel free to include it in the patchset if that helps resolve > dependencies. If you don't have the time, I will send tomorrow a new version of this patch which fixes the commit topic and before that your libc-compat.h change so both could be applied together. Feel free to be faster :) > >> > I don't like leaving a few dozen non-compiling header files into uapi. > >> > >> I agree, but I do not see a simple solution. > >> > >> Unless libc has the analogous change, including either or > >> in userspace can unfortunately cause breakage. > >> > >> The added include if __KERNEL__ is defined should be safe, though. > > > > Yes, for the kernel side, but your libc-compat change would nice for > > userspace, where something will break for sure, but providing source > > API compatibility is sometimes impossible. > > > > To summarize, this change from me, and your libc-compat.c for time.h, or? > > I'm still afraid that this patch as is will break builds that include > first. I agree, but I also want uapi headers to cleanly compile. I know this might break stuff on userspace side which rely on these broken header file dependencies, but if the fix to just re-order include statements I'm fine with it, also when the complaints hit my inbox. If I had the CPU time, memory and disk space, I'd do a full yocto distro build to see how badly userspace could break but I don't at home. -Mikko
Re: [PATCH v06 18/36] uapi linux/errqueue.h: include linux/time.h in user space
On Sun, Aug 06, 2017 at 05:24:20PM -0400, Willem de Bruijn wrote: > >> > +#ifdef __KERNEL__ > >> > +#include > >> > +#else > >> > +#include > >> > +#endif /* __KERNEL__ */ > >> > >> This will break applications that include manually. > >> I previously sent a patch to use libc-compat to make compilation succeed > >> when both are included in the case where is included after > >> . > >> > >> https://lkml.org/lkml/2016/9/12/872 > >> > >> The inverse will require changes to the libc header to avoid redefining > >> symbols already defined by > >> > >> The second patch in that 2-patch set included > >> unconditionally after the fix. This broke builds that also included > >> in the wrong order. I did not resubmit the first patch as a > >> stand-alone, as it is not sufficient to avoid breakage. > > > > I wasn't aware of your change, but I was about to send this to fix the > > case when glibc is included before : > > > > https://github.com/mcfrisk/linux/commit/f3952a27b8a21c6478d26e6246055383483f6a66 > > There are a few differences between the two. Including does not > unconditionally define all the symbols. Some are conditional on additional > state, such as __timespec_defined. Yep, your patch seems better for libc-compat.h. Could you send it again? > > but you also ran into problems where is included before > > which need fixes in libc header side. > > > > So how to proceed with these? > > The libc-compat change is a good fix that can be submitted on its own. Yes, please do so. > > I don't like leaving a few dozen non-compiling header files into uapi. > > I agree, but I do not see a simple solution. > > Unless libc has the analogous change, including either or > in userspace can unfortunately cause breakage. > > The added include if __KERNEL__ is defined should be safe, though. Yes, for the kernel side, but your libc-compat change would nice for userspace, where something will break for sure, but providing source API compatibility is sometimes impossible. To summarize, this change from me, and your libc-compat.c for time.h, or? -Mikko
Re: [PATCH v06 18/36] uapi linux/errqueue.h: include linux/time.h in user space
On Sun, Aug 06, 2017 at 05:24:20PM -0400, Willem de Bruijn wrote: > >> > +#ifdef __KERNEL__ > >> > +#include > >> > +#else > >> > +#include > >> > +#endif /* __KERNEL__ */ > >> > >> This will break applications that include manually. > >> I previously sent a patch to use libc-compat to make compilation succeed > >> when both are included in the case where is included after > >> . > >> > >> https://lkml.org/lkml/2016/9/12/872 > >> > >> The inverse will require changes to the libc header to avoid redefining > >> symbols already defined by > >> > >> The second patch in that 2-patch set included > >> unconditionally after the fix. This broke builds that also included > >> in the wrong order. I did not resubmit the first patch as a > >> stand-alone, as it is not sufficient to avoid breakage. > > > > I wasn't aware of your change, but I was about to send this to fix the > > case when glibc is included before : > > > > https://github.com/mcfrisk/linux/commit/f3952a27b8a21c6478d26e6246055383483f6a66 > > There are a few differences between the two. Including does not > unconditionally define all the symbols. Some are conditional on additional > state, such as __timespec_defined. Yep, your patch seems better for libc-compat.h. Could you send it again? > > but you also ran into problems where is included before > > which need fixes in libc header side. > > > > So how to proceed with these? > > The libc-compat change is a good fix that can be submitted on its own. Yes, please do so. > > I don't like leaving a few dozen non-compiling header files into uapi. > > I agree, but I do not see a simple solution. > > Unless libc has the analogous change, including either or > in userspace can unfortunately cause breakage. > > The added include if __KERNEL__ is defined should be safe, though. Yes, for the kernel side, but your libc-compat change would nice for userspace, where something will break for sure, but providing source API compatibility is sometimes impossible. To summarize, this change from me, and your libc-compat.c for time.h, or? -Mikko
Re: [PATCH v06 04/36] uapi scsi/scsi_netlink_fc.h: use __u16, __u32 and __u64 from linux/types.h
Hi, On Sun, Aug 06, 2017 at 11:22:53AM -0700, James Bottomley wrote: > On Sun, 2017-08-06 at 18:43 +0200, Mikko Rapeli wrote: > > Fixes userspace compilation errors like: > > > > scsi/scsi_netlink_fc.h:60:2: error: expected specifier-qualifier-list > > before ‘uint64_t’ > > Rather than patching the kernel, why not #include in your > userspace programme? The userspace program is actually a test which checks that uapi headers compile alone because several headers are not compiling at all and/or require special tricks. The test is available here: http://marc.info/?l=linux-kernel=150203944104544=2 I have tried that approach before but then: https://lkml.org/lkml/2015/6/1/160 For some subsystems like fuse the above message was not enough and they are including stdint.h in userspace. What shall we do with this old scsi header file? -Mikko
Re: [PATCH v06 04/36] uapi scsi/scsi_netlink_fc.h: use __u16, __u32 and __u64 from linux/types.h
Hi, On Sun, Aug 06, 2017 at 11:22:53AM -0700, James Bottomley wrote: > On Sun, 2017-08-06 at 18:43 +0200, Mikko Rapeli wrote: > > Fixes userspace compilation errors like: > > > > scsi/scsi_netlink_fc.h:60:2: error: expected specifier-qualifier-list > > before ‘uint64_t’ > > Rather than patching the kernel, why not #include in your > userspace programme? The userspace program is actually a test which checks that uapi headers compile alone because several headers are not compiling at all and/or require special tricks. The test is available here: http://marc.info/?l=linux-kernel=150203944104544=2 I have tried that approach before but then: https://lkml.org/lkml/2015/6/1/160 For some subsystems like fuse the above message was not enough and they are including stdint.h in userspace. What shall we do with this old scsi header file? -Mikko
Re: [PATCH v06 18/36] uapi linux/errqueue.h: include linux/time.h in user space
On Sun, Aug 06, 2017 at 04:26:50PM -0400, Willem de Bruijn wrote: > On Sun, Aug 6, 2017 at 4:23 PM, Willem de Bruijn > <willemdebruijn.ker...@gmail.com> wrote: > > On Sun, Aug 6, 2017 at 12:44 PM, Mikko Rapeli <mikko.rap...@iki.fi> wrote: > >> linux/time.h conflicts with user space header time.h. Try to be compatible > >> with both. > >> > >> Fixes userspace compilation error: > >> > >> error: array type has incomplete element type > >> struct timespec ts[3]; > >> > >> Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi> > >> Cc: Willem de Bruijn <will...@google.com> > >> Cc: Soheil Hassas Yeganeh <soh...@google.com> > >> Cc: net...@vger.kernel.org > >> --- > >> include/uapi/linux/errqueue.h | 6 ++ > >> 1 file changed, 6 insertions(+) > >> > >> diff --git a/include/uapi/linux/errqueue.h b/include/uapi/linux/errqueue.h > >> index 07bdce1f444a..b310b2c6d94f 100644 > >> --- a/include/uapi/linux/errqueue.h > >> +++ b/include/uapi/linux/errqueue.h > >> @@ -3,6 +3,12 @@ > >> > >> #include > >> > >> +#ifdef __KERNEL__ > >> +#include > >> +#else > >> +#include > >> +#endif /* __KERNEL__ */ > > > > This will break applications that include manually. > > Also, the patch title reads "include in user space", > but it includes in that environment. Oops, missed while squashing some commits. Will fix. Thanks! -Mikko
Re: [PATCH v06 18/36] uapi linux/errqueue.h: include linux/time.h in user space
On Sun, Aug 06, 2017 at 04:26:50PM -0400, Willem de Bruijn wrote: > On Sun, Aug 6, 2017 at 4:23 PM, Willem de Bruijn > wrote: > > On Sun, Aug 6, 2017 at 12:44 PM, Mikko Rapeli wrote: > >> linux/time.h conflicts with user space header time.h. Try to be compatible > >> with both. > >> > >> Fixes userspace compilation error: > >> > >> error: array type has incomplete element type > >> struct timespec ts[3]; > >> > >> Signed-off-by: Mikko Rapeli > >> Cc: Willem de Bruijn > >> Cc: Soheil Hassas Yeganeh > >> Cc: net...@vger.kernel.org > >> --- > >> include/uapi/linux/errqueue.h | 6 ++ > >> 1 file changed, 6 insertions(+) > >> > >> diff --git a/include/uapi/linux/errqueue.h b/include/uapi/linux/errqueue.h > >> index 07bdce1f444a..b310b2c6d94f 100644 > >> --- a/include/uapi/linux/errqueue.h > >> +++ b/include/uapi/linux/errqueue.h > >> @@ -3,6 +3,12 @@ > >> > >> #include > >> > >> +#ifdef __KERNEL__ > >> +#include > >> +#else > >> +#include > >> +#endif /* __KERNEL__ */ > > > > This will break applications that include manually. > > Also, the patch title reads "include in user space", > but it includes in that environment. Oops, missed while squashing some commits. Will fix. Thanks! -Mikko
Re: [PATCH v06 18/36] uapi linux/errqueue.h: include linux/time.h in user space
On Sun, Aug 06, 2017 at 04:23:16PM -0400, Willem de Bruijn wrote: > On Sun, Aug 6, 2017 at 12:44 PM, Mikko Rapeli <mikko.rap...@iki.fi> wrote: > > linux/time.h conflicts with user space header time.h. Try to be compatible > > with both. > > > > Fixes userspace compilation error: > > > > error: array type has incomplete element type > > struct timespec ts[3]; > > > > Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi> > > Cc: Willem de Bruijn <will...@google.com> > > Cc: Soheil Hassas Yeganeh <soh...@google.com> > > Cc: net...@vger.kernel.org > > --- > > include/uapi/linux/errqueue.h | 6 ++ > > 1 file changed, 6 insertions(+) > > > > diff --git a/include/uapi/linux/errqueue.h b/include/uapi/linux/errqueue.h > > index 07bdce1f444a..b310b2c6d94f 100644 > > --- a/include/uapi/linux/errqueue.h > > +++ b/include/uapi/linux/errqueue.h > > @@ -3,6 +3,12 @@ > > > > #include > > > > +#ifdef __KERNEL__ > > +#include > > +#else > > +#include > > +#endif /* __KERNEL__ */ > > This will break applications that include manually. > I previously sent a patch to use libc-compat to make compilation succeed > when both are included in the case where is included after > . > > https://lkml.org/lkml/2016/9/12/872 > > The inverse will require changes to the libc header to avoid redefining > symbols already defined by > > The second patch in that 2-patch set included > unconditionally after the fix. This broke builds that also included > in the wrong order. I did not resubmit the first patch as a > stand-alone, as it is not sufficient to avoid breakage. I wasn't aware of your change, but I was about to send this to fix the case when glibc is included before : https://github.com/mcfrisk/linux/commit/f3952a27b8a21c6478d26e6246055383483f6a66 but you also ran into problems where is included before which need fixes in libc header side. So how to proceed with these? I don't like leaving a few dozen non-compiling header files into uapi. -Mikko
Re: [PATCH v06 18/36] uapi linux/errqueue.h: include linux/time.h in user space
On Sun, Aug 06, 2017 at 04:23:16PM -0400, Willem de Bruijn wrote: > On Sun, Aug 6, 2017 at 12:44 PM, Mikko Rapeli wrote: > > linux/time.h conflicts with user space header time.h. Try to be compatible > > with both. > > > > Fixes userspace compilation error: > > > > error: array type has incomplete element type > > struct timespec ts[3]; > > > > Signed-off-by: Mikko Rapeli > > Cc: Willem de Bruijn > > Cc: Soheil Hassas Yeganeh > > Cc: net...@vger.kernel.org > > --- > > include/uapi/linux/errqueue.h | 6 ++ > > 1 file changed, 6 insertions(+) > > > > diff --git a/include/uapi/linux/errqueue.h b/include/uapi/linux/errqueue.h > > index 07bdce1f444a..b310b2c6d94f 100644 > > --- a/include/uapi/linux/errqueue.h > > +++ b/include/uapi/linux/errqueue.h > > @@ -3,6 +3,12 @@ > > > > #include > > > > +#ifdef __KERNEL__ > > +#include > > +#else > > +#include > > +#endif /* __KERNEL__ */ > > This will break applications that include manually. > I previously sent a patch to use libc-compat to make compilation succeed > when both are included in the case where is included after > . > > https://lkml.org/lkml/2016/9/12/872 > > The inverse will require changes to the libc header to avoid redefining > symbols already defined by > > The second patch in that 2-patch set included > unconditionally after the fix. This broke builds that also included > in the wrong order. I did not resubmit the first patch as a > stand-alone, as it is not sufficient to avoid breakage. I wasn't aware of your change, but I was about to send this to fix the case when glibc is included before : https://github.com/mcfrisk/linux/commit/f3952a27b8a21c6478d26e6246055383483f6a66 but you also ran into problems where is included before which need fixes in libc header side. So how to proceed with these? I don't like leaving a few dozen non-compiling header files into uapi. -Mikko
[PATCH v06 17/36] uapi linux/sctp.h: use __u8, __u16 and __u32 from linux/types.h
Fixes userspace compilation errors like:
linux/sctp.h:652:2: error: unknown type name ‘uint32_t’
Acked-by: Neil Horman <nhor...@tuxdriver.com>
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Cc: Marcelo Ricardo Leitner <marcelo.leit...@gmail.com>
Cc: Xin Long <lucien@gmail.com>
Cc: Phil Sutter <p...@nwl.cc>
---
include/uapi/linux/sctp.h | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h
index 6217ff8500a1..d8b83fd56572 100644
--- a/include/uapi/linux/sctp.h
+++ b/include/uapi/linux/sctp.h
@@ -805,13 +805,13 @@ struct sctp_authkeyid {
*/
struct sctp_sack_info {
sctp_assoc_tsack_assoc_id;
- uint32_tsack_delay;
- uint32_tsack_freq;
+ __u32 sack_delay;
+ __u32 sack_freq;
};
struct sctp_assoc_value {
-sctp_assoc_tassoc_id;
-uint32_tassoc_value;
+ sctp_assoc_tassoc_id;
+ __u32 assoc_value;
};
/*
@@ -881,7 +881,7 @@ struct sctp_status {
struct sctp_authchunks {
sctp_assoc_tgauth_assoc_id;
__u32 gauth_number_of_chunks;
- uint8_t gauth_chunks[];
+ __u8gauth_chunks[];
};
/* The broken spelling has been released already in lksctp-tools header,
@@ -1077,15 +1077,15 @@ struct sctp_info {
struct sctp_reset_streams {
sctp_assoc_t srs_assoc_id;
- uint16_t srs_flags;
- uint16_t srs_number_streams;/* 0 == ALL */
- uint16_t srs_stream_list[]; /* list if srs_num_streams is not 0 */
+ __u16 srs_flags;
+ __u16 srs_number_streams; /* 0 == ALL */
+ __u16 srs_stream_list[];/* list if srs_num_streams is not 0 */
};
struct sctp_add_streams {
sctp_assoc_t sas_assoc_id;
- uint16_t sas_instrms;
- uint16_t sas_outstrms;
+ __u16 sas_instrms;
+ __u16 sas_outstrms;
};
#endif /* _UAPI_SCTP_H */
--
2.13.3
[PATCH v06 17/36] uapi linux/sctp.h: use __u8, __u16 and __u32 from linux/types.h
Fixes userspace compilation errors like:
linux/sctp.h:652:2: error: unknown type name ‘uint32_t’
Acked-by: Neil Horman
Signed-off-by: Mikko Rapeli
Cc: Marcelo Ricardo Leitner
Cc: Xin Long
Cc: Phil Sutter
---
include/uapi/linux/sctp.h | 20 ++--
1 file changed, 10 insertions(+), 10 deletions(-)
diff --git a/include/uapi/linux/sctp.h b/include/uapi/linux/sctp.h
index 6217ff8500a1..d8b83fd56572 100644
--- a/include/uapi/linux/sctp.h
+++ b/include/uapi/linux/sctp.h
@@ -805,13 +805,13 @@ struct sctp_authkeyid {
*/
struct sctp_sack_info {
sctp_assoc_tsack_assoc_id;
- uint32_tsack_delay;
- uint32_tsack_freq;
+ __u32 sack_delay;
+ __u32 sack_freq;
};
struct sctp_assoc_value {
-sctp_assoc_tassoc_id;
-uint32_tassoc_value;
+ sctp_assoc_tassoc_id;
+ __u32 assoc_value;
};
/*
@@ -881,7 +881,7 @@ struct sctp_status {
struct sctp_authchunks {
sctp_assoc_tgauth_assoc_id;
__u32 gauth_number_of_chunks;
- uint8_t gauth_chunks[];
+ __u8gauth_chunks[];
};
/* The broken spelling has been released already in lksctp-tools header,
@@ -1077,15 +1077,15 @@ struct sctp_info {
struct sctp_reset_streams {
sctp_assoc_t srs_assoc_id;
- uint16_t srs_flags;
- uint16_t srs_number_streams;/* 0 == ALL */
- uint16_t srs_stream_list[]; /* list if srs_num_streams is not 0 */
+ __u16 srs_flags;
+ __u16 srs_number_streams; /* 0 == ALL */
+ __u16 srs_stream_list[];/* list if srs_num_streams is not 0 */
};
struct sctp_add_streams {
sctp_assoc_t sas_assoc_id;
- uint16_t sas_instrms;
- uint16_t sas_outstrms;
+ __u16 sas_instrms;
+ __u16 sas_outstrms;
};
#endif /* _UAPI_SCTP_H */
--
2.13.3
[PATCH v06 26/36] uapi xen/privcmd.h: fix compilation in userspace
xen/interface/xen.h is not exported from kernel headers so remove the
dependency and provide needed defines for domid_t and xen_pfn_t if they
are not already defined by some other e.g. Xen specific headers.
Suggested by Andrew Cooper <andrew.coop...@citrix.com> on lkml message
<5569f9c9.8000...@citrix.com>.
The ifdef for ARM is ugly but did not find better solutions for it.
Then use __kernel_size_t instead of size_t since that is available in
uapi headers in user space.
Fixes userspace compilation errors:
xen/privcmd.h:38:31: fatal error: xen/interface/xen.h: No such file or directory
xen/privcmd.h:92:2: error: unknown type name ‘size_t’
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Cc: Paul Durrant <paul.durr...@citrix.com>
Cc: David Vrabel <david.vra...@citrix.com>
Cc: Stefano Stabellini <sstabell...@kernel.org>
Cc: Russell King <li...@armlinux.org.uk>
---
include/uapi/xen/privcmd.h | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/include/uapi/xen/privcmd.h b/include/uapi/xen/privcmd.h
index 63ee95c9dabb..565f3003741d 100644
--- a/include/uapi/xen/privcmd.h
+++ b/include/uapi/xen/privcmd.h
@@ -35,7 +35,17 @@
#include
#include
-#include
+
+/* Defined by include/xen/interface/xen.h, but it is not part of Linux uapi */
+#ifndef __XEN_PUBLIC_XEN_H__
+typedef __u16 domid_t;
+
+#if (defined __ARMEL__ || defined __ARMEB__)
+typedef __u64 xen_pfn_t;
+#else
+typedef unsigned long xen_pfn_t;
+#endif /* (defined __ARMEL__ || defined __ARMEB__) */
+#endif /* __XEN_PUBLIC_XEN_H__ */
struct privcmd_hypercall {
__u64 op;
@@ -79,7 +89,7 @@ struct privcmd_mmapbatch_v2 {
struct privcmd_dm_op_buf {
void __user *uptr;
- size_t size;
+ __kernel_size_t size;
};
struct privcmd_dm_op {
--
2.13.3
[PATCH v06 26/36] uapi xen/privcmd.h: fix compilation in userspace
xen/interface/xen.h is not exported from kernel headers so remove the
dependency and provide needed defines for domid_t and xen_pfn_t if they
are not already defined by some other e.g. Xen specific headers.
Suggested by Andrew Cooper on lkml message
<5569f9c9.8000...@citrix.com>.
The ifdef for ARM is ugly but did not find better solutions for it.
Then use __kernel_size_t instead of size_t since that is available in
uapi headers in user space.
Fixes userspace compilation errors:
xen/privcmd.h:38:31: fatal error: xen/interface/xen.h: No such file or directory
xen/privcmd.h:92:2: error: unknown type name ‘size_t’
Signed-off-by: Mikko Rapeli
Cc: Paul Durrant
Cc: David Vrabel
Cc: Stefano Stabellini
Cc: Russell King
---
include/uapi/xen/privcmd.h | 14 --
1 file changed, 12 insertions(+), 2 deletions(-)
diff --git a/include/uapi/xen/privcmd.h b/include/uapi/xen/privcmd.h
index 63ee95c9dabb..565f3003741d 100644
--- a/include/uapi/xen/privcmd.h
+++ b/include/uapi/xen/privcmd.h
@@ -35,7 +35,17 @@
#include
#include
-#include
+
+/* Defined by include/xen/interface/xen.h, but it is not part of Linux uapi */
+#ifndef __XEN_PUBLIC_XEN_H__
+typedef __u16 domid_t;
+
+#if (defined __ARMEL__ || defined __ARMEB__)
+typedef __u64 xen_pfn_t;
+#else
+typedef unsigned long xen_pfn_t;
+#endif /* (defined __ARMEL__ || defined __ARMEB__) */
+#endif /* __XEN_PUBLIC_XEN_H__ */
struct privcmd_hypercall {
__u64 op;
@@ -79,7 +89,7 @@ struct privcmd_mmapbatch_v2 {
struct privcmd_dm_op_buf {
void __user *uptr;
- size_t size;
+ __kernel_size_t size;
};
struct privcmd_dm_op {
--
2.13.3
[PATCH v06 09/36] uapi asm-generic/sembuf.h: include asm/posix_types.h and asm/ipcbuf.h
Fixes userspace compilation errors like: error: field ‘msg_perm’ has incomplete type struct ipc64_perm msg_perm; error: unknown type name ‘__kernel_ulong_t’ Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi> Acked-by: Arnd Bergmann <a...@arndb.de> Cc: H.J. Lu <hjl.to...@gmail.com> Cc: H. Peter Anvin <h...@zytor.com> --- include/uapi/asm-generic/sembuf.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/uapi/asm-generic/sembuf.h b/include/uapi/asm-generic/sembuf.h index 4cb2c13e5090..17d523f86923 100644 --- a/include/uapi/asm-generic/sembuf.h +++ b/include/uapi/asm-generic/sembuf.h @@ -2,6 +2,8 @@ #define __ASM_GENERIC_SEMBUF_H #include +#include +#include /* * The semid64_ds structure for x86 architecture. -- 2.13.3
[PATCH v06 09/36] uapi asm-generic/sembuf.h: include asm/posix_types.h and asm/ipcbuf.h
Fixes userspace compilation errors like: error: field ‘msg_perm’ has incomplete type struct ipc64_perm msg_perm; error: unknown type name ‘__kernel_ulong_t’ Signed-off-by: Mikko Rapeli Acked-by: Arnd Bergmann Cc: H.J. Lu Cc: H. Peter Anvin --- include/uapi/asm-generic/sembuf.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/uapi/asm-generic/sembuf.h b/include/uapi/asm-generic/sembuf.h index 4cb2c13e5090..17d523f86923 100644 --- a/include/uapi/asm-generic/sembuf.h +++ b/include/uapi/asm-generic/sembuf.h @@ -2,6 +2,8 @@ #define __ASM_GENERIC_SEMBUF_H #include +#include +#include /* * The semid64_ds structure for x86 architecture. -- 2.13.3
[PATCH v06 36/36] uapi linux/kfd_ioctl.h: use __u32 and __u64 instead of uint32_t and uint64_t
Include instead of which on Linux includes
and on non-Linux platforms defines __u32 etc types.
Fixes user space compilation errors like:
linux/kfd_ioctl.h:33:2: error: unknown type name ‘uint32_t’
uint32_t major_version; /* from KFD */
^~~~
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Cc: Yair Shachar <yair.shac...@amd.com>
Cc: Oded Gabbay <oded.gab...@gmail.com>
Cc: Andrew Lewycky <andrew.lewy...@amd.com>
---
include/uapi/linux/kfd_ioctl.h | 172 -
1 file changed, 86 insertions(+), 86 deletions(-)
diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h
index d6833426fdef..189ebfc2e193 100644
--- a/include/uapi/linux/kfd_ioctl.h
+++ b/include/uapi/linux/kfd_ioctl.h
@@ -23,15 +23,15 @@
#ifndef KFD_IOCTL_H_INCLUDED
#define KFD_IOCTL_H_INCLUDED
-#include
+#include
#include
#define KFD_IOCTL_MAJOR_VERSION 1
#define KFD_IOCTL_MINOR_VERSION 1
struct kfd_ioctl_get_version_args {
- uint32_t major_version; /* from KFD */
- uint32_t minor_version; /* from KFD */
+ __u32 major_version;/* from KFD */
+ __u32 minor_version;/* from KFD */
};
/* For kfd_ioctl_create_queue_args.queue_type. */
@@ -43,36 +43,36 @@ struct kfd_ioctl_get_version_args {
#define KFD_MAX_QUEUE_PRIORITY 15
struct kfd_ioctl_create_queue_args {
- uint64_t ring_base_address; /* to KFD */
- uint64_t write_pointer_address; /* from KFD */
- uint64_t read_pointer_address; /* from KFD */
- uint64_t doorbell_offset; /* from KFD */
-
- uint32_t ring_size; /* to KFD */
- uint32_t gpu_id;/* to KFD */
- uint32_t queue_type;/* to KFD */
- uint32_t queue_percentage; /* to KFD */
- uint32_t queue_priority;/* to KFD */
- uint32_t queue_id; /* from KFD */
-
- uint64_t eop_buffer_address;/* to KFD */
- uint64_t eop_buffer_size; /* to KFD */
- uint64_t ctx_save_restore_address; /* to KFD */
- uint64_t ctx_save_restore_size; /* to KFD */
+ __u64 ring_base_address;/* to KFD */
+ __u64 write_pointer_address;/* from KFD */
+ __u64 read_pointer_address; /* from KFD */
+ __u64 doorbell_offset; /* from KFD */
+
+ __u32 ring_size;/* to KFD */
+ __u32 gpu_id; /* to KFD */
+ __u32 queue_type; /* to KFD */
+ __u32 queue_percentage; /* to KFD */
+ __u32 queue_priority; /* to KFD */
+ __u32 queue_id; /* from KFD */
+
+ __u64 eop_buffer_address; /* to KFD */
+ __u64 eop_buffer_size; /* to KFD */
+ __u64 ctx_save_restore_address; /* to KFD */
+ __u64 ctx_save_restore_size;/* to KFD */
};
struct kfd_ioctl_destroy_queue_args {
- uint32_t queue_id; /* to KFD */
- uint32_t pad;
+ __u32 queue_id; /* to KFD */
+ __u32 pad;
};
struct kfd_ioctl_update_queue_args {
- uint64_t ring_base_address; /* to KFD */
+ __u64 ring_base_address;/* to KFD */
- uint32_t queue_id; /* to KFD */
- uint32_t ring_size; /* to KFD */
- uint32_t queue_percentage; /* to KFD */
- uint32_t queue_priority;/* to KFD */
+ __u32 queue_id; /* to KFD */
+ __u32 ring_size;/* to KFD */
+ __u32 queue_percentage; /* to KFD */
+ __u32 queue_priority; /* to KFD */
};
/* For kfd_ioctl_set_memory_policy_args.default_policy and alternate_policy */
@@ -80,13 +80,13 @@ struct kfd_ioctl_update_queue_args {
#define KFD_IOC_CACHE_POLICY_NONCOHERENT 1
struct kfd_ioctl_set_memory_policy_args {
- uint64_t alternate_aperture_base; /* to KFD */
- uint64_t alternate_aperture_size; /* to KFD */
+ __u64 alternate_aperture_base; /* to KFD */
+ __u64 alternate_aperture_size; /* to KFD */
- uint32_t gpu_id;/* to KFD */
- uint32_t default_policy;/* to KFD */
- uint32_t alternate_policy; /* to KFD */
- uint32_t pad;
+ __u32 gpu_id; /* to KFD */
+ __u32 default_policy; /* to KFD */
+ __u32 alternate_policy; /* to KFD */
+ __u32 pad;
};
/*
@@ -97,26 +97,26 @@ struct kfd_ioctl_set_memory_policy_args {
*/
struct kfd_ioctl_get_clock_counters_args {
- uint64_t gpu_clock_counter; /* from KFD */
- uint64_t cpu_clock_counter; /* from KFD */
- uint64_t system_clock_counter; /* from KFD */
- uint64_t system_clock_freq; /* from KFD */
+ __u64 gpu_clock_counter;/* from KFD */
+ __u64 cpu_clock_counter;/* from KFD */
+ __u64 system_clock_counter; /* from KFD */
+ __u64 system_clock_freq;/* from KFD */
[PATCH v06 36/36] uapi linux/kfd_ioctl.h: use __u32 and __u64 instead of uint32_t and uint64_t
Include instead of which on Linux includes
and on non-Linux platforms defines __u32 etc types.
Fixes user space compilation errors like:
linux/kfd_ioctl.h:33:2: error: unknown type name ‘uint32_t’
uint32_t major_version; /* from KFD */
^~~~
Signed-off-by: Mikko Rapeli
Cc: Yair Shachar
Cc: Oded Gabbay
Cc: Andrew Lewycky
---
include/uapi/linux/kfd_ioctl.h | 172 -
1 file changed, 86 insertions(+), 86 deletions(-)
diff --git a/include/uapi/linux/kfd_ioctl.h b/include/uapi/linux/kfd_ioctl.h
index d6833426fdef..189ebfc2e193 100644
--- a/include/uapi/linux/kfd_ioctl.h
+++ b/include/uapi/linux/kfd_ioctl.h
@@ -23,15 +23,15 @@
#ifndef KFD_IOCTL_H_INCLUDED
#define KFD_IOCTL_H_INCLUDED
-#include
+#include
#include
#define KFD_IOCTL_MAJOR_VERSION 1
#define KFD_IOCTL_MINOR_VERSION 1
struct kfd_ioctl_get_version_args {
- uint32_t major_version; /* from KFD */
- uint32_t minor_version; /* from KFD */
+ __u32 major_version;/* from KFD */
+ __u32 minor_version;/* from KFD */
};
/* For kfd_ioctl_create_queue_args.queue_type. */
@@ -43,36 +43,36 @@ struct kfd_ioctl_get_version_args {
#define KFD_MAX_QUEUE_PRIORITY 15
struct kfd_ioctl_create_queue_args {
- uint64_t ring_base_address; /* to KFD */
- uint64_t write_pointer_address; /* from KFD */
- uint64_t read_pointer_address; /* from KFD */
- uint64_t doorbell_offset; /* from KFD */
-
- uint32_t ring_size; /* to KFD */
- uint32_t gpu_id;/* to KFD */
- uint32_t queue_type;/* to KFD */
- uint32_t queue_percentage; /* to KFD */
- uint32_t queue_priority;/* to KFD */
- uint32_t queue_id; /* from KFD */
-
- uint64_t eop_buffer_address;/* to KFD */
- uint64_t eop_buffer_size; /* to KFD */
- uint64_t ctx_save_restore_address; /* to KFD */
- uint64_t ctx_save_restore_size; /* to KFD */
+ __u64 ring_base_address;/* to KFD */
+ __u64 write_pointer_address;/* from KFD */
+ __u64 read_pointer_address; /* from KFD */
+ __u64 doorbell_offset; /* from KFD */
+
+ __u32 ring_size;/* to KFD */
+ __u32 gpu_id; /* to KFD */
+ __u32 queue_type; /* to KFD */
+ __u32 queue_percentage; /* to KFD */
+ __u32 queue_priority; /* to KFD */
+ __u32 queue_id; /* from KFD */
+
+ __u64 eop_buffer_address; /* to KFD */
+ __u64 eop_buffer_size; /* to KFD */
+ __u64 ctx_save_restore_address; /* to KFD */
+ __u64 ctx_save_restore_size;/* to KFD */
};
struct kfd_ioctl_destroy_queue_args {
- uint32_t queue_id; /* to KFD */
- uint32_t pad;
+ __u32 queue_id; /* to KFD */
+ __u32 pad;
};
struct kfd_ioctl_update_queue_args {
- uint64_t ring_base_address; /* to KFD */
+ __u64 ring_base_address;/* to KFD */
- uint32_t queue_id; /* to KFD */
- uint32_t ring_size; /* to KFD */
- uint32_t queue_percentage; /* to KFD */
- uint32_t queue_priority;/* to KFD */
+ __u32 queue_id; /* to KFD */
+ __u32 ring_size;/* to KFD */
+ __u32 queue_percentage; /* to KFD */
+ __u32 queue_priority; /* to KFD */
};
/* For kfd_ioctl_set_memory_policy_args.default_policy and alternate_policy */
@@ -80,13 +80,13 @@ struct kfd_ioctl_update_queue_args {
#define KFD_IOC_CACHE_POLICY_NONCOHERENT 1
struct kfd_ioctl_set_memory_policy_args {
- uint64_t alternate_aperture_base; /* to KFD */
- uint64_t alternate_aperture_size; /* to KFD */
+ __u64 alternate_aperture_base; /* to KFD */
+ __u64 alternate_aperture_size; /* to KFD */
- uint32_t gpu_id;/* to KFD */
- uint32_t default_policy;/* to KFD */
- uint32_t alternate_policy; /* to KFD */
- uint32_t pad;
+ __u32 gpu_id; /* to KFD */
+ __u32 default_policy; /* to KFD */
+ __u32 alternate_policy; /* to KFD */
+ __u32 pad;
};
/*
@@ -97,26 +97,26 @@ struct kfd_ioctl_set_memory_policy_args {
*/
struct kfd_ioctl_get_clock_counters_args {
- uint64_t gpu_clock_counter; /* from KFD */
- uint64_t cpu_clock_counter; /* from KFD */
- uint64_t system_clock_counter; /* from KFD */
- uint64_t system_clock_freq; /* from KFD */
+ __u64 gpu_clock_counter;/* from KFD */
+ __u64 cpu_clock_counter;/* from KFD */
+ __u64 system_clock_counter; /* from KFD */
+ __u64 system_clock_freq;/* from KFD */
- uint32_t gpu_id;/* to KFD */
- uint32_t pad;
+ __u32 gpu_id
[PATCH v06 27/36] uapi xen/gntdev.h: include xen/privcmd.h and define grant_ref_t
Both are needed to compile in userspace. Fixes these
userspace compile errors:
xen/gntdev.h:151:4: error: unknown type name ‘grant_ref_t’
grant_ref_t ref;
^
xen/gntdev.h:153:4: error: unknown type name ‘domid_t’
domid_t domid;
^
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Cc: Boris Ostrovsky <boris.ostrov...@oracle.com>
Cc: Juergen Gross <jgr...@suse.com>
Cc: xen-de...@lists.xenproject.org
---
include/uapi/xen/gntdev.h | 6 ++
include/xen/interface/grant_table.h | 6 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/include/uapi/xen/gntdev.h b/include/uapi/xen/gntdev.h
index d0661977667e..f208706b07c9 100644
--- a/include/uapi/xen/gntdev.h
+++ b/include/uapi/xen/gntdev.h
@@ -34,6 +34,12 @@
#define __LINUX_PUBLIC_GNTDEV_H__
#include
+#include
+
+/*
+ * Reference to a grant entry in a specified domain's grant table.
+ */
+typedef __u32 grant_ref_t;
struct ioctl_gntdev_grant_ref {
/* The domain ID of the grant to be mapped. */
diff --git a/include/xen/interface/grant_table.h
b/include/xen/interface/grant_table.h
index 7fb7112d667c..29b3724aec2c 100644
--- a/include/xen/interface/grant_table.h
+++ b/include/xen/interface/grant_table.h
@@ -29,6 +29,7 @@
#define __XEN_PUBLIC_GRANT_TABLE_H__
#include
+#include /* for grant_ref_t */
/***
* GRANT TABLE REPRESENTATION
@@ -85,11 +86,6 @@
*/
/*
- * Reference to a grant entry in a specified domain's grant table.
- */
-typedef uint32_t grant_ref_t;
-
-/*
* A grant table comprises a packed array of grant entries in one or more
* page frames shared between Xen and a guest.
* [XEN]: This field is written by Xen and read by the sharing guest.
--
2.13.3
[PATCH v06 27/36] uapi xen/gntdev.h: include xen/privcmd.h and define grant_ref_t
Both are needed to compile in userspace. Fixes these
userspace compile errors:
xen/gntdev.h:151:4: error: unknown type name ‘grant_ref_t’
grant_ref_t ref;
^
xen/gntdev.h:153:4: error: unknown type name ‘domid_t’
domid_t domid;
^
Signed-off-by: Mikko Rapeli
Cc: Boris Ostrovsky
Cc: Juergen Gross
Cc: xen-de...@lists.xenproject.org
---
include/uapi/xen/gntdev.h | 6 ++
include/xen/interface/grant_table.h | 6 +-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/include/uapi/xen/gntdev.h b/include/uapi/xen/gntdev.h
index d0661977667e..f208706b07c9 100644
--- a/include/uapi/xen/gntdev.h
+++ b/include/uapi/xen/gntdev.h
@@ -34,6 +34,12 @@
#define __LINUX_PUBLIC_GNTDEV_H__
#include
+#include
+
+/*
+ * Reference to a grant entry in a specified domain's grant table.
+ */
+typedef __u32 grant_ref_t;
struct ioctl_gntdev_grant_ref {
/* The domain ID of the grant to be mapped. */
diff --git a/include/xen/interface/grant_table.h
b/include/xen/interface/grant_table.h
index 7fb7112d667c..29b3724aec2c 100644
--- a/include/xen/interface/grant_table.h
+++ b/include/xen/interface/grant_table.h
@@ -29,6 +29,7 @@
#define __XEN_PUBLIC_GRANT_TABLE_H__
#include
+#include /* for grant_ref_t */
/***
* GRANT TABLE REPRESENTATION
@@ -85,11 +86,6 @@
*/
/*
- * Reference to a grant entry in a specified domain's grant table.
- */
-typedef uint32_t grant_ref_t;
-
-/*
* A grant table comprises a packed array of grant entries in one or more
* page frames shared between Xen and a guest.
* [XEN]: This field is written by Xen and read by the sharing guest.
--
2.13.3
[PATCH v06 18/36] uapi linux/errqueue.h: include linux/time.h in user space
linux/time.h conflicts with user space header time.h. Try to be compatible
with both.
Fixes userspace compilation error:
error: array type has incomplete element type
struct timespec ts[3];
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Cc: Willem de Bruijn <will...@google.com>
Cc: Soheil Hassas Yeganeh <soh...@google.com>
Cc: net...@vger.kernel.org
---
include/uapi/linux/errqueue.h | 6 ++
1 file changed, 6 insertions(+)
diff --git a/include/uapi/linux/errqueue.h b/include/uapi/linux/errqueue.h
index 07bdce1f444a..b310b2c6d94f 100644
--- a/include/uapi/linux/errqueue.h
+++ b/include/uapi/linux/errqueue.h
@@ -3,6 +3,12 @@
#include
+#ifdef __KERNEL__
+#include
+#else
+#include
+#endif /* __KERNEL__ */
+
struct sock_extended_err {
__u32 ee_errno;
__u8ee_origin;
--
2.13.3
[PATCH v06 18/36] uapi linux/errqueue.h: include linux/time.h in user space
linux/time.h conflicts with user space header time.h. Try to be compatible
with both.
Fixes userspace compilation error:
error: array type has incomplete element type
struct timespec ts[3];
Signed-off-by: Mikko Rapeli
Cc: Willem de Bruijn
Cc: Soheil Hassas Yeganeh
Cc: net...@vger.kernel.org
---
include/uapi/linux/errqueue.h | 6 ++
1 file changed, 6 insertions(+)
diff --git a/include/uapi/linux/errqueue.h b/include/uapi/linux/errqueue.h
index 07bdce1f444a..b310b2c6d94f 100644
--- a/include/uapi/linux/errqueue.h
+++ b/include/uapi/linux/errqueue.h
@@ -3,6 +3,12 @@
#include
+#ifdef __KERNEL__
+#include
+#else
+#include
+#endif /* __KERNEL__ */
+
struct sock_extended_err {
__u32 ee_errno;
__u8ee_origin;
--
2.13.3
[PATCH v06 13/36] x86 uapi asm/sembuf.h: include linux/types.h and linux/ipc.h
Fixes userspace compile errors like: error: field ‘sem_perm’ has incomplete type struct ipc64_perm sem_perm; /* permissions .. see ipc.h */ error: unknown type name ‘__kernel_time_t’ __kernel_time_t sem_otime; /* last semop time */ Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi> Cc: Al Viro <v...@zeniv.linux.org.uk> Cc: Arnd Bergmann <a...@arndb.de> Cc: H. Peter Anvin <h...@zytor.com> --- arch/x86/include/uapi/asm/sembuf.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/include/uapi/asm/sembuf.h b/arch/x86/include/uapi/asm/sembuf.h index cc2d6a3aeae7..f11ed5282eec 100644 --- a/arch/x86/include/uapi/asm/sembuf.h +++ b/arch/x86/include/uapi/asm/sembuf.h @@ -1,6 +1,9 @@ #ifndef _ASM_X86_SEMBUF_H #define _ASM_X86_SEMBUF_H +#include +#include + /* * The semid64_ds structure for x86 architecture. * Note extra padding because this structure is passed back and forth -- 2.13.3
[PATCH v06 13/36] x86 uapi asm/sembuf.h: include linux/types.h and linux/ipc.h
Fixes userspace compile errors like: error: field ‘sem_perm’ has incomplete type struct ipc64_perm sem_perm; /* permissions .. see ipc.h */ error: unknown type name ‘__kernel_time_t’ __kernel_time_t sem_otime; /* last semop time */ Signed-off-by: Mikko Rapeli Cc: Al Viro Cc: Arnd Bergmann Cc: H. Peter Anvin --- arch/x86/include/uapi/asm/sembuf.h | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/x86/include/uapi/asm/sembuf.h b/arch/x86/include/uapi/asm/sembuf.h index cc2d6a3aeae7..f11ed5282eec 100644 --- a/arch/x86/include/uapi/asm/sembuf.h +++ b/arch/x86/include/uapi/asm/sembuf.h @@ -1,6 +1,9 @@ #ifndef _ASM_X86_SEMBUF_H #define _ASM_X86_SEMBUF_H +#include +#include + /* * The semid64_ds structure for x86 architecture. * Note extra padding because this structure is passed back and forth -- 2.13.3
[PATCH v06 06/36] uapi asm-generic/ipcbuf.h: include linux/posix_types.h
Fixes userspace compilation error: error: unknown type name ‘__kernel_key_t’ Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi> Acked-by: Arnd Bergmann <a...@arndb.de> Cc: "H. Peter Anvin" <h...@zytor.com> Cc: H.J. Lu <hjl.to...@gmail.com> --- include/uapi/asm-generic/ipcbuf.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/uapi/asm-generic/ipcbuf.h b/include/uapi/asm-generic/ipcbuf.h index 3dbcc1e771c0..909f825096f4 100644 --- a/include/uapi/asm-generic/ipcbuf.h +++ b/include/uapi/asm-generic/ipcbuf.h @@ -1,6 +1,8 @@ #ifndef __ASM_GENERIC_IPCBUF_H #define __ASM_GENERIC_IPCBUF_H +#include + /* * The generic ipc64_perm structure: * Note extra padding because this structure is passed back and forth -- 2.13.3
[PATCH v06 06/36] uapi asm-generic/ipcbuf.h: include linux/posix_types.h
Fixes userspace compilation error: error: unknown type name ‘__kernel_key_t’ Signed-off-by: Mikko Rapeli Acked-by: Arnd Bergmann Cc: "H. Peter Anvin" Cc: H.J. Lu --- include/uapi/asm-generic/ipcbuf.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/uapi/asm-generic/ipcbuf.h b/include/uapi/asm-generic/ipcbuf.h index 3dbcc1e771c0..909f825096f4 100644 --- a/include/uapi/asm-generic/ipcbuf.h +++ b/include/uapi/asm-generic/ipcbuf.h @@ -1,6 +1,8 @@ #ifndef __ASM_GENERIC_IPCBUF_H #define __ASM_GENERIC_IPCBUF_H +#include + /* * The generic ipc64_perm structure: * Note extra padding because this structure is passed back and forth -- 2.13.3
[PATCH v06 02/36] uapi scsi/scsi_bsg_fc.h: use __u8, __u32 and __u64 from linux/types.h
Fixes userspace compilation errors like:
scsi/scsi_bsg_fc.h:83:2: error: unknown type name ‘uint8_t’
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Cc: linux-s...@vger.kernel.org
---
include/uapi/scsi/scsi_bsg_fc.h | 54 +
1 file changed, 28 insertions(+), 26 deletions(-)
diff --git a/include/uapi/scsi/scsi_bsg_fc.h b/include/uapi/scsi/scsi_bsg_fc.h
index 3031b900b087..1a2044755636 100644
--- a/include/uapi/scsi/scsi_bsg_fc.h
+++ b/include/uapi/scsi/scsi_bsg_fc.h
@@ -22,6 +22,8 @@
#ifndef SCSI_BSG_FC_H
#define SCSI_BSG_FC_H
+#include
+
/*
* This file intended to be included by both kernel and user space
*/
@@ -80,10 +82,10 @@
* with the transport upon completion of the login.
*/
struct fc_bsg_host_add_rport {
- uint8_t reserved;
+ __u8reserved;
/* FC Address Identier of the remote port to login to */
- uint8_t port_id[3];
+ __u8port_id[3];
};
/* Response:
@@ -101,10 +103,10 @@ struct fc_bsg_host_add_rport {
* remain logged in with the remote port.
*/
struct fc_bsg_host_del_rport {
- uint8_t reserved;
+ __u8reserved;
/* FC Address Identier of the remote port to logout of */
- uint8_t port_id[3];
+ __u8port_id[3];
};
/* Response:
@@ -125,10 +127,10 @@ struct fc_bsg_host_els {
* ELS Command Code being sent (must be the same as byte 0
* of the payload)
*/
- uint8_t command_code;
+ __u8command_code;
/* FC Address Identier of the remote port to send the ELS to */
- uint8_t port_id[3];
+ __u8port_id[3];
};
/* Response:
@@ -165,14 +167,14 @@ struct fc_bsg_ctels_reply {
* Note: x_RJT/BSY status will indicae that the rjt_data field
* is valid and contains the reason/explanation values.
*/
- uint32_tstatus; /* See FC_CTELS_STATUS_xxx */
+ __u32 status; /* See FC_CTELS_STATUS_xxx */
/* valid if status is not FC_CTELS_STATUS_OK */
struct {
- uint8_t action; /* fragment_id for CT REJECT */
- uint8_t reason_code;
- uint8_t reason_explanation;
- uint8_t vendor_unique;
+ __u8action; /* fragment_id for CT REJECT */
+ __u8reason_code;
+ __u8reason_explanation;
+ __u8vendor_unique;
} rjt_data;
};
@@ -188,17 +190,17 @@ struct fc_bsg_ctels_reply {
* and whether to tear it down after the request.
*/
struct fc_bsg_host_ct {
- uint8_t reserved;
+ __u8reserved;
/* FC Address Identier of the remote port to send the ELS to */
- uint8_t port_id[3];
+ __u8port_id[3];
/*
* We need words 0-2 of the generic preamble for the LLD's
*/
- uint32_tpreamble_word0; /* revision & IN_ID */
- uint32_tpreamble_word1; /* GS_Type, GS_SubType, Options, Rsvd */
- uint32_tpreamble_word2; /* Cmd Code, Max Size */
+ __u32 preamble_word0; /* revision & IN_ID */
+ __u32 preamble_word1; /* GS_Type, GS_SubType, Options, Rsvd */
+ __u32 preamble_word2; /* Cmd Code, Max Size */
};
/* Response:
@@ -218,17 +220,17 @@ struct fc_bsg_host_vendor {
* Identifies the vendor that the message is formatted for. This
* should be the recipient of the message.
*/
- uint64_t vendor_id;
+ __u64 vendor_id;
/* start of vendor command area */
- uint32_t vendor_cmd[0];
+ __u32 vendor_cmd[0];
};
/* Response:
*/
struct fc_bsg_host_vendor_reply {
/* start of vendor response area */
- uint32_t vendor_rsp[0];
+ __u32 vendor_rsp[0];
};
@@ -247,7 +249,7 @@ struct fc_bsg_rport_els {
* ELS Command Code being sent (must be the same as
* byte 0 of the payload)
*/
- uint8_t els_code;
+ __u8 els_code;
};
/* Response:
@@ -265,9 +267,9 @@ struct fc_bsg_rport_ct {
/*
* We need words 0-2 of the generic preamble for the LLD's
*/
- uint32_tpreamble_word0; /* revision & IN_ID */
- uint32_tpreamble_word1; /* GS_Type, GS_SubType, Options, Rsvd */
- uint32_tpreamble_word2; /* Cmd Code, Max Size */
+ __u32 preamble_word0; /* revision & IN_ID */
+ __u32 preamble_word1; /* GS_Type, GS_SubType, Options, Rsvd */
+ __u32 preamble_word2; /* Cmd Code, Max Size */
};
/* Response:
*
@@ -279,7 +281,7 @@ struct fc_bsg_rport_ct {
/* request (CDB) structure of the sg_io_v4 */
struct fc_bsg_request {
- uint32_t msgcode;
+ __u32 msgcode;
union {
struct fc_bsg_host_add_rporth_addrport;
[PATCH v06 02/36] uapi scsi/scsi_bsg_fc.h: use __u8, __u32 and __u64 from linux/types.h
Fixes userspace compilation errors like:
scsi/scsi_bsg_fc.h:83:2: error: unknown type name ‘uint8_t’
Signed-off-by: Mikko Rapeli
Cc: linux-s...@vger.kernel.org
---
include/uapi/scsi/scsi_bsg_fc.h | 54 +
1 file changed, 28 insertions(+), 26 deletions(-)
diff --git a/include/uapi/scsi/scsi_bsg_fc.h b/include/uapi/scsi/scsi_bsg_fc.h
index 3031b900b087..1a2044755636 100644
--- a/include/uapi/scsi/scsi_bsg_fc.h
+++ b/include/uapi/scsi/scsi_bsg_fc.h
@@ -22,6 +22,8 @@
#ifndef SCSI_BSG_FC_H
#define SCSI_BSG_FC_H
+#include
+
/*
* This file intended to be included by both kernel and user space
*/
@@ -80,10 +82,10 @@
* with the transport upon completion of the login.
*/
struct fc_bsg_host_add_rport {
- uint8_t reserved;
+ __u8reserved;
/* FC Address Identier of the remote port to login to */
- uint8_t port_id[3];
+ __u8port_id[3];
};
/* Response:
@@ -101,10 +103,10 @@ struct fc_bsg_host_add_rport {
* remain logged in with the remote port.
*/
struct fc_bsg_host_del_rport {
- uint8_t reserved;
+ __u8reserved;
/* FC Address Identier of the remote port to logout of */
- uint8_t port_id[3];
+ __u8port_id[3];
};
/* Response:
@@ -125,10 +127,10 @@ struct fc_bsg_host_els {
* ELS Command Code being sent (must be the same as byte 0
* of the payload)
*/
- uint8_t command_code;
+ __u8command_code;
/* FC Address Identier of the remote port to send the ELS to */
- uint8_t port_id[3];
+ __u8port_id[3];
};
/* Response:
@@ -165,14 +167,14 @@ struct fc_bsg_ctels_reply {
* Note: x_RJT/BSY status will indicae that the rjt_data field
* is valid and contains the reason/explanation values.
*/
- uint32_tstatus; /* See FC_CTELS_STATUS_xxx */
+ __u32 status; /* See FC_CTELS_STATUS_xxx */
/* valid if status is not FC_CTELS_STATUS_OK */
struct {
- uint8_t action; /* fragment_id for CT REJECT */
- uint8_t reason_code;
- uint8_t reason_explanation;
- uint8_t vendor_unique;
+ __u8action; /* fragment_id for CT REJECT */
+ __u8reason_code;
+ __u8reason_explanation;
+ __u8vendor_unique;
} rjt_data;
};
@@ -188,17 +190,17 @@ struct fc_bsg_ctels_reply {
* and whether to tear it down after the request.
*/
struct fc_bsg_host_ct {
- uint8_t reserved;
+ __u8reserved;
/* FC Address Identier of the remote port to send the ELS to */
- uint8_t port_id[3];
+ __u8port_id[3];
/*
* We need words 0-2 of the generic preamble for the LLD's
*/
- uint32_tpreamble_word0; /* revision & IN_ID */
- uint32_tpreamble_word1; /* GS_Type, GS_SubType, Options, Rsvd */
- uint32_tpreamble_word2; /* Cmd Code, Max Size */
+ __u32 preamble_word0; /* revision & IN_ID */
+ __u32 preamble_word1; /* GS_Type, GS_SubType, Options, Rsvd */
+ __u32 preamble_word2; /* Cmd Code, Max Size */
};
/* Response:
@@ -218,17 +220,17 @@ struct fc_bsg_host_vendor {
* Identifies the vendor that the message is formatted for. This
* should be the recipient of the message.
*/
- uint64_t vendor_id;
+ __u64 vendor_id;
/* start of vendor command area */
- uint32_t vendor_cmd[0];
+ __u32 vendor_cmd[0];
};
/* Response:
*/
struct fc_bsg_host_vendor_reply {
/* start of vendor response area */
- uint32_t vendor_rsp[0];
+ __u32 vendor_rsp[0];
};
@@ -247,7 +249,7 @@ struct fc_bsg_rport_els {
* ELS Command Code being sent (must be the same as
* byte 0 of the payload)
*/
- uint8_t els_code;
+ __u8 els_code;
};
/* Response:
@@ -265,9 +267,9 @@ struct fc_bsg_rport_ct {
/*
* We need words 0-2 of the generic preamble for the LLD's
*/
- uint32_tpreamble_word0; /* revision & IN_ID */
- uint32_tpreamble_word1; /* GS_Type, GS_SubType, Options, Rsvd */
- uint32_tpreamble_word2; /* Cmd Code, Max Size */
+ __u32 preamble_word0; /* revision & IN_ID */
+ __u32 preamble_word1; /* GS_Type, GS_SubType, Options, Rsvd */
+ __u32 preamble_word2; /* Cmd Code, Max Size */
};
/* Response:
*
@@ -279,7 +281,7 @@ struct fc_bsg_rport_ct {
/* request (CDB) structure of the sg_io_v4 */
struct fc_bsg_request {
- uint32_t msgcode;
+ __u32 msgcode;
union {
struct fc_bsg_host_add_rporth_addrport;
struct fc_bsg_host_del_rpo
[PATCH v06 25/36] uapi linux/android/binder.h: use __kernel_pid_t and __kernel_uid_t
Fixes userspace compilation errors:
error: unknown type name ‘pid_t’
pid_t sender_pid
error: unknown type name ‘uid_t’
uid_t sender_euid;
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Cc: Greg Kroah-Hartman <gre...@linuxfoundation.org>
Cc: Arve Hjønnevåg <a...@android.com>
Cc: Riley Andrews <riandr...@android.com>
Cc: Todd Kjos <tk...@android.com>
Cc: Martijn Coenen <m...@google.com>
Cc: de...@driverdev.osuosl.org
---
include/uapi/linux/android/binder.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/android/binder.h
b/include/uapi/linux/android/binder.h
index 51f891fb1b18..4f7247722ad6 100644
--- a/include/uapi/linux/android/binder.h
+++ b/include/uapi/linux/android/binder.h
@@ -229,8 +229,8 @@ struct binder_transaction_data {
/* General information about the transaction. */
__u32 flags;
- pid_t sender_pid;
- uid_t sender_euid;
+ __kernel_pid_t sender_pid;
+ __kernel_uid_t sender_euid;
binder_size_t data_size; /* number of bytes of data */
binder_size_t offsets_size; /* number of bytes of offsets */
--
2.13.3
[PATCH v06 25/36] uapi linux/android/binder.h: use __kernel_pid_t and __kernel_uid_t
Fixes userspace compilation errors:
error: unknown type name ‘pid_t’
pid_t sender_pid
error: unknown type name ‘uid_t’
uid_t sender_euid;
Signed-off-by: Mikko Rapeli
Cc: Greg Kroah-Hartman
Cc: Arve Hjønnevåg
Cc: Riley Andrews
Cc: Todd Kjos
Cc: Martijn Coenen
Cc: de...@driverdev.osuosl.org
---
include/uapi/linux/android/binder.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/android/binder.h
b/include/uapi/linux/android/binder.h
index 51f891fb1b18..4f7247722ad6 100644
--- a/include/uapi/linux/android/binder.h
+++ b/include/uapi/linux/android/binder.h
@@ -229,8 +229,8 @@ struct binder_transaction_data {
/* General information about the transaction. */
__u32 flags;
- pid_t sender_pid;
- uid_t sender_euid;
+ __kernel_pid_t sender_pid;
+ __kernel_uid_t sender_euid;
binder_size_t data_size; /* number of bytes of data */
binder_size_t offsets_size; /* number of bytes of offsets */
--
2.13.3
[PATCH v06 28/36] uapi xen/evtchn.h: include xen/privcmd.h
It has definition of domid_t. Fixes userspace compiler error when xen/privcmd.h is compiled alone: xen/evtchn.h:100:2: error: unknown type name ‘domid_t’ domid_t domid; ^~~ Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi> Cc: Boris Ostrovsky <boris.ostrov...@oracle.com> Cc: Juergen Gross <jgr...@suse.com> Cc: xen-de...@lists.xenproject.org --- include/uapi/xen/evtchn.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/uapi/xen/evtchn.h b/include/uapi/xen/evtchn.h index cb4aa4bb905e..81df4b378938 100644 --- a/include/uapi/xen/evtchn.h +++ b/include/uapi/xen/evtchn.h @@ -33,6 +33,8 @@ #ifndef __LINUX_PUBLIC_EVTCHN_H__ #define __LINUX_PUBLIC_EVTCHN_H__ +#include + /* * Bind a fresh port to VIRQ @virq. * Return allocated port. -- 2.13.3
[PATCH v06 28/36] uapi xen/evtchn.h: include xen/privcmd.h
It has definition of domid_t. Fixes userspace compiler error when xen/privcmd.h is compiled alone: xen/evtchn.h:100:2: error: unknown type name ‘domid_t’ domid_t domid; ^~~ Signed-off-by: Mikko Rapeli Cc: Boris Ostrovsky Cc: Juergen Gross Cc: xen-de...@lists.xenproject.org --- include/uapi/xen/evtchn.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/uapi/xen/evtchn.h b/include/uapi/xen/evtchn.h index cb4aa4bb905e..81df4b378938 100644 --- a/include/uapi/xen/evtchn.h +++ b/include/uapi/xen/evtchn.h @@ -33,6 +33,8 @@ #ifndef __LINUX_PUBLIC_EVTCHN_H__ #define __LINUX_PUBLIC_EVTCHN_H__ +#include + /* * Bind a fresh port to VIRQ @virq. * Return allocated port. -- 2.13.3
[PATCH v06 07/36] uapi asm-generic/msgbuf.h: include asm/ipcbuf.h
Fixes userspace compilation errors like: error: field ‘msg_perm’ has incomplete type struct ipc64_perm msg_perm Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi> Acked-by: Arnd Bergmann <a...@arndb.de> Cc: H.J. Lu <hjl.to...@gmail.com> Cc: H. Peter Anvin <h...@zytor.com> --- include/uapi/asm-generic/msgbuf.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/uapi/asm-generic/msgbuf.h b/include/uapi/asm-generic/msgbuf.h index f55ecc43c60f..f5fbd8e8ab05 100644 --- a/include/uapi/asm-generic/msgbuf.h +++ b/include/uapi/asm-generic/msgbuf.h @@ -2,6 +2,8 @@ #define __ASM_GENERIC_MSGBUF_H #include +#include + /* * generic msqid64_ds structure. * -- 2.13.3
[PATCH v06 07/36] uapi asm-generic/msgbuf.h: include asm/ipcbuf.h
Fixes userspace compilation errors like: error: field ‘msg_perm’ has incomplete type struct ipc64_perm msg_perm Signed-off-by: Mikko Rapeli Acked-by: Arnd Bergmann Cc: H.J. Lu Cc: H. Peter Anvin --- include/uapi/asm-generic/msgbuf.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/uapi/asm-generic/msgbuf.h b/include/uapi/asm-generic/msgbuf.h index f55ecc43c60f..f5fbd8e8ab05 100644 --- a/include/uapi/asm-generic/msgbuf.h +++ b/include/uapi/asm-generic/msgbuf.h @@ -2,6 +2,8 @@ #define __ASM_GENERIC_MSGBUF_H #include +#include + /* * generic msqid64_ds structure. * -- 2.13.3
[PATCH v06 10/36] uapi asm-generic/signal.h: use __kernel_size_t instead of size_t
Fixes userspace compiler error:
error: unknown type name ‘size_t’
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Acked-by: Arnd Bergmann <a...@arndb.de>
Cc: Al Viro <v...@zeniv.linux.org.uk>
Cc: H. Peter Anvin <h...@zytor.com>
---
include/uapi/asm-generic/signal.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/uapi/asm-generic/signal.h
b/include/uapi/asm-generic/signal.h
index 3094618d382f..6bbcdfa5db89 100644
--- a/include/uapi/asm-generic/signal.h
+++ b/include/uapi/asm-generic/signal.h
@@ -113,7 +113,7 @@ struct sigaction {
typedef struct sigaltstack {
void __user *ss_sp;
int ss_flags;
- size_t ss_size;
+ __kernel_size_t ss_size;
} stack_t;
#endif /* __ASSEMBLY__ */
--
2.13.3
[PATCH v06 10/36] uapi asm-generic/signal.h: use __kernel_size_t instead of size_t
Fixes userspace compiler error:
error: unknown type name ‘size_t’
Signed-off-by: Mikko Rapeli
Acked-by: Arnd Bergmann
Cc: Al Viro
Cc: H. Peter Anvin
---
include/uapi/asm-generic/signal.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/uapi/asm-generic/signal.h
b/include/uapi/asm-generic/signal.h
index 3094618d382f..6bbcdfa5db89 100644
--- a/include/uapi/asm-generic/signal.h
+++ b/include/uapi/asm-generic/signal.h
@@ -113,7 +113,7 @@ struct sigaction {
typedef struct sigaltstack {
void __user *ss_sp;
int ss_flags;
- size_t ss_size;
+ __kernel_size_t ss_size;
} stack_t;
#endif /* __ASSEMBLY__ */
--
2.13.3
[PATCH v06 30/36] uapi rdma/rdma_user_rxe.h: include in.h and in6.h
Fixes these userspace compilation errors when rdma_user_rxe.h is compiled
alone:
rdma/rdma_user_rxe.h:59:20: error: field ‘_sockaddr’ has incomplete type
struct sockaddr _sockaddr;
^
rdma/rdma_user_rxe.h:60:22: error: field ‘_sockaddr_in’ has incomplete type
struct sockaddr_in _sockaddr_in;
^~~~
rdma/rdma_user_rxe.h:61:23: error: field ‘_sockaddr_in6’ has incomplete type
struct sockaddr_in6 _sockaddr_in6;
^
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Acked-by: Moni Shoua <mo...@mellanox.com>
Acked-by: Doug Ledford <dledf...@redhat.com>
Cc: Sean Hefty <sean.he...@intel.com>
Cc: Hal Rosenstock <hal.rosenst...@gmail.com>
Cc: linux-r...@vger.kernel.org
---
include/uapi/rdma/rdma_user_rxe.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/uapi/rdma/rdma_user_rxe.h
b/include/uapi/rdma/rdma_user_rxe.h
index 1de99cfdaf7d..ce6c929ca331 100644
--- a/include/uapi/rdma/rdma_user_rxe.h
+++ b/include/uapi/rdma/rdma_user_rxe.h
@@ -34,6 +34,8 @@
#define RDMA_USER_RXE_H
#include
+#include
+#include
union rxe_gid {
__u8raw[16];
--
2.13.3
[PATCH v06 30/36] uapi rdma/rdma_user_rxe.h: include in.h and in6.h
Fixes these userspace compilation errors when rdma_user_rxe.h is compiled
alone:
rdma/rdma_user_rxe.h:59:20: error: field ‘_sockaddr’ has incomplete type
struct sockaddr _sockaddr;
^
rdma/rdma_user_rxe.h:60:22: error: field ‘_sockaddr_in’ has incomplete type
struct sockaddr_in _sockaddr_in;
^~~~
rdma/rdma_user_rxe.h:61:23: error: field ‘_sockaddr_in6’ has incomplete type
struct sockaddr_in6 _sockaddr_in6;
^
Signed-off-by: Mikko Rapeli
Acked-by: Moni Shoua
Acked-by: Doug Ledford
Cc: Sean Hefty
Cc: Hal Rosenstock
Cc: linux-r...@vger.kernel.org
---
include/uapi/rdma/rdma_user_rxe.h | 2 ++
1 file changed, 2 insertions(+)
diff --git a/include/uapi/rdma/rdma_user_rxe.h
b/include/uapi/rdma/rdma_user_rxe.h
index 1de99cfdaf7d..ce6c929ca331 100644
--- a/include/uapi/rdma/rdma_user_rxe.h
+++ b/include/uapi/rdma/rdma_user_rxe.h
@@ -34,6 +34,8 @@
#define RDMA_USER_RXE_H
#include
+#include
+#include
union rxe_gid {
__u8raw[16];
--
2.13.3
[PATCH v06 11/36] uapi asm-generic/ucontext.h: include asm/signal.h and asm/sigcontext.h
Fixes userspace compiler errors:
error: unknown type name ‘stack_t’
error: field ‘uc_mcontext’ has incomplete type
struct sigcontext uc_mcontext;
error: unknown type name ‘sigset_t’
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Cc: H. Peter Anvin <h...@zytor.com>
Cc: Arnd Bergmann <a...@arndb.de>
Cc: Al Viro <v...@zeniv.linux.org.uk>
---
include/uapi/asm-generic/ucontext.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/include/uapi/asm-generic/ucontext.h
b/include/uapi/asm-generic/ucontext.h
index ad77343e8a9a..448152801c4f 100644
--- a/include/uapi/asm-generic/ucontext.h
+++ b/include/uapi/asm-generic/ucontext.h
@@ -1,6 +1,9 @@
#ifndef __ASM_GENERIC_UCONTEXT_H
#define __ASM_GENERIC_UCONTEXT_H
+#include
+#include
+
struct ucontext {
unsigned long uc_flags;
struct ucontext *uc_link;
--
2.13.3
[PATCH v06 24/36] uapi linux/coda_psdev.h: move upc_req definition from uapi to kernel side headers
Only users of upc_req in kernel side fs/coda/psdev.c and fs/coda/upcall.c
already include linux/coda_psdev.h.
Suggested by Jan Harkes <jahar...@cs.cmu.edu> on lkml message
<2015053913.ga23...@cs.cmu.edu>.
Fixes these include/uapi/linux/coda_psdev.h compilation errors in userspace:
./linux/coda_psdev.h:12:19: error: field ‘uc_chain’ has incomplete type
struct list_headuc_chain;
^
./linux/coda_psdev.h:13:2: error: unknown type name ‘caddr_t’
caddr_t uc_data;
^
./linux/coda_psdev.h:14:2: error: unknown type name ‘u_short’
u_short uc_flags;
^
./linux/coda_psdev.h:15:2: error: unknown type name ‘u_short’
u_short uc_inSize; /* Size is at most 5000 bytes */
^
./linux/coda_psdev.h:16:2: error: unknown type name ‘u_short’
u_short uc_outSize;
^
./linux/coda_psdev.h:17:2: error: unknown type name ‘u_short’
u_short uc_opcode; /* copied from data to save lookup */
^
./linux/coda_psdev.h:19:2: error: unknown type name ‘wait_queue_head_t’
wait_queue_head_t uc_sleep; /* process' wait queue */
^
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Cc: c...@cs.cmu.edu
Cc: Jan Harkes <jahar...@cs.cmu.edu>
---
include/linux/coda_psdev.h | 11 +++
include/uapi/linux/coda_psdev.h | 13 -
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h
index 31e4e1f1547c..8eccf94b6d25 100644
--- a/include/linux/coda_psdev.h
+++ b/include/linux/coda_psdev.h
@@ -18,6 +18,17 @@ struct venus_comm {
struct mutexvc_mutex;
};
+/* messages between coda filesystem in kernel and Venus */
+struct upc_req {
+ struct list_headuc_chain;
+ caddr_t uc_data;
+ u_short uc_flags;
+ u_short uc_inSize; /* Size is at most 5000 bytes */
+ u_short uc_outSize;
+ u_short uc_opcode; /* copied from data to save lookup
*/
+ int uc_unique;
+ wait_queue_head_t uc_sleep; /* process' wait queue */
+};
static inline struct venus_comm *coda_vcp(struct super_block *sb)
{
diff --git a/include/uapi/linux/coda_psdev.h b/include/uapi/linux/coda_psdev.h
index 79d05981fc4b..e2c44d2f7d5b 100644
--- a/include/uapi/linux/coda_psdev.h
+++ b/include/uapi/linux/coda_psdev.h
@@ -6,19 +6,6 @@
#define CODA_PSDEV_MAJOR 67
#define MAX_CODADEVS 5 /* how many do we allow */
-
-/* messages between coda filesystem in kernel and Venus */
-struct upc_req {
- struct list_headuc_chain;
- caddr_t uc_data;
- u_short uc_flags;
- u_short uc_inSize; /* Size is at most 5000 bytes */
- u_short uc_outSize;
- u_short uc_opcode; /* copied from data to save lookup */
- int uc_unique;
- wait_queue_head_t uc_sleep; /* process' wait queue */
-};
-
#define CODA_REQ_ASYNC 0x1
#define CODA_REQ_READ 0x2
#define CODA_REQ_WRITE 0x4
--
2.13.3
[PATCH v06 11/36] uapi asm-generic/ucontext.h: include asm/signal.h and asm/sigcontext.h
Fixes userspace compiler errors:
error: unknown type name ‘stack_t’
error: field ‘uc_mcontext’ has incomplete type
struct sigcontext uc_mcontext;
error: unknown type name ‘sigset_t’
Signed-off-by: Mikko Rapeli
Cc: H. Peter Anvin
Cc: Arnd Bergmann
Cc: Al Viro
---
include/uapi/asm-generic/ucontext.h | 3 +++
1 file changed, 3 insertions(+)
diff --git a/include/uapi/asm-generic/ucontext.h
b/include/uapi/asm-generic/ucontext.h
index ad77343e8a9a..448152801c4f 100644
--- a/include/uapi/asm-generic/ucontext.h
+++ b/include/uapi/asm-generic/ucontext.h
@@ -1,6 +1,9 @@
#ifndef __ASM_GENERIC_UCONTEXT_H
#define __ASM_GENERIC_UCONTEXT_H
+#include
+#include
+
struct ucontext {
unsigned long uc_flags;
struct ucontext *uc_link;
--
2.13.3
[PATCH v06 24/36] uapi linux/coda_psdev.h: move upc_req definition from uapi to kernel side headers
Only users of upc_req in kernel side fs/coda/psdev.c and fs/coda/upcall.c
already include linux/coda_psdev.h.
Suggested by Jan Harkes on lkml message
<2015053913.ga23...@cs.cmu.edu>.
Fixes these include/uapi/linux/coda_psdev.h compilation errors in userspace:
./linux/coda_psdev.h:12:19: error: field ‘uc_chain’ has incomplete type
struct list_headuc_chain;
^
./linux/coda_psdev.h:13:2: error: unknown type name ‘caddr_t’
caddr_t uc_data;
^
./linux/coda_psdev.h:14:2: error: unknown type name ‘u_short’
u_short uc_flags;
^
./linux/coda_psdev.h:15:2: error: unknown type name ‘u_short’
u_short uc_inSize; /* Size is at most 5000 bytes */
^
./linux/coda_psdev.h:16:2: error: unknown type name ‘u_short’
u_short uc_outSize;
^
./linux/coda_psdev.h:17:2: error: unknown type name ‘u_short’
u_short uc_opcode; /* copied from data to save lookup */
^
./linux/coda_psdev.h:19:2: error: unknown type name ‘wait_queue_head_t’
wait_queue_head_t uc_sleep; /* process' wait queue */
^
Signed-off-by: Mikko Rapeli
Cc: c...@cs.cmu.edu
Cc: Jan Harkes
---
include/linux/coda_psdev.h | 11 +++
include/uapi/linux/coda_psdev.h | 13 -
2 files changed, 11 insertions(+), 13 deletions(-)
diff --git a/include/linux/coda_psdev.h b/include/linux/coda_psdev.h
index 31e4e1f1547c..8eccf94b6d25 100644
--- a/include/linux/coda_psdev.h
+++ b/include/linux/coda_psdev.h
@@ -18,6 +18,17 @@ struct venus_comm {
struct mutexvc_mutex;
};
+/* messages between coda filesystem in kernel and Venus */
+struct upc_req {
+ struct list_headuc_chain;
+ caddr_t uc_data;
+ u_short uc_flags;
+ u_short uc_inSize; /* Size is at most 5000 bytes */
+ u_short uc_outSize;
+ u_short uc_opcode; /* copied from data to save lookup
*/
+ int uc_unique;
+ wait_queue_head_t uc_sleep; /* process' wait queue */
+};
static inline struct venus_comm *coda_vcp(struct super_block *sb)
{
diff --git a/include/uapi/linux/coda_psdev.h b/include/uapi/linux/coda_psdev.h
index 79d05981fc4b..e2c44d2f7d5b 100644
--- a/include/uapi/linux/coda_psdev.h
+++ b/include/uapi/linux/coda_psdev.h
@@ -6,19 +6,6 @@
#define CODA_PSDEV_MAJOR 67
#define MAX_CODADEVS 5 /* how many do we allow */
-
-/* messages between coda filesystem in kernel and Venus */
-struct upc_req {
- struct list_headuc_chain;
- caddr_t uc_data;
- u_short uc_flags;
- u_short uc_inSize; /* Size is at most 5000 bytes */
- u_short uc_outSize;
- u_short uc_opcode; /* copied from data to save lookup */
- int uc_unique;
- wait_queue_head_t uc_sleep; /* process' wait queue */
-};
-
#define CODA_REQ_ASYNC 0x1
#define CODA_REQ_READ 0x2
#define CODA_REQ_WRITE 0x4
--
2.13.3
[PATCH v06 05/36] uapi linux/sysctl.h: use __kernel_size_t instead of size_t
Fixes userspace compilation error:
error: unknown type name ‘size_t’
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Cc: Arnd Bergmann <a...@arndb.de>
Cc: David S. Miller <da...@davemloft.net>
---
include/uapi/linux/sysctl.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h
index e13d48058b8d..35a4b8b417fe 100644
--- a/include/uapi/linux/sysctl.h
+++ b/include/uapi/linux/sysctl.h
@@ -35,9 +35,9 @@ struct __sysctl_args {
int __user *name;
int nlen;
void __user *oldval;
- size_t __user *oldlenp;
+ __kernel_size_t __user *oldlenp;
void __user *newval;
- size_t newlen;
+ __kernel_size_t newlen;
unsigned long __unused[4];
};
--
2.13.3
[PATCH v06 33/36] uapi linux/fsmap.h: use __kernel_size_t instead of size_t
Fixes user space compilation error:
linux/fsmap.h:71:19: error: unknown type name ‘size_t’
static __inline__ size_t
^~
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Cc: Darrick J. Wong <darrick.w...@oracle.com>
---
include/uapi/linux/fsmap.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/uapi/linux/fsmap.h b/include/uapi/linux/fsmap.h
index 7e8e5f0bd6d2..99600bbed6b6 100644
--- a/include/uapi/linux/fsmap.h
+++ b/include/uapi/linux/fsmap.h
@@ -68,7 +68,7 @@ struct fsmap_head {
};
/* Size of an fsmap_head with room for nr records. */
-static inline size_t
+static inline __kernel_size_t
fsmap_sizeof(
unsigned intnr)
{
--
2.13.3
[PATCH v06 05/36] uapi linux/sysctl.h: use __kernel_size_t instead of size_t
Fixes userspace compilation error:
error: unknown type name ‘size_t’
Signed-off-by: Mikko Rapeli
Cc: Arnd Bergmann
Cc: David S. Miller
---
include/uapi/linux/sysctl.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/sysctl.h b/include/uapi/linux/sysctl.h
index e13d48058b8d..35a4b8b417fe 100644
--- a/include/uapi/linux/sysctl.h
+++ b/include/uapi/linux/sysctl.h
@@ -35,9 +35,9 @@ struct __sysctl_args {
int __user *name;
int nlen;
void __user *oldval;
- size_t __user *oldlenp;
+ __kernel_size_t __user *oldlenp;
void __user *newval;
- size_t newlen;
+ __kernel_size_t newlen;
unsigned long __unused[4];
};
--
2.13.3
[PATCH v06 33/36] uapi linux/fsmap.h: use __kernel_size_t instead of size_t
Fixes user space compilation error:
linux/fsmap.h:71:19: error: unknown type name ‘size_t’
static __inline__ size_t
^~
Signed-off-by: Mikko Rapeli
Cc: Darrick J. Wong
---
include/uapi/linux/fsmap.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/uapi/linux/fsmap.h b/include/uapi/linux/fsmap.h
index 7e8e5f0bd6d2..99600bbed6b6 100644
--- a/include/uapi/linux/fsmap.h
+++ b/include/uapi/linux/fsmap.h
@@ -68,7 +68,7 @@ struct fsmap_head {
};
/* Size of an fsmap_head with room for nr records. */
-static inline size_t
+static inline __kernel_size_t
fsmap_sizeof(
unsigned intnr)
{
--
2.13.3
[PATCH v06 35/36] uapi linux/tls.h: don't include in user space
It is not needed and not part of uapi headers, but causes user space compilation error: fatal error: net/tcp.h: No such file or directory #include ^ Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi> Cc: Dave Watson <davejwat...@fb.com> Cc: Ilya Lesokhin <il...@mellanox.com> Cc: Aviad Yehezkel <avia...@mellanox.com> --- include/uapi/linux/tls.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/uapi/linux/tls.h b/include/uapi/linux/tls.h index cc1d21db35d8..d87c698623f2 100644 --- a/include/uapi/linux/tls.h +++ b/include/uapi/linux/tls.h @@ -37,7 +37,9 @@ #include #include #include +#ifdef __KERNEL__ #include +#endif /* TLS socket options */ #define TLS_TX 1 /* Set transmit parameters */ -- 2.13.3
[PATCH v06 35/36] uapi linux/tls.h: don't include in user space
It is not needed and not part of uapi headers, but causes user space compilation error: fatal error: net/tcp.h: No such file or directory #include ^ Signed-off-by: Mikko Rapeli Cc: Dave Watson Cc: Ilya Lesokhin Cc: Aviad Yehezkel --- include/uapi/linux/tls.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/uapi/linux/tls.h b/include/uapi/linux/tls.h index cc1d21db35d8..d87c698623f2 100644 --- a/include/uapi/linux/tls.h +++ b/include/uapi/linux/tls.h @@ -37,7 +37,9 @@ #include #include #include +#ifdef __KERNEL__ #include +#endif /* TLS socket options */ #define TLS_TX 1 /* Set transmit parameters */ -- 2.13.3
[PATCH v06 01/36] Add scripts/headers_compile_test.sh: compile test for exported uapi headers
Users of kernel uapi header files would be happier if they did not
contain kernel specific parts and would contain #include statements
for all other header files that they depend on, and in general would
compile also in user space. If Linux kernal uapi headers compile in
user space, then they can also be used to do ABI and API compatibility
checks against different kernel versions. ABI checks can also be used
by Linux distribution build systems like yocto/bitbake to avoid
recompiling dependencies if changes are ABI compatible.
For each header file exported to userspace, this script tries to
compile it together with minimal header files from GCC and libc, and
reports results.
In the test execution environment, libc and GCC header file locations
are parsed from gcc compiler configuration.
Some gcc and kernel headers depend on libc headers which are made available
by copying from the compiler default location to a temporary location and
removing possibly existing kernel headers from this directory. This is a bit
of a hack but seems to work in multiple environments so test can be
executed without installing headers to /usr/include and compiling a full
Linux distribution on top.
Tested natively on:
Debian unstable, i586-linux-gnu and gcc 4.9.2
Raspbian Wheezy, arm-linux-gnueabihf and gcc 4.6.3
Ubuntu 12.04 LTS, x86_64-linux-gnu and gcc 4.6.3
Tested cross compilation using standard CROSS_COMPILE=/path/to/gcc with:
arm-linux-gnueabihf-gcc (crosstool-NG linaro-1.13.1-4.9-2014.09 - Linaro GCC
4.9-2014.09) 4.9.2 20140904 (prerelease)
Execute the script in the directory where kernel header files are installed.
For example with kernel tree from v4.13-rc3-216-g0a23ea65ce9f on x86 i586:
$ make headers_install
$ cd usr/include
$ ../../scripts/headers_compile_test.sh
...
Kernel header compile test statistics:
42 files failed the kernel header compile test.
821 files passed the kernel header compile test.
Once all these errors have been fixed, this test could be added to
'make headers_check'.
In addition to plain compile test, there is also a glibc header
compatibility test, which compiles all kernel uapi headers against a
non-conflicting set of all GNU libc headers. The test covers
variants where kernel header is included before libc header
and libc header before kernel header.
Tested in Debian unstable with libc6 version 2.24-14.
Example execution with output:
$ make headers_install
$ cd usr/include
$ ../../scripts/headers_compile_test.sh -lk
Testing that
/home/mcfrisk/src/linux-2.6/usr/headers_compile_test_include.qd5RuE/libc_headers.h
compiles
cc -Wall -c -nostdinc -I /usr/lib/gcc/i686-linux-gnu/6/include -I
/usr/lib/gcc/i686-linux-gnu/6/include-fixed -I . -I
/home/mcfrisk/src/linux-2.6/usr/headers_compile_test_include.qd5RuE -I
/home/mcfrisk/src/linux-2.6/usr/headers_compile_test_include.qd5RuE/i686-linux-gnu
-o /dev/null /home/mcfrisk/src/linux-2.6/usr/include/drm/i810_drm.h
PASSED: drm/i810_drm.h
cc -Wall -c -nostdinc -I /usr/lib/gcc/i686-linux-gnu/6/include -I
/usr/lib/gcc/i686-linux-gnu/6/include-fixed -I . -I
/home/mcfrisk/src/linux-2.6/usr/headers_compile_test_include.qd5RuE -I
/home/mcfrisk/src/linux-2.6/usr/headers_compile_test_include.qd5RuE/i686-linux-gnu
-o /dev/null
/home/mcfrisk/src/linux-2.6/usr/include/drm/i810_drm.h_libc_before_kernel.h
...
In file included from /home/mcfrisk/src/linux-2.6/usr/include/asm/sigcontext.h_l
ibc_before_kernel.h:2:0:
./asm/sigcontext.h:291:8: error: redefinition of ‘struct sigcontext’
struct sigcontext {
^~
In file included from /home/mcfrisk/src/linux-2.6/usr/headers_compile_test_inclu
de.qd5RuE/signal.h:306:0,
from /home/mcfrisk/src/linux-2.6/usr/headers_compile_test_inclu
de.qd5RuE/sys/param.h:28,
from /home/mcfrisk/src/linux-2.6/usr/headers_compile_test_inclu
de.qd5RuE/resolv.h:62,
from /home/mcfrisk/src/linux-2.6/usr/headers_compile_test_inclu
de.qd5RuE/libc_headers.h:103,
from /home/mcfrisk/src/linux-2.6/usr/include/asm/sigcontext.h_l
ibc_before_kernel.h:1:
/home/mcfrisk/src/linux-2.6/usr/headers_compile_test_include.qd5RuE/bits/sigcont
ext.h:93:8: note: originally defined here
struct sigcontext
^~
FAILED libc before kernel test: asm/sigcontext.h
...
Kernel header compile test statistics:
42 files failed the kernel header compile test.
821 files passed the kernel header compile test.
libc and kernel header compatibility test statistics:
73 files failed libc before kernel include test.
790 files passed libc before kernel include test.
Since I've been stubborn enough to work with this script and fixes to the
test failures for a few years, I added my self to MAINTAINERS.
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Cc: Alexander Stein <alexander.st...@systec-electronic.com>
Cc: Gabriel Laskar <gabr...@lse.epita.fr>
Cc: Dmitry V. Levin <l...@altlinux.org>
Cc: Arnd Bergmann <a...@arndb.de>
Cc: ne
[PATCH v06 01/36] Add scripts/headers_compile_test.sh: compile test for exported uapi headers
Users of kernel uapi header files would be happier if they did not
contain kernel specific parts and would contain #include statements
for all other header files that they depend on, and in general would
compile also in user space. If Linux kernal uapi headers compile in
user space, then they can also be used to do ABI and API compatibility
checks against different kernel versions. ABI checks can also be used
by Linux distribution build systems like yocto/bitbake to avoid
recompiling dependencies if changes are ABI compatible.
For each header file exported to userspace, this script tries to
compile it together with minimal header files from GCC and libc, and
reports results.
In the test execution environment, libc and GCC header file locations
are parsed from gcc compiler configuration.
Some gcc and kernel headers depend on libc headers which are made available
by copying from the compiler default location to a temporary location and
removing possibly existing kernel headers from this directory. This is a bit
of a hack but seems to work in multiple environments so test can be
executed without installing headers to /usr/include and compiling a full
Linux distribution on top.
Tested natively on:
Debian unstable, i586-linux-gnu and gcc 4.9.2
Raspbian Wheezy, arm-linux-gnueabihf and gcc 4.6.3
Ubuntu 12.04 LTS, x86_64-linux-gnu and gcc 4.6.3
Tested cross compilation using standard CROSS_COMPILE=/path/to/gcc with:
arm-linux-gnueabihf-gcc (crosstool-NG linaro-1.13.1-4.9-2014.09 - Linaro GCC
4.9-2014.09) 4.9.2 20140904 (prerelease)
Execute the script in the directory where kernel header files are installed.
For example with kernel tree from v4.13-rc3-216-g0a23ea65ce9f on x86 i586:
$ make headers_install
$ cd usr/include
$ ../../scripts/headers_compile_test.sh
...
Kernel header compile test statistics:
42 files failed the kernel header compile test.
821 files passed the kernel header compile test.
Once all these errors have been fixed, this test could be added to
'make headers_check'.
In addition to plain compile test, there is also a glibc header
compatibility test, which compiles all kernel uapi headers against a
non-conflicting set of all GNU libc headers. The test covers
variants where kernel header is included before libc header
and libc header before kernel header.
Tested in Debian unstable with libc6 version 2.24-14.
Example execution with output:
$ make headers_install
$ cd usr/include
$ ../../scripts/headers_compile_test.sh -lk
Testing that
/home/mcfrisk/src/linux-2.6/usr/headers_compile_test_include.qd5RuE/libc_headers.h
compiles
cc -Wall -c -nostdinc -I /usr/lib/gcc/i686-linux-gnu/6/include -I
/usr/lib/gcc/i686-linux-gnu/6/include-fixed -I . -I
/home/mcfrisk/src/linux-2.6/usr/headers_compile_test_include.qd5RuE -I
/home/mcfrisk/src/linux-2.6/usr/headers_compile_test_include.qd5RuE/i686-linux-gnu
-o /dev/null /home/mcfrisk/src/linux-2.6/usr/include/drm/i810_drm.h
PASSED: drm/i810_drm.h
cc -Wall -c -nostdinc -I /usr/lib/gcc/i686-linux-gnu/6/include -I
/usr/lib/gcc/i686-linux-gnu/6/include-fixed -I . -I
/home/mcfrisk/src/linux-2.6/usr/headers_compile_test_include.qd5RuE -I
/home/mcfrisk/src/linux-2.6/usr/headers_compile_test_include.qd5RuE/i686-linux-gnu
-o /dev/null
/home/mcfrisk/src/linux-2.6/usr/include/drm/i810_drm.h_libc_before_kernel.h
...
In file included from /home/mcfrisk/src/linux-2.6/usr/include/asm/sigcontext.h_l
ibc_before_kernel.h:2:0:
./asm/sigcontext.h:291:8: error: redefinition of ‘struct sigcontext’
struct sigcontext {
^~
In file included from /home/mcfrisk/src/linux-2.6/usr/headers_compile_test_inclu
de.qd5RuE/signal.h:306:0,
from /home/mcfrisk/src/linux-2.6/usr/headers_compile_test_inclu
de.qd5RuE/sys/param.h:28,
from /home/mcfrisk/src/linux-2.6/usr/headers_compile_test_inclu
de.qd5RuE/resolv.h:62,
from /home/mcfrisk/src/linux-2.6/usr/headers_compile_test_inclu
de.qd5RuE/libc_headers.h:103,
from /home/mcfrisk/src/linux-2.6/usr/include/asm/sigcontext.h_l
ibc_before_kernel.h:1:
/home/mcfrisk/src/linux-2.6/usr/headers_compile_test_include.qd5RuE/bits/sigcont
ext.h:93:8: note: originally defined here
struct sigcontext
^~
FAILED libc before kernel test: asm/sigcontext.h
...
Kernel header compile test statistics:
42 files failed the kernel header compile test.
821 files passed the kernel header compile test.
libc and kernel header compatibility test statistics:
73 files failed libc before kernel include test.
790 files passed libc before kernel include test.
Since I've been stubborn enough to work with this script and fixes to the
test failures for a few years, I added my self to MAINTAINERS.
Signed-off-by: Mikko Rapeli
Cc: Alexander Stein
Cc: Gabriel Laskar
Cc: Dmitry V. Levin
Cc: Arnd Bergmann
Cc: net...@vger.kernel.org
Cc: linux-...@vger.kernel.org
---
MAINTAINERS | 5 +
scripts/headers_compile_test.sh | 507
[PATCH v06 20/36] uapi linux/scc.h: include linux/sockios.h
Fixes userspace compilation error: error: ‘SIOCDEVPRIVATE’ undeclared here (not in a function) SIOCSCCRESERVED = SIOCDEVPRIVATE Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi> Cc: net...@vger.kernel.org Cc: linux-h...@vger.kernel.org Cc: Joerg Reuter <jreu...@yaina.de> --- include/uapi/linux/scc.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/uapi/linux/scc.h b/include/uapi/linux/scc.h index 72b6b8153374..2992b88ca4ce 100644 --- a/include/uapi/linux/scc.h +++ b/include/uapi/linux/scc.h @@ -3,6 +3,7 @@ #ifndef _UAPI_SCC_H #define _UAPI_SCC_H +#include /* selection of hardware types */ -- 2.13.3
[PATCH v06 20/36] uapi linux/scc.h: include linux/sockios.h
Fixes userspace compilation error: error: ‘SIOCDEVPRIVATE’ undeclared here (not in a function) SIOCSCCRESERVED = SIOCDEVPRIVATE Signed-off-by: Mikko Rapeli Cc: net...@vger.kernel.org Cc: linux-h...@vger.kernel.org Cc: Joerg Reuter --- include/uapi/linux/scc.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/uapi/linux/scc.h b/include/uapi/linux/scc.h index 72b6b8153374..2992b88ca4ce 100644 --- a/include/uapi/linux/scc.h +++ b/include/uapi/linux/scc.h @@ -3,6 +3,7 @@ #ifndef _UAPI_SCC_H #define _UAPI_SCC_H +#include /* selection of hardware types */ -- 2.13.3
[PATCH v06 14/36] arm uapi asm/signal.h: include for size_t in userspace
Arnd Bergmann <a...@arndb.de> doubts that __kernel_size_t could be used here so trying to fall back to gcc's . Fixes uapi header compilation error from userspace on ARCH=arm: asm/signal.h:112:2: error: unknown type name ‘size_t’ size_t ss_size; Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi> Cc: Arnd Bergmann <a...@arndb.de> --- arch/arm/include/uapi/asm/signal.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/include/uapi/asm/signal.h b/arch/arm/include/uapi/asm/signal.h index 33073bdcf091..63066f624c10 100644 --- a/arch/arm/include/uapi/asm/signal.h +++ b/arch/arm/include/uapi/asm/signal.h @@ -12,6 +12,8 @@ struct siginfo; #define NSIG 32 typedef unsigned long sigset_t; +#include + #endif /* __KERNEL__ */ #define SIGHUP 1 -- 2.13.3
[PATCH v06 14/36] arm uapi asm/signal.h: include for size_t in userspace
Arnd Bergmann doubts that __kernel_size_t could be used here so trying to fall back to gcc's . Fixes uapi header compilation error from userspace on ARCH=arm: asm/signal.h:112:2: error: unknown type name ‘size_t’ size_t ss_size; Signed-off-by: Mikko Rapeli Cc: Arnd Bergmann --- arch/arm/include/uapi/asm/signal.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm/include/uapi/asm/signal.h b/arch/arm/include/uapi/asm/signal.h index 33073bdcf091..63066f624c10 100644 --- a/arch/arm/include/uapi/asm/signal.h +++ b/arch/arm/include/uapi/asm/signal.h @@ -12,6 +12,8 @@ struct siginfo; #define NSIG 32 typedef unsigned long sigset_t; +#include + #endif /* __KERNEL__ */ #define SIGHUP 1 -- 2.13.3
[PATCH v06 32/36] uapi drm/armada_drm.h: use __u32 and __u64 instead of uint32_t and uint64_t
These are defined in linux/types.h or drm/drm.h. Fixes
user space compilation errors like:
drm/armada_drm.h:26:2: error: unknown type name ‘uint32_t’
uint32_t handle;
^~~~
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Cc: Emil Velikov <emil.l.veli...@gmail.com>
Cc: Gabriel Laskar <gabr...@lse.epita.fr>
Cc: Russell King <rmk+ker...@arm.linux.org.uk>
Cc: Rob Clark <robdcl...@gmail.com>
---
include/uapi/drm/armada_drm.h | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/include/uapi/drm/armada_drm.h b/include/uapi/drm/armada_drm.h
index 72e326f9c7de..0cb932416cfe 100644
--- a/include/uapi/drm/armada_drm.h
+++ b/include/uapi/drm/armada_drm.h
@@ -23,27 +23,27 @@ extern "C" {
DRM_##dir(DRM_COMMAND_BASE + DRM_ARMADA_##name, struct drm_armada_##str)
struct drm_armada_gem_create {
- uint32_t handle;
- uint32_t size;
+ __u32 handle;
+ __u32 size;
};
#define DRM_IOCTL_ARMADA_GEM_CREATE \
ARMADA_IOCTL(IOWR, GEM_CREATE, gem_create)
struct drm_armada_gem_mmap {
- uint32_t handle;
- uint32_t pad;
- uint64_t offset;
- uint64_t size;
- uint64_t addr;
+ __u32 handle;
+ __u32 pad;
+ __u64 offset;
+ __u64 size;
+ __u64 addr;
};
#define DRM_IOCTL_ARMADA_GEM_MMAP \
ARMADA_IOCTL(IOWR, GEM_MMAP, gem_mmap)
struct drm_armada_gem_pwrite {
- uint64_t ptr;
- uint32_t handle;
- uint32_t offset;
- uint32_t size;
+ __u64 ptr;
+ __u32 handle;
+ __u32 offset;
+ __u32 size;
};
#define DRM_IOCTL_ARMADA_GEM_PWRITE \
ARMADA_IOCTL(IOW, GEM_PWRITE, gem_pwrite)
--
2.13.3
[PATCH v06 32/36] uapi drm/armada_drm.h: use __u32 and __u64 instead of uint32_t and uint64_t
These are defined in linux/types.h or drm/drm.h. Fixes
user space compilation errors like:
drm/armada_drm.h:26:2: error: unknown type name ‘uint32_t’
uint32_t handle;
^~~~
Signed-off-by: Mikko Rapeli
Cc: Emil Velikov
Cc: Gabriel Laskar
Cc: Russell King
Cc: Rob Clark
---
include/uapi/drm/armada_drm.h | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/include/uapi/drm/armada_drm.h b/include/uapi/drm/armada_drm.h
index 72e326f9c7de..0cb932416cfe 100644
--- a/include/uapi/drm/armada_drm.h
+++ b/include/uapi/drm/armada_drm.h
@@ -23,27 +23,27 @@ extern "C" {
DRM_##dir(DRM_COMMAND_BASE + DRM_ARMADA_##name, struct drm_armada_##str)
struct drm_armada_gem_create {
- uint32_t handle;
- uint32_t size;
+ __u32 handle;
+ __u32 size;
};
#define DRM_IOCTL_ARMADA_GEM_CREATE \
ARMADA_IOCTL(IOWR, GEM_CREATE, gem_create)
struct drm_armada_gem_mmap {
- uint32_t handle;
- uint32_t pad;
- uint64_t offset;
- uint64_t size;
- uint64_t addr;
+ __u32 handle;
+ __u32 pad;
+ __u64 offset;
+ __u64 size;
+ __u64 addr;
};
#define DRM_IOCTL_ARMADA_GEM_MMAP \
ARMADA_IOCTL(IOWR, GEM_MMAP, gem_mmap)
struct drm_armada_gem_pwrite {
- uint64_t ptr;
- uint32_t handle;
- uint32_t offset;
- uint32_t size;
+ __u64 ptr;
+ __u32 handle;
+ __u32 offset;
+ __u32 size;
};
#define DRM_IOCTL_ARMADA_GEM_PWRITE \
ARMADA_IOCTL(IOW, GEM_PWRITE, gem_pwrite)
--
2.13.3
[PATCH v06 16/36] uapi linux/dlm_netlink.h: include linux/dlmconstants.h
Fixes userspace compilation error:
error: ‘DLM_RESNAME_MAXLEN’ undeclared here (not in a function)
char resource_name[DLM_RESNAME_MAXLEN];
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Cc: Christine Caulfield <ccaul...@redhat.com>
Cc: David Teigland <teigl...@redhat.com>
Cc: cluster-de...@redhat.com
---
include/uapi/linux/dlm_netlink.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/uapi/linux/dlm_netlink.h b/include/uapi/linux/dlm_netlink.h
index 647c8ef27227..ef1e2e08769a 100644
--- a/include/uapi/linux/dlm_netlink.h
+++ b/include/uapi/linux/dlm_netlink.h
@@ -10,6 +10,7 @@
#define _DLM_NETLINK_H
#include
+#include
enum {
DLM_STATUS_WAITING = 1,
--
2.13.3
[PATCH v06 16/36] uapi linux/dlm_netlink.h: include linux/dlmconstants.h
Fixes userspace compilation error:
error: ‘DLM_RESNAME_MAXLEN’ undeclared here (not in a function)
char resource_name[DLM_RESNAME_MAXLEN];
Signed-off-by: Mikko Rapeli
Cc: Christine Caulfield
Cc: David Teigland
Cc: cluster-de...@redhat.com
---
include/uapi/linux/dlm_netlink.h | 1 +
1 file changed, 1 insertion(+)
diff --git a/include/uapi/linux/dlm_netlink.h b/include/uapi/linux/dlm_netlink.h
index 647c8ef27227..ef1e2e08769a 100644
--- a/include/uapi/linux/dlm_netlink.h
+++ b/include/uapi/linux/dlm_netlink.h
@@ -10,6 +10,7 @@
#define _DLM_NETLINK_H
#include
+#include
enum {
DLM_STATUS_WAITING = 1,
--
2.13.3
[PATCH v06 12/36] x86 uapi asm/signal.h: use __kernel_size_t instead of size_t
Fixes userspace compilation error:
error: unknown type name ‘size_t’
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Cc: Al Viro <v...@zeniv.linux.org.uk>
Cc: Arnd Bergmann <a...@arndb.de>
Cc: H. Peter Anvin <h...@zytor.com>
---
arch/x86/include/uapi/asm/signal.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/uapi/asm/signal.h
b/arch/x86/include/uapi/asm/signal.h
index 8264f47cf53e..74346db30758 100644
--- a/arch/x86/include/uapi/asm/signal.h
+++ b/arch/x86/include/uapi/asm/signal.h
@@ -127,7 +127,7 @@ struct sigaction {
typedef struct sigaltstack {
void __user *ss_sp;
int ss_flags;
- size_t ss_size;
+ __kernel_size_t ss_size;
} stack_t;
#endif /* __ASSEMBLY__ */
--
2.13.3
[PATCH v06 22/36] uapi linux/reiserfs_xattr.h: use __kernel_size_t instead of size_t
Fixes userspace compilation error:
error: unknown type name ‘size_t’
size_t length;
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Cc: reiserfs-de...@vger.kernel.org
---
include/uapi/linux/reiserfs_xattr.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/uapi/linux/reiserfs_xattr.h
b/include/uapi/linux/reiserfs_xattr.h
index 38fdd648be21..af52b38ef783 100644
--- a/include/uapi/linux/reiserfs_xattr.h
+++ b/include/uapi/linux/reiserfs_xattr.h
@@ -18,7 +18,7 @@ struct reiserfs_xattr_header {
struct reiserfs_security_handle {
const char *name;
void *value;
- size_t length;
+ __kernel_size_t length;
};
#endif /* _LINUX_REISERFS_XATTR_H */
--
2.13.3
[PATCH v06 00/36] Userspace compile test and fixes for exported uapi header files
v6: Addressed v5 review comments. Dropped patches already applied from other developers for same problems: thanks Christoph Hellwig, Nicolas Dichtel, Arnd Bergmann, Dmitry V. Levin, Leon Romanovsky, David Lebrun, Jason Gunthorpe, Jonas Gorski, Stephen Hemminger, Davide Caratti and others! Moved glibc compatibility fix to a separate patch set to focus on these. Minor tuning to scripts/headers_compile_test.sh. Since several patches are not getting any review comments from lkml or from people and lists added by scripts/get_maintainer.pl, added manually crafted Cc:'s to the patches. v5: https://lkml.org/lkml/2016/8/22/661 two years now from v1 to v5 though some of the patches have been applied with these changes all uapi headers compile stand alone in users space added myself to MAINTAINERS for the test script tried to fix all v04 review findings due to regression in one of the accepted patches, added a glibc compatibility test fixed some glibc compatibility issues, which are hopefully on the right path v4: https://lkml.org/lkml/2015/10/15/22 tried to fix v03 review findings tried to fix all hack patches v3: https://lkml.org/lkml/2015/5/30/96 tried to fix all v2 review findings tried to guess how to fix a few more issue with a few hacks, 0 files fail and 760 files pass the compile test on 32bit x86 v2: https://lkml.org/lkml/2015/2/16/521 added cross compiler support with CROSS_COMPILE, detecting libc and GCC headers from compiler, more header file fixes v1: https://lkml.org/lkml/2014/8/21/665 Users of kernel header files would be happier if they did not contain kernel specific parts and would contain #include statements for all other header files that they depend on, and in general would compile. This patch set introduces a compile test for headers exported to userspace and then fixes all 42 of the remaining userspace header compilation failures. Some of the fixes may change include order and thus may expose incompatibilities between kernel and libc and other userspace library headers which include incompatible copies of kernel uapi header definitions. Changes are also available in headers_test_v06 branch at github: https://github.com/mcfrisk/linux/tree/headers_test_v06 Here's how to run the userspace compile tests and example output with these patches applied on top of v4.13-rc3-216-g0a23ea65ce9f: $ make headers_install $ cd usr/include $ ../../scripts/headers_compile_test.sh ... Kernel header compile test statistics: 0 files failed the kernel header compile test. 863 files passed the kernel header compile test. Compile tested with the test itself on 32bit x86 and armhf and with allmodconfig on x86 i586. Would be nice when various Linux kernel subsystem maintainers would pick and apply patches from this series to their queues, and comment if there are problems with any of them. Mikko Rapeli (36): Add scripts/headers_compile_test.sh: compile test for exported uapi headers uapi scsi/scsi_bsg_fc.h: use __u8, __u32 and __u64 from linux/types.h uapi scsi/scsi_netlink.h: use __u8, __u16 and __u64 from linux/types.h uapi scsi/scsi_netlink_fc.h: use __u16, __u32 and __u64 from linux/types.h uapi linux/sysctl.h: use __kernel_size_t instead of size_t uapi asm-generic/ipcbuf.h: include linux/posix_types.h uapi asm-generic/msgbuf.h: include asm/ipcbuf.h uapi asm-generic/shmbuf.h: include fixes uapi asm-generic/sembuf.h: include asm/posix_types.h and asm/ipcbuf.h uapi asm-generic/signal.h: use __kernel_size_t instead of size_t uapi asm-generic/ucontext.h: include asm/signal.h and asm/sigcontext.h x86 uapi asm/signal.h: use __kernel_size_t instead of size_t x86 uapi asm/sembuf.h: include linux/types.h and linux/ipc.h arm uapi asm/signal.h: include for size_t in userspace uapi linux/socket.h: include sys/socket.h in user space uapi linux/dlm_netlink.h: include linux/dlmconstants.h uapi linux/sctp.h: use __u8, __u16 and __u32 from linux/types.h uapi linux/errqueue.h: include linux/time.h in user space uapi linux/omapfb.h: use __kernel_size_t instead of size_t uapi linux/scc.h: include linux/sockios.h uapi linux/kexec.h: use __kernel_size_t instead of size_t uapi linux/reiserfs_xattr.h: use __kernel_size_t instead of size_t uapi linux/coda.h: use __kernel_pid_t and add u_short etc definitions for userspace uapi linux/coda_psdev.h: move upc_req definition from uapi to kernel side headers uapi linux/android/binder.h: use __kernel_pid_t and __kernel_uid_t uapi xen/privcmd.h: fix compilation in userspace uapi xen/gntdev.h: include xen/privcmd.h and define grant_ref_t uapi xen/evtchn.h: include xen/privcmd.h uapi linux/elfcore.h: remove non-compiling userspace parts uapi rdma/rdma_user_rxe.h: include in.h and in6.h uapi linux/patchkey.h: change #error to #warning if file included directly uapi drm/armada_drm.h: use __u32 and __u64 instead of uint32_t and uint64_t uapi linux/fsmap.h: use __kernel_size_t instead of size_t
[PATCH v06 31/36] uapi linux/patchkey.h: change #error to #warning if file included directly
Would be nice to be able to compile all userspace header files also alone. Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi> Cc: alsa-de...@alsa-project.org Cc: Andrew Veliath <andre...@usa.net> Cc: Riccardo Facchetti <fiz...@tin.it> --- include/uapi/linux/patchkey.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/linux/patchkey.h b/include/uapi/linux/patchkey.h index 1bda0e56bc5e..cee195d6d826 100644 --- a/include/uapi/linux/patchkey.h +++ b/include/uapi/linux/patchkey.h @@ -11,7 +11,7 @@ */ #ifndef _LINUX_PATCHKEY_H_INDIRECT -#error "patchkey.h included directly" +#warning "patchkey.h included directly" #endif #ifndef _UAPI_LINUX_PATCHKEY_H -- 2.13.3
[PATCH v06 12/36] x86 uapi asm/signal.h: use __kernel_size_t instead of size_t
Fixes userspace compilation error:
error: unknown type name ‘size_t’
Signed-off-by: Mikko Rapeli
Cc: Al Viro
Cc: Arnd Bergmann
Cc: H. Peter Anvin
---
arch/x86/include/uapi/asm/signal.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/arch/x86/include/uapi/asm/signal.h
b/arch/x86/include/uapi/asm/signal.h
index 8264f47cf53e..74346db30758 100644
--- a/arch/x86/include/uapi/asm/signal.h
+++ b/arch/x86/include/uapi/asm/signal.h
@@ -127,7 +127,7 @@ struct sigaction {
typedef struct sigaltstack {
void __user *ss_sp;
int ss_flags;
- size_t ss_size;
+ __kernel_size_t ss_size;
} stack_t;
#endif /* __ASSEMBLY__ */
--
2.13.3
[PATCH v06 22/36] uapi linux/reiserfs_xattr.h: use __kernel_size_t instead of size_t
Fixes userspace compilation error:
error: unknown type name ‘size_t’
size_t length;
Signed-off-by: Mikko Rapeli
Cc: reiserfs-de...@vger.kernel.org
---
include/uapi/linux/reiserfs_xattr.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/uapi/linux/reiserfs_xattr.h
b/include/uapi/linux/reiserfs_xattr.h
index 38fdd648be21..af52b38ef783 100644
--- a/include/uapi/linux/reiserfs_xattr.h
+++ b/include/uapi/linux/reiserfs_xattr.h
@@ -18,7 +18,7 @@ struct reiserfs_xattr_header {
struct reiserfs_security_handle {
const char *name;
void *value;
- size_t length;
+ __kernel_size_t length;
};
#endif /* _LINUX_REISERFS_XATTR_H */
--
2.13.3
[PATCH v06 00/36] Userspace compile test and fixes for exported uapi header files
v6: Addressed v5 review comments. Dropped patches already applied from other developers for same problems: thanks Christoph Hellwig, Nicolas Dichtel, Arnd Bergmann, Dmitry V. Levin, Leon Romanovsky, David Lebrun, Jason Gunthorpe, Jonas Gorski, Stephen Hemminger, Davide Caratti and others! Moved glibc compatibility fix to a separate patch set to focus on these. Minor tuning to scripts/headers_compile_test.sh. Since several patches are not getting any review comments from lkml or from people and lists added by scripts/get_maintainer.pl, added manually crafted Cc:'s to the patches. v5: https://lkml.org/lkml/2016/8/22/661 two years now from v1 to v5 though some of the patches have been applied with these changes all uapi headers compile stand alone in users space added myself to MAINTAINERS for the test script tried to fix all v04 review findings due to regression in one of the accepted patches, added a glibc compatibility test fixed some glibc compatibility issues, which are hopefully on the right path v4: https://lkml.org/lkml/2015/10/15/22 tried to fix v03 review findings tried to fix all hack patches v3: https://lkml.org/lkml/2015/5/30/96 tried to fix all v2 review findings tried to guess how to fix a few more issue with a few hacks, 0 files fail and 760 files pass the compile test on 32bit x86 v2: https://lkml.org/lkml/2015/2/16/521 added cross compiler support with CROSS_COMPILE, detecting libc and GCC headers from compiler, more header file fixes v1: https://lkml.org/lkml/2014/8/21/665 Users of kernel header files would be happier if they did not contain kernel specific parts and would contain #include statements for all other header files that they depend on, and in general would compile. This patch set introduces a compile test for headers exported to userspace and then fixes all 42 of the remaining userspace header compilation failures. Some of the fixes may change include order and thus may expose incompatibilities between kernel and libc and other userspace library headers which include incompatible copies of kernel uapi header definitions. Changes are also available in headers_test_v06 branch at github: https://github.com/mcfrisk/linux/tree/headers_test_v06 Here's how to run the userspace compile tests and example output with these patches applied on top of v4.13-rc3-216-g0a23ea65ce9f: $ make headers_install $ cd usr/include $ ../../scripts/headers_compile_test.sh ... Kernel header compile test statistics: 0 files failed the kernel header compile test. 863 files passed the kernel header compile test. Compile tested with the test itself on 32bit x86 and armhf and with allmodconfig on x86 i586. Would be nice when various Linux kernel subsystem maintainers would pick and apply patches from this series to their queues, and comment if there are problems with any of them. Mikko Rapeli (36): Add scripts/headers_compile_test.sh: compile test for exported uapi headers uapi scsi/scsi_bsg_fc.h: use __u8, __u32 and __u64 from linux/types.h uapi scsi/scsi_netlink.h: use __u8, __u16 and __u64 from linux/types.h uapi scsi/scsi_netlink_fc.h: use __u16, __u32 and __u64 from linux/types.h uapi linux/sysctl.h: use __kernel_size_t instead of size_t uapi asm-generic/ipcbuf.h: include linux/posix_types.h uapi asm-generic/msgbuf.h: include asm/ipcbuf.h uapi asm-generic/shmbuf.h: include fixes uapi asm-generic/sembuf.h: include asm/posix_types.h and asm/ipcbuf.h uapi asm-generic/signal.h: use __kernel_size_t instead of size_t uapi asm-generic/ucontext.h: include asm/signal.h and asm/sigcontext.h x86 uapi asm/signal.h: use __kernel_size_t instead of size_t x86 uapi asm/sembuf.h: include linux/types.h and linux/ipc.h arm uapi asm/signal.h: include for size_t in userspace uapi linux/socket.h: include sys/socket.h in user space uapi linux/dlm_netlink.h: include linux/dlmconstants.h uapi linux/sctp.h: use __u8, __u16 and __u32 from linux/types.h uapi linux/errqueue.h: include linux/time.h in user space uapi linux/omapfb.h: use __kernel_size_t instead of size_t uapi linux/scc.h: include linux/sockios.h uapi linux/kexec.h: use __kernel_size_t instead of size_t uapi linux/reiserfs_xattr.h: use __kernel_size_t instead of size_t uapi linux/coda.h: use __kernel_pid_t and add u_short etc definitions for userspace uapi linux/coda_psdev.h: move upc_req definition from uapi to kernel side headers uapi linux/android/binder.h: use __kernel_pid_t and __kernel_uid_t uapi xen/privcmd.h: fix compilation in userspace uapi xen/gntdev.h: include xen/privcmd.h and define grant_ref_t uapi xen/evtchn.h: include xen/privcmd.h uapi linux/elfcore.h: remove non-compiling userspace parts uapi rdma/rdma_user_rxe.h: include in.h and in6.h uapi linux/patchkey.h: change #error to #warning if file included directly uapi drm/armada_drm.h: use __u32 and __u64 instead of uint32_t and uint64_t uapi linux/fsmap.h: use __kernel_size_t instead of size_t
[PATCH v06 31/36] uapi linux/patchkey.h: change #error to #warning if file included directly
Would be nice to be able to compile all userspace header files also alone. Signed-off-by: Mikko Rapeli Cc: alsa-de...@alsa-project.org Cc: Andrew Veliath Cc: Riccardo Facchetti --- include/uapi/linux/patchkey.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/uapi/linux/patchkey.h b/include/uapi/linux/patchkey.h index 1bda0e56bc5e..cee195d6d826 100644 --- a/include/uapi/linux/patchkey.h +++ b/include/uapi/linux/patchkey.h @@ -11,7 +11,7 @@ */ #ifndef _LINUX_PATCHKEY_H_INDIRECT -#error "patchkey.h included directly" +#warning "patchkey.h included directly" #endif #ifndef _UAPI_LINUX_PATCHKEY_H -- 2.13.3
[PATCH v06 03/36] uapi scsi/scsi_netlink.h: use __u8, __u16 and __u64 from linux/types.h
Fixes userspace compilation errors like:
scsi/scsi_netlink.h:43:2: error: unknown type name ‘uint8_t’
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Cc: linux-s...@vger.kernel.org
---
include/uapi/scsi/scsi_netlink.h | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/include/uapi/scsi/scsi_netlink.h b/include/uapi/scsi/scsi_netlink.h
index 62b4edab15d3..36b53a769a04 100644
--- a/include/uapi/scsi/scsi_netlink.h
+++ b/include/uapi/scsi/scsi_netlink.h
@@ -22,8 +22,8 @@
#ifndef SCSI_NETLINK_H
#define SCSI_NETLINK_H
-#include
#include
+#include
/*
* This file intended to be included by both kernel and user space
@@ -40,12 +40,12 @@
/* SCSI_TRANSPORT_MSG event message header */
struct scsi_nl_hdr {
- uint8_t version;
- uint8_t transport;
- uint16_t magic;
- uint16_t msgtype;
- uint16_t msglen;
-} __attribute__((aligned(sizeof(uint64_t;
+ __u8 version;
+ __u8 transport;
+ __u16 magic;
+ __u16 msgtype;
+ __u16 msglen;
+} __attribute__((aligned(sizeof(__u64;
/* scsi_nl_hdr->version value */
#define SCSI_NL_VERSION1
@@ -89,10 +89,10 @@ struct scsi_nl_hdr {
*/
struct scsi_nl_host_vendor_msg {
struct scsi_nl_hdr snlh;/* must be 1st element ! */
- uint64_t vendor_id;
- uint16_t host_no;
- uint16_t vmsg_datalen;
-} __attribute__((aligned(sizeof(uint64_t;
+ __u64 vendor_id;
+ __u16 host_no;
+ __u16 vmsg_datalen;
+} __attribute__((aligned(sizeof(__u64;
/*
--
2.13.3
[PATCH v06 03/36] uapi scsi/scsi_netlink.h: use __u8, __u16 and __u64 from linux/types.h
Fixes userspace compilation errors like:
scsi/scsi_netlink.h:43:2: error: unknown type name ‘uint8_t’
Signed-off-by: Mikko Rapeli
Cc: linux-s...@vger.kernel.org
---
include/uapi/scsi/scsi_netlink.h | 22 +++---
1 file changed, 11 insertions(+), 11 deletions(-)
diff --git a/include/uapi/scsi/scsi_netlink.h b/include/uapi/scsi/scsi_netlink.h
index 62b4edab15d3..36b53a769a04 100644
--- a/include/uapi/scsi/scsi_netlink.h
+++ b/include/uapi/scsi/scsi_netlink.h
@@ -22,8 +22,8 @@
#ifndef SCSI_NETLINK_H
#define SCSI_NETLINK_H
-#include
#include
+#include
/*
* This file intended to be included by both kernel and user space
@@ -40,12 +40,12 @@
/* SCSI_TRANSPORT_MSG event message header */
struct scsi_nl_hdr {
- uint8_t version;
- uint8_t transport;
- uint16_t magic;
- uint16_t msgtype;
- uint16_t msglen;
-} __attribute__((aligned(sizeof(uint64_t;
+ __u8 version;
+ __u8 transport;
+ __u16 magic;
+ __u16 msgtype;
+ __u16 msglen;
+} __attribute__((aligned(sizeof(__u64;
/* scsi_nl_hdr->version value */
#define SCSI_NL_VERSION1
@@ -89,10 +89,10 @@ struct scsi_nl_hdr {
*/
struct scsi_nl_host_vendor_msg {
struct scsi_nl_hdr snlh;/* must be 1st element ! */
- uint64_t vendor_id;
- uint16_t host_no;
- uint16_t vmsg_datalen;
-} __attribute__((aligned(sizeof(uint64_t;
+ __u64 vendor_id;
+ __u16 host_no;
+ __u16 vmsg_datalen;
+} __attribute__((aligned(sizeof(__u64;
/*
--
2.13.3
[PATCH v06 29/36] uapi linux/elfcore.h: remove non-compiling userspace parts
Remove typedef elf_greg_t greg_t and friends from userspace. Remove struct elf_prstatus completely from userspace. elfcore.h as such does not compile in userspace. All userspace users of like gcc/gdb and linux-tools contain their own modified versions of the file. With these changes the file compiles but is generally not usable for things like core dump parsing but luckily userspace users already know this and have their own modified version of the needed definitions and headers. But at least this compiles now. Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi> Cc: Al Viro <v...@zeniv.linux.org.uk> Cc: Ingo Molnar <mi...@kernel.org> Cc: Roland McGrath <rol...@redhat.com> --- include/uapi/linux/elfcore.h | 21 +++-- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/include/uapi/linux/elfcore.h b/include/uapi/linux/elfcore.h index 569737cfb557..6c230664e362 100644 --- a/include/uapi/linux/elfcore.h +++ b/include/uapi/linux/elfcore.h @@ -15,15 +15,7 @@ struct elf_siginfo int si_errno; /* errno */ }; - -#ifndef __KERNEL__ -typedef elf_greg_t greg_t; -typedef elf_gregset_t gregset_t; -typedef elf_fpregset_t fpregset_t; -typedef elf_fpxregset_t fpxregset_t; -#define NGREG ELF_NGREG -#endif - +#ifdef __KERNEL__ /* * Definitions to generate Intel SVR4-like core files. * These mostly have the same names as the SVR4 types with "elf_" @@ -48,10 +40,10 @@ struct elf_prstatus struct sigaltstack pr_altstack; /* Alternate stack info */ struct sigaction pr_action; /* Signal action for current sig */ #endif - pid_t pr_pid; - pid_t pr_ppid; - pid_t pr_pgrp; - pid_t pr_sid; + __kernel_pid_t pr_pid; + __kernel_pid_t pr_ppid; + __kernel_pid_t pr_pgrp; + __kernel_pid_t pr_sid; struct timeval pr_utime;/* User time */ struct timeval pr_stime;/* System time */ struct timeval pr_cutime; /* Cumulative user time */ @@ -72,6 +64,7 @@ struct elf_prstatus #endif int pr_fpvalid; /* True if math co-processor being used. */ }; +#endif /* __KERNEL__ */ #define ELF_PRARGSZ(80)/* Number of chars for args */ @@ -84,7 +77,7 @@ struct elf_prpsinfo unsigned long pr_flag; /* flags */ __kernel_uid_t pr_uid; __kernel_gid_t pr_gid; - pid_t pr_pid, pr_ppid, pr_pgrp, pr_sid; + __kernel_pid_t pr_pid, pr_ppid, pr_pgrp, pr_sid; /* Lots missing */ charpr_fname[16]; /* filename of executable */ charpr_psargs[ELF_PRARGSZ]; /* initial part of arg list */ -- 2.13.3
[PATCH v06 29/36] uapi linux/elfcore.h: remove non-compiling userspace parts
Remove typedef elf_greg_t greg_t and friends from userspace. Remove struct elf_prstatus completely from userspace. elfcore.h as such does not compile in userspace. All userspace users of like gcc/gdb and linux-tools contain their own modified versions of the file. With these changes the file compiles but is generally not usable for things like core dump parsing but luckily userspace users already know this and have their own modified version of the needed definitions and headers. But at least this compiles now. Signed-off-by: Mikko Rapeli Cc: Al Viro Cc: Ingo Molnar Cc: Roland McGrath --- include/uapi/linux/elfcore.h | 21 +++-- 1 file changed, 7 insertions(+), 14 deletions(-) diff --git a/include/uapi/linux/elfcore.h b/include/uapi/linux/elfcore.h index 569737cfb557..6c230664e362 100644 --- a/include/uapi/linux/elfcore.h +++ b/include/uapi/linux/elfcore.h @@ -15,15 +15,7 @@ struct elf_siginfo int si_errno; /* errno */ }; - -#ifndef __KERNEL__ -typedef elf_greg_t greg_t; -typedef elf_gregset_t gregset_t; -typedef elf_fpregset_t fpregset_t; -typedef elf_fpxregset_t fpxregset_t; -#define NGREG ELF_NGREG -#endif - +#ifdef __KERNEL__ /* * Definitions to generate Intel SVR4-like core files. * These mostly have the same names as the SVR4 types with "elf_" @@ -48,10 +40,10 @@ struct elf_prstatus struct sigaltstack pr_altstack; /* Alternate stack info */ struct sigaction pr_action; /* Signal action for current sig */ #endif - pid_t pr_pid; - pid_t pr_ppid; - pid_t pr_pgrp; - pid_t pr_sid; + __kernel_pid_t pr_pid; + __kernel_pid_t pr_ppid; + __kernel_pid_t pr_pgrp; + __kernel_pid_t pr_sid; struct timeval pr_utime;/* User time */ struct timeval pr_stime;/* System time */ struct timeval pr_cutime; /* Cumulative user time */ @@ -72,6 +64,7 @@ struct elf_prstatus #endif int pr_fpvalid; /* True if math co-processor being used. */ }; +#endif /* __KERNEL__ */ #define ELF_PRARGSZ(80)/* Number of chars for args */ @@ -84,7 +77,7 @@ struct elf_prpsinfo unsigned long pr_flag; /* flags */ __kernel_uid_t pr_uid; __kernel_gid_t pr_gid; - pid_t pr_pid, pr_ppid, pr_pgrp, pr_sid; + __kernel_pid_t pr_pid, pr_ppid, pr_pgrp, pr_sid; /* Lots missing */ charpr_fname[16]; /* filename of executable */ charpr_psargs[ELF_PRARGSZ]; /* initial part of arg list */ -- 2.13.3
[PATCH v06 04/36] uapi scsi/scsi_netlink_fc.h: use __u16, __u32 and __u64 from linux/types.h
Fixes userspace compilation errors like:
scsi/scsi_netlink_fc.h:60:2: error: expected specifier-qualifier-list before
‘uint64_t’
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Cc: linux-s...@vger.kernel.org
---
include/uapi/scsi/scsi_netlink_fc.h | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/uapi/scsi/scsi_netlink_fc.h
b/include/uapi/scsi/scsi_netlink_fc.h
index cbf76e479761..2493a0f533dc 100644
--- a/include/uapi/scsi/scsi_netlink_fc.h
+++ b/include/uapi/scsi/scsi_netlink_fc.h
@@ -57,14 +57,14 @@
*/
struct fc_nl_event {
struct scsi_nl_hdr snlh;/* must be 1st element ! */
- uint64_t seconds;
- uint64_t vendor_id;
- uint16_t host_no;
- uint16_t event_datalen;
- uint32_t event_num;
- uint32_t event_code;
- uint32_t event_data;
-} __attribute__((aligned(sizeof(uint64_t;
+ __u64 seconds;
+ __u64 vendor_id;
+ __u16 host_no;
+ __u16 event_datalen;
+ __u32 event_num;
+ __u32 event_code;
+ __u32 event_data;
+} __attribute__((aligned(sizeof(__u64;
#endif /* SCSI_NETLINK_FC_H */
--
2.13.3
[PATCH v06 04/36] uapi scsi/scsi_netlink_fc.h: use __u16, __u32 and __u64 from linux/types.h
Fixes userspace compilation errors like:
scsi/scsi_netlink_fc.h:60:2: error: expected specifier-qualifier-list before
‘uint64_t’
Signed-off-by: Mikko Rapeli
Cc: linux-s...@vger.kernel.org
---
include/uapi/scsi/scsi_netlink_fc.h | 16
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/include/uapi/scsi/scsi_netlink_fc.h
b/include/uapi/scsi/scsi_netlink_fc.h
index cbf76e479761..2493a0f533dc 100644
--- a/include/uapi/scsi/scsi_netlink_fc.h
+++ b/include/uapi/scsi/scsi_netlink_fc.h
@@ -57,14 +57,14 @@
*/
struct fc_nl_event {
struct scsi_nl_hdr snlh;/* must be 1st element ! */
- uint64_t seconds;
- uint64_t vendor_id;
- uint16_t host_no;
- uint16_t event_datalen;
- uint32_t event_num;
- uint32_t event_code;
- uint32_t event_data;
-} __attribute__((aligned(sizeof(uint64_t;
+ __u64 seconds;
+ __u64 vendor_id;
+ __u16 host_no;
+ __u16 event_datalen;
+ __u32 event_num;
+ __u32 event_code;
+ __u32 event_data;
+} __attribute__((aligned(sizeof(__u64;
#endif /* SCSI_NETLINK_FC_H */
--
2.13.3
[PATCH v06 08/36] uapi asm-generic/shmbuf.h: include fixes
Include linux/types.h and asm/msgbuf.h and use __kernel_size_t instead
of size_t.
Fixes userspace compilation errors like:
error: field ‘shm_perm’ has incomplete type
struct ipc64_perm shm_perm; /* operation perms */
error: unknown type name ‘size_t’
error: unknown type name ‘__kernel_time_t’
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Acked-by: Arnd Bergmann <a...@arndb.de>
Cc: H.J. Lu <hjl.to...@gmail.com>
Cc: H. Peter Anvin <h...@zytor.com>
---
include/uapi/asm-generic/shmbuf.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/include/uapi/asm-generic/shmbuf.h
b/include/uapi/asm-generic/shmbuf.h
index 7e9fb2f0853b..ae867ad1e5e4 100644
--- a/include/uapi/asm-generic/shmbuf.h
+++ b/include/uapi/asm-generic/shmbuf.h
@@ -1,7 +1,9 @@
#ifndef __ASM_GENERIC_SHMBUF_H
#define __ASM_GENERIC_SHMBUF_H
+#include
#include
+#include
/*
* The shmid64_ds structure for x86 architecture.
@@ -24,7 +26,7 @@
struct shmid64_ds {
struct ipc64_perm shm_perm; /* operation perms */
- size_t shm_segsz; /* size of segment (bytes) */
+ __kernel_size_t shm_segsz; /* size of segment (bytes) */
__kernel_time_t shm_atime; /* last attach time */
#if __BITS_PER_LONG != 64
unsigned long __unused1;
--
2.13.3
[PATCH v06 08/36] uapi asm-generic/shmbuf.h: include fixes
Include linux/types.h and asm/msgbuf.h and use __kernel_size_t instead
of size_t.
Fixes userspace compilation errors like:
error: field ‘shm_perm’ has incomplete type
struct ipc64_perm shm_perm; /* operation perms */
error: unknown type name ‘size_t’
error: unknown type name ‘__kernel_time_t’
Signed-off-by: Mikko Rapeli
Acked-by: Arnd Bergmann
Cc: H.J. Lu
Cc: H. Peter Anvin
---
include/uapi/asm-generic/shmbuf.h | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/include/uapi/asm-generic/shmbuf.h
b/include/uapi/asm-generic/shmbuf.h
index 7e9fb2f0853b..ae867ad1e5e4 100644
--- a/include/uapi/asm-generic/shmbuf.h
+++ b/include/uapi/asm-generic/shmbuf.h
@@ -1,7 +1,9 @@
#ifndef __ASM_GENERIC_SHMBUF_H
#define __ASM_GENERIC_SHMBUF_H
+#include
#include
+#include
/*
* The shmid64_ds structure for x86 architecture.
@@ -24,7 +26,7 @@
struct shmid64_ds {
struct ipc64_perm shm_perm; /* operation perms */
- size_t shm_segsz; /* size of segment (bytes) */
+ __kernel_size_t shm_segsz; /* size of segment (bytes) */
__kernel_time_t shm_atime; /* last attach time */
#if __BITS_PER_LONG != 64
unsigned long __unused1;
--
2.13.3
[PATCH v06 23/36] uapi linux/coda.h: use __kernel_pid_t and add u_short etc definitions for userspace
Fixes userspace compilation errors about unknown pid_t, u_short etc types.
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Cc: Jan Harkes <jahar...@cs.cmu.edu>
Cc: codal...@coda.cs.cmu.edu
---
include/uapi/linux/coda.h | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/coda.h b/include/uapi/linux/coda.h
index 695fade33c64..2985ca00d63b 100644
--- a/include/uapi/linux/coda.h
+++ b/include/uapi/linux/coda.h
@@ -100,7 +100,14 @@ typedef unsigned long long u_quad_t;
#if defined(__linux__)
#include
#define cdev_t u_quad_t
+
#ifndef __KERNEL__
+typedef unsigned long u_long;
+typedef unsigned int u_int;
+typedef unsigned short u_short;
+typedef u_long ino_t;
+typedef u_long dev_t;
+typedef void *caddr_t;
#if !defined(_UQUAD_T_) && (!defined(__GLIBC__) || __GLIBC__ < 2)
#define _UQUAD_T_ 1
typedef unsigned long long u_quad_t;
@@ -295,8 +302,8 @@ struct coda_statfs {
struct coda_in_hdr {
u_int32_t opcode;
u_int32_t unique; /* Keep multiple outstanding msgs distinct */
-pid_t pid;
-pid_t pgid;
+__kernel_pid_t pid;
+__kernel_pid_t pgid;
vuid_t uid;
};
--
2.13.3
[PATCH v06 23/36] uapi linux/coda.h: use __kernel_pid_t and add u_short etc definitions for userspace
Fixes userspace compilation errors about unknown pid_t, u_short etc types.
Signed-off-by: Mikko Rapeli
Cc: Jan Harkes
Cc: codal...@coda.cs.cmu.edu
---
include/uapi/linux/coda.h | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/coda.h b/include/uapi/linux/coda.h
index 695fade33c64..2985ca00d63b 100644
--- a/include/uapi/linux/coda.h
+++ b/include/uapi/linux/coda.h
@@ -100,7 +100,14 @@ typedef unsigned long long u_quad_t;
#if defined(__linux__)
#include
#define cdev_t u_quad_t
+
#ifndef __KERNEL__
+typedef unsigned long u_long;
+typedef unsigned int u_int;
+typedef unsigned short u_short;
+typedef u_long ino_t;
+typedef u_long dev_t;
+typedef void *caddr_t;
#if !defined(_UQUAD_T_) && (!defined(__GLIBC__) || __GLIBC__ < 2)
#define _UQUAD_T_ 1
typedef unsigned long long u_quad_t;
@@ -295,8 +302,8 @@ struct coda_statfs {
struct coda_in_hdr {
u_int32_t opcode;
u_int32_t unique; /* Keep multiple outstanding msgs distinct */
-pid_t pid;
-pid_t pgid;
+__kernel_pid_t pid;
+__kernel_pid_t pgid;
vuid_t uid;
};
--
2.13.3
[PATCH v06 34/36] uapi: break dependency loop between and
Name structs in linux/hdlc/ioctl.h and forward declare and use them in
linux/if.h. Then include linux/if.h in linux/hdlc/ioctl.h to fix
user space compilation problem:
hdlc/ioctl.h:73:14: error: ‘IFNAMSIZ’ undeclared here (not in a function)
char master[IFNAMSIZ]; /* Name of master FRAD device */
^~~~
This approach for suggested by Frans Klaver <franskla...@gmail.com>
in lkml message
<CAH6sp9Ni636HR4sma0SeSZPs+Tws9Y41jij-=fu0gmzj5zb...@mail.gmail.com>.
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Cc: Frans Klaver <franskla...@gmail.com>
Cc: David Miller <da...@davemloft.net>
---
include/uapi/linux/hdlc/ioctl.h | 17 +
include/uapi/linux/if.h | 23 ---
2 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/include/uapi/linux/hdlc/ioctl.h b/include/uapi/linux/hdlc/ioctl.h
index 04bc0274a189..717d3edef7d1 100644
--- a/include/uapi/linux/hdlc/ioctl.h
+++ b/include/uapi/linux/hdlc/ioctl.h
@@ -1,6 +1,7 @@
#ifndef __HDLC_IOCTL_H__
#define __HDLC_IOCTL_H__
+#include
#define GENERIC_HDLC_VERSION 4 /* For synchronization with sethdlc utility */
@@ -36,25 +37,25 @@
#ifndef __ASSEMBLY__
-typedef struct {
+typedef struct sync_serial_settings {
unsigned int clock_rate; /* bits per second */
unsigned int clock_type; /* internal, external, TX-internal etc. */
unsigned short loopback;
} sync_serial_settings; /* V.35, V.24, X.21 */
-typedef struct {
+typedef struct te1_settings {
unsigned int clock_rate; /* bits per second */
unsigned int clock_type; /* internal, external, TX-internal etc. */
unsigned short loopback;
unsigned int slot_map;
} te1_settings; /* T1, E1 */
-typedef struct {
+typedef struct raw_hdlc_proto {
unsigned short encoding;
unsigned short parity;
} raw_hdlc_proto;
-typedef struct {
+typedef struct fr_proto {
unsigned int t391;
unsigned int t392;
unsigned int n391;
@@ -64,16 +65,16 @@ typedef struct {
unsigned short dce; /* 1 for DCE (network side) operation */
} fr_proto;
-typedef struct {
+typedef struct fr_proto_pvc {
unsigned int dlci;
} fr_proto_pvc; /* for creating/deleting FR PVCs */
-typedef struct {
+typedef struct fr_proto_pvc_info {
unsigned int dlci;
char master[IFNAMSIZ]; /* Name of master FRAD device */
-}fr_proto_pvc_info;/* for returning PVC information only */
+} fr_proto_pvc_info; /* for returning PVC information only */
-typedef struct {
+typedef struct cisco_proto {
unsigned int interval;
unsigned int timeout;
} cisco_proto;
diff --git a/include/uapi/linux/if.h b/include/uapi/linux/if.h
index 259617a551f2..b57d9cd08ac9 100644
--- a/include/uapi/linux/if.h
+++ b/include/uapi/linux/if.h
@@ -34,6 +34,15 @@
#defineIFALIASZ256
#include
+/* Forward declarations to break dependency loop with */
+struct sync_serial_settings;
+struct ae1_settings;
+struct raw_hdlc_proto;
+struct fr_proto;
+struct fr_proto_pvc;
+struct fr_proto_pvc_info;
+struct cisco_proto;
+
/* For glibc compatibility. An empty enum does not compile. */
#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 || \
__UAPI_DEF_IF_NET_DEVICE_FLAGS != 0
@@ -206,15 +215,15 @@ struct if_settings {
unsigned int size; /* Size of the data allocated by the caller */
union {
/* {atm/eth/dsl}_settings anyone ? */
- raw_hdlc_proto __user *raw_hdlc;
- cisco_proto __user *cisco;
- fr_proto__user *fr;
- fr_proto_pvc__user *fr_pvc;
- fr_proto_pvc_info __user *fr_pvc_info;
+ struct raw_hdlc_proto __user *raw_hdlc;
+ struct cisco_proto __user *cisco;
+ struct fr_proto __user *fr;
+ struct fr_proto_pvc __user *fr_pvc;
+ struct fr_proto_pvc_info__user *fr_pvc_info;
/* interface settings */
- sync_serial_settings__user *sync;
- te1_settings__user *te1;
+ struct sync_serial_settings __user *sync;
+ struct te1_settings __user *te1;
} ifs_ifsu;
};
--
2.13.3
[PATCH v06 19/36] uapi linux/omapfb.h: use __kernel_size_t instead of size_t
Fixes userspace compilation error:
error: unknown type name ‘size_t’
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Cc: linux-o...@vger.kernel.org
Cc: Tomi Valkeinen <tomi.valkei...@ti.com>
Cc: Aaro Koskinen <aaro.koski...@iki.fi>
---
include/uapi/linux/omapfb.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/uapi/linux/omapfb.h b/include/uapi/linux/omapfb.h
index 7c97bc00ac6d..b637a924618f 100644
--- a/include/uapi/linux/omapfb.h
+++ b/include/uapi/linux/omapfb.h
@@ -181,7 +181,7 @@ struct omapfb_memory_read {
__u16 y;
__u16 w;
__u16 h;
- size_t buffer_size;
+ __kernel_size_t buffer_size;
void __user *buffer;
};
--
2.13.3
[PATCH v06 34/36] uapi: break dependency loop between and
Name structs in linux/hdlc/ioctl.h and forward declare and use them in
linux/if.h. Then include linux/if.h in linux/hdlc/ioctl.h to fix
user space compilation problem:
hdlc/ioctl.h:73:14: error: ‘IFNAMSIZ’ undeclared here (not in a function)
char master[IFNAMSIZ]; /* Name of master FRAD device */
^~~~
This approach for suggested by Frans Klaver
in lkml message
.
Signed-off-by: Mikko Rapeli
Cc: Frans Klaver
Cc: David Miller
---
include/uapi/linux/hdlc/ioctl.h | 17 +
include/uapi/linux/if.h | 23 ---
2 files changed, 25 insertions(+), 15 deletions(-)
diff --git a/include/uapi/linux/hdlc/ioctl.h b/include/uapi/linux/hdlc/ioctl.h
index 04bc0274a189..717d3edef7d1 100644
--- a/include/uapi/linux/hdlc/ioctl.h
+++ b/include/uapi/linux/hdlc/ioctl.h
@@ -1,6 +1,7 @@
#ifndef __HDLC_IOCTL_H__
#define __HDLC_IOCTL_H__
+#include
#define GENERIC_HDLC_VERSION 4 /* For synchronization with sethdlc utility */
@@ -36,25 +37,25 @@
#ifndef __ASSEMBLY__
-typedef struct {
+typedef struct sync_serial_settings {
unsigned int clock_rate; /* bits per second */
unsigned int clock_type; /* internal, external, TX-internal etc. */
unsigned short loopback;
} sync_serial_settings; /* V.35, V.24, X.21 */
-typedef struct {
+typedef struct te1_settings {
unsigned int clock_rate; /* bits per second */
unsigned int clock_type; /* internal, external, TX-internal etc. */
unsigned short loopback;
unsigned int slot_map;
} te1_settings; /* T1, E1 */
-typedef struct {
+typedef struct raw_hdlc_proto {
unsigned short encoding;
unsigned short parity;
} raw_hdlc_proto;
-typedef struct {
+typedef struct fr_proto {
unsigned int t391;
unsigned int t392;
unsigned int n391;
@@ -64,16 +65,16 @@ typedef struct {
unsigned short dce; /* 1 for DCE (network side) operation */
} fr_proto;
-typedef struct {
+typedef struct fr_proto_pvc {
unsigned int dlci;
} fr_proto_pvc; /* for creating/deleting FR PVCs */
-typedef struct {
+typedef struct fr_proto_pvc_info {
unsigned int dlci;
char master[IFNAMSIZ]; /* Name of master FRAD device */
-}fr_proto_pvc_info;/* for returning PVC information only */
+} fr_proto_pvc_info; /* for returning PVC information only */
-typedef struct {
+typedef struct cisco_proto {
unsigned int interval;
unsigned int timeout;
} cisco_proto;
diff --git a/include/uapi/linux/if.h b/include/uapi/linux/if.h
index 259617a551f2..b57d9cd08ac9 100644
--- a/include/uapi/linux/if.h
+++ b/include/uapi/linux/if.h
@@ -34,6 +34,15 @@
#defineIFALIASZ256
#include
+/* Forward declarations to break dependency loop with */
+struct sync_serial_settings;
+struct ae1_settings;
+struct raw_hdlc_proto;
+struct fr_proto;
+struct fr_proto_pvc;
+struct fr_proto_pvc_info;
+struct cisco_proto;
+
/* For glibc compatibility. An empty enum does not compile. */
#if __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO != 0 || \
__UAPI_DEF_IF_NET_DEVICE_FLAGS != 0
@@ -206,15 +215,15 @@ struct if_settings {
unsigned int size; /* Size of the data allocated by the caller */
union {
/* {atm/eth/dsl}_settings anyone ? */
- raw_hdlc_proto __user *raw_hdlc;
- cisco_proto __user *cisco;
- fr_proto__user *fr;
- fr_proto_pvc__user *fr_pvc;
- fr_proto_pvc_info __user *fr_pvc_info;
+ struct raw_hdlc_proto __user *raw_hdlc;
+ struct cisco_proto __user *cisco;
+ struct fr_proto __user *fr;
+ struct fr_proto_pvc __user *fr_pvc;
+ struct fr_proto_pvc_info__user *fr_pvc_info;
/* interface settings */
- sync_serial_settings__user *sync;
- te1_settings__user *te1;
+ struct sync_serial_settings __user *sync;
+ struct te1_settings __user *te1;
} ifs_ifsu;
};
--
2.13.3
[PATCH v06 19/36] uapi linux/omapfb.h: use __kernel_size_t instead of size_t
Fixes userspace compilation error:
error: unknown type name ‘size_t’
Signed-off-by: Mikko Rapeli
Cc: linux-o...@vger.kernel.org
Cc: Tomi Valkeinen
Cc: Aaro Koskinen
---
include/uapi/linux/omapfb.h | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/include/uapi/linux/omapfb.h b/include/uapi/linux/omapfb.h
index 7c97bc00ac6d..b637a924618f 100644
--- a/include/uapi/linux/omapfb.h
+++ b/include/uapi/linux/omapfb.h
@@ -181,7 +181,7 @@ struct omapfb_memory_read {
__u16 y;
__u16 w;
__u16 h;
- size_t buffer_size;
+ __kernel_size_t buffer_size;
void __user *buffer;
};
--
2.13.3
[PATCH v06 21/36] uapi linux/kexec.h: use __kernel_size_t instead of size_t
Fixes userspace compilation error:
error: unknown type name ‘size_t’
size_t bufsz;
Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi>
Cc: ke...@lists.infradead.org
Cc: Eric Biederman <ebied...@xmission.com>
---
include/uapi/linux/kexec.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/kexec.h b/include/uapi/linux/kexec.h
index aae5ebf2022b..f964d83b2757 100644
--- a/include/uapi/linux/kexec.h
+++ b/include/uapi/linux/kexec.h
@@ -51,9 +51,9 @@
*/
struct kexec_segment {
const void *buf;
- size_t bufsz;
+ __kernel_size_t bufsz;
const void *mem;
- size_t memsz;
+ __kernel_size_t memsz;
};
#endif /* __KERNEL__ */
--
2.13.3
[PATCH v06 21/36] uapi linux/kexec.h: use __kernel_size_t instead of size_t
Fixes userspace compilation error:
error: unknown type name ‘size_t’
size_t bufsz;
Signed-off-by: Mikko Rapeli
Cc: ke...@lists.infradead.org
Cc: Eric Biederman
---
include/uapi/linux/kexec.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/include/uapi/linux/kexec.h b/include/uapi/linux/kexec.h
index aae5ebf2022b..f964d83b2757 100644
--- a/include/uapi/linux/kexec.h
+++ b/include/uapi/linux/kexec.h
@@ -51,9 +51,9 @@
*/
struct kexec_segment {
const void *buf;
- size_t bufsz;
+ __kernel_size_t bufsz;
const void *mem;
- size_t memsz;
+ __kernel_size_t memsz;
};
#endif /* __KERNEL__ */
--
2.13.3
[PATCH v06 15/36] uapi linux/socket.h: include sys/socket.h in user space
This libc header has sockaddr definition in user space. Fixes user space compilation errors like these from kernel headers including only linux/socket.h: error: field ‘ifru_addr’ has incomplete type struct sockaddr ifru_addr; error: field ‘_sockaddr’ has incomplete type struct sockaddr _sockaddr; error: invalid application of ‘sizeof’ to incomplete type ‘struct sockaddr’ With this following uapi headers now compile in user space: rdma/rdma_user_rxe.h linux/vm_sockets.h linux/ncp_fs.h linux/nfc.h linux/phonet.h Signed-off-by: Mikko Rapeli <mikko.rap...@iki.fi> Cc: net...@vger.kernel.org Cc: Dmitry V. Levin <l...@altlinux.org> --- include/uapi/linux/socket.h | 4 1 file changed, 4 insertions(+) diff --git a/include/uapi/linux/socket.h b/include/uapi/linux/socket.h index 76ab0c68561e..8a81197cc08b 100644 --- a/include/uapi/linux/socket.h +++ b/include/uapi/linux/socket.h @@ -1,6 +1,10 @@ #ifndef _UAPI_LINUX_SOCKET_H #define _UAPI_LINUX_SOCKET_H +#ifndef __KERNEL__ +#include +#endif + /* * Desired design of maximum size and alignment (see RFC2553) */ -- 2.13.3
[PATCH v06 15/36] uapi linux/socket.h: include sys/socket.h in user space
This libc header has sockaddr definition in user space. Fixes user space compilation errors like these from kernel headers including only linux/socket.h: error: field ‘ifru_addr’ has incomplete type struct sockaddr ifru_addr; error: field ‘_sockaddr’ has incomplete type struct sockaddr _sockaddr; error: invalid application of ‘sizeof’ to incomplete type ‘struct sockaddr’ With this following uapi headers now compile in user space: rdma/rdma_user_rxe.h linux/vm_sockets.h linux/ncp_fs.h linux/nfc.h linux/phonet.h Signed-off-by: Mikko Rapeli Cc: net...@vger.kernel.org Cc: Dmitry V. Levin --- include/uapi/linux/socket.h | 4 1 file changed, 4 insertions(+) diff --git a/include/uapi/linux/socket.h b/include/uapi/linux/socket.h index 76ab0c68561e..8a81197cc08b 100644 --- a/include/uapi/linux/socket.h +++ b/include/uapi/linux/socket.h @@ -1,6 +1,10 @@ #ifndef _UAPI_LINUX_SOCKET_H #define _UAPI_LINUX_SOCKET_H +#ifndef __KERNEL__ +#include +#endif + /* * Desired design of maximum size and alignment (see RFC2553) */ -- 2.13.3
Re: [PATCH 3/4] uapi glibc compat: Do not check for __USE_MISC
On Thu, Mar 16, 2017 at 07:59:12AM +, David Woodhouse wrote: > On Sun, 2017-03-12 at 23:00 +0100, Hauke Mehrtens wrote: > > __USE_MISC is glibc specific and not available in musl libc. Only do > > this check when glibc is used. This fixes a problem with musl libc. > > ... > > -/* Coordinate with glibc net/if.h header. */ > > -#if defined(_NET_IF_H) && defined(__USE_MISC) > > +/* Coordinate with libc net/if.h header. */ > > +#if defined(_NET_IF_H) && (!defined(__GLIBC__) || defined(__USE_MISC)) > > I *really* don't like building up a plethora of knowledge about > specific libc implementations in the kernel. As a general rule, if we > have *anything* that depends on __GLIBC__ then we are Doing It Wrong™. Kernel does not depend on glibc but uapi headers check for some defintions so that userspace code can include both libc and kernel header files without compiler errors. This interface between kernel and libc header files is messy due to long history of copying header files from kernel to libc implementations etc and thus this kind of ifdef magic with in depth knowledge of various libc's defintions is currently unavoidable. -Mikko
Re: [PATCH 3/4] uapi glibc compat: Do not check for __USE_MISC
On Thu, Mar 16, 2017 at 07:59:12AM +, David Woodhouse wrote: > On Sun, 2017-03-12 at 23:00 +0100, Hauke Mehrtens wrote: > > __USE_MISC is glibc specific and not available in musl libc. Only do > > this check when glibc is used. This fixes a problem with musl libc. > > ... > > -/* Coordinate with glibc net/if.h header. */ > > -#if defined(_NET_IF_H) && defined(__USE_MISC) > > +/* Coordinate with libc net/if.h header. */ > > +#if defined(_NET_IF_H) && (!defined(__GLIBC__) || defined(__USE_MISC)) > > I *really* don't like building up a plethora of knowledge about > specific libc implementations in the kernel. As a general rule, if we > have *anything* that depends on __GLIBC__ then we are Doing It Wrong™. Kernel does not depend on glibc but uapi headers check for some defintions so that userspace code can include both libc and kernel header files without compiler errors. This interface between kernel and libc header files is messy due to long history of copying header files from kernel to libc implementations etc and thus this kind of ifdef magic with in depth knowledge of various libc's defintions is currently unavoidable. -Mikko
Re: [PATCH 4/4] uapi/if_ether.h: prevent redefinition of struct ethhdr
On Sun, Mar 12, 2017 at 11:00:39PM +0100, Hauke Mehrtens wrote:
> From: David Heidelberger <david.heidelber...@ixit.cz>
>
> Musl provides its own ethhdr struct definition. Add a guard to prevent
> its definition of the appropriate musl header has already been included.
>
> Signed-off-by: John Spencer <maillist-li...@barfooze.de>
> Tested-by: David Heidelberger <david.heidelber...@ixit.cz>
> Signed-off-by: Jonas Gorski <j...@openwrt.org>
Acked-by: Mikko Rapeli <mikko.rap...@iki.fi>
> ---
> include/uapi/linux/if_ether.h| 3 +++
> include/uapi/linux/libc-compat.h | 11 +++
> 2 files changed, 14 insertions(+)
>
> diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h
> index 5bc9bfd816b7..fb5ab8c1e753 100644
> --- a/include/uapi/linux/if_ether.h
> +++ b/include/uapi/linux/if_ether.h
> @@ -22,6 +22,7 @@
> #define _UAPI_LINUX_IF_ETHER_H
>
> #include
> +#include
>
> /*
> * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
> @@ -142,11 +143,13 @@
> * This is an Ethernet frame header.
> */
>
> +#if __UAPI_DEF_ETHHDR
> struct ethhdr {
> unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
> unsigned char h_source[ETH_ALEN]; /* source ether addr*/
> __be16 h_proto;/* packet type ID field */
> } __attribute__((packed));
> +#endif
>
>
> #endif /* _UAPI_LINUX_IF_ETHER_H */
> diff --git a/include/uapi/linux/libc-compat.h
> b/include/uapi/linux/libc-compat.h
> index ce2fa8a4ced6..c92d32f213d1 100644
> --- a/include/uapi/linux/libc-compat.h
> +++ b/include/uapi/linux/libc-compat.h
> @@ -87,6 +87,14 @@
>
> #endif /* _NET_IF_H */
>
> +/* musl defines the ethhdr struct itself in its netinet/if_ether.h.
> + * Glibc just includes the kernel header and uses a different guard. */
> +#if defined(_NETINET_IF_ETHER_H)
> +#define __UAPI_DEF_ETHHDR0
> +#else
> +#define __UAPI_DEF_ETHHDR1
> +#endif
> +
> /* Coordinate with glibc netinet/in.h header. */
> #if defined(_NETINET_IN_H)
>
> @@ -182,6 +190,9 @@
> /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
> #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
>
> +/* Definitions for if_ether.h */
> +#define __UAPI_DEF_ETHHDR1
> +
> /* Definitions for in.h */
> #define __UAPI_DEF_IN_ADDR 1
> #define __UAPI_DEF_IN_IPPROTO1
> --
> 2.11.0
>
Re: [PATCH 4/4] uapi/if_ether.h: prevent redefinition of struct ethhdr
On Sun, Mar 12, 2017 at 11:00:39PM +0100, Hauke Mehrtens wrote:
> From: David Heidelberger
>
> Musl provides its own ethhdr struct definition. Add a guard to prevent
> its definition of the appropriate musl header has already been included.
>
> Signed-off-by: John Spencer
> Tested-by: David Heidelberger
> Signed-off-by: Jonas Gorski
Acked-by: Mikko Rapeli
> ---
> include/uapi/linux/if_ether.h| 3 +++
> include/uapi/linux/libc-compat.h | 11 +++
> 2 files changed, 14 insertions(+)
>
> diff --git a/include/uapi/linux/if_ether.h b/include/uapi/linux/if_ether.h
> index 5bc9bfd816b7..fb5ab8c1e753 100644
> --- a/include/uapi/linux/if_ether.h
> +++ b/include/uapi/linux/if_ether.h
> @@ -22,6 +22,7 @@
> #define _UAPI_LINUX_IF_ETHER_H
>
> #include
> +#include
>
> /*
> * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
> @@ -142,11 +143,13 @@
> * This is an Ethernet frame header.
> */
>
> +#if __UAPI_DEF_ETHHDR
> struct ethhdr {
> unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
> unsigned char h_source[ETH_ALEN]; /* source ether addr*/
> __be16 h_proto;/* packet type ID field */
> } __attribute__((packed));
> +#endif
>
>
> #endif /* _UAPI_LINUX_IF_ETHER_H */
> diff --git a/include/uapi/linux/libc-compat.h
> b/include/uapi/linux/libc-compat.h
> index ce2fa8a4ced6..c92d32f213d1 100644
> --- a/include/uapi/linux/libc-compat.h
> +++ b/include/uapi/linux/libc-compat.h
> @@ -87,6 +87,14 @@
>
> #endif /* _NET_IF_H */
>
> +/* musl defines the ethhdr struct itself in its netinet/if_ether.h.
> + * Glibc just includes the kernel header and uses a different guard. */
> +#if defined(_NETINET_IF_ETHER_H)
> +#define __UAPI_DEF_ETHHDR0
> +#else
> +#define __UAPI_DEF_ETHHDR1
> +#endif
> +
> /* Coordinate with glibc netinet/in.h header. */
> #if defined(_NETINET_IN_H)
>
> @@ -182,6 +190,9 @@
> /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
> #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
>
> +/* Definitions for if_ether.h */
> +#define __UAPI_DEF_ETHHDR1
> +
> /* Definitions for in.h */
> #define __UAPI_DEF_IN_ADDR 1
> #define __UAPI_DEF_IN_IPPROTO1
> --
> 2.11.0
>
Re: [PATCH 3/4] uapi glibc compat: Do not check for __USE_MISC
On Sun, Mar 12, 2017 at 11:00:38PM +0100, Hauke Mehrtens wrote: > __USE_MISC is glibc specific and not available in musl libc. Only do > this check when glibc is used. This fixes a problem with musl libc. > Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de> Acked-by: Mikko Rapeli <mikko.rap...@iki.fi> > --- > include/uapi/linux/libc-compat.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/uapi/linux/libc-compat.h > b/include/uapi/linux/libc-compat.h > index 49a8cc3138ae..ce2fa8a4ced6 100644 > --- a/include/uapi/linux/libc-compat.h > +++ b/include/uapi/linux/libc-compat.h > @@ -51,8 +51,8 @@ > /* We have included libc headers... */ > #if !defined(__KERNEL__) > > -/* Coordinate with glibc net/if.h header. */ > -#if defined(_NET_IF_H) && defined(__USE_MISC) > +/* Coordinate with libc net/if.h header. */ > +#if defined(_NET_IF_H) && (!defined(__GLIBC__) || defined(__USE_MISC)) > > /* GLIBC headers included first so don't define anything > * that would already be defined. */ > -- > 2.11.0 >
Re: [PATCH 3/4] uapi glibc compat: Do not check for __USE_MISC
On Sun, Mar 12, 2017 at 11:00:38PM +0100, Hauke Mehrtens wrote: > __USE_MISC is glibc specific and not available in musl libc. Only do > this check when glibc is used. This fixes a problem with musl libc. > Signed-off-by: Hauke Mehrtens Acked-by: Mikko Rapeli > --- > include/uapi/linux/libc-compat.h | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/include/uapi/linux/libc-compat.h > b/include/uapi/linux/libc-compat.h > index 49a8cc3138ae..ce2fa8a4ced6 100644 > --- a/include/uapi/linux/libc-compat.h > +++ b/include/uapi/linux/libc-compat.h > @@ -51,8 +51,8 @@ > /* We have included libc headers... */ > #if !defined(__KERNEL__) > > -/* Coordinate with glibc net/if.h header. */ > -#if defined(_NET_IF_H) && defined(__USE_MISC) > +/* Coordinate with libc net/if.h header. */ > +#if defined(_NET_IF_H) && (!defined(__GLIBC__) || defined(__USE_MISC)) > > /* GLIBC headers included first so don't define anything > * that would already be defined. */ > -- > 2.11.0 >
Re: [PATCH 2/4] uapi glibc compat: fix build if libc defines IFF_ECHO
On Sun, Mar 12, 2017 at 11:00:37PM +0100, Hauke Mehrtens wrote: > musl 1.1.15 defines IFF_ECHO and the other net_device_flags options. > When a user application includes linux/if.h and net/if.h the compile > will fail. > > Activate __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO only when > it is needed. This should also make this work in case glibc will add > these defines. > > Signed-off-by: Hauke Mehrtens <ha...@hauke-m.de> Acked-by: Mikko Rapeli <mikko.rap...@iki.fi> > --- > include/uapi/linux/libc-compat.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/include/uapi/linux/libc-compat.h > b/include/uapi/linux/libc-compat.h > index 7c1fead03c50..49a8cc3138ae 100644 > --- a/include/uapi/linux/libc-compat.h > +++ b/include/uapi/linux/libc-compat.h > @@ -64,9 +64,11 @@ > /* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ > #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 > /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ > +#ifndef IFF_ECHO > #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO > #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 > #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ > +#endif /* IFF_ECHO */ > > #else /* _NET_IF_H */ > > -- > 2.11.0 >
Re: [PATCH 2/4] uapi glibc compat: fix build if libc defines IFF_ECHO
On Sun, Mar 12, 2017 at 11:00:37PM +0100, Hauke Mehrtens wrote: > musl 1.1.15 defines IFF_ECHO and the other net_device_flags options. > When a user application includes linux/if.h and net/if.h the compile > will fail. > > Activate __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO only when > it is needed. This should also make this work in case glibc will add > these defines. > > Signed-off-by: Hauke Mehrtens Acked-by: Mikko Rapeli > --- > include/uapi/linux/libc-compat.h | 2 ++ > 1 file changed, 2 insertions(+) > > diff --git a/include/uapi/linux/libc-compat.h > b/include/uapi/linux/libc-compat.h > index 7c1fead03c50..49a8cc3138ae 100644 > --- a/include/uapi/linux/libc-compat.h > +++ b/include/uapi/linux/libc-compat.h > @@ -64,9 +64,11 @@ > /* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */ > #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0 > /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */ > +#ifndef IFF_ECHO > #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO > #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1 > #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */ > +#endif /* IFF_ECHO */ > > #else /* _NET_IF_H */ > > -- > 2.11.0 >
