From patchwork Fri Jun 2 10:13:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 102446 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp924888vqr; Fri, 2 Jun 2023 03:29:24 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ6L2CjAkZAX4IGRaefIcFw3UfDJAxZkHBqBUW2wnxPuTdDgM1QTsdFnWKbzdT0SSPjwcPzp X-Received: by 2002:a05:6358:2812:b0:123:5664:e493 with SMTP id k18-20020a056358281200b001235664e493mr10197116rwb.27.1685701764222; Fri, 02 Jun 2023 03:29:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685701764; cv=none; d=google.com; s=arc-20160816; b=JaPzOmoCjmHhUuZl28te9xaPgmbFtytV9T5g9IPLgEYGpyP9rQzbzOuIzoCb558zVo O7gendTN6YO+m4WbHT87KRsd2+utT+VDmJhUNIHk4eCfi76AV/jwbOuEfT7xLLP84IKe iouV4hdtxYjMIRJf7nMvu8+afuyxrOgztxIBwXFQw5Sg+IstoPNSNHqTSYBHAdogcfZp x+yObrgAjnlwVdIa1HXc3jqsxSsYjDtzNs8nlOEuUWb8kivI5v4xvKrXH76iE+Aqncoj VAv4I4tpEdzTzKHSK5PMbABaLQ/SFbQu0s4fWMhsZHRnRHFNNtHgcnY2/qAn9AHJfvSy qUwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=Mn7RXE41n21od5stVTbucM8IPehZAKJb7S+xRWs313U=; b=a48dGBRwlg+MKJhVDGCdBCkqGOp5hnjACbqWWW++4wb7m+kAeZoSW6uyU8zI35GXBO AqAOLliQpXWhNEJXyFUgZXYJxDDI1lK1IbknwX3zxQbo78T9znjE0XzaI7tS9o1MvKp8 XGl5zIRarZMGGUjoBb5TNG3N6GWxYLYkNLs4lKSL3Kac3pomMjNvni7yCKoLMrec/0C7 kejsf1OwtoGYq9MKtBhnDDxHURuBbkOp6j/sSc7LlG8zAB0ao8fLMxpuONEY9fBTkqAs CeCixEXumYItsDN9QT5dScpkv0ZAmSifxoh7gsK8b5dheON6ydLOYFAmDNtN6ym4uIjc NWpA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HJXId3a8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id my14-20020a17090b4c8e00b0025082583ae6si857169pjb.187.2023.06.02.03.29.09; Fri, 02 Jun 2023 03:29:24 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=HJXId3a8; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235451AbjFBKYu (ORCPT + 99 others); Fri, 2 Jun 2023 06:24:50 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46510 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235389AbjFBKXu (ORCPT ); Fri, 2 Jun 2023 06:23:50 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id BE4FA10F1; Fri, 2 Jun 2023 03:23:22 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5B5A664E63; Fri, 2 Jun 2023 10:23:22 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D3C10C4339C; Fri, 2 Jun 2023 10:23:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1685701401; bh=U1WWTB8Ed6jF5PagzQzhXVR5oyHC5bjwVmmRHfA2IP0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=HJXId3a8i18aoMDC6f7F7nH7CSVy8FgoZIaU6lLBaNsLeOpllBOWqUOmwRwz0Ok+q vg+ynEoLQlKVXG5DTE4vJYpBgYoVBbr+ZG8NyT+9NOV7FwJFbdqKVBWF+XEoTYADwJ HIq4C3KDpQV+jSOv61iGLifJ+FvXTCs2KPY8vNyus4h0ZHXkX3dvdW9J7crnUScUw6 QyKYB507rOC65FsX4ZIWPpGUbFRGQSc/VkdOhTd/91IDGrflqp5oJZDxANpJigC4jB PKwGjNSfKZBU3qw7XsEunHVzQ5PPgX44aBoaqFAhFyZpAPsBcCigyU0mFXQNcUbBxe +bl5DpMPH/A3w== From: Ard Biesheuvel To: linux-efi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Ard Biesheuvel , Evgeniy Baskov , Borislav Petkov , Andy Lutomirski , Dave Hansen , Ingo Molnar , Peter Zijlstra , Thomas Gleixner , Alexey Khoroshilov , Peter Jones , Gerd Hoffmann , Dave Young , Mario Limonciello , Kees Cook , Tom Lendacky , "Kirill A . Shutemov" , Linus Torvalds , Joerg Roedel Subject: [PATCH v4 17/21] x86/decompressor: Factor out kernel decompression and relocation Date: Fri, 2 Jun 2023 12:13:09 +0200 Message-Id: <20230602101313.3557775-18-ardb@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230602101313.3557775-1-ardb@kernel.org> References: <20230602101313.3557775-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=2968; i=ardb@kernel.org; h=from:subject; bh=U1WWTB8Ed6jF5PagzQzhXVR5oyHC5bjwVmmRHfA2IP0=; b=owGbwMvMwCFmkMcZplerG8N4Wi2JIaXywBama5deh/9pYD/+7o20UPilU0cYGPcu8vpRorXs7 ryU+4VfO0pZGMQ4GGTFFFkEZv99t/P0RKla51myMHNYmUCGMHBxCsBEVH8yMuz8u3q9ROlEpuip d573LL8bY3g3rqxZZPlM9U5VMfZrskmMDG8Cci5/Z7aIk2c/mS94a/8Gk/623aE7LVQ3ffhxXWK RNi8A X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767586413490898434?= X-GMAIL-MSGID: =?utf-8?q?1767586413490898434?= Factor out the decompressor sequence that invokes the decompressor, parses the ELF and applies the relocations so that it can be called directly from the EFI stub. Signed-off-by: Ard Biesheuvel --- arch/x86/boot/compressed/misc.c | 28 ++++++++++++++++---- arch/x86/include/asm/boot.h | 8 ++++++ 2 files changed, 31 insertions(+), 5 deletions(-) diff --git a/arch/x86/boot/compressed/misc.c b/arch/x86/boot/compressed/misc.c index ad7a2297c9e186df..831485a66300319e 100644 --- a/arch/x86/boot/compressed/misc.c +++ b/arch/x86/boot/compressed/misc.c @@ -330,11 +330,33 @@ static size_t parse_elf(void *output) return ehdr.e_entry - LOAD_PHYSICAL_ADDR; } +const unsigned long kernel_total_size = VO__end - VO__text; + static u8 boot_heap[BOOT_HEAP_SIZE] __aligned(4); extern unsigned char input_data[]; extern unsigned int input_len, output_len; +unsigned long decompress_kernel(unsigned char *outbuf, unsigned long virt_addr, + void (*error)(char *x)) +{ + unsigned long entry; + + if (!free_mem_ptr) { + free_mem_ptr = (unsigned long)boot_heap; + free_mem_end_ptr = (unsigned long)boot_heap + sizeof(boot_heap); + } + + if (__decompress(input_data, input_len, NULL, NULL, outbuf, output_len, + NULL, error) < 0) + return ULONG_MAX; + + entry = parse_elf(outbuf); + handle_relocations(outbuf, output_len, virt_addr); + + return entry; +} + /* * The compressed kernel image (ZO), has been moved so that its position * is against the end of the buffer used to hold the uncompressed kernel @@ -354,7 +376,6 @@ extern unsigned int input_len, output_len; */ asmlinkage __visible void *extract_kernel(void *rmode, unsigned char *output) { - const unsigned long kernel_total_size = VO__end - VO__text; unsigned long virt_addr = LOAD_PHYSICAL_ADDR; memptr heap = (memptr)boot_heap; unsigned long needed_size; @@ -464,10 +485,7 @@ asmlinkage __visible void *extract_kernel(void *rmode, unsigned char *output) accept_memory(__pa(output), __pa(output) + needed_size); } - __decompress(input_data, input_len, NULL, NULL, output, output_len, - NULL, error); - entry_offset = parse_elf(output); - handle_relocations(output, output_len, virt_addr); + entry_offset = decompress_kernel(output, virt_addr, error); debug_putstr("done.\nBooting the kernel (entry_offset: 0x"); debug_puthex(entry_offset); diff --git a/arch/x86/include/asm/boot.h b/arch/x86/include/asm/boot.h index 9191280d9ea3160d..4ae14339cb8cc72d 100644 --- a/arch/x86/include/asm/boot.h +++ b/arch/x86/include/asm/boot.h @@ -62,4 +62,12 @@ # define BOOT_STACK_SIZE 0x1000 #endif +#ifndef __ASSEMBLY__ +extern unsigned int output_len; +extern const unsigned long kernel_total_size; + +unsigned long decompress_kernel(unsigned char *outbuf, unsigned long virt_addr, + void (*error)(char *x)); +#endif + #endif /* _ASM_X86_BOOT_H */