[edk2-devel] EmulatorPkg: fixes for NetBSD compilation

tlaronde@polynum.com posted 1 patch 1 week, 6 days ago
Failed in applying to current master (apply log)
[edk2-devel] EmulatorPkg: fixes for NetBSD compilation
Posted by tlaronde@polynum.com 1 week, 6 days ago
diff --git a/EmulatorPkg/Unix/Host/BlockIo.c b/EmulatorPkg/Unix/Host/BlockIo.c
index cf2d6b4cda..c0c694be55 100644
--- a/EmulatorPkg/Unix/Host/BlockIo.c
+++ b/EmulatorPkg/Unix/Host/BlockIo.c
@@ -133,6 +133,20 @@ EmuBlockIoOpenDevice (
 
       ioctl (Private->fd, DKIOCGETMAXBLOCKCOUNTWRITE, &Private->Media->OptimalTransferLengthGranularity);
     }
+ #elif _NETBSD_SOURCE
+    {
+      u_int  BlockSize;
+      off_t  DiskSize;
+
+      if (ioctl (Private->fd,  DIOCGSECTORSIZE, &BlockSize) == 0) {
+        Private->Media->BlockSize = BlockSize;
+      }
+
+      if (ioctl (Private->fd, DIOCGMEDIASIZE, &DiskSize) == 0) {
+        Private->NumberOfBlocks   = DivU64x32 (DiskSize, (UINT32)BlockSize);
+        Private->Media->LastBlock = Private->NumberOfBlocks - 1;
+      }
+    }
  #else
     {
       size_t  BlockSize;
@@ -154,7 +168,7 @@ EmuBlockIoOpenDevice (
     Private->Media->LastBlock = Private->NumberOfBlocks - 1;
 
     if (fstatfs (Private->fd, &buf) == 0) {
- #if __APPLE__
+ #if __APPLE__ || _NETBSD_SOURCE
       Private->Media->OptimalTransferLengthGranularity = buf.f_iosize/buf.f_bsize;
  #else
       Private->Media->OptimalTransferLengthGranularity = buf.f_bsize/buf.f_bsize;
diff --git a/EmulatorPkg/Unix/Host/Host.c b/EmulatorPkg/Unix/Host/Host.c
index 38c01c84af..c505300129 100644
--- a/EmulatorPkg/Unix/Host/Host.c
+++ b/EmulatorPkg/Unix/Host/Host.c
@@ -12,6 +12,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #define MAP_ANONYMOUS  MAP_ANON
 #endif
 
+#ifdef _NETBSD_SOURCE
+#define MAP_ANON_FD_ (-1)
+#else
+#define MAP_ANON_FD_ (0)
+#endif
+
 //
 // Globals
 //
@@ -187,7 +193,7 @@ main (
   //
   InitialStackMemorySize = STACK_SIZE;
   InitialStackMemory     = (UINTN)MapMemory (
-                                    0,
+                                    MAP_ANON_FD_,
                                     (UINT32)InitialStackMemorySize,
                                     PROT_READ | PROT_WRITE | PROT_EXEC,
                                     MAP_ANONYMOUS | MAP_PRIVATE
@@ -348,6 +354,7 @@ MapMemory (
   while ((!isAligned) && (base != 0)) {
     res = mmap ((void *)base, length, prot, flags, fd, 0);
     if (res == MAP_FAILED) {
+      perror("MapMemory");
       return NULL;
     }
 
@@ -640,7 +647,7 @@ SecUnixPeiAutoScan (
 
   *MemoryBase = 0;
   res         = MapMemory (
-                  0,
+                  MAP_ANON_FD_,
                   gSystemMemory[Index].Size,
                   PROT_READ | PROT_WRITE | PROT_EXEC,
                   MAP_PRIVATE | MAP_ANONYMOUS
diff --git a/EmulatorPkg/Unix/Host/Host.h b/EmulatorPkg/Unix/Host/Host.h
index 0c81cdfc01..0de925adaf 100644
--- a/EmulatorPkg/Unix/Host/Host.h
+++ b/EmulatorPkg/Unix/Host/Host.h
@@ -31,6 +31,8 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 
 #if __CYGWIN__
   #include <sys/dirent.h>
+#elif _NETBSD_SOURCE
+  #include <dirent.h>
 #else
   #include <sys/dir.h>
 #endif
@@ -55,7 +57,7 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
 #include <net/if.h>
 #include <ifaddrs.h>
 
-#ifdef __APPLE__
+#if defined(__APPLE__)
   #include <net/if_dl.h>
   #include <net/bpf.h>
   #include <sys/param.h>
@@ -65,6 +67,9 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
   #ifndef _Bool
 #define _Bool  char  // for clang debug
   #endif
+#elif defined(_NETBSD_SOURCE)
+  #define statfs statvfs
+  #define fstatfs fstatvfs
 #else
   #include <termio.h>
   #include <sys/vfs.h>

signed-off-by: Thierry LARONDE <tlaronde@polynum.com>
-- 
        Thierry Laronde <tlaronde +AT+ polynum +dot+ com>
                     http://www.kergis.com/
                    http://kertex.kergis.com/
Key fingerprint = 0FF7 E906 FBAF FE95 FD89  250D 52B1 AE95 6006 F40C


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#96521): https://edk2.groups.io/g/devel/message/96521
Mute This Topic: https://groups.io/mt/95182515/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-
Re: [edk2-devel] EmulatorPkg: fixes for NetBSD compilation
Posted by Pedro Falcato 1 week, 5 days ago
On Mon, Nov 21, 2022 at 9:21 PM <tlaronde@polynum.com> wrote:

> diff --git a/EmulatorPkg/Unix/Host/BlockIo.c
> b/EmulatorPkg/Unix/Host/BlockIo.c
> index cf2d6b4cda..c0c694be55 100644
> --- a/EmulatorPkg/Unix/Host/BlockIo.c
> +++ b/EmulatorPkg/Unix/Host/BlockIo.c
> @@ -133,6 +133,20 @@ EmuBlockIoOpenDevice (
>
>        ioctl (Private->fd, DKIOCGETMAXBLOCKCOUNTWRITE,
> &Private->Media->OptimalTransferLengthGranularity);
>      }
> + #elif _NETBSD_SOURCE
> +    {
> +      u_int  BlockSize;
>
Hi,

Again, thanks for the patches. Please send them in the way I kind of
described in my other reply.

s/u_int/UINT/

+      off_t  DiskSize;
>
I think this off_t is fine, per the other off_t usages, I don't know if the
maintainers agree.

> +
> +      if (ioctl (Private->fd,  DIOCGSECTORSIZE, &BlockSize) == 0) {
> +        Private->Media->BlockSize = BlockSize;
> +      }
> +
> +      if (ioctl (Private->fd, DIOCGMEDIASIZE, &DiskSize) == 0) {
> +        Private->NumberOfBlocks   = DivU64x32 (DiskSize,
> (UINT32)BlockSize);
> +        Private->Media->LastBlock = Private->NumberOfBlocks - 1;
> +      }
> +    }
>   #else
>      {
>        size_t  BlockSize;
>


> diff --git a/EmulatorPkg/Unix/Host/Host.c b/EmulatorPkg/Unix/Host/Host.c
> index 38c01c84af..c505300129 100644
> --- a/EmulatorPkg/Unix/Host/Host.c
> +++ b/EmulatorPkg/Unix/Host/Host.c
> @@ -12,6 +12,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
>  #define MAP_ANONYMOUS  MAP_ANON
>  #endif
>
> +#ifdef _NETBSD_SOURCE
> +#define MAP_ANON_FD_ (-1)
> +#else
> +#define MAP_ANON_FD_ (0)
> +#endif
>
Would there be a harm if we just passed -1 everywhere? It's a bit odd
NetBSD explicitly requires this, but AFAIK implementations
either EINVAL on fd != -1 or take whatever since it's anon. The main
implementations (Linux, FreeBSD, NetBSD, OpenBSD, macOS) seem to
agree that passing -1 should be safe everywhere (in fact, it's pretty funny
that all BSD-derived implementations agree with the fd = -1 thing, but I
digress).

The rest of the patch looks mostly ok to me, but then again, I'm not a
maintainer for this.

Thanks,
Pedro


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#96524): https://edk2.groups.io/g/devel/message/96524
Mute This Topic: https://groups.io/mt/95182515/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-


Re: [edk2-devel] EmulatorPkg: fixes for NetBSD compilation
Posted by tlaronde@polynum.com 1 week, 5 days ago
Hello Pedro,

Le Mon, Nov 21, 2022 at 10:32:51PM +0000, Pedro Falcato a écrit :
> On Mon, Nov 21, 2022 at 9:21 PM <tlaronde@polynum.com> wrote:
> 
> > diff --git a/EmulatorPkg/Unix/Host/BlockIo.c
> > b/EmulatorPkg/Unix/Host/BlockIo.c
> > index cf2d6b4cda..c0c694be55 100644
> > --- a/EmulatorPkg/Unix/Host/BlockIo.c
> > +++ b/EmulatorPkg/Unix/Host/BlockIo.c
> > @@ -133,6 +133,20 @@ EmuBlockIoOpenDevice (
> >
> >        ioctl (Private->fd, DKIOCGETMAXBLOCKCOUNTWRITE,
> > &Private->Media->OptimalTransferLengthGranularity);
> >      }
> > + #elif _NETBSD_SOURCE
> > +    {
> > +      u_int  BlockSize;
> >
> Hi,
> 
> Again, thanks for the patches. Please send them in the way I kind of
> described in my other reply.
> 
> s/u_int/UINT/
> 
> +      off_t  DiskSize;
> >
> I think this off_t is fine, per the other off_t usages, I don't know if the
> maintainers agree.
> 
> > +
> > +      if (ioctl (Private->fd,  DIOCGSECTORSIZE, &BlockSize) == 0) {
> > +        Private->Media->BlockSize = BlockSize;
> > +      }
> > +
> > +      if (ioctl (Private->fd, DIOCGMEDIASIZE, &DiskSize) == 0) {
> > +        Private->NumberOfBlocks   = DivU64x32 (DiskSize,
> > (UINT32)BlockSize);
> > +        Private->Media->LastBlock = Private->NumberOfBlocks - 1;
> > +      }
> > +    }
> >   #else
> >      {
> >        size_t  BlockSize;
> >
> 
> 
> > diff --git a/EmulatorPkg/Unix/Host/Host.c b/EmulatorPkg/Unix/Host/Host.c
> > index 38c01c84af..c505300129 100644
> > --- a/EmulatorPkg/Unix/Host/Host.c
> > +++ b/EmulatorPkg/Unix/Host/Host.c
> > @@ -12,6 +12,12 @@ SPDX-License-Identifier: BSD-2-Clause-Patent
> >  #define MAP_ANONYMOUS  MAP_ANON
> >  #endif
> >
> > +#ifdef _NETBSD_SOURCE
> > +#define MAP_ANON_FD_ (-1)
> > +#else
> > +#define MAP_ANON_FD_ (0)
> > +#endif
> >
> Would there be a harm if we just passed -1 everywhere? It's a bit odd
> NetBSD explicitly requires this, but AFAIK implementations
> either EINVAL on fd != -1 or take whatever since it's anon. The main
> implementations (Linux, FreeBSD, NetBSD, OpenBSD, macOS) seem to
> agree that passing -1 should be safe everywhere (in fact, it's pretty funny
> that all BSD-derived implementations agree with the fd = -1 thing, but I
> digress).

Since MAP_ANON is not specified by POSIX1, I tend to think that what is
not in POSIX should be explicitely set in the code.

So if other OSes (with which edk2 is used) agree on (-1), my personal
taste would be to keep at least the define macro:

#define MAP_ANON_FD_ (-1)

as an indication that the definition is not standard (so that someone
with a system choking on this, could easily spot the culprit). (The
trailing underscore is because leading ones shall be reserved for
standard or system implementation, and the trailing is a way to indicate
that the macro is somehow local. Is there a convention for this in 
EDK2?)

Best,
-- 
        Thierry Laronde <tlaronde +AT+ polynum +dot+ com>
                     http://www.kergis.com/
                    http://kertex.kergis.com/
Key fingerprint = 0FF7 E906 FBAF FE95 FD89  250D 52B1 AE95 6006 F40C


-=-=-=-=-=-=-=-=-=-=-=-
Groups.io Links: You receive all messages sent to this group.
View/Reply Online (#96544): https://edk2.groups.io/g/devel/message/96544
Mute This Topic: https://groups.io/mt/95182515/1787277
Group Owner: devel+owner@edk2.groups.io
Unsubscribe: https://edk2.groups.io/g/devel/unsub [importer@patchew.org]
-=-=-=-=-=-=-=-=-=-=-=-