SIOCGSTAMPNS definition missing

SIOCGSTAMPNS definition missing

[yamabiko]

Hello,
when I tried to compile qemu on a Gentoo musl based system it complained 
about "SIOCGSTAMPNS" being undeclared. Using "-DSIOCGSTAMPNS=0x8907" as 
CFLAG worked as a workaround. So it looks like the definition it's 
missing from some header file (ioctl.h?)
See https://forums.gentoo.org/viewtopic-t-1066924.html for more info

Re: SIOCGSTAMPNS definition missing

[Rich Felker]

On Tue, Aug 01, 2017 at 10:08:02AM +0000, yamabiko@onenetbeyond.org wrote:
> Hello,
> when I tried to compile qemu on a Gentoo musl based system it
> complained about "SIOCGSTAMPNS" being undeclared. Using
> "-DSIOCGSTAMPNS=0x8907" as CFLAG worked as a workaround. So it looks
> like the definition it's missing from some header file (ioctl.h?)
> See https://forums.gentoo.org/viewtopic-t-1066924.html for more info

Thanks for the report.

Has anyone else looked at this yet? It probably needs per-arch
additions to the bits/ioctl.h headers.

Rich

Re: SIOCGSTAMPNS definition missing

[Szabolcs Nagy]

* Rich Felker <dalias@libc.org> [2017-08-11 20:53:38 -0400]:
> On Tue, Aug 01, 2017 at 10:08:02AM +0000, yamabiko@onenetbeyond.org wrote:
> > Hello,
> > when I tried to compile qemu on a Gentoo musl based system it
> > complained about "SIOCGSTAMPNS" being undeclared. Using
> > "-DSIOCGSTAMPNS=0x8907" as CFLAG worked as a workaround. So it looks
> > like the definition it's missing from some header file (ioctl.h?)
> > See https://forums.gentoo.org/viewtopic-t-1066924.html for more info
> 
> Thanks for the report.
> 
> Has anyone else looked at this yet? It probably needs per-arch
> additions to the bits/ioctl.h headers.
> 

it seems to be defined in asm/sockios.h which
is included via sys/socket.h in glibc i think so
musl should put it into sys/socket.h if anywhere.

Re: SIOCGSTAMPNS definition missing

[Szabolcs Nagy]

* Szabolcs Nagy <nsz@port70.net> [2017-08-13 18:03:01 +0200]:

> * Rich Felker <dalias@libc.org> [2017-08-11 20:53:38 -0400]:
> > On Tue, Aug 01, 2017 at 10:08:02AM +0000, yamabiko@onenetbeyond.org wrote:
> > > Hello,
> > > when I tried to compile qemu on a Gentoo musl based system it
> > > complained about "SIOCGSTAMPNS" being undeclared. Using
> > > "-DSIOCGSTAMPNS=0x8907" as CFLAG worked as a workaround. So it looks
> > > like the definition it's missing from some header file (ioctl.h?)
> > > See https://forums.gentoo.org/viewtopic-t-1066924.html for more info
> > 
> > Thanks for the report.
> > 
> > Has anyone else looked at this yet? It probably needs per-arch
> > additions to the bits/ioctl.h headers.
> > 
> 
> it seems to be defined in asm/sockios.h which
> is included via sys/socket.h in glibc i think so
> musl should put it into sys/socket.h if anywhere.

it seems i proposed the sockios stuff to be removed
from ioctl.h, but that was not applied:

http://www.openwall.com/lists/musl/2016/07/03/22

i think those sockios macros should be moved from
ioctl.h to socket.h and the SIOCGSTAMPNS should
be added to them. (or we can add the macro now
to ioctl.h and move them later)

