Skip to contentSkip to conversation

efi/libstub: Avoid UTF-16 conversion busywork

PATCH In review Ard Biesheuvel 3 participants 12 messages Sep 16 – Sep 17

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

v3 cover efi/libstub: Avoid UTF-16 conversion busywork

From: Ard Biesheuvel <[email protected]>

The EFI libstub performs some redundant conversions between UTF-16 and UTF-8 and back again, which includes dealing with surrogate pairs, which UEFI implementations themselves simply ignore.

So drop all the homegrown code, and use the existing UCS-2 (== UTF-16 without surrogate pairs) library code where conversion to UTF-8 is actually needed (the kernel command line).

The remaining handling involves the EFI console, which supports wide characters natively, so just use those directly.

Changes since v2 [1]:
- drop x86 specific patch, it has been split out into a separate series
[2]
- handle truncated output of ucs2_as_utf8() in the middle of a multibyte character correctly
- improve ucs2_as_utf8() documentation
- tweaks to the commit logs

Changes since v1 [0]:
- drop size limit from ucs2_strscpy() instead of just the WARN()
- suppress modinfo sections from ucs2_string when __DISABLE_EXPORTS is defined
- allow the input limit and max output size to be passed separately to ucs2_to_utf8()
- reimplement efi_convert_cmdline() to optimize the common case, and only process the input character by character if its size exceeds COMMAND_LINE_SIZE
- use memcpy() to avoid strscpy() semantics in handling of %ls
- incorporate Vincent's patch (which inspired this work) for completeness

Cc Vincent Mailhol <[email protected]>

[0] https://lore.kernel.org/all/[email protected]
[1] http://lore.kernel.org/r/[email protected]
[2] http://lore.kernel.org/r/[email protected]

Ard Biesheuvel (8):
lib/ucs2_string: Drop arbitrary input size limit and associated WARN() lib/ucs2_string: Suppress modinfo when __DISABLE_EXPORTS is set lib/ucs2_string: Split out ucs2_as_utf8_l() taking a separate limit efi/libstub: Use ucs2_string library for UTF-16 to UTF-8 conversion efi/libstub: Avoid efi_puts() for compile time constant strings efi/libstub: Output UTF-16 directly from vsnprintf() efi/libstub: Add support for printing human readable GUIDs efi/libstub: Add efi_snprintf() to construct wide strings

Vincent Mailhol (1):
efi/libstub: add initial Boot Loader Interface support

 drivers/firmware/efi/libstub/Makefile          |   3 +-
 drivers/firmware/efi/libstub/bli.c             |  87 ++++++++++++
 drivers/firmware/efi/libstub/efi-stub-helper.c |  98 +++++--------
 drivers/firmware/efi/libstub/efi-stub.c        |   1 +
 drivers/firmware/efi/libstub/efistub.h         |   8 +-
 drivers/firmware/efi/libstub/gop.c             |   6 +-
 drivers/firmware/efi/libstub/printk.c          |  95 ++-----------
 drivers/firmware/efi/libstub/vsprintf.c        | 149 +++++++-------------
 drivers/firmware/efi/libstub/x86-stub.c        |   1 +
 include/linux/efi.h                            |  22 +++
 include/linux/ucs2_string.h                    |  11 +-
 lib/ucs2_string.c                              |  19 +--
 12 files changed, 242 insertions(+), 258 deletions(-)
 create mode 100644 drivers/firmware/efi/libstub/bli.c
Signature · 1 line
2.55.0.1032.g73a4cd73de-goog
#1 lore raw

PATCH v3 1/9 lib/ucs2_string: Drop arbitrary input size limit and associated WARN()

From: Ard Biesheuvel <[email protected]>

It's not really the job of library code to WARN and potentially bring down the system (with panic_on_warn=1) on a condition that is fairly arbitrary to begin with.

So drop the WARN_ON_ONCE() as well as the condition from ucs2_strscpy().

---
 lib/ucs2_string.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
lib/ucs2_string.c +1 -1
index 1f7dd4eb640a..d66fef9c9b81 100644
@@ -57,7 +57,7 @@ ssize_t ucs2_strscpy(ucs2_char_t *dst, const ucs2_char_t *src, size_t count)
 	 * Ensure that we have a valid amount of space. We need to store at
 	 * least one NUL-character.
 	 */
