commit fc1c80358af6818164594d18f5d77d1be6f17c65
author Stephen Boyd <swboyd@chromium.org> Wed Oct 06 20:58:37 2021 -0700
committer Commit Bot <commit-bot@chromium.org> Tue Oct 12 03:41:10 2021 +0000
tree 1759a43b3dce851433e0c7952a809666412e041e
parent ca7c71beecf8d2747ec8354ba0b9469d1aa9e20b

cros_generate_breakpad_symbols: Upload vmlinux symbols

We don't install vmlinux into /boot/ but we do install the splitdebug
file into /usr/lib/debug/boot/ as vmlinux.debug with CL:3210949. Let's
treat that case specially and generate the breakpad symbols for vmlinux
so we have kernel symbols.

BUG=b:186639923
TEST=./run_tests

Change-Id: Iafe3055f81c72dff35974088ccac847dc6252b9e
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3210932
Reviewed-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Stephen Boyd <swboyd@chromium.org>
Tested-by: Stephen Boyd <swboyd@chromium.org>

scripts/cros_generate_breakpad_symbols.py

diff --git a/scripts/cros_generate_breakpad_symbols.py b/scripts/cros_generate_breakpad_symbols.py
index cd67e5c..151255c 100644
--- a/scripts/cros_generate_breakpad_symbols.py
+++ b/scripts/cros_generate_breakpad_symbols.py
@@ -31,6 +31,10 @@
 from chromite.lib import signals
 from chromite.utils import file_util
 
+# Elf files that don't exist but have a split .debug file installed.
+ALLOWED_DEBUG_ONLY_FILES = {
+    'boot/vmlinux',
+}
 
 SymbolHeader = collections.namedtuple('SymbolHeader',
                                       ('cpu', 'id', 'name', 'os',))
@@ -81,6 +85,7 @@
   assert breakpad_dir
   if num_errors is None:
     num_errors = ctypes.c_int()
+  debug_file_only = not os.path.exists(elf_file)
 
   cmd_base = [dump_syms_cmd, '-v']
   if strip_cfi:
@@ -108,7 +113,11 @@
       dir=breakpad_dir, delete=False) as temp:
     if debug_file:
       # Try to dump the symbols using the debug file like normal.
-      cmd_args = [elf_file, os.path.dirname(debug_file)]
+      if debug_file_only:
+        cmd_args = [debug_file]
+      else:
+        cmd_args = [elf_file, os.path.dirname(debug_file)]
+
       result = _DumpIt(cmd_args)
 
       if result.returncode:
@@ -243,7 +252,9 @@
         continue
 
       # Filter out files based on common issues with the elf file.
-      if not os.path.exists(elf_file):
+      elf_path = os.path.relpath(elf_file, sysroot)
+      debug_only = elf_path in ALLOWED_DEBUG_ONLY_FILES
+      if not os.path.exists(elf_file) and not debug_only:
         # Sometimes we filter out programs from /usr/bin but leave behind
         # the .debug file.
         logging.warning('Skipping missing %s', elf_file)