From patchwork Tue Nov 22 16:10:12 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 24463 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:f944:0:0:0:0:0 with SMTP id q4csp2302926wrr; Tue, 22 Nov 2022 08:15:44 -0800 (PST) X-Google-Smtp-Source: AA0mqf4yTEHiadLuxu/feesDL9/vtJdp/S7v/zedrl9V0gavGBJPJXVfmyJfg6kKJ84TL2Z5+FlO X-Received: by 2002:a17:902:b682:b0:188:f8bd:9589 with SMTP id c2-20020a170902b68200b00188f8bd9589mr8117583pls.91.1669133744601; Tue, 22 Nov 2022 08:15:44 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1669133744; cv=none; d=google.com; s=arc-20160816; b=Pm3L7V4gQTzeNGaL/qOtuUN3yz55dOMGrfzn3jG13ld+cZu65zkyZIeuBKXGNZvBZa lmkC8DCukDM0nru9CX092/tUMeWyOccXSMR2VfBmBugwqLkgCHFd4bBa2N4U4qmeHvkw nioo5gqicV9tEKwM91uI8+RnKfgZx3DjNYK7IOXD7mwdiQDdeEY5ZPj1VWwQFO2oPrkf wagw1CptIiuqoAKMo9rnZq46/edQ7gwUB23GWTrL9dfpbzamT0P6sfzKb2M2v45VxCT/ cPQsYoIGaCvrqKI0Ps1FSch57MoxoB0i4AAlDqt50bKIiysCuvKWPxwmIldhsx84PnIA LYqQ== 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=X9OYwjsYNYZd52ICZMe1O+IWrVbrkjdSSqB3aoeg6sc=; b=UATlOjs68hMjT/3APZK/B/wcYOgxT4DdvUDph7TimS0jkNQMQ6mir/WMvLYOHfEPOI 6G0qxLlLa+ZqVGICDZ/dsy+OLV407nMqCzxBtBOhTSYV+gRVEuYQ05ldqZl1xf0i/Ytf YgX9659w6W4Yw0zs9oLSkGICA+71dxPTyK0m9IzQYzFKDSJGgp6DbsW39Eq6wFTg5ZsR zLzEIO8x/6EmcsI2F6uE6XlyF5dGD7gU4SP9ipEyOMgdLYt6uusPDHf0uR26nh+rgm1G VxJH8murQwulTajl6GZSI3ZCi8MEf3atJsSsS/t23c71Zo7dGJDmjeurAYmfmtmUw/i8 3ReA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=hVxTisLD; 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 129-20020a630187000000b00476c6e96225si13865277pgb.539.2022.11.22.08.15.28; Tue, 22 Nov 2022 08:15:44 -0800 (PST) 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=hVxTisLD; 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 S234278AbiKVQLy (ORCPT + 99 others); Tue, 22 Nov 2022 11:11:54 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232132AbiKVQLT (ORCPT ); Tue, 22 Nov 2022 11:11:19 -0500 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 15F2973421; Tue, 22 Nov 2022 08:11:02 -0800 (PST) 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 ams.source.kernel.org (Postfix) with ESMTPS id C70C0B81C10; Tue, 22 Nov 2022 16:11:00 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B4559C433D7; Tue, 22 Nov 2022 16:10:57 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1669133459; bh=ReDXv/q3k9hMwnrrtZAWhC5ghMLwcJr6hIjqxuAEllw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=hVxTisLDPi7J+oQOfFOl1fJpuNdgrmJW8coJidIe/CYMFZZcTQbWQ/wT4GY+a+eLo yOdMlFjLDpziqPyztfgWOqy7U4CSTZBgvD6w6TIRvDaZAePZLyDW5MKIUNVnfiJ9kG x9YZnLWgL+4E6ILgsoeHep4Sdi5kbdOzwq83D36GVm7pwpLvOtFNnECFu7ryXv2Qq6 Lg8myt7Mx0yFuqy09b6a/n1Xi6OdYfaAgIu3fp5/nkyMwIQpMr4m69Tj/PiB3+Is3q P2PtJ/gsrd8Y+3F1hX9PzhHOzv16koy/uF4QbImqVhtlZa9unIqTs0cRTDqWoaBHjk JzwblZLWQWkuw== From: Ard Biesheuvel To: linux-efi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Ard Biesheuvel , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , Michael Roth Subject: [PATCH v3 12/17] x86/compressed: move startup32_load_idt() out of head_64.S Date: Tue, 22 Nov 2022 17:10:12 +0100 Message-Id: <20221122161017.2426828-13-ardb@kernel.org> X-Mailer: git-send-email 2.35.1 In-Reply-To: <20221122161017.2426828-1-ardb@kernel.org> References: <20221122161017.2426828-1-ardb@kernel.org> MIME-Version: 1.0 X-Developer-Signature: v=1; a=openpgp-sha256; l=4967; i=ardb@kernel.org; h=from:subject; bh=ReDXv/q3k9hMwnrrtZAWhC5ghMLwcJr6hIjqxuAEllw=; b=owEB7QES/pANAwAKAcNPIjmS2Y8kAcsmYgBjfPRgzwGVx/T1BBAR2+PJz9BwCwj6JuS5em6yTyOg pxvocYGJAbMEAAEKAB0WIQT72WJ8QGnJQhU3VynDTyI5ktmPJAUCY3z0YAAKCRDDTyI5ktmPJNw4C/ 9lFituVzfi6BkQa27qIpp8Newy0/YneL6tT8/bLqyrVdIM3vdLP5KcIJ7ctN0zS6DXQyf0JVCj2zKm pVSnVCjviTU7PouBCLtGlRRSFPoftPlFpiSVGFTmm6H/H0u8sCNSIO38hUSJCr5X7JUSJSMpwaif5K c0xrpoQk9oX8PaHxpqOZt57lAtt178he8jE3U9iDwA7tWtbZ85Wtr4EFGwykVEqB6ZxJOsZNTsScos +M3yU97f1ph+lm32dHQSw2IDaNQ44R8EiV2Dc+WX70Y5h/eXYNu4M4xG4yYASV0eM8MGRRWC1b4pAs zPOsEhylMW8ZJO3lkCVHg7Sos8Zvw3BHIe2gx2Y7KwozUzhTBF5iqq/WGtvSG/8uCJDm7ecGyvuzuD AIdaDaM5FsVLqvxtD4fEANHtp1YcC+34uW54Ohp3eywjof2GRB9q9BOizvHfwiR/amqiaA1Z122k8m fbQgDOfU4WIG2ee9D0FRNf6qq1HQ0bMd5oNAPfQIVmKGQ= X-Developer-Key: i=ardb@kernel.org; a=openpgp; fpr=F43D03328115A198C90016883D200E9CA6329909 X-Spam-Status: No, score=-7.1 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 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?1750213585355147208?= X-GMAIL-MSGID: =?utf-8?q?1750213585355147208?= Now that startup32_load_idt() has been refactored into an ordinary callable function, move it into mem-encrypt.S where it belongs. Signed-off-by: Ard Biesheuvel --- arch/x86/boot/compressed/head_64.S | 72 -------------------- arch/x86/boot/compressed/mem_encrypt.S | 72 +++++++++++++++++++- 2 files changed, 71 insertions(+), 73 deletions(-) diff --git a/arch/x86/boot/compressed/head_64.S b/arch/x86/boot/compressed/head_64.S index 2d42852d5b828209..97b2167f128cbefe 100644 --- a/arch/x86/boot/compressed/head_64.S +++ b/arch/x86/boot/compressed/head_64.S @@ -715,78 +715,6 @@ SYM_DATA_START(boot_idt) .endr SYM_DATA_END_LABEL(boot_idt, SYM_L_GLOBAL, boot_idt_end) -#ifdef CONFIG_AMD_MEM_ENCRYPT -SYM_DATA_START(boot32_idt_desc) - .word boot32_idt_end - boot32_idt - 1 - .long 0 -SYM_DATA_END(boot32_idt_desc) - .balign 8 -SYM_DATA_START(boot32_idt) - .rept 32 - .quad 0 - .endr -SYM_DATA_END_LABEL(boot32_idt, SYM_L_GLOBAL, boot32_idt_end) - - .text - .code32 -/* - * Write an IDT entry into boot32_idt - * - * Parameters: - * - * %eax: Handler address - * %edx: Vector number - * %ecx: IDT address - */ -SYM_FUNC_START_LOCAL(startup32_set_idt_entry) - /* IDT entry address to %ecx */ - leal (%ecx, %edx, 8), %ecx - - /* Build IDT entry, lower 4 bytes */ - movl %eax, %edx - andl $0x0000ffff, %edx # Target code segment offset [15:0] - orl $(__KERNEL32_CS << 16), %edx # Target code segment selector - - /* Store lower 4 bytes to IDT */ - movl %edx, (%ecx) - - /* Build IDT entry, upper 4 bytes */ - movl %eax, %edx - andl $0xffff0000, %edx # Target code segment offset [31:16] - orl $0x00008e00, %edx # Present, Type 32-bit Interrupt Gate - - /* Store upper 4 bytes to IDT */ - movl %edx, 4(%ecx) - - RET -SYM_FUNC_END(startup32_set_idt_entry) - -SYM_FUNC_START(startup32_load_idt) - push %ebp - push %ebx - - call 1f -1: pop %ebp - - leal (boot32_idt - 1b)(%ebp), %ebx - - /* #VC handler */ - leal (startup32_vc_handler - 1b)(%ebp), %eax - movl $X86_TRAP_VC, %edx - movl %ebx, %ecx - call startup32_set_idt_entry - - /* Load IDT */ - leal (boot32_idt_desc - 1b)(%ebp), %ecx - movl %ebx, 2(%ecx) - lidt (%ecx) - - pop %ebx - pop %ebp - RET -SYM_FUNC_END(startup32_load_idt) -#endif - /* * Check for the correct C-bit position when the startup_32 boot-path is used. * diff --git a/arch/x86/boot/compressed/mem_encrypt.S b/arch/x86/boot/compressed/mem_encrypt.S index a73e4d783cae20b6..6747e5e4c696637c 100644 --- a/arch/x86/boot/compressed/mem_encrypt.S +++ b/arch/x86/boot/compressed/mem_encrypt.S @@ -12,6 +12,8 @@ #include #include #include +#include +#include .text .code32 @@ -98,7 +100,7 @@ SYM_CODE_START_LOCAL(sev_es_req_cpuid) jmp 1b SYM_CODE_END(sev_es_req_cpuid) -SYM_CODE_START(startup32_vc_handler) +SYM_CODE_START_LOCAL(startup32_vc_handler) pushl %eax pushl %ebx pushl %ecx @@ -184,6 +186,63 @@ SYM_CODE_START(startup32_vc_handler) jmp .Lfail SYM_CODE_END(startup32_vc_handler) +/* + * Write an IDT entry into boot32_idt + * + * Parameters: + * + * %eax: Handler address + * %edx: Vector number + * %ecx: IDT address + */ +SYM_FUNC_START_LOCAL(startup32_set_idt_entry) + /* IDT entry address to %ecx */ + leal (%ecx, %edx, 8), %ecx + + /* Build IDT entry, lower 4 bytes */ + movl %eax, %edx + andl $0x0000ffff, %edx # Target code segment offset [15:0] + orl $(__KERNEL32_CS << 16), %edx # Target code segment selector + + /* Store lower 4 bytes to IDT */ + movl %edx, (%ecx) + + /* Build IDT entry, upper 4 bytes */ + movl %eax, %edx + andl $0xffff0000, %edx # Target code segment offset [31:16] + orl $0x00008e00, %edx # Present, Type 32-bit Interrupt Gate + + /* Store upper 4 bytes to IDT */ + movl %edx, 4(%ecx) + + RET +SYM_FUNC_END(startup32_set_idt_entry) + +SYM_FUNC_START(startup32_load_idt) + push %ebp + push %ebx + + call 1f +1: pop %ebp + + leal (boot32_idt - 1b)(%ebp), %ebx + + /* #VC handler */ + leal (startup32_vc_handler - 1b)(%ebp), %eax + movl $X86_TRAP_VC, %edx + movl %ebx, %ecx + call startup32_set_idt_entry + + /* Load IDT */ + leal (boot32_idt_desc - 1b)(%ebp), %ecx + movl %ebx, 2(%ecx) + lidt (%ecx) + + pop %ebx + pop %ebp + RET +SYM_FUNC_END(startup32_load_idt) + .code64 #include "../../kernel/sev_verify_cbit.S" @@ -195,4 +254,15 @@ SYM_CODE_END(startup32_vc_handler) SYM_DATA(sme_me_mask, .quad 0) SYM_DATA(sev_status, .quad 0) SYM_DATA(sev_check_data, .quad 0) + +SYM_DATA_START_LOCAL(boot32_idt) + .rept 32 + .quad 0 + .endr +SYM_DATA_END(boot32_idt) + +SYM_DATA_START_LOCAL(boot32_idt_desc) + .word . - boot32_idt - 1 + .long 0 +SYM_DATA_END(boot32_idt_desc) #endif