-	if (count == 0 || WARN_ON_ONCE(count > INT_MAX / sizeof(*dst)))
+	if (count == 0)
 		return -E2BIG;
 
 	/*
Signature · 1 line
2.55.0.1032.g73a4cd73de-goog
#2 lore raw

PATCH v3 2/9 lib/ucs2_string: Suppress modinfo when __DISABLE_EXPORTS is set

In reply to Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

Allow the UCS-2 string library to be reused in the EFI stub, by suppressing the modinfo data that is usually emitted so that the library can be built as a module.

---
 lib/ucs2_string.c | 2 ++
 1 file changed, 2 insertions(+)
lib/ucs2_string.c +2 -0
index d66fef9c9b81..f75fb4f7961a 100644
@@ -165,5 +165,7 @@ ucs2_as_utf8(u8 *dest, const ucs2_char_t *src, unsigned long maxlength)
 }
 EXPORT_SYMBOL(ucs2_as_utf8);
 
+#ifndef __DISABLE_EXPORTS
 MODULE_DESCRIPTION("UCS2 string handling");
 MODULE_LICENSE("GPL v2");
+#endif
Signature · 1 line
2.55.0.1032.g73a4cd73de-goog
#3 lore raw

PATCH v3 3/9 lib/ucs2_string: Split out ucs2_as_utf8_l() taking a separate limit

In reply to Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

ucs2_as_utf8() takes a maxlength argument, which specifies how many bytes the function is permitted to store into the destination buffer.

The same value is used as an upper bound for the ucs2_strnlen() invocation, which is reasonable in the general case, as each UCS-2 character produces at least one byte of UTF-8 output, and so there is never a need to process more than 'maxlength' UCS-2 characters.

However, if the UCS-2 string is not NUL terminated, ucs2_strnlen() may read past the end of the buffer if 'maxlength' is set to a high value.

Current callers pass UCS-2 strings that are expected to be NUL terminated, but for processing the load options in the EFI stub, a version is needed that takes a separate limit argument. So split that off from the current implementation.

---
 include/linux/ucs2_string.h | 11 ++++++++++-
 lib/ucs2_string.c           | 15 ++++++++-------
 2 files changed, 18 insertions(+), 8 deletions(-)
include/linux/ucs2_string.h +10 -1
index c499ae809c7d..74f23ca5a967 100644
@@ -14,7 +14,16 @@ ssize_t ucs2_strscpy(ucs2_char_t *dst, const ucs2_char_t *src, size_t count);
 int ucs2_strncmp(const ucs2_char_t *a, const ucs2_char_t *b, size_t len);
 
 unsigned long ucs2_utf8size(const ucs2_char_t *src);
+unsigned long
+ucs2_as_utf8_l(u8 *dest, const ucs2_char_t *src, unsigned long limit,
+	       unsigned long maxlength);
+
+static inline
 unsigned long ucs2_as_utf8(u8 *dest, const ucs2_char_t *src,
-			   unsigned long maxlength);
+			   unsigned long maxlength)
+{
+	return ucs2_as_utf8_l(dest, src, ucs2_strnlen(src, maxlength),
+			      maxlength);
+}
 
 #endif /* _LINUX_UCS2_STRING_H_ */
lib/ucs2_string.c +8 -7
index f75fb4f7961a..6c067b4280b9 100644
@@ -125,18 +125,19 @@ ucs2_utf8size(const ucs2_char_t *src)
 EXPORT_SYMBOL(ucs2_utf8size);
 
 /*
- * copy at most maxlength bytes of whole utf8 characters to dest from the
- * ucs2 string src.
+ * Copy at most @limit whole utf8 characters to @dest from the ucs2 string
+ * @src, using no more than @maxlength bytes of buffer space.
  *
- * The return value is the number of characters copied, not including the
- * final NUL character.
+ * The return value is the number of bytes copied, not including the final NUL
+ * character. No NUL character will be appended if the output length equals
+ * @maxlength.
  */
 unsigned long
