Skip to content

efi/libstub: Avoid UTF-16 conversion busywork

Ard Biesheuvel linux-efi lkml 2 versions – In review

Get series with b4
b4 am [email protected]

Versions newest first · linked by author and title

  1. v3 Latest9 patches 2 repliesIn review
  2. v210 patches 18 repliesSuperseded

Patches in v3 No applies recorded yet

#Subject and filesSizeRepliesApplied
1/9lib/ucs2_string: Drop arbitrary input size limit and associated WARN()lib/ucs2_string.c+1 -10 replies
2/9lib/ucs2_string: Suppress modinfo when __DISABLE_EXPORTS is setlib/ucs2_string.c+2 -00 replies
3/9lib/ucs2_string: Split out ucs2_as_utf8_l() taking a separate limitinclude/linux/ucs2_string.h lib/ucs2_string.c+18 -80 replies
4/9efi/libstub: Use ucs2_string library for UTF-16 to UTF-8 conversiondrivers/firmware/efi/libstub/Makefile drivers/firmware/efi/libstub/efi-stub-helper.c drivers/firmware/efi/libstub/vsprintf.c+39 -730 replies
5/9efi/libstub: Avoid efi_puts() for compile time constant stringsdrivers/firmware/efi/libstub/gop.c drivers/firmware/efi/libstub/printk.c+5 -50 replies
6/9efi/libstub: Output UTF-16 directly from vsnprintf()drivers/firmware/efi/libstub/efistub.h drivers/firmware/efi/libstub/printk.c drivers/firmware/efi/libstub/vsprintf.c+22 -1700 replies
7/9efi/libstub: Add support for printing human readable GUIDsdrivers/firmware/efi/libstub/vsprintf.c+34 -50 replies
8/9efi/libstub: Add efi_snprintf() to construct wide stringsdrivers/firmware/efi/libstub/efistub.h drivers/firmware/efi/libstub/vsprintf.c+12 -00 replies
9/9efi/libstub: add initial Boot Loader Interface supportdrivers/firmware/efi/libstub/Makefile drivers/firmware/efi/libstub/bli.c drivers/firmware/efi/libstub/efi-stub.c +3 more+114 -10 replies

Reviews trailers per patch

None of the 9 patches has a Reviewed-by or Acked-by of their own; the series has one for all of them.

PatchVincent Mailhol
SeriesR-b
1/9
2/9
3/9
4/9
5/9
6/9
7/9
8/9
9/9

Trailers given in replies are filled; those carried in the patches from earlier versions are outlined with dashes.

Read the v3 thread

Cover letter [PATCH v3 0/9] 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