From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DFE98C433E6 for ; Mon, 25 Jan 2021 16:38:06 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B2426229C4 for ; Mon, 25 Jan 2021 16:38:06 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730815AbhAYQht (ORCPT ); Mon, 25 Jan 2021 11:37:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44026 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730655AbhAYQgA (ORCPT ); Mon, 25 Jan 2021 11:36:00 -0500 Received: from mail-pg1-x52b.google.com (mail-pg1-x52b.google.com [IPv6:2607:f8b0:4864:20::52b]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id ECDF2C06174A for ; Mon, 25 Jan 2021 08:35:18 -0800 (PST) Received: by mail-pg1-x52b.google.com with SMTP id q7so9259538pgm.5 for ; Mon, 25 Jan 2021 08:35:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=izjjW/9zccoyWG/BVlEKLo7XojOKOYywCCSsPOjKEpo=; b=bSzjmibwJNIQxPxfx8Mf+GNY0FUVyQlnh4/gOY9DceK+6GAHxT8lLpNUqOjE9QdM9I 2bG3Efwy6liSoaLXLg+YcdMwuYR7bicgBgadxqVcV7VL+ykKpao2Boj6dpCDMTMOblbm djLYRQqv9o1E3fODUocyNQEPI9ZUpY5VD7uY53TT2jMuvgAMdKnwUq2cS8llnNiS1uO/ 9I0ARreDrevu/FK/2hwiCgC/Py+BP/flZtNA/xTWCD2ufNG+opCtbzGuDj01S86b8Ngr la0XgxK2JTDkXS1CHG1jZ5FV3/8SEGRT4DzmYEUlCVp8khzUkL8Fa09J+fLfilabAm2r TWgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=izjjW/9zccoyWG/BVlEKLo7XojOKOYywCCSsPOjKEpo=; b=JvaCDxrsAZH0nJ/tgpTCnym8juysl1OwvX82+d85RO8t4n/i+h0rPk35Z73nUOmw1C 1BlauQJN70gwIVm6fcYw+BbCYKzBA78ZRyfpPgXiA+ZjjKLzW5MYlId7EyGAThf7pxqH VIXdY8Jo+qdH8sMO0qJJJDJGVtld3h2ONaA9KANuADRNUV9fcVSGC+HoUnT2E4388Tl/ qYteBg8npRJ7WZnhzKr/DtiC65S69J2r6H9XuJHdJIAEubpCS78kHSHI5iUUPAA2VZRT OSRaLxfGsXHFCUtmaLTueD2nSJ5sRlut9FSeL+jFSZnJlOMXoUmgox+tIcJCnLwUelwb RrDg== X-Gm-Message-State: AOAM532Le54Eo+NVyQlVGVh0b0DmTE2XBcbD5nrV8y9IlMBFNZoW23pi 0uUYD5eiigsMZXuAHXVxdM84NXs06lFsSQ== X-Google-Smtp-Source: ABdhPJy7jZWWYvVDd0nwA+v7B/JaReDjfKm1w5oovf9ottFahg2Xe0P0Yx5tCC/Hc+crEgLkYPYz3Q== X-Received: by 2002:aa7:8b0f:0:b029:1c0:e782:ba29 with SMTP id f15-20020aa78b0f0000b02901c0e782ba29mr1161353pfd.37.1611592518357; Mon, 25 Jan 2021 08:35:18 -0800 (PST) Received: from localhost ([47.251.4.198]) by smtp.gmail.com with ESMTPSA id a4sm17293260pfg.41.2021.01.25.08.35.17 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 25 Jan 2021 08:35:17 -0800 (PST) From: Lai Jiangshan To: linux-kernel@vger.kernel.org Cc: Lai Jiangshan , Andy Lutomirski , Thomas Gleixner , Ingo Molnar , Borislav Petkov , x86@kernel.org, "H. Peter Anvin" , Dave Hansen , Peter Zijlstra , Al Viro , Vincenzo Frascino , Joerg Roedel , Ricardo Neri , Reinette Chatre , Andrew Morton , Gabriel Krisman Bertazi , Kees Cook , Frederic Weisbecker , Jens Axboe , Arvind Sankar , Brian Gerst , Ard Biesheuvel , Andi Kleen , Mike Rapoport , Mike Hommey , Mark Gross , Fenghua Yu , Tony Luck , Anthony Steinhauser , Jay Lang , "Chang S. Bae" Subject: [PATCH V2 4/6] x86_32/sysenter: restore %fs before switching stack Date: Tue, 26 Jan 2021 01:34:32 +0800 Message-Id: <20210125173444.22696-5-jiangshanlai@gmail.com> X-Mailer: git-send-email 2.19.1.6.gb485710b In-Reply-To: <20210125173444.22696-1-jiangshanlai@gmail.com> References: <20210125173444.22696-1-jiangshanlai@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Lai Jiangshan Prepare for using percpu and removing TSS_entry2task_stack Signed-off-by: Lai Jiangshan --- arch/x86/entry/entry_32.S | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S index 4513702ba45d..a8d2640394f9 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -279,11 +279,13 @@ .Lfinished_frame_\@: .endm -.macro SAVE_ALL pt_regs_ax=%eax switch_stacks=0 skip_gs=0 unwind_espfix=0 +.macro SAVE_ALL pt_regs_ax=%eax switch_stacks=0 skip_gs=0 skip_fs=0 unwind_espfix=0 cld .if \skip_gs == 0 PUSH_GS .endif + +.if \skip_fs == 0 pushl %fs pushl %eax @@ -293,6 +295,7 @@ UNWIND_ESPFIX_STACK .endif popl %eax +.endif FIXUP_FRAME pushl %es @@ -906,18 +909,27 @@ SYM_FUNC_START(entry_SYSENTER_32) BUG_IF_WRONG_CR3 no_user_check=1 SWITCH_TO_KERNEL_CR3 scratch_reg=%eax + /* Restore kernel %fs, so that we can use PERCPU */ + pushl %fs + movl $(__KERNEL_PERCPU), %eax + movl %eax, %fs + /* Switch to task stack */ movl %esp, %eax - movl (2*4+TSS_entry2task_stack)(%esp), %esp + movl (3*4+TSS_entry2task_stack)(%esp), %esp .Lsysenter_past_esp: pushl $__USER_DS /* pt_regs->ss */ pushl $0 /* pt_regs->sp (placeholder) */ - pushl 4(%eax) /* pt_regs->flags (except IF = 0) */ + pushl 8(%eax) /* pt_regs->flags (except IF = 0) */ pushl $__USER_CS /* pt_regs->cs */ pushl $0 /* pt_regs->ip = 0 (placeholder) */ - pushl (%eax) /* pt_regs->orig_ax */ - SAVE_ALL pt_regs_ax=$-ENOSYS /* save rest, stack already switched */ + pushl 4(%eax) /* pt_regs->orig_ax */ + PUSH_GS /* pt_regs->gs */ + pushl (%eax) /* pt_regs->fs */ + /* save rest, stack and %fs already switched */ + SAVE_ALL pt_regs_ax=$-ENOSYS skip_gs=1 skip_fs=1 + SET_KERNEL_GS %edx /* * SYSENTER doesn't filter flags, so we need to clear NT, AC -- 2.19.1.6.gb485710b