-ucs2_as_utf8(u8 *dest, const ucs2_char_t *src, unsigned long maxlength)
+ucs2_as_utf8_l(u8 *dest, const ucs2_char_t *src, unsigned long limit,
+	       unsigned long maxlength)
 {
 	unsigned int i;
 	unsigned long j = 0;
-	unsigned long limit = ucs2_strnlen(src, maxlength);
 
 	for (i = 0; maxlength && i < limit; i++) {
 		u16 c = src[i];
@@ -163,7 +164,7 @@ ucs2_as_utf8(u8 *dest, const ucs2_char_t *src, unsigned long maxlength)
 		dest[j] = '\0';
 	return j;
 }
-EXPORT_SYMBOL(ucs2_as_utf8);
+EXPORT_SYMBOL(ucs2_as_utf8_l);
 
 #ifndef __DISABLE_EXPORTS
 MODULE_DESCRIPTION("UCS2 string handling");
Signature · 1 line
2.55.0.1032.g73a4cd73de-goog
#4 lore raw

PATCH v3 4/9 efi/libstub: Use ucs2_string library for UTF-16 to UTF-8 conversion

In reply to Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

Don't rely on sprintf() with a wide string conversion modifier to convert the command line from UTF-16 to UTF-8. Instead, use the existing ucs2 string library routine that does the same. Note that while UEFI claims support for UTF-16, in practice it ignores surrogate pairs entirely, and so the simplified UCS-2 character set (where each character takes up exactly 2 bytes) is sufficient here.

This removes the only user of sprintf() in the EFI stub, so drop that function as well.

Since boot memory is plentiful on UEFI systems, just establish a worst case upper bound for the size of the buffer (which can never exceed COMMAND_LINE_SIZE), and allocate that first. Then, perform the conversion, and only fall back to processing the command line character by character if that resulted in truncation. This makes the common execution path much simpler.

Note that this no longer truncates the command line at the first newline, but there is no evidence that this has ever been needed.

---
 drivers/firmware/efi/libstub/Makefile          |  3 +-
 drivers/firmware/efi/libstub/efi-stub-helper.c | 98 ++++++++------------
 drivers/firmware/efi/libstub/vsprintf.c        | 11 ---
 3 files changed, 39 insertions(+), 73 deletions(-)
drivers/firmware/efi/libstub/Makefile +2 -1
index 77a2b2d74f3f..12c0c7deb5cb 100644
@@ -66,7 +66,8 @@ KBUILD_AFLAGS			:= $(KBUILD_CFLAGS) -D__ASSEMBLY__
 lib-y				:= efi-stub-helper.o gop.o secureboot.o tpm.o \
 				   file.o mem.o random.o randomalloc.o pci.o \
 				   skip_spaces.o lib-cmdline.o lib-ctype.o \
-				   alignedmem.o printk.o vsprintf.o
+				   alignedmem.o printk.o vsprintf.o \
+				   lib-ucs2_string.o
 
 # include the stub's libfdt dependencies from lib/ when needed
 libfdt-deps			:= fdt_rw.c fdt_ro.c fdt_wip.c fdt.c \
drivers/firmware/efi/libstub/efi-stub-helper.c +37 -61

124 lines not on this page · raw message

drivers/firmware/efi/libstub/vsprintf.c +0 -11
index 71c71c222346..dba136679172 100644
@@ -551,14 +551,3 @@ int vsnprintf(char *buf, size_t size, const char *fmt, va_list ap)
 
 	return pos;
 }
-
-int snprintf(char *buf, size_t size, const char *fmt, ...)
-{
-	va_list args;
-	int i;
-
-	va_start(args, fmt);
-	i = vsnprintf(buf, size, fmt, args);
-	va_end(args);
-	return i;
-}
Signature · 1 line
2.55.0.1032.g73a4cd73de-goog
#5 lore raw

PATCH v3 5/9 efi/libstub: Avoid efi_puts() for compile time constant strings

In reply to Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

efi_puts() performs a UTF-8 to UTF-16 conversion on its input, as the EFI console's native character set is UTF-16.

This is pointless for compile time constant strings, since we can simply define those as UTF-16 to begin with. This takes slightly more space, but removes any runtime handling of those strings, simplifying the code.

Note that efi_puts() also performs LF to CR-LF conversion, so this needs to be taken into account as well.

---
 drivers/firmware/efi/libstub/gop.c    | 6 +++---
 drivers/firmware/efi/libstub/printk.c | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)
drivers/firmware/efi/libstub/gop.c +3 -3
index 80dc8cfeb33e..6919e28ba92b 100644
@@ -309,12 +309,12 @@ static u32 choose_mode_list(efi_graphics_output_protocol_t *gop)
 	efi_status_t status;
 
 	efi_printk("Available graphics modes are 0-%u\n", max_mode-1);