one issue is that the mips macros are currently
wrong (don't match the kernel uapi definitions).

Re: SIOCGSTAMPNS definition missing

[Rich Felker]

On Sun, Aug 13, 2017 at 06:35:15PM +0200, Szabolcs Nagy wrote:
> * Szabolcs Nagy <nsz@port70.net> [2017-08-13 18:03:01 +0200]:
> 
> > * Rich Felker <dalias@libc.org> [2017-08-11 20:53:38 -0400]:
> > > On Tue, Aug 01, 2017 at 10:08:02AM +0000, yamabiko@onenetbeyond.org wrote:
> > > > Hello,
> > > > when I tried to compile qemu on a Gentoo musl based system it
> > > > complained about "SIOCGSTAMPNS" being undeclared. Using
> > > > "-DSIOCGSTAMPNS=0x8907" as CFLAG worked as a workaround. So it looks
> > > > like the definition it's missing from some header file (ioctl.h?)
> > > > See https://forums.gentoo.org/viewtopic-t-1066924.html for more info
> > > 
> > > Thanks for the report.
> > > 
> > > Has anyone else looked at this yet? It probably needs per-arch
> > > additions to the bits/ioctl.h headers.
> > > 
> > 
> > it seems to be defined in asm/sockios.h which
> > is included via sys/socket.h in glibc i think so
> > musl should put it into sys/socket.h if anywhere.
> 
> it seems i proposed the sockios stuff to be removed
> from ioctl.h, but that was not applied:
> 
> http://www.openwall.com/lists/musl/2016/07/03/22
> 
> i think those sockios macros should be moved from
> ioctl.h to socket.h and the SIOCGSTAMPNS should
> be added to them. (or we can add the macro now
> to ioctl.h and move them later)

They're not in the reserved namespace for socket.h, and unless there's
a strong legacy-compat argument for having them in socket.h, I think
it's rather undesirable to put them there even under default ("BSD")
feature profile since in practice almost everything uses the default.
If almost nothing has broken so far from not having them in socket.h,
that suggests to me that putting them there is probably undesirable.

> one issue is that the mips macros are currently
> wrong (don't match the kernel uapi definitions).

Uhg.

Rich

[PATCH 1/2] fix mips ioctl macros to match linux asm/sockios.h

[Szabolcs Nagy]

---
 arch/mips/bits/ioctl.h    | 10 +++++-----
 arch/mips64/bits/ioctl.h  | 10 +++++-----
 arch/mipsn32/bits/ioctl.h | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/arch/mips/bits/ioctl.h b/arch/mips/bits/ioctl.h
index accd7af2..793c66ee 100644
--- a/arch/mips/bits/ioctl.h
+++ b/arch/mips/bits/ioctl.h
@@ -139,11 +139,11 @@ struct winsize {
 #define N_SYNC_PPP      14
 #define N_HCI           15
 
-#define FIOSETOWN       0x8901
-#define SIOCSPGRP       0x8902
-#define FIOGETOWN       0x8903
-#define SIOCGPGRP       0x8904
-#define SIOCATMARK      0x8905
+#define FIOGETOWN       _IOR('f', 123, int)
+#define FIOSETOWN       _IOW('f', 124, int)
+#define SIOCATMARK      _IOR('s', 7, int)
+#define SIOCSPGRP       _IOW('s', 8, pid_t)
+#define SIOCGPGRP       _IOR('s', 9, pid_t)
 #define SIOCGSTAMP      0x8906
 
 #define SIOCADDRT       0x890B
diff --git a/arch/mips64/bits/ioctl.h b/arch/mips64/bits/ioctl.h
index accd7af2..793c66ee 100644
--- a/arch/mips64/bits/ioctl.h
+++ b/arch/mips64/bits/ioctl.h
@@ -139,11 +139,11 @@ struct winsize {
 #define N_SYNC_PPP      14
 #define N_HCI           15
 
-#define FIOSETOWN       0x8901
-#define SIOCSPGRP       0x8902
-#define FIOGETOWN       0x8903
-#define SIOCGPGRP       0x8904
-#define SIOCATMARK      0x8905
+#define FIOGETOWN       _IOR('f', 123, int)
+#define FIOSETOWN       _IOW('f', 124, int)
+#define SIOCATMARK      _IOR('s', 7, int)
+#define SIOCSPGRP       _IOW('s', 8, pid_t)
+#define SIOCGPGRP       _IOR('s', 9, pid_t)
 #define SIOCGSTAMP      0x8906
 
 #define SIOCADDRT       0x890B
diff --git a/arch/mipsn32/bits/ioctl.h b/arch/mipsn32/bits/ioctl.h
index accd7af2..793c66ee 100644
--- a/arch/mipsn32/bits/ioctl.h
+++ b/arch/mipsn32/bits/ioctl.h
@@ -139,11 +139,11 @@ struct winsize {
 #define N_SYNC_PPP      14
 #define N_HCI           15
 
-#define FIOSETOWN       0x8901
-#define SIOCSPGRP       0x8902
-#define FIOGETOWN       0x8903
-#define SIOCGPGRP       0x8904
-#define SIOCATMARK      0x8905
+#define FIOGETOWN       _IOR('f', 123, int)
+#define FIOSETOWN       _IOW('f', 124, int)
+#define SIOCATMARK      _IOR('s', 7, int)
+#define SIOCSPGRP       _IOW('s', 8, pid_t)
+#define SIOCGPGRP       _IOR('s', 9, pid_t)
 #define SIOCGSTAMP      0x8906
 
 #define SIOCADDRT       0x890B
-- 
2.14.1

[PATCH 2/2] add SIOCGSTAMPNS socket ioctl macro to ioctl.h

[Szabolcs Nagy]

it is defined in linux asm/sockios.h since commit
ae40eb1ef30ab4120bd3c8b7e3da99ee53d27a23 (linux v2.6.22)
but was missing from musl by accident.

in musl the sockios macros are exposed in sys/ioctl.h together
with other ioctl requests instead of in sys/socket.h because of
namespace rules. (glibc has them in sys/socket.h under _GNU_SOURCE.)
---
 arch/generic/bits/ioctl.h   | 1 +
 arch/mips/bits/ioctl.h      | 1 +
 arch/mips64/bits/ioctl.h    | 1 +
 arch/mipsn32/bits/ioctl.h   | 1 +
 arch/powerpc/bits/ioctl.h   | 1 +
 arch/powerpc64/bits/ioctl.h | 1 +
 arch/s390x/bits/ioctl.h     | 1 +
 arch/sh/bits/ioctl.h        | 1 +
 8 files changed, 8 insertions(+)

diff --git a/arch/generic/bits/ioctl.h b/arch/generic/bits/ioctl.h
index c2035fc5..44deb11a 100644
--- a/arch/generic/bits/ioctl.h
+++ b/arch/generic/bits/ioctl.h
@@ -137,6 +137,7 @@ struct winsize {
 #define SIOCGPGRP       0x8904
 #define SIOCATMARK      0x8905
 #define SIOCGSTAMP      0x8906
+#define SIOCGSTAMPNS    0x8907
 
 #define SIOCADDRT       0x890B
 #define SIOCDELRT       0x890C
diff --git a/arch/mips/bits/ioctl.h b/arch/mips/bits/ioctl.h
index 793c66ee..71394449 100644
--- a/arch/mips/bits/ioctl.h
+++ b/arch/mips/bits/ioctl.h
@@ -145,6 +145,7 @@ struct winsize {
 #define SIOCSPGRP       _IOW('s', 8, pid_t)
 #define SIOCGPGRP       _IOR('s', 9, pid_t)
 #define SIOCGSTAMP      0x8906
+#define SIOCGSTAMPNS    0x8907
 
 #define SIOCADDRT       0x890B
 #define SIOCDELRT       0x890C
diff --git a/arch/mips64/bits/ioctl.h b/arch/mips64/bits/ioctl.h
index 793c66ee..71394449 100644
--- a/arch/mips64/bits/ioctl.h
+++ b/arch/mips64/bits/ioctl.h
@@ -145,6 +145,7 @@ struct winsize {
 #define SIOCSPGRP       _IOW('s', 8, pid_t)
 #define SIOCGPGRP       _IOR('s', 9, pid_t)
 #define SIOCGSTAMP      0x8906
+#define SIOCGSTAMPNS    0x8907
 
 #define SIOCADDRT       0x890B
 #define SIOCDELRT       0x890C
diff --git a/arch/mipsn32/bits/ioctl.h b/arch/mipsn32/bits/ioctl.h
index 793c66ee..71394449 100644
--- a/arch/mipsn32/bits/ioctl.h
+++ b/arch/mipsn32/bits/ioctl.h
@@ -145,6 +145,7 @@ struct winsize {
 #define SIOCSPGRP       _IOW('s', 8, pid_t)
 #define SIOCGPGRP       _IOR('s', 9, pid_t)
 #define SIOCGSTAMP      0x8906
+#define SIOCGSTAMPNS    0x8907
 
 #define SIOCADDRT       0x890B
 #define SIOCDELRT       0x890C
diff --git a/arch/powerpc/bits/ioctl.h b/arch/powerpc/bits/ioctl.h
index 6d49cf4e..d3771dd3 100644
--- a/arch/powerpc/bits/ioctl.h
+++ b/arch/powerpc/bits/ioctl.h
@@ -150,6 +150,7 @@ struct winsize {
 #define SIOCGPGRP       0x8904
 #define SIOCATMARK      0x8905
 #define SIOCGSTAMP      0x8906
+#define SIOCGSTAMPNS    0x8907
 
 #define SIOCADDRT       0x890B
 #define SIOCDELRT       0x890C
diff --git a/arch/powerpc64/bits/ioctl.h b/arch/powerpc64/bits/ioctl.h
index 6d49cf4e..d3771dd3 100644
--- a/arch/powerpc64/bits/ioctl.h
+++ b/arch/powerpc64/bits/ioctl.h
@@ -150,6 +150,7 @@ struct winsize {
 #define SIOCGPGRP       0x8904
 #define SIOCATMARK      0x8905
 #define SIOCGSTAMP      0x8906
+#define SIOCGSTAMPNS    0x8907
 
 #define SIOCADDRT       0x890B
 #define SIOCDELRT       0x890C
diff --git a/arch/s390x/bits/ioctl.h b/arch/s390x/bits/ioctl.h
index 11196e15..0ebac590 100644
--- a/arch/s390x/bits/ioctl.h
+++ b/arch/s390x/bits/ioctl.h
@@ -131,6 +131,7 @@ struct winsize {
 #define SIOCGPGRP       0x8904
 #define SIOCATMARK      0x8905
 #define SIOCGSTAMP      0x8906
+#define SIOCGSTAMPNS    0x8907
 
 #define SIOCADDRT       0x890B
 #define SIOCDELRT       0x890C
diff --git a/arch/sh/bits/ioctl.h b/arch/sh/bits/ioctl.h
index e6e7d344..15256c51 100644
--- a/arch/sh/bits/ioctl.h
+++ b/arch/sh/bits/ioctl.h
@@ -141,6 +141,7 @@ struct winsize {
 #define SIOCSPGRP       _IOW('s', 8, int)
 #define SIOCGPGRP       _IOW('s', 9, int)
 #define SIOCGSTAMP      _IOR('s', 100, char[8])
+#define SIOCGSTAMPNS    _IOR('s', 101, char[8])
 
 #define SIOCADDRT       0x890B
 #define SIOCDELRT       0x890C
-- 
2.14.1