From patchwork Fri Oct 11 08:52:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 13832234 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6E665CFD2EB for ; Fri, 11 Oct 2024 08:53:09 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.816776.1230888 (Exim 4.92) (envelope-from ) id 1szBON-0001tL-Dg; Fri, 11 Oct 2024 08:52:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 816776.1230888; Fri, 11 Oct 2024 08:52:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1szBON-0001sK-8o; Fri, 11 Oct 2024 08:52:59 +0000 Received: by outflank-mailman (input) for mailman id 816776; Fri, 11 Oct 2024 08:52:58 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1szBOM-0001pc-7t for xen-devel@lists.xenproject.org; Fri, 11 Oct 2024 08:52:58 +0000 Received: from mail-lf1-x12c.google.com (mail-lf1-x12c.google.com [2a00:1450:4864:20::12c]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 35f3fee5-87ae-11ef-a0bd-8be0dac302b0; Fri, 11 Oct 2024 10:52:57 +0200 (CEST) Received: by mail-lf1-x12c.google.com with SMTP id 2adb3069b0e04-5398b589032so3082989e87.1 for ; Fri, 11 Oct 2024 01:52:57 -0700 (PDT) Received: from fziglio-desktop.. ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a99a80dc290sm186131566b.155.2024.10.11.01.52.55 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Oct 2024 01:52:55 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 35f3fee5-87ae-11ef-a0bd-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1728636776; x=1729241576; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=kevqHPlOngQuOmstH4bxiNiM3x5PtCpRDsAd+HUlWeY=; b=IcyCYIL0aFqEbryKqeHXG/li/H8DW0KUKOScao7/GDY0dYovOhYMgeme3QEqJho683 5gl6X+5/IvCJ6TwTgUlzlT+W4QpZzsb3MgaXX/B9fG38FO01t9+LUUiQyuaAaxeqDlI/ BywahSqVrlBSR/aU5+y+HTO9BFTrvAsTkyGK0= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728636776; x=1729241576; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=kevqHPlOngQuOmstH4bxiNiM3x5PtCpRDsAd+HUlWeY=; b=CAjpEsYr4UcSxvU8Alc/FcRkW9jbHgTfxM2m16e2c6dvLy8v4vsu6tbSGQiZU3RM9E kf9Hnb6iA8WaBJBqrsKV7KewmoJYoiQb1WrK0IImZ5SMdbAUghVn/ejewKtQ9qeZT5Z1 Yadw0K4KJrdkZytCTMJeyENvRLl6mY05twTO0b8yJ55y/4f85WCIwirZeY95/P3ezr6H Dklljovuis6/AbOX/eYcJIFkL3I1yU2x48+iBEK+hZER3DzPdfBxsLd3sunBWLeTEuwD iRqqy7g4f9FXcB67EkLvR/yqQgeKZs/3SepUsD1sNdEP+mbbFu804UUPRCZnl/8gIJVb QfIQ== X-Gm-Message-State: AOJu0YzBTD0/bH5Oer7yJCuQg2Td5a/H+ejQdRtQFqKBulEpx71gyI4j JZdWxJr8GlgN4V+rZO4QBrn+0PWzhT5pgxekA5cnn2sqjr66/cKx68J1qNMVij1i2Lws40ZN70/ 9 X-Google-Smtp-Source: AGHT+IEyrRg/HCEajzOUUpGzIiNFdhvAgIdLhgp7IEdHP832Xej2NWnC5GKZHjbm6xOcH3/7EH3EQA== X-Received: by 2002:a05:6512:3196:b0:539:a353:279b with SMTP id 2adb3069b0e04-539da3b1ec8mr1321973e87.9.1728636776162; Fri, 11 Oct 2024 01:52:56 -0700 (PDT) From: Frediano Ziglio To: xen-devel@lists.xenproject.org Cc: Frediano Ziglio , Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , Julien Grall , Stefano Stabellini Subject: [PATCH v3 1/5] x86/boot: create a C bundle for 32 bit boot code and use it Date: Fri, 11 Oct 2024 09:52:40 +0100 Message-Id: <20241011085244.432368-2-frediano.ziglio@cloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241011085244.432368-1-frediano.ziglio@cloud.com> References: <20241011085244.432368-1-frediano.ziglio@cloud.com> MIME-Version: 1.0 The current method to include 32 bit C boot code is: - compile each function we want to use into a separate object file; - each function is compiled with -fpic option; - convert these object files to binary files. This operation removes GOP which we don't want in the executable; - a small assembly part in each file add the entry point; - code can't have external references, all possible variables are passed by value or pointer; - include these binary files in head.S. There are currently some limitations: - code is compiled separately, it's not possible to share a function (like memcpy) between different functions to use; - although code is compiled with -fpic there's no certainty there are no relocations, specifically data ones. This can lead into hard to find bugs; - it's hard to add a simple function; - having to pass external variables makes hard to do multiple things otherwise functions would require a lot of parameters so code would have to be split into multiple functions which is not easy; - we generate a single text section containing data and code, not a problem at the moment but if we want to add W^X protection it's not helpful. Current change extends the current process: - all object files are linked together before getting converted making possible to share code between the function we want to call; - a single object file is generated with all functions to use and exported symbols to easily call; - variables to use are declared in linker script and easily used inside C code. Declaring them manually could be annoying but makes also easier to check them. Using external pointers can be still an issue if they are not fixed. If an external symbol is not declared this gives a link error; - linker script put data (bss and data) into a separate section and check that that section is empty making sure code is W^X compatible; Some details of the implementation: - C code is compiled with -fpic flags (as before); - object files from C code are linked together; - the single bundled object file is linked with 2 slightly different script files to generate 2 bundled object files; - the 2 bundled object files are converted to binary removing the need for global offset tables; - a Python script is used to generate assembly source from the 2 binaries; - the single assembly file is compiled to generate final bundled object file; - to detect possible unwanted relocation in data/code code is generated with different addresses. This is enforced starting .text section at different positions and adding a fixed "gap" at the beginning. This makes sure code and data is position independent; - to detect used symbols in data/code symbols are placed in .text section at different offsets (based on the line in the linker script). This is needed as potentially a reference to a symbol is converted to a reference to the containing section so multiple symbols could be converted to reference to same symbol (section name) and we need to distinguish them; - to avoid relocations - --orphan-handling=error option to linker is used to make sure we account for all possible sections from C code; Current limitations: - the main one is the lack of support for 64 bit code. It would make sure that even the code used for 64 bit (at the moment EFI code) is code and data position independent. We cannot assume that code that came from code compiled for 32 bit and compiled for 64 bit is code and data position independent, different compiler options lead to different code/data. Signed-off-by: Frediano Ziglio --- Changes since v1: - separate lines adding files in Makefile; - remove unneeded "#undef ENTRY" in build32.lds.S; - print some information from combine_two_binaries only passing --verbose; - detect --orphan-handling=error option dynamically; - define and use a LD32; - more intermediate targets to build more in parallel; - use obj32 in Makefile to keep list of 32 bit object files; - 32 bit object files are now named XXX.32.o; - rename "cbundle" to "built_in_32". --- xen/arch/x86/boot/.gitignore | 5 +- xen/arch/x86/boot/Makefile | 58 +++-- .../x86/boot/{build32.lds => build32.lds.S} | 43 +++- xen/arch/x86/boot/cmdline.c | 12 -- xen/arch/x86/boot/head.S | 12 -- xen/arch/x86/boot/reloc.c | 14 -- xen/tools/combine_two_binaries | 198 ++++++++++++++++++ 7 files changed, 283 insertions(+), 59 deletions(-) rename xen/arch/x86/boot/{build32.lds => build32.lds.S} (63%) create mode 100755 xen/tools/combine_two_binaries diff --git a/xen/arch/x86/boot/.gitignore b/xen/arch/x86/boot/.gitignore index a379db7988..ebad650e5c 100644 --- a/xen/arch/x86/boot/.gitignore +++ b/xen/arch/x86/boot/.gitignore @@ -1,3 +1,4 @@ /mkelf32 -/*.bin -/*.lnk +/build32.*.lds +/built_in_32.*.bin +/built_in_32.*.map diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile index ff0f965876..4cf0d7e140 100644 --- a/xen/arch/x86/boot/Makefile +++ b/xen/arch/x86/boot/Makefile @@ -1,15 +1,18 @@ +obj32 := cmdline.o +obj32 += reloc.o + obj-bin-y += head.o +obj-bin-y += built_in_32.o -head-bin-objs := cmdline.o reloc.o +obj32 := $(patsubst %.o,%.32.o,$(obj32)) -nocov-y += $(head-bin-objs) -noubsan-y += $(head-bin-objs) -targets += $(head-bin-objs) +nocov-y += $(obj32) +noubsan-y += $(obj32) +targets += $(obj32) -head-bin-objs := $(addprefix $(obj)/,$(head-bin-objs)) +obj32 := $(addprefix $(obj)/,$(obj32)) $(obj)/head.o: AFLAGS-y += -Wa$(comma)-I$(obj) -$(obj)/head.o: $(head-bin-objs:.o=.bin) CFLAGS_x86_32 := $(subst -m64,-m32 -march=i686,$(XEN_TREEWIDE_CFLAGS)) $(call cc-options-add,CFLAGS_x86_32,CC,$(EMBEDDED_EXTRA_CFLAGS)) @@ -17,17 +20,46 @@ CFLAGS_x86_32 += -Werror -fno-builtin -g0 -msoft-float -mregparm=3 CFLAGS_x86_32 += -nostdinc -include $(filter %/include/xen/config.h,$(XEN_CFLAGS)) CFLAGS_x86_32 += $(filter -I% -O%,$(XEN_CFLAGS)) -D__XEN__ +LD32 := $(LD) $(subst x86_64,i386,$(LDFLAGS_DIRECT)) + # override for 32bit binaries -$(head-bin-objs): CFLAGS_stack_boundary := -$(head-bin-objs): XEN_CFLAGS := $(CFLAGS_x86_32) -fpic +$(obj32): CFLAGS_stack_boundary := +$(obj32): XEN_CFLAGS := $(CFLAGS_x86_32) -fpic LDFLAGS_DIRECT-$(call ld-option,--warn-rwx-segments) := --no-warn-rwx-segments LDFLAGS_DIRECT += $(LDFLAGS_DIRECT-y) -%.bin: %.lnk - $(OBJCOPY) -j .text -O binary $< $@ +$(obj)/%.32.o: $(src)/%.c FORCE + $(call if_changed_rule,cc_o_c) + +$(obj)/build32.final.lds: AFLAGS-y += -DFINAL +$(obj)/build32.other.lds $(obj)/build32.final.lds: $(src)/build32.lds.S + $(call if_changed_dep,cpp_lds_S) + +orphan-handling-$(call ld-option,--orphan-handling=error) := --orphan-handling=error + +# link all object files together +$(obj)/built_in_32.tmp.o: $(obj32) + $(LD32) -r -o $@ $(obj32) + +$(obj)/built_in_32.%.bin: $(obj)/build32.%.lds $(obj)/built_in_32.tmp.o +## link bundle with a given layout + $(LD32) $(orphan-handling-y) -N -T $< -Map $(obj)/built_in_32.$(*F).map -o $(obj)/built_in_32.$(*F).o $(obj)/built_in_32.tmp.o +## extract binaries from object + $(OBJCOPY) -j .text -O binary $(obj)/built_in_32.$(*F).o $@ + rm -f $(obj)/built_in_32.$(*F).o -%.lnk: %.o $(src)/build32.lds - $(LD) $(subst x86_64,i386,$(LDFLAGS_DIRECT)) -N -T $(filter %.lds,$^) -o $@ $< +# generate final object file combining and checking above binaries +$(obj)/built_in_32.o: $(obj)/built_in_32.other.bin $(obj)/built_in_32.final.bin + $(PYTHON) $(srctree)/tools/combine_two_binaries \ + --script $(obj)/build32.final.lds \ + --bin1 $(obj)/built_in_32.other.bin --bin2 $(obj)/built_in_32.final.bin \ + --map $(obj)/built_in_32.final.map \ + --exports cmdline_parse_early,reloc \ + --section-header '.section .init.text, "ax", @progbits' \ + --output $(obj)/built_in_32.s + $(CC) -c $(obj)/built_in_32.s -o $@.tmp + rm -f $(obj)/built_in_32.s $@ + mv $@.tmp $@ -clean-files := *.lnk *.bin +clean-files := built_in_32.*.bin built_in_32.*.map build32.*.lds diff --git a/xen/arch/x86/boot/build32.lds b/xen/arch/x86/boot/build32.lds.S similarity index 63% rename from xen/arch/x86/boot/build32.lds rename to xen/arch/x86/boot/build32.lds.S index 56edaa727b..72a4c5c614 100644 --- a/xen/arch/x86/boot/build32.lds +++ b/xen/arch/x86/boot/build32.lds.S @@ -15,22 +15,52 @@ * with this program. If not, see . */ -ENTRY(_start) +#ifdef FINAL +# define GAP 0 +# define MULT 0 +# define TEXT_START +#else +# define GAP 0x010200 +# define MULT 1 +# define TEXT_START 0x408020 +#endif +# define DECLARE_IMPORT(name) name = . + (__LINE__ * MULT) + +ENTRY(dummy_start) SECTIONS { - /* Merge code and data into one section. */ - .text : { + /* Merge code and read-only data into one section. */ + .text TEXT_START : { + /* Silence linker warning, we are not going to use it */ + dummy_start = .; + + /* Declare below any symbol name needed. + * Each symbol should be on its own line. + * It looks like a tedious work but we make sure the things we use. + * Potentially they should be all variables. */ + DECLARE_IMPORT(__base_relocs_start); + DECLARE_IMPORT(__base_relocs_end); + . = . + GAP; *(.text) *(.text.*) - *(.data) - *(.data.*) *(.rodata) *(.rodata.*) + } + + /* Writeable data sections. Check empty. + * We collapse all into code section and we don't want it to be writeable. */ + .data : { + *(.data) + *(.data.*) *(.bss) *(.bss.*) } - + /DISCARD/ : { + *(.comment) + *(.comment.*) + *(.note.*) + } /* Dynamic linkage sections. Collected simply so we can check they're empty. */ .got : { *(.got) @@ -64,3 +94,4 @@ ASSERT(SIZEOF(.igot.plt) == 0, ".igot.plt non-empty") ASSERT(SIZEOF(.iplt) == 0, ".iplt non-empty") ASSERT(SIZEOF(.plt) == 0, ".plt non-empty") ASSERT(SIZEOF(.rel) == 0, "leftover relocations") +ASSERT(SIZEOF(.data) == 0, "we don't want data") diff --git a/xen/arch/x86/boot/cmdline.c b/xen/arch/x86/boot/cmdline.c index fc9241ede9..196c580e91 100644 --- a/xen/arch/x86/boot/cmdline.c +++ b/xen/arch/x86/boot/cmdline.c @@ -18,18 +18,6 @@ * Linux kernel source (linux/lib/string.c). */ -/* - * This entry point is entered from xen/arch/x86/boot/head.S with: - * - %eax = &cmdline, - * - %edx = &early_boot_opts. - */ -asm ( - " .text \n" - " .globl _start \n" - "_start: \n" - " jmp cmdline_parse_early \n" - ); - #include #include #include diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index c4de1dfab5..e0776e3896 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -759,18 +759,6 @@ trampoline_setup: /* Jump into the relocated trampoline. */ lret - /* - * cmdline and reloc are written in C, and linked to be 32bit PIC with - * entrypoints at 0 and using the fastcall convention. - */ -FUNC_LOCAL(cmdline_parse_early) - .incbin "cmdline.bin" -END(cmdline_parse_early) - -FUNC_LOCAL(reloc) - .incbin "reloc.bin" -END(reloc) - ENTRY(trampoline_start) #include "trampoline.S" ENTRY(trampoline_end) diff --git a/xen/arch/x86/boot/reloc.c b/xen/arch/x86/boot/reloc.c index 8c58affcd9..94b078d7b1 100644 --- a/xen/arch/x86/boot/reloc.c +++ b/xen/arch/x86/boot/reloc.c @@ -12,20 +12,6 @@ * Daniel Kiper */ -/* - * This entry point is entered from xen/arch/x86/boot/head.S with: - * - %eax = MAGIC, - * - %edx = INFORMATION_ADDRESS, - * - %ecx = TOPMOST_LOW_MEMORY_STACK_ADDRESS. - * - 0x04(%esp) = BOOT_VIDEO_INFO_ADDRESS. - */ -asm ( - " .text \n" - " .globl _start \n" - "_start: \n" - " jmp reloc \n" - ); - #include #include #include diff --git a/xen/tools/combine_two_binaries b/xen/tools/combine_two_binaries new file mode 100755 index 0000000000..ea2d6ddc4e --- /dev/null +++ b/xen/tools/combine_two_binaries @@ -0,0 +1,198 @@ +#!/usr/bin/env python3 + +from __future__ import print_function +import argparse +import re +import struct +import sys + +parser = argparse.ArgumentParser(description='Generate assembly file to merge into other code.') +parser.add_argument('--script', dest='script', + required=True, + help='Linker script for extracting symbols') +parser.add_argument('--bin1', dest='bin1', + required=True, + help='First binary') +parser.add_argument('--bin2', dest='bin2', + required=True, + help='Second binary') +parser.add_argument('--output', dest='output', + help='Output file') +parser.add_argument('--map', dest='mapfile', + help='Map file to read for symbols to export') +parser.add_argument('--exports', dest='exports', + help='Symbols to export') +parser.add_argument('--section-header', dest='section_header', + default='.text', + help='Section header declaration') +parser.add_argument('-v', '--verbose', + action='store_true') +args = parser.parse_args() + +gap = 0x010200 +text_diff = 0x408020 + +# Parse linker script for external symbols to use. +symbol_re = re.compile(r'\s+(\S+)\s*=\s*\.\s*\+\s*\((\d+)\s*\*\s*0\s*\)\s*;') +symbols = {} +lines = {} +for line in open(args.script): + m = symbol_re.match(line) + if not m: + continue + (name, line_num) = (m.group(1), int(m.group(2))) + if line_num == 0: + raise Exception("Invalid line number found:\n\t" + line) + if line_num in symbols: + raise Exception("Symbol with this line already present:\n\t" + line) + if name in lines: + raise Exception("Symbol with this name already present:\n\t" + name) + symbols[line_num] = name + lines[name] = line_num + +exports = [] +if args.exports is not None: + exports = dict([(name, None) for name in args.exports.split(',')]) + +# Parse mapfile, look for ther symbols we want to export. +if args.mapfile is not None: + symbol_re = re.compile(r'\s{15,}0x([0-9a-f]+)\s+(\S+)\n') + for line in open(args.mapfile): + m = symbol_re.match(line) + if not m or m.group(2) not in exports: + continue + addr = int(m.group(1), 16) + exports[m.group(2)] = addr +for (name, addr) in exports.items(): + if addr is None: + raise Exception("Required export symbols %s not found" % name) + +file1 = open(args.bin1, 'rb') +file2 = open(args.bin2, 'rb') +file1.seek(0, 2) +size1 = file1.tell() +file2.seek(0, 2) +size2 = file2.tell() +if size1 > size2: + file1, file2 = file2, file1 + size1, size2 = size2, size1 +if size2 != size1 + gap: + raise Exception('File sizes do not match') + +file1.seek(0, 0) +data1 = file1.read(size1) +file2.seek(gap, 0) +data2 = file2.read(size1) + +max_line = max(symbols.keys()) + +def to_int32(n): + '''Convert a number to signed 32 bit integer truncating if needed''' + mask = (1 << 32) - 1 + h = 1 << 31 + return (n & mask) ^ h - h + +i = 0 +references = {} +internals = 0 +while i <= size1 - 4: + n1 = struct.unpack('= 10: + break + continue + # This is a relative relocation to a symbol, accepted, code/data is + # relocatable. + if diff < gap and diff >= gap - max_line: + n = gap - diff + symbol = symbols.get(n) + # check we have a symbol + if symbol is None: + raise Exception("Cannot find symbol for line %d" % n) + pos = i - 1 + if args.verbose: + print('Position %#x %d %s' % (pos, n, symbol), file=sys.stderr) + i += 3 + references[pos] = symbol + continue + # First byte is the same, move to next byte + if diff & 0xff == 0 and i <= size1 - 4: + continue + # Probably a type of relocation we don't want or support + pos = i - 1 + suggestion = '' + symbol = symbols.get(-diff - text_diff) + if symbol is not None: + suggestion = " Maybe %s is not defined as hidden?" % symbol + raise Exception(("Unexpected difference found at %#x " + "n1=%#x n2=%#x diff=%#x gap=%#x.%s") % \ + (pos, n1, n2, diff, gap, suggestion)) +if internals != 0: + raise Exception("Previous relocations found") + +def line_bytes(buf, out): + '''Output an assembly line with all bytes in "buf"''' + if type(buf) == str: + print("\t.byte " + ','.join([str(ord(c)) for c in buf]), file=out) + else: + print("\t.byte " + ','.join([str(n) for n in buf]), file=out) + +def part(start, end, out): + '''Output bytes of "data" from "start" to "end"''' + while start < end: + e = min(start + 16, end) + line_bytes(data1[start:e], out) + start = e + +def reference(pos, out): + name = references[pos] + n = struct.unpack('= (1 << 31): + n -= (1 << 32) + n += pos + if n < 0: + n = -n + sign = '-' + print("\t.hidden %s\n\t.long %s %s %#x - ." % (name, name, sign, n), + file=out) + +def output(out): + prev = 0 + exports_by_addr = {} + for (sym, addr) in exports.items(): + exports_by_addr.setdefault(addr, []).append(sym) + positions = list(references.keys()) + positions += list(exports_by_addr.keys()) + for pos in sorted(positions): + part(prev, pos, out) + prev = pos + if pos in references: + reference(pos, out) + prev = pos + 4 + if pos in exports_by_addr: + for sym in exports_by_addr[pos]: + print("\t.global %s\n\t.hidden %s\n%s:" % (sym, sym, sym), + file=out) + part(prev, size1, out) + +out = sys.stdout +if args.output is not None: + out = open(args.output, 'w') +print('\t' + args.section_header, file=out) +output(out) +print('\n\t.section\t.note.GNU-stack,"",@progbits', file=out) +out.flush() From patchwork Fri Oct 11 08:52:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 13832235 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 009A9CFD2EF for ; Fri, 11 Oct 2024 08:53:10 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.816777.1230898 (Exim 4.92) (envelope-from ) id 1szBON-00025B-VE; Fri, 11 Oct 2024 08:52:59 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 816777.1230898; Fri, 11 Oct 2024 08:52:59 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1szBON-00022y-NQ; Fri, 11 Oct 2024 08:52:59 +0000 Received: by outflank-mailman (input) for mailman id 816777; Fri, 11 Oct 2024 08:52:58 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1szBOM-0001pc-Qd for xen-devel@lists.xenproject.org; Fri, 11 Oct 2024 08:52:58 +0000 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [2a00:1450:4864:20::631]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 365cef9e-87ae-11ef-a0bd-8be0dac302b0; Fri, 11 Oct 2024 10:52:57 +0200 (CEST) Received: by mail-ej1-x631.google.com with SMTP id a640c23a62f3a-a9950d27234so258743266b.1 for ; Fri, 11 Oct 2024 01:52:57 -0700 (PDT) Received: from fziglio-desktop.. ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a99a80dc290sm186131566b.155.2024.10.11.01.52.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Oct 2024 01:52:56 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 365cef9e-87ae-11ef-a0bd-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1728636777; x=1729241577; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=zUggCQPTyO9ygn34x4HeSgdbn1nIPGVC8lBKowza6Ww=; b=ULZgpcC2Pc+Aeh+HNXd07K/EkIz33sD8izpgx4x3Zn9Izdc1IUm7yndfjpn6AfbJzs 4ocFyy73DRTfxHQPtpdLO87sMQZoxlx0M4kb0C5n5PFHx6gxqWK7bSF4ikZPNOe2A7hr FNVrSnjJwScHfvf6J/6HWV9qhtIvLWVrjJd6c= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728636777; x=1729241577; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=zUggCQPTyO9ygn34x4HeSgdbn1nIPGVC8lBKowza6Ww=; b=xRAbEhaGZiOnjJUiuH0/3tujEaE1wpLXznwgdD+s2vAU3374rVywQAT45NZ4bI4Krt ekJYY9HwjcLYSI+wFvhD7WQYveQxpa00H7XbZEXXr+t0XpKtmoDWF7lzL+2KSLLWTzjr 1O7Y2WPnQYNeFqDA7pCezq7s6pyDxMIT6LfYZBnRxQU5tG1wpjMzRBwa3kzKp/OP1/NY ln4e/atGrdLMtnGAq2W62POxEfZFSudKhbkneT7EgCRiZfRHilB8iFPDp7ddTf7pBxWS P49WLxveELQCzQURrjtLY/pNTVjYJ7Kuxv7jYLEaz3GlhMsovEMu2X8ny3BWFa3A0xi3 FjvQ== X-Gm-Message-State: AOJu0Yzv/d4RrN9Ka9gh8bmDOhe/s2hH4U5LJXYDLgaAO+ykuihdM+jz mQ1mGJT8SBmPFJ+17r5zKDM31ZymyMqm63yf0FnRL20tkkBxbo0Mh4aHxa1AfgkVQEP6uUwFJdv 5 X-Google-Smtp-Source: AGHT+IH65Eld8JdkIAY7cU2W6Ra7H+4tZO/nE4hRKbWIgqgRMd1GZ4mpQGirx+/zNR0Btne7p1Lvxg== X-Received: by 2002:a17:907:7ea4:b0:a99:408c:6a16 with SMTP id a640c23a62f3a-a99b9315e79mr138590366b.12.1728636776928; Fri, 11 Oct 2024 01:52:56 -0700 (PDT) From: Frediano Ziglio To: xen-devel@lists.xenproject.org Cc: Frediano Ziglio , Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= , "Daniel P. Smith" , =?utf-8?q?Marek_Marczykow?= =?utf-8?q?ski-G=C3=B3recki?= Subject: [PATCH v3 2/5] x86/boot: Reuse code to relocate trampoline Date: Fri, 11 Oct 2024 09:52:41 +0100 Message-Id: <20241011085244.432368-3-frediano.ziglio@cloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241011085244.432368-1-frediano.ziglio@cloud.com> References: <20241011085244.432368-1-frediano.ziglio@cloud.com> MIME-Version: 1.0 Move code from efi-boot.h to a separate, new, reloc-trampoline.c file. Reuse this new code to replace assembly code in head.S doing the same thing. Signed-off-by: Frediano Ziglio --- xen/arch/x86/boot/Makefile | 12 ++++++---- xen/arch/x86/boot/build32.lds.S | 5 ++++ xen/arch/x86/boot/head.S | 23 +----------------- xen/arch/x86/boot/reloc-trampoline.c | 36 ++++++++++++++++++++++++++++ xen/arch/x86/efi/efi-boot.h | 15 ++---------- 5 files changed, 52 insertions(+), 39 deletions(-) create mode 100644 xen/arch/x86/boot/reloc-trampoline.c diff --git a/xen/arch/x86/boot/Makefile b/xen/arch/x86/boot/Makefile index 4cf0d7e140..24b4b0cb17 100644 --- a/xen/arch/x86/boot/Makefile +++ b/xen/arch/x86/boot/Makefile @@ -1,14 +1,18 @@ obj32 := cmdline.o obj32 += reloc.o +obj32 += reloc-trampoline.o + +obj64 := reloc-trampoline.o obj-bin-y += head.o obj-bin-y += built_in_32.o +obj-bin-y += $(obj64) obj32 := $(patsubst %.o,%.32.o,$(obj32)) -nocov-y += $(obj32) -noubsan-y += $(obj32) -targets += $(obj32) +nocov-y += $(obj32) $(obj64) +noubsan-y += $(obj32) $(obj64) +targets += $(obj32) $(obj64) obj32 := $(addprefix $(obj)/,$(obj32)) @@ -55,7 +59,7 @@ $(obj)/built_in_32.o: $(obj)/built_in_32.other.bin $(obj)/built_in_32.final.bin --script $(obj)/build32.final.lds \ --bin1 $(obj)/built_in_32.other.bin --bin2 $(obj)/built_in_32.final.bin \ --map $(obj)/built_in_32.final.map \ - --exports cmdline_parse_early,reloc \ + --exports cmdline_parse_early,reloc,reloc_trampoline32 \ --section-header '.section .init.text, "ax", @progbits' \ --output $(obj)/built_in_32.s $(CC) -c $(obj)/built_in_32.s -o $@.tmp diff --git a/xen/arch/x86/boot/build32.lds.S b/xen/arch/x86/boot/build32.lds.S index 72a4c5c614..9d09e3adbd 100644 --- a/xen/arch/x86/boot/build32.lds.S +++ b/xen/arch/x86/boot/build32.lds.S @@ -41,6 +41,11 @@ SECTIONS * Potentially they should be all variables. */ DECLARE_IMPORT(__base_relocs_start); DECLARE_IMPORT(__base_relocs_end); + DECLARE_IMPORT(__trampoline_rel_start); + DECLARE_IMPORT(__trampoline_rel_stop); + DECLARE_IMPORT(__trampoline_seg_start); + DECLARE_IMPORT(__trampoline_seg_stop); + DECLARE_IMPORT(trampoline_phys); . = . + GAP; *(.text) *(.text.*) diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index e0776e3896..ade2c5c43d 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -706,28 +706,7 @@ trampoline_setup: mov %edx, sym_offs(l1_bootmap)(%esi, %ecx, 8) /* Apply relocations to bootstrap trampoline. */ - mov sym_esi(trampoline_phys), %edx - lea sym_esi(__trampoline_rel_start), %edi - lea sym_esi(__trampoline_rel_stop), %ecx -1: - mov (%edi), %eax - add %edx, (%edi, %eax) - add $4,%edi - - cmp %ecx, %edi - jb 1b - - /* Patch in the trampoline segment. */ - shr $4,%edx - lea sym_esi(__trampoline_seg_start), %edi - lea sym_esi(__trampoline_seg_stop), %ecx -1: - mov (%edi), %eax - mov %dx, (%edi, %eax) - add $4,%edi - - cmp %ecx, %edi - jb 1b + call reloc_trampoline32 /* Do not parse command line on EFI platform here. */ cmpb $0, sym_esi(efi_platform) diff --git a/xen/arch/x86/boot/reloc-trampoline.c b/xen/arch/x86/boot/reloc-trampoline.c new file mode 100644 index 0000000000..c899e99b08 --- /dev/null +++ b/xen/arch/x86/boot/reloc-trampoline.c @@ -0,0 +1,36 @@ +/* SPDX-License-Identifier: GPL-2.0-only */ + +#include +#include +#include + +extern const int32_t __trampoline_rel_start[], __trampoline_rel_stop[]; +extern const int32_t __trampoline_seg_start[], __trampoline_seg_stop[]; + +#if defined(__i386__) +void reloc_trampoline32(void) +#elif defined (__x86_64__) +void reloc_trampoline64(void) +#else +#error Unknow architecture +#endif +{ + unsigned long phys = trampoline_phys; + const int32_t *trampoline_ptr; + + /* + * Apply relocations to trampoline. + * + * This modifies the trampoline in place within Xen, so that it will + * operate correctly when copied into place. + */ + for ( trampoline_ptr = __trampoline_rel_start; + trampoline_ptr < __trampoline_rel_stop; + ++trampoline_ptr ) + *(uint32_t *)(*trampoline_ptr + (long)trampoline_ptr) += phys; + + for ( trampoline_ptr = __trampoline_seg_start; + trampoline_ptr < __trampoline_seg_stop; + ++trampoline_ptr ) + *(uint16_t *)(*trampoline_ptr + (long)trampoline_ptr) = phys >> 4; +} diff --git a/xen/arch/x86/efi/efi-boot.h b/xen/arch/x86/efi/efi-boot.h index 94f3443364..1acceec471 100644 --- a/xen/arch/x86/efi/efi-boot.h +++ b/xen/arch/x86/efi/efi-boot.h @@ -103,27 +103,16 @@ static void __init efi_arch_relocate_image(unsigned long delta) } } -extern const int32_t __trampoline_rel_start[], __trampoline_rel_stop[]; -extern const int32_t __trampoline_seg_start[], __trampoline_seg_stop[]; +void reloc_trampoline64(void); static void __init relocate_trampoline(unsigned long phys) { - const int32_t *trampoline_ptr; - trampoline_phys = phys; if ( !efi_enabled(EFI_LOADER) ) return; - /* Apply relocations to trampoline. */ - for ( trampoline_ptr = __trampoline_rel_start; - trampoline_ptr < __trampoline_rel_stop; - ++trampoline_ptr ) - *(u32 *)(*trampoline_ptr + (long)trampoline_ptr) += phys; - for ( trampoline_ptr = __trampoline_seg_start; - trampoline_ptr < __trampoline_seg_stop; - ++trampoline_ptr ) - *(u16 *)(*trampoline_ptr + (long)trampoline_ptr) = phys >> 4; + reloc_trampoline64(); } static void __init place_string(u32 *addr, const char *s) From patchwork Fri Oct 11 08:52:42 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 13832237 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 6A2B9CFD2EC for ; Fri, 11 Oct 2024 08:53:18 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.816778.1230912 (Exim 4.92) (envelope-from ) id 1szBOP-0002YI-AX; Fri, 11 Oct 2024 08:53:01 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 816778.1230912; Fri, 11 Oct 2024 08:53:01 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1szBOP-0002Xx-5c; Fri, 11 Oct 2024 08:53:01 +0000 Received: by outflank-mailman (input) for mailman id 816778; Fri, 11 Oct 2024 08:52:59 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1szBON-0001pc-Qg for xen-devel@lists.xenproject.org; Fri, 11 Oct 2024 08:52:59 +0000 Received: from mail-lf1-x12d.google.com (mail-lf1-x12d.google.com [2a00:1450:4864:20::12d]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id 36c4745f-87ae-11ef-a0bd-8be0dac302b0; Fri, 11 Oct 2024 10:52:58 +0200 (CEST) Received: by mail-lf1-x12d.google.com with SMTP id 2adb3069b0e04-5398b589032so3083021e87.1 for ; Fri, 11 Oct 2024 01:52:58 -0700 (PDT) Received: from fziglio-desktop.. ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a99a80dc290sm186131566b.155.2024.10.11.01.52.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Oct 2024 01:52:57 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 36c4745f-87ae-11ef-a0bd-8be0dac302b0 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1728636778; x=1729241578; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=lRozCPE4hLmDkWuRsnYBmVRqJbay8YlPxBu7rNpVYHk=; b=j8oRP/zvijd4/gyzqIqGO08n+9NwH/QrAW4apd4wVReRtorYq7OShF+PNI4dX1BY5o z9j7jiQoWpphrj/Hl3YhFFHZfTe4Q4e0ZL+J15dvPW6wf9UD9rfOtaEPs0N9PExvi43t OlUR8j8ASDVbCA+CzOYyTO8f7TA8bihFBhfDM= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728636778; x=1729241578; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=lRozCPE4hLmDkWuRsnYBmVRqJbay8YlPxBu7rNpVYHk=; b=dF5X2MKx95CqGBmrysz/XpHKjMPeIw2XViJoTacyO86RxGrd10/e8iZ4fyQ2AWGUey e/TeMdchO4erBCwbrsxnnNCYLNSpTLIQpWZKHyZMlFalUZvPnnIcvz1umcdSYCju5N+p iOEh0v7VG9UbT6vbBsdIwF9XuP3g/zih6u75V1u0WTsn4tq0Yy5FOR4KWwfgZXA7B9qD fceyPW9NjIhI/KJvXQcP54udBBUrGsDLZQEJJBi5qZZ7goETXMGAvvAQHgER0MrZfwQg pTFhFCOhlUS5yJ7KlEsqpKp7y5X6Go9NMbYX3PV0bsWirhuGCib/kopRPAFpTSXU2gCH R1aA== X-Gm-Message-State: AOJu0Ywon4fBEwDHq/8t4ug/FwhSfrzmma+gA4mzUCWcVuLOlI9Qtlh0 nO6qWgMfuvCDobYws7u61NfENF0zvXb12UalvT1UB1yRvPaDZq90qU1pkfIGLgtV5k4DfivwcBI e X-Google-Smtp-Source: AGHT+IGDJrAsvWMO6oVkUaso7GKsUX42/Ol93PeUTzRMQ/Xv3G8+ltoWMcNCFuW8P4t0E1tmoaMuEw== X-Received: by 2002:a05:6512:3992:b0:536:a695:9414 with SMTP id 2adb3069b0e04-539da3b205amr1335442e87.6.1728636777686; Fri, 11 Oct 2024 01:52:57 -0700 (PDT) From: Frediano Ziglio To: xen-devel@lists.xenproject.org Cc: Frediano Ziglio , Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Subject: [PATCH v3 3/5] x86/boot: Use boot_vid_info variable directly from C code Date: Fri, 11 Oct 2024 09:52:42 +0100 Message-Id: <20241011085244.432368-4-frediano.ziglio@cloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241011085244.432368-1-frediano.ziglio@cloud.com> References: <20241011085244.432368-1-frediano.ziglio@cloud.com> MIME-Version: 1.0 No more need to pass from assembly code. Signed-off-by: Frediano Ziglio Reviewed-by: Andrew Cooper --- Changes since v1: - split the 2 variable changes into 2 commits. Changes since v2: - revert commit order. --- xen/arch/x86/boot/build32.lds.S | 1 + xen/arch/x86/boot/head.S | 10 +--------- xen/arch/x86/boot/reloc.c | 13 +++++-------- 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/xen/arch/x86/boot/build32.lds.S b/xen/arch/x86/boot/build32.lds.S index 9d09e3adbd..26ef609523 100644 --- a/xen/arch/x86/boot/build32.lds.S +++ b/xen/arch/x86/boot/build32.lds.S @@ -46,6 +46,7 @@ SECTIONS DECLARE_IMPORT(__trampoline_seg_start); DECLARE_IMPORT(__trampoline_seg_stop); DECLARE_IMPORT(trampoline_phys); + DECLARE_IMPORT(boot_vid_info); . = . + GAP; *(.text) *(.text.*) diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index ade2c5c43d..5da7ac138f 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -514,18 +514,10 @@ trampoline_setup: mov sym_esi(trampoline_phys), %ecx add $TRAMPOLINE_SPACE,%ecx -#ifdef CONFIG_VIDEO - lea sym_esi(boot_vid_info), %edx -#else - xor %edx, %edx -#endif - /* Save Multiboot / PVH info struct (after relocation) for later use. */ - push %edx /* Boot video info to be filled from MB2. */ mov %ebx, %edx /* Multiboot / PVH information address. */ - /* reloc(magic/eax, info/edx, trampoline/ecx, video/stk) using fastcall. */ + /* reloc(magic/eax, info/edx, trampoline/ecx) using fastcall. */ call reloc - add $4, %esp #ifdef CONFIG_PVH_GUEST cmpb $0, sym_esi(pvh_boot) diff --git a/xen/arch/x86/boot/reloc.c b/xen/arch/x86/boot/reloc.c index 94b078d7b1..707d9c5f15 100644 --- a/xen/arch/x86/boot/reloc.c +++ b/xen/arch/x86/boot/reloc.c @@ -176,7 +176,7 @@ static multiboot_info_t *mbi_reloc(uint32_t mbi_in, memctx *ctx) return mbi_out; } -static multiboot_info_t *mbi2_reloc(uint32_t mbi_in, uint32_t video_out, memctx *ctx) +static multiboot_info_t *mbi2_reloc(uint32_t mbi_in, memctx *ctx) { const multiboot2_fixed_t *mbi_fix = _p(mbi_in); const multiboot2_memory_map_t *mmap_src; @@ -185,7 +185,7 @@ static multiboot_info_t *mbi2_reloc(uint32_t mbi_in, uint32_t video_out, memctx memory_map_t *mmap_dst; multiboot_info_t *mbi_out; #ifdef CONFIG_VIDEO - struct boot_video_info *video = NULL; + struct boot_video_info *video = &boot_vid_info; #endif uint32_t ptr; unsigned int i, mod_idx = 0; @@ -290,12 +290,11 @@ static multiboot_info_t *mbi2_reloc(uint32_t mbi_in, uint32_t video_out, memctx #ifdef CONFIG_VIDEO case MULTIBOOT2_TAG_TYPE_VBE: - if ( video_out ) + if ( video ) { const struct vesa_ctrl_info *ci; const struct vesa_mode_info *mi; - video = _p(video_out); ci = (const void *)get_mb2_data(tag, vbe, vbe_control_info); mi = (const void *)get_mb2_data(tag, vbe, vbe_mode_info); @@ -321,7 +320,6 @@ static multiboot_info_t *mbi2_reloc(uint32_t mbi_in, uint32_t video_out, memctx if ( (get_mb2_data(tag, framebuffer, framebuffer_type) != MULTIBOOT2_FRAMEBUFFER_TYPE_RGB) ) { - video_out = 0; video = NULL; } break; @@ -346,8 +344,7 @@ static multiboot_info_t *mbi2_reloc(uint32_t mbi_in, uint32_t video_out, memctx } /* SAF-1-safe */ -void *reloc(uint32_t magic, uint32_t in, uint32_t trampoline, - uint32_t video_info) +void *reloc(uint32_t magic, uint32_t in, uint32_t trampoline) { memctx ctx = { trampoline }; @@ -357,7 +354,7 @@ void *reloc(uint32_t magic, uint32_t in, uint32_t trampoline, return mbi_reloc(in, &ctx); case MULTIBOOT2_BOOTLOADER_MAGIC: - return mbi2_reloc(in, video_info, &ctx); + return mbi2_reloc(in, &ctx); case XEN_HVM_START_MAGIC_VALUE: if ( IS_ENABLED(CONFIG_PVH_GUEST) ) From patchwork Fri Oct 11 08:52:43 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 13832239 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 0A4FECFD2EF for ; Fri, 11 Oct 2024 08:53:20 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.816779.1230922 (Exim 4.92) (envelope-from ) id 1szBOQ-0002or-IW; Fri, 11 Oct 2024 08:53:02 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 816779.1230922; Fri, 11 Oct 2024 08:53:02 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1szBOQ-0002oe-EO; Fri, 11 Oct 2024 08:53:02 +0000 Received: by outflank-mailman (input) for mailman id 816779; Fri, 11 Oct 2024 08:53:01 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1szBOP-0001pW-2m for xen-devel@lists.xenproject.org; Fri, 11 Oct 2024 08:53:01 +0000 Received: from mail-ej1-x630.google.com (mail-ej1-x630.google.com [2a00:1450:4864:20::630]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 3757dd8b-87ae-11ef-99a2-01e77a169b0f; Fri, 11 Oct 2024 10:52:59 +0200 (CEST) Received: by mail-ej1-x630.google.com with SMTP id a640c23a62f3a-a7aa086b077so252160966b.0 for ; Fri, 11 Oct 2024 01:52:59 -0700 (PDT) Received: from fziglio-desktop.. ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a99a80dc290sm186131566b.155.2024.10.11.01.52.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Oct 2024 01:52:58 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 3757dd8b-87ae-11ef-99a2-01e77a169b0f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1728636779; x=1729241579; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=PONmpVj452UNcuxdCaXQokIwfePg1HbIGVi4eT66zNs=; b=C7ffj/P5FiOg6xnw0n5tFedXMCE1+QR4Rs83uJwo8ORWiWUJ6OxCyHttoAveZve9Jz Zn3s25prHxGxLeDckTBl199JdLMipVrvpKtdWxu3p+R5P7r9ZLwc0EBHDTkMMBnQCuoL jL9lIzez/4ecsr7cCxgtnwKSllOCwWq2P9mDU= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728636779; x=1729241579; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=PONmpVj452UNcuxdCaXQokIwfePg1HbIGVi4eT66zNs=; b=f0xW0/SNnmde5bNEjOvFIINwoH6HKHI0/B756qjDQgnN+vhXoBEtFT9X9dca+yRXYB nacIGwIUwwSZ0Lb9oJAGC8CsjMIwcMLQ0CvOvcV1lNGjP3NKLswuHWD6If+SggfIp4RI McE/E1RdnmqFFY8OtNe3U50x8a3Y8AWx7MtELpzL2bbDY8NFgC2UM3aM0KRaeb/pxFZH RQc14BBYw/sJjgFjgzHSA9MFP2EKgQugZ+bYzIcGjShtVZ7fCkpAYSYxhuQc99rPyid1 6KH30KA/Q01LNxcxcd9ML+85qu3bEIMh2E36EJWWduwdZCpX/k1TxG2hTx9aKAJL/Ax7 r3bA== X-Gm-Message-State: AOJu0YwP2NmosvuwaGFo2P8FMRflCREtBpluvlPGamRzO4jJ+3EiQMi9 M2GpQVxec1LR5uD7au3mVjTAr9k/NG7pWxgrXckQ0hym8aMBZhaDkGWrucr+MWMQw9m0I4vu6pI R X-Google-Smtp-Source: AGHT+IFcXAmr7qYJ0m5aasxdJqAhT3Ebj57sPRb/TvFys5xJg5FDBMrb/TWO2PyR5rR7fRjiGz+tXA== X-Received: by 2002:a17:907:1c21:b0:a99:4dc1:b931 with SMTP id a640c23a62f3a-a99b95fb483mr158946266b.64.1728636778732; Fri, 11 Oct 2024 01:52:58 -0700 (PDT) From: Frediano Ziglio To: xen-devel@lists.xenproject.org Cc: Frediano Ziglio , Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Subject: [PATCH v3 4/5] x86/boot: Use trampoline_phys variable directly from C code Date: Fri, 11 Oct 2024 09:52:43 +0100 Message-Id: <20241011085244.432368-5-frediano.ziglio@cloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241011085244.432368-1-frediano.ziglio@cloud.com> References: <20241011085244.432368-1-frediano.ziglio@cloud.com> MIME-Version: 1.0 No more need to pass from assembly code. Signed-off-by: Frediano Ziglio Reviewed-by: Andrew Cooper --- Changes since v1: - split the 2 variable changes into 2 commits. Changes since v2: - revert commit order; - avoid useless casts. --- xen/arch/x86/boot/head.S | 6 +----- xen/arch/x86/boot/reloc.c | 8 ++++++-- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/xen/arch/x86/boot/head.S b/xen/arch/x86/boot/head.S index 5da7ac138f..dcda91cfda 100644 --- a/xen/arch/x86/boot/head.S +++ b/xen/arch/x86/boot/head.S @@ -510,13 +510,9 @@ trampoline_setup: mov %esi, sym_esi(xen_phys_start) mov %esi, sym_esi(trampoline_xen_phys_start) - /* Get bottom-most low-memory stack address. */ - mov sym_esi(trampoline_phys), %ecx - add $TRAMPOLINE_SPACE,%ecx - /* Save Multiboot / PVH info struct (after relocation) for later use. */ mov %ebx, %edx /* Multiboot / PVH information address. */ - /* reloc(magic/eax, info/edx, trampoline/ecx) using fastcall. */ + /* reloc(magic/eax, info/edx) using fastcall. */ call reloc #ifdef CONFIG_PVH_GUEST diff --git a/xen/arch/x86/boot/reloc.c b/xen/arch/x86/boot/reloc.c index 707d9c5f15..e50e161b27 100644 --- a/xen/arch/x86/boot/reloc.c +++ b/xen/arch/x86/boot/reloc.c @@ -19,6 +19,9 @@ #include #include #include +#include + +#include #include @@ -344,9 +347,10 @@ static multiboot_info_t *mbi2_reloc(uint32_t mbi_in, memctx *ctx) } /* SAF-1-safe */ -void *reloc(uint32_t magic, uint32_t in, uint32_t trampoline) +void *reloc(uint32_t magic, uint32_t in) { - memctx ctx = { trampoline }; + /* Get bottom-most low-memory stack address. */ + memctx ctx = { trampoline_phys + TRAMPOLINE_SPACE }; switch ( magic ) { From patchwork Fri Oct 11 08:52:44 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Frediano Ziglio X-Patchwork-Id: 13832236 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id AE4F5CFD2F0 for ; Fri, 11 Oct 2024 08:53:12 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.816780.1230932 (Exim 4.92) (envelope-from ) id 1szBOR-00035k-Qj; Fri, 11 Oct 2024 08:53:03 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 816780.1230932; Fri, 11 Oct 2024 08:53:03 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1szBOR-00034x-MP; Fri, 11 Oct 2024 08:53:03 +0000 Received: by outflank-mailman (input) for mailman id 816780; Fri, 11 Oct 2024 08:53:02 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1szBOQ-0001pW-2k for xen-devel@lists.xenproject.org; Fri, 11 Oct 2024 08:53:02 +0000 Received: from mail-ej1-x62a.google.com (mail-ej1-x62a.google.com [2a00:1450:4864:20::62a]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id 37ceffee-87ae-11ef-99a2-01e77a169b0f; Fri, 11 Oct 2024 10:53:00 +0200 (CEST) Received: by mail-ej1-x62a.google.com with SMTP id a640c23a62f3a-a99b1f43aceso167644966b.0 for ; Fri, 11 Oct 2024 01:53:00 -0700 (PDT) Received: from fziglio-desktop.. ([185.25.67.249]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-a99a80dc290sm186131566b.155.2024.10.11.01.52.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Oct 2024 01:52:59 -0700 (PDT) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Precedence: list Sender: "Xen-devel" X-Inumbo-ID: 37ceffee-87ae-11ef-99a2-01e77a169b0f DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=cloud.com; s=cloud; t=1728636779; x=1729241579; darn=lists.xenproject.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=/R9IwC5Rg/1YFlZU2XC6OhmnY2lp5++tA2yhEvcFGMk=; b=OLnUT6Yitv2Gtmooe6pGIdG9k9ScqxrHgy6OnIZ0Jn4fMF+UW9SUqeekj2+7C7zysL L0qQlGvFWchbTqabaNWldqDXQMcCZNiPoh7zVMV8ibCNFv1dgh0Z8N8hxmSK1y7nxy+w 5Sr+LwP7Usykym7mJF96gLm+XJ+VgRv23ogF8= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728636779; x=1729241579; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=/R9IwC5Rg/1YFlZU2XC6OhmnY2lp5++tA2yhEvcFGMk=; b=mC9hMl2z6RZdEDCjw4aQS4OI95NStH/MGHzM1QSshnyRWo0g1FGRAKSZp2hqxO+1kM +GEMMkySimaXbFg1dN/Hip0UTOjzCSXKcQkfeS2dXnCoaHbzQOL/xeM+dVBvV9/Ie4Bn OkFLjmT4xbbBQFGbgffxOJJh+WL18euV0rZzXB0ZIc2W781I7GArHVbNFHf+n+tjJbVV O6n0aEylgaJn/5CctbK4a46i78spasG0/zkmSy53CSjeaEh0lyQBuRr3bt1LPNlOxoM2 sIJmbuZYU2uTDs3BzlZlXjr2WAmwchpSl8DjcDdYe1WoopJmoZS/0cj+5ODu4GkLpXjr xwQg== X-Gm-Message-State: AOJu0YyH+NUfLSBlsG2q8cM+ITVqI/yXrVQE+0mv2mAPdWpqoc1w3TBx QecKFJ4QpBvPEMvkZ+7w4CYGQz+c4EE1eXrgPIpC9pa0Q4hSkVIw3ixdTJQLFBaW8UA4qJrdA2S Q X-Google-Smtp-Source: AGHT+IGBOYE4zyCRUvPPmI/UkTNGIfxKjFn2FgdW0kCrdoLIEAb+RPQdUsb4nxpLbmx23vbnvusOqw== X-Received: by 2002:a17:907:3e9f:b0:a8a:8dd3:f135 with SMTP id a640c23a62f3a-a99a10edd5dmr494381266b.14.1728636779566; Fri, 11 Oct 2024 01:52:59 -0700 (PDT) From: Frediano Ziglio To: xen-devel@lists.xenproject.org Cc: Frediano Ziglio , Jan Beulich , Andrew Cooper , =?utf-8?q?Roger_Pau_Monn=C3=A9?= Subject: [PATCH v3 5/5] x86/boot: Clarify comment Date: Fri, 11 Oct 2024 09:52:44 +0100 Message-Id: <20241011085244.432368-6-frediano.ziglio@cloud.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241011085244.432368-1-frediano.ziglio@cloud.com> References: <20241011085244.432368-1-frediano.ziglio@cloud.com> MIME-Version: 1.0 Signed-off-by: Frediano Ziglio --- xen/arch/x86/boot/reloc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xen/arch/x86/boot/reloc.c b/xen/arch/x86/boot/reloc.c index e50e161b27..e725cfb6eb 100644 --- a/xen/arch/x86/boot/reloc.c +++ b/xen/arch/x86/boot/reloc.c @@ -65,7 +65,7 @@ typedef struct memctx { /* * Simple bump allocator. * - * It starts from the base of the trampoline and allocates downwards. + * It starts on top of space reserved for the trampoline and allocates downwards. */ uint32_t ptr; } memctx;