-	efi_puts("  * = current mode\n"
-		 "  - = unusable mode\n");
+	efi_char16_puts(L"  * = current mode\r\n"
+			 "  - = unusable mode\r\n");
 
 	choose_mode(gop, match_list, (void *)cur_mode);
 
-	efi_puts("\nPress any key to continue (or wait 10 seconds)\n");
+	efi_char16_puts(L"\r\nPress any key to continue (or wait 10 seconds)\r\n");
 	status = efi_wait_for_key(10 * EFI_USEC_PER_SEC, &key);
 	if (status != EFI_SUCCESS && status != EFI_TIMEOUT) {
 		efi_err("Unable to read key, continuing in 10 seconds\n");
drivers/firmware/efi/libstub/printk.c +2 -2
index bc599212c05d..f36639886d00 100644
@@ -136,7 +136,7 @@ int efi_printk(const char *fmt, ...)
 		return 0;
 
 	if (loglevel >= 0)
-		efi_puts("EFI stub: ");
+		efi_char16_puts(L"EFI stub: ");
 
 	fmt = printk_skip_level(fmt);
 
@@ -146,7 +146,7 @@ int efi_printk(const char *fmt, ...)
 
 	efi_puts(printf_buf);
 	if (printed >= sizeof(printf_buf)) {
-		efi_puts("[Message truncated]\n");
+		efi_char16_puts(L"[Message truncated]\r\n");
 		return -1;
 	}
 
Signature · 1 line
2.55.0.1032.g73a4cd73de-goog
#6 lore raw

PATCH v3 6/9 efi/libstub: Output UTF-16 directly from vsnprintf()

In reply to Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

The only remaining users of vsnprintf() in the EFI stub are the diagnostic printk()'s, which are emitted to the console and not recorded for posterity.

The EFI console uses UTF-16 (or actually, UCS-2) natively, and so all non-UTF16 strings that are emitted need to be converted. Given the stub's vsnprintf() support for wide strings (using the %ls conversion modifier), which uses UTF-16 to UTF-8 conversion internally, the final conversion to UTF-16 needs to support not just plain ASCII but UTF-8 as well.

This is all pointless, of course, and it makes more sense to use UTF-16 internally. This removes the need for UTF-16 to UTF-8 conversion in vsnprintf(), and given that all non-wide string inputs to vsnprintf() that exist in the stub today are compile time constant ASCII strings, the need to convert UTF-8 to UTF-16 disappears as well.

So implement efi_vsnprintf() taking a const char *fmt as before, but outputting a efi_char16_t[] that can be passed to the EFI console directly, rather than via efi_puts(), leaving the latter unused and therefore removed.

Note that efi_puts() performs LF to CR-LF conversion internally, so add this capability to efi_vsnprintf() as well.

---
 drivers/firmware/efi/libstub/efistub.h  |  5 +-
 drivers/firmware/efi/libstub/printk.c   | 91 ++-----------------
 drivers/firmware/efi/libstub/vsprintf.c | 96 +++-----------------
 3 files changed, 22 insertions(+), 170 deletions(-)
drivers/firmware/efi/libstub/efistub.h +3 -2
index fd91fc15ec81..36056c624782 100644
@@ -1078,9 +1078,10 @@ efi_status_t check_platform_features(void);
 
 void *get_efi_config_table(efi_guid_t guid);
 
-/* NOTE: These functions do not print a trailing newline after the string */
 void efi_char16_puts(efi_char16_t *);
-void efi_puts(const char *str);
+
+int efi_vsnprintf(efi_char16_t *buf, size_t size, const char *fmt, va_list ap,
+		  bool crlf);
 
 __printf(1, 2) int efi_printk(char const *fmt, ...);
 
drivers/firmware/efi/libstub/printk.c +7 -84

116 lines not on this page · raw message

drivers/firmware/efi/libstub/vsprintf.c +12 -84

136 lines not on this page · raw message

Signature · 1 line
2.55.0.1032.g73a4cd73de-goog
#7 lore raw

PATCH v3 7/9 efi/libstub: Add support for printing human readable GUIDs

In reply to Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

Add support for the %pUl printk conversion specifier, which takes a pointer to a GUID and prints it in the usual format:

aaaaaaaa-bbbb-cccc-dddd-dddddddddddd

---
 drivers/firmware/efi/libstub/vsprintf.c | 39 +++++++++++++++++---
 1 file changed, 34 insertions(+), 5 deletions(-)
drivers/firmware/efi/libstub/vsprintf.c +34 -5
index bd32af6b4f4d..54b82ba798a2 100644
@@ -113,6 +113,8 @@ char *put_dec(char *end, unsigned long long n)
 	return p;
 }
 
