d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

stand: Compile out the extensive superblock diagnostic messages for BIOS loader

Browse Source 
The BIOS loader operates in a very constrained environment. The messages
for the super block integrity tests take up about 12k of space. Compile
them out for the BIOS loader, while leaving it intact for all other
loaders that aren't space constrained. These aren't used in the 'super
tiny' *boot* programs, so no adjustment is needed there.

We reply on the fact that (a) i386 doesn't support 32-bit UEFI booting
and (b) LIBSA_CPUARCH is "i386" when building on both i386 and when
we're building the 32-bit libsa32 library.

This saves about 12k of space for this constrained envrionment and will
take a bit of the pressure off some machines where the loader has grown
too big for their BIOS (see comments in i386/loader/Makefile for
details).

Sponsored by:		Netflix
Reviewed by:		mckusick
Differential Revision:	https://reviews.freebsd.org/D36175
This commit is contained in:
Warner Losh 2022-08-12 11:08:36 -06:00
parent f8a199f28f
commit 1482113008
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
stand/libsa/Makefile
View File

@ -170,6 +170,17 @@ SRCS+= time.c
.PATH: ${SRCTOP}/sys/ufs/ffs
SRCS+=ffs_subr.c ffs_tables.c
#
# i386 has a constrained space for its /boot/loader, so compile out the
# extensive messages diagnosing bad superblocks. i386 doesn't support UEFI
# booting, so doing it always makes sense natively there. When we compile
# for 32-bit on amd64, LIBSA_CPUARCH is also i386 and we use libsa32 only
# for the BIOS /boot/loader which has the same constraints.
#
.if ${LIBSA_CPUARCH} == "i386"
CFLAGS.ffs_subr.c+= -DSTANDALONE_SMALL
.endif
CFLAGS.gzipfs.c+= ${ZLIB_CFLAGS}
CFLAGS.pkgfs.c+= ${ZLIB_CFLAGS}
CFLAGS.bzipfs.c+= -I${SRCTOP}/contrib/bzip2 -DBZ_NO_STDIO -DBZ_NO_COMPRESS

6
sys/ufs/ffs/ffs_subr.c
View File

@ -323,7 +323,11 @@ readsuper(void *devfd, struct fs **fsp, off_t sblockloc, int flags,
* Verify the filesystem values.
*/
#define ILOG2(num) (fls(num) - 1)
#define MPRINT if (prtmsg) printf
#ifdef STANDALONE_SMALL
#define MPRINT(...) do { } while (0)
#else
#define MPRINT(...) if (prtmsg) printf(__VA_ARGS__)
#endif
#define FCHK(lhs, op, rhs, fmt) \
if (lhs op rhs) { \
MPRINT("UFS%d superblock failed: %s (" #fmt ") %s %s (" \