+static const char digits[16] = "0123456789ABCDEF";
+
 static
 char *number(char *end, unsigned long long num, int base, char locase)
 {
@@ -121,9 +123,6 @@ char *number(char *end, unsigned long long num, int base, char locase)
 	 * produces same digits or (maybe lowercased) letters
 	 */
 
-	/* we are called with base 8, 10 or 16, only, thus don't need "G..."  */
-	static const char digits[16] = "0123456789ABCDEF"; /* "GHIJKLMNOPQRSTUVWXYZ"; */
-
 	switch (base) {
 	case 10:
 		if (num != 0)
@@ -144,6 +143,29 @@ char *number(char *end, unsigned long long num, int base, char locase)
 	return end;
 }
 
+static char *guid_to_str(const efi_guid_t *guid, char *out, char locase)
+{
+	static const u8 guid_index[UUID_SIZE] = {
+		3, 2, 1, 0, 5, 4, 7, 6, 8, 9, 10, 11, 12, 13, 14, 15,
+	};
+
+	for (int i = 0, p = 0; i < ARRAY_SIZE(guid_index); i++) {
+		u8 byte = guid->b[guid_index[i]];
+
+		out[p++] = locase | digits[byte >> 4];
+		out[p++] = locase | digits[byte & 0xf];
+
+		switch (i) {
+		case 3:
+		case 5:
+		case 7:
+		case 9:
+			out[p++] = '-';
+		}
+	}
+	return out;
+}
+
 #define ZEROPAD	1		/* pad with zero */
 #define SIGN	2		/* unsigned/signed long */
 #define PLUS	4		/* show plus */
@@ -253,8 +275,7 @@ do {				\
 int efi_vsnprintf(efi_char16_t *buf, size_t size, const char *fmt, va_list ap,
 		  bool crlf)
 {
-	/* The maximum space required is to print a 64-bit number in octal */
-	char tmp[(sizeof(unsigned long long) * 8 + 2) / 3];
+	char tmp[UUID_STRING_LEN];
 	char *tmp_end = &tmp[ARRAY_SIZE(tmp)];
 	long long num;
 	int base;
@@ -367,6 +388,14 @@ int efi_vsnprintf(efi_char16_t *buf, size_t size, const char *fmt, va_list ap,
 			break;
 
 		case 'p':
+			if (fmt[1] == 'U' && (fmt[2] | 0x20) == 'l') {
+				flags &= LEFT;
+				s = guid_to_str(va_arg(args, efi_guid_t *), tmp, fmt[2] & 0x20);
+				precision = len = UUID_STRING_LEN;
+				fmt += 2;
+				goto output;
+			}
+
 			if (precision < 0)
 				precision = 2 * sizeof(void *);
 			fallthrough;
Signature · 1 line
2.55.0.1032.g73a4cd73de-goog
#8 lore raw

PATCH v3 8/9 efi/libstub: Add efi_snprintf() to construct wide strings

In reply to Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

The native EFI character set is UTF-16 (or in practice, UCS-2). Implement efi_snprintf() to construct UTF-16 strings using printf style templates. This will be used in a subsequent patch to set the LoaderDevicePartUUID EFI variable.

---
 drivers/firmware/efi/libstub/efistub.h  |  1 +
 drivers/firmware/efi/libstub/vsprintf.c | 11 +++++++++++
 2 files changed, 12 insertions(+)
drivers/firmware/efi/libstub/efistub.h +1 -0
index 36056c624782..880c1d0c464b 100644
@@ -1084,6 +1084,7 @@ int efi_vsnprintf(efi_char16_t *buf, size_t size, const char *fmt, va_list ap,
 		  bool crlf);
 
 __printf(1, 2) int efi_printk(char const *fmt, ...);
+__printf(3, 4) int efi_snprintf(efi_char16_t *buf, size_t size, const char *fmt, ...);
 
 void efi_free(unsigned long size, unsigned long addr);
 DEFINE_FREE(efi_pool, void *, if (_T) efi_bs_call(free_pool, _T));
drivers/firmware/efi/libstub/vsprintf.c +11 -0
index 54b82ba798a2..071c8b245b68 100644
@@ -508,3 +508,14 @@ int efi_vsnprintf(efi_char16_t *buf, size_t size, const char *fmt, va_list ap,
 
 	return pos;
 }
+
+int efi_snprintf(efi_char16_t *buf, size_t size, const char *fmt, ...)
+{
+       va_list args;
+       int i;
+
+       va_start(args, fmt);
+       i = efi_vsnprintf(buf, size, fmt, args, false);
+       va_end(args);
+       return i;
+}
Signature · 1 line
2.55.0.1032.g73a4cd73de-goog
#9 lore raw

PATCH v3 9/9 efi/libstub: add initial Boot Loader Interface support

In reply to Ard Biesheuvel

From: Vincent Mailhol <[email protected]>

The Boot Loader Interface (BLI) [1] defines EFI variables that expose boot loader state to the running OS. LoaderInfo identifies the boot loader, while LoaderDevicePartUUID records the GPT partition UUID of the partition containing it.

LoaderDevicePartUUID is used, for example, by systemd-gpt-auto-generator
[2] to identify the disk the boot loader was launched from and automatically detect and mount partitions on it.

GRUB [3] and systemd-boot [4] populate these variables, but when the kernel is started directly by EFI firmware, there is no conventional external boot loader to provide them. In that case, because the EFI stub performs the boot loader role, it should provide the variables itself.

Use LoaderInfo as a sentinel: if it is already set by an earlier boot stage or cannot be set, bail out. Otherwise, populate the other BLI variables.

Parse the loaded image device path, extract the GUID signature from its GPT HD() node and publish it under the Linux loader entry vendor GUID as the volatile LoaderDevicePartUUID EFI variable.

Install the efi_bli_set_variables() hook in both the generic efi-stub.c path and the x86-specific x86-stub.c path.

[1] The Boot Loader Interface

[2] systemd-gpt-auto-generator

[3] GRUB -- §16.2 bli

[4] systemd -- systemd-boot UEFI Boot Manager

[ardb: - constify 'image' pointer parameter
- pass efi_guid_t* to efi_snprintf()]

---
 drivers/firmware/efi/libstub/Makefile   |  2 +-
 drivers/firmware/efi/libstub/bli.c      | 87 ++++++++++++++++++++
 drivers/firmware/efi/libstub/efi-stub.c |  1 +
 drivers/firmware/efi/libstub/efistub.h  |  2 +
 drivers/firmware/efi/libstub/x86-stub.c |  1 +
 include/linux/efi.h                     | 22 +++++
 6 files changed, 114 insertions(+), 1 deletion(-)
drivers/firmware/efi/libstub/Makefile +1 -1
index 12c0c7deb5cb..564773c89d14 100644
@@ -66,7 +66,7 @@ KBUILD_AFLAGS			:= $(KBUILD_CFLAGS) -D__ASSEMBLY__
 lib-y				:= efi-stub-helper.o gop.o secureboot.o tpm.o \
 				   file.o mem.o random.o randomalloc.o pci.o \
 				   skip_spaces.o lib-cmdline.o lib-ctype.o \
-				   alignedmem.o printk.o vsprintf.o \
+				   alignedmem.o printk.o vsprintf.o bli.o \
 				   lib-ucs2_string.o
 
 # include the stub's libfdt dependencies from lib/ when needed
drivers/firmware/efi/libstub/bli.c new file +87 -0

87 lines not on this page · raw message

drivers/firmware/efi/libstub/efi-stub.c +1 -0
index 42d6073bcd06..2a95f4ea104a 100644
@@ -165,6 +165,7 @@ efi_status_t efi_stub_common(efi_handle_t handle,
 	dpy = setup_primary_display();
 
 	efi_retrieve_eventlog();
+	efi_bli_set_variables(image);
 
 	/* Ask the firmware to clear memory on unclean shutdown */
 	efi_enable_reset_attack_mitigation();
drivers/firmware/efi/libstub/efistub.h +2 -0
index 880c1d0c464b..4f9e7ae28b6c 100644
@@ -1072,6 +1072,8 @@ efi_status_t efi_random_alloc(unsigned long size, unsigned long align,
 			      int memory_type, unsigned long alloc_min,
 			      unsigned long alloc_max);
 
+void efi_bli_set_variables(const efi_loaded_image_t *image);
+
 efi_status_t efi_random_get_seed(void);
 
 efi_status_t check_platform_features(void);
drivers/firmware/efi/libstub/x86-stub.c +1 -0
index cef32e2c82d8..b762f7f37f28 100644
@@ -1014,6 +1014,7 @@ void __noreturn efi_stub_entry(efi_handle_t handle,
 	efi_random_get_seed();
 
 	efi_retrieve_eventlog();
+	efi_bli_set_variables(image);
 
 	setup_graphics(boot_params);
 
include/linux/efi.h +22 -0
index c35446a0b66f..ecb34be37a87 100644
@@ -957,6 +957,17 @@ extern int efi_status_to_err(efi_status_t status);
 #define   EFI_DEV_END_INSTANCE			0x01
 #define   EFI_DEV_END_ENTIRE			0xFF
 
+enum efi_hd_partition_format {
+	EFI_HD_PARTITION_FORMAT_MBR = 1,
+	EFI_HD_PARTITION_FORMAT_GPT,
+};
+
+enum efi_hd_signature_type {
+	EFI_HD_SIGNATURE_TYPE_NONE,
+	EFI_HD_SIGNATURE_TYPE_MBR,
+	EFI_HD_SIGNATURE_TYPE_GUID,
+};
+
 struct efi_generic_dev_path {
 	u8				type;
 	u8				sub_type;
@@ -988,6 +999,16 @@ struct efi_rel_offset_dev_path {
 	u64				ending_offset;
 } __packed;
 
+struct efi_hd_dev_path {
+	struct efi_generic_dev_path	header;
+	u32				partition_number;
+	u64				partition_start;
+	u64				partition_size;
+	efi_guid_t			signature;
+	u8				partition_format;
+	u8				signature_type;
+} __packed;
+
 struct efi_mem_mapped_dev_path {
 	struct efi_generic_dev_path	header;
 	u32				memory_type;
@@ -1007,6 +1028,7 @@ struct efi_dev_path {
 		struct efi_pci_dev_path		pci;
 		struct efi_vendor_dev_path	vendor;
 		struct efi_rel_offset_dev_path	rel_offset;
+		struct efi_hd_dev_path		hd;
 	};
 } __packed;
 
Signature · 1 line
2.55.0.1032.g73a4cd73de-goog
Reviewed-by on the v3 series
#10 lore raw
In reply to Ard Biesheuvel
Quoted 6 lines · Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

The EFI libstub performs some redundant conversions between UTF-16 and UTF-8 and back again, which includes dealing with surrogate pairs, which UEFI implementations themselves simply ignore.

Quoted 6 lines

So drop all the homegrown code, and use the existing UCS-2 (== UTF-16 without surrogate pairs) library code where conversion to UTF-8 is actually needed (the kernel command line).

The remaining handling involves the EFI console, which supports wide characters natively, so just use those directly.

This v3 looks good to me and runs fine.

Patch 8 still uses spaces instead of tabulation for indentations. But, notwithstanding of that and for the full series:

Yours sincerely,
Vincent Mailhol

maintainer
#11 lore raw
Quoted 14 lines · Vincent Mailhol
Quoted 6 lines · Ard Biesheuvel

From: Ard Biesheuvel <[email protected]>

The EFI libstub performs some redundant conversions between UTF-16 and UTF-8 and back again, which includes dealing with surrogate pairs, which UEFI implementations themselves simply ignore.

Quoted 6 lines

So drop all the homegrown code, and use the existing UCS-2 (== UTF-16 without surrogate pairs) library code where conversion to UTF-8 is actually needed (the kernel command line).

The remaining handling involves the EFI console, which supports wide characters natively, so just use those directly.

Quoted 7 lines

This v3 looks good to me and runs fine.

Patch 8 still uses spaces instead of tabulation for indentations. But, notwithstanding of that and for the full series:

Thanks. I've fixed patch #8 and pushed the set (minus the x86 boot) to the bootloader-info topic branch. I'll merge that into efi/next once the x86 changes land in tip.