From patchwork Wed Jul 11 11:29:17 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 10519451 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 17E5F603D7 for ; Wed, 11 Jul 2018 11:30:53 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 17B0026861 for ; Wed, 11 Jul 2018 11:30:53 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0933F28B76; Wed, 11 Jul 2018 11:30:53 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 47B5328837 for ; Wed, 11 Jul 2018 11:30:52 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 00F016B027A; Wed, 11 Jul 2018 07:30:12 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id F25EC6B027B; Wed, 11 Jul 2018 07:30:11 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id DEC416B027D; Wed, 11 Jul 2018 07:30:11 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-ed1-f69.google.com (mail-ed1-f69.google.com [209.85.208.69]) by kanga.kvack.org (Postfix) with ESMTP id 7EB036B027A for ; Wed, 11 Jul 2018 07:30:11 -0400 (EDT) Received: by mail-ed1-f69.google.com with SMTP id c20-v6so9861752eds.21 for ; Wed, 11 Jul 2018 04:30:11 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:from:to:cc:subject:date :message-id:in-reply-to:references; bh=b6h6CGJ6/fru66hI4g1VGNxKCq9jO06ac07su+LJgn4=; b=FkE3c6v3rukGsnIQIeX9scrzN5bQ4AKFX1+4S0KBi3HF9uRDYY0IkCUMFNnvWzRe4X c9e/+7OcPuza7OacL5NoPdlvd1EN2C3u3AkgOBFe/Unbl8hn1Z7iraZ/TGbOw9fyEKpL XPScPTBSQFzWfti9p+jU/gcxDQRMAbj2nX9IQEXB3JJpFJnCCE5HxVFWA4e9brIzScpM hOmpRHwL9QJK/XIR4r2iDAy0ClgaoQQu6hFvolp1Bsf0ZS71wubdRZ3CvZmr7TMLdtdF COVE0FTRFHfN7JdlDVoHkQpUHDjFFQyoq7iEcxvWQUsuY7GtsqWjohRo3Ul5KP+bfatS TAPg== X-Gm-Message-State: APt69E27ZiwA/u9cy7tRZEqnB/M0n6ksFy1YRhVqxL+EizbkaYVUgjUU W3tP/mQ8XC+GkQ4A/7kJBfLMdTzC6qIaCJa+4mJSxwb1yfki0oIT4ht3/vLfie+iV7cQi2paFOy Ze/yE7QQQeCqb55HP/yKD+irBhw+8cf+H+XXYbMXKiNpZcr0eqVrf1PhZ4zQAwhk9zQ== X-Received: by 2002:a50:de03:: with SMTP id z3-v6mr31197237edk.245.1531308611064; Wed, 11 Jul 2018 04:30:11 -0700 (PDT) X-Google-Smtp-Source: AAOMgpdbQjThhQNb9DcC0gpAUTJXqMjkXtkcl2CLKlkbkFNYHcZr/wiQAP64rc1+sWGtF2gsgdR8 X-Received: by 2002:a50:de03:: with SMTP id z3-v6mr31197179edk.245.1531308610211; Wed, 11 Jul 2018 04:30:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531308610; cv=none; d=google.com; s=arc-20160816; b=YEGZay6BndXwyNM0KNlStfiE1VZu319+0kzSPHapv/G4rqbMqqHAVEKbD2+HO6vVKC i5tWifRF/Sl8CkegtXfAvB+Zbim5PuVbUNt9JqSR94mRM9Bg9z52SCVSQU7Qh7ERPqHW cnhMTbQ3l8o6OiH9Wh09JjInHeftBp5+BxT27WE5hOC34tJFw3KtrJwc2hdM7/DMiv5r uYTOBlBeBv5y31+0RQqbHZgxoYpbKlBkIoyho/rFng9ClVqQgjuN4q+bRUAxlAsk7JyG OQOjWt3Q2ty9hPzqSKaeZe3X4T/BKkv49UW1/iVWmqIijYq58v9bDX8pl5UVEzZHugKp BR7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature:arc-authentication-results; bh=b6h6CGJ6/fru66hI4g1VGNxKCq9jO06ac07su+LJgn4=; b=vALz8QGLvR8/6S70WDeVMixX/8+La6EjzBZbCUSn/y7yCeL9Hdm6ExQmep9pCF0wh2 s98F2gci2+QZUjeQRMvMOdAgYuZg1gtI9o+uuskBGC1GjGQUbgxxu5kmtcPA8/o4MXic IEt0JQJ3WDPqH83r07x8iNbF3bTjjWWEeM0JWbtU6czER2jPKxtBbyooBnkJ6sBugS8Q 8yREnvYFDHMfM+8kl5qmBHu7FeDvVQkn2vLrgp/Y0++rV8TUBz9n9xKfFFDbQnCl+s9y qRvNQEe4BqTahwXDXf+4lurclhQw5xi3jiIOzms/SYBcV5wyfXPPmFQD6hEJ1LOdFGZ/ PB9Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@8bytes.org header.s=mail-1 header.b=aW3Vlc7O; spf=pass (google.com: domain of joro@8bytes.org designates 2a01:238:4383:600:38bc:a715:4b6d:a889 as permitted sender) smtp.mailfrom=joro@8bytes.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=8bytes.org Received: from theia.8bytes.org (8bytes.org. [2a01:238:4383:600:38bc:a715:4b6d:a889]) by mx.google.com with ESMTPS id s8-v6si1959034edi.258.2018.07.11.04.30.10 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 11 Jul 2018 04:30:10 -0700 (PDT) Received-SPF: pass (google.com: domain of joro@8bytes.org designates 2a01:238:4383:600:38bc:a715:4b6d:a889 as permitted sender) client-ip=2a01:238:4383:600:38bc:a715:4b6d:a889; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@8bytes.org header.s=mail-1 header.b=aW3Vlc7O; spf=pass (google.com: domain of joro@8bytes.org designates 2a01:238:4383:600:38bc:a715:4b6d:a889 as permitted sender) smtp.mailfrom=joro@8bytes.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=8bytes.org Received: by theia.8bytes.org (Postfix, from userid 1000) id 700188BE; Wed, 11 Jul 2018 13:30:01 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=8bytes.org; s=mail-1; t=1531308602; bh=n3+7XfnmMMT/GDfMbmx6Bsj6M5vPUt9hNhxRV/Xb5t0=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=aW3Vlc7On1NcpP8IOj1gbRcfzgT1RyQiKKVxkKTbJg7RyTOtmLgILsQS7i3cBYL83 zceAOg/3jE3YHMXOKexGqESzItkBh1RCVvP9iW2iq18CnFsQ1oAhZVsjRA/P2NK1Qv FDxacXYtbZ1ctNfEcF8ikTJJG0u6KxMUc8BBaoon0F7eYqipWUIr7XHEIfpEGn3D6K jleH52tRJFpPsEMutA6RYIsBPaFRUuLgRV/ACHHMkBR6ksyvqEgbT/NuO8qNNoElNi Zvghl5D10HWnLs7ZCuaSyyU1l+0t2ikd5jfX3GJA3V7BtspoDsfuhTsgWPUTBJkvMv jH7Wa9uwOsSrg== From: Joerg Roedel To: Thomas Gleixner , Ingo Molnar , "H . Peter Anvin" Cc: x86@kernel.org, linux-kernel@vger.kernel.org, linux-mm@kvack.org, Linus Torvalds , Andy Lutomirski , Dave Hansen , Josh Poimboeuf , Juergen Gross , Peter Zijlstra , Borislav Petkov , Jiri Kosina , Boris Ostrovsky , Brian Gerst , David Laight , Denys Vlasenko , Eduardo Valentin , Greg KH , Will Deacon , aliguori@amazon.com, daniel.gruss@iaik.tugraz.at, hughd@google.com, keescook@google.com, Andrea Arcangeli , Waiman Long , Pavel Machek , "David H . Gutteridge" , jroedel@suse.de, joro@8bytes.org Subject: [PATCH 10/39] x86/entry/32: Handle Entry from Kernel-Mode on Entry-Stack Date: Wed, 11 Jul 2018 13:29:17 +0200 Message-Id: <1531308586-29340-11-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531308586-29340-1-git-send-email-joro@8bytes.org> References: <1531308586-29340-1-git-send-email-joro@8bytes.org> X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP From: Joerg Roedel It can happen that we enter the kernel from kernel-mode and on the entry-stack. The most common way this happens is when we get an exception while loading the user-space segment registers on the kernel-to-userspace exit path. The segment loading needs to be done after the entry-stack switch, because the stack-switch needs kernel %fs for per_cpu access. When this happens, we need to make sure that we leave the kernel with the entry-stack again, so that the interrupted code-path runs on the right stack when switching to the user-cr3. We do this by detecting this condition on kernel-entry by checking CS.RPL and %esp, and if it happens, we copy over the complete content of the entry stack to the task-stack. This needs to be done because once we enter the exception handlers we might be scheduled out or even migrated to a different CPU, so that we can't rely on the entry-stack contents. We also leave a marker in the stack-frame to detect this condition on the exit path. On the exit path the copy is reversed, we copy all of the remaining task-stack back to the entry-stack and switch to it. Signed-off-by: Joerg Roedel --- arch/x86/entry/entry_32.S | 116 +++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 115 insertions(+), 1 deletion(-) diff --git a/arch/x86/entry/entry_32.S b/arch/x86/entry/entry_32.S index 3d1a114..b3af76e 100644 --- a/arch/x86/entry/entry_32.S +++ b/arch/x86/entry/entry_32.S @@ -299,6 +299,9 @@ * copied there. So allocate the stack-frame on the task-stack and * switch to it before we do any copying. */ + +#define CS_FROM_ENTRY_STACK (1 << 31) + .macro SWITCH_TO_KERNEL_STACK ALTERNATIVE "", "jmp .Lend_\@", X86_FEATURE_XENPV @@ -320,6 +323,16 @@ /* Load top of task-stack into %edi */ movl TSS_entry_stack(%edi), %edi + /* + * Clear upper bits of the CS slot in pt_regs in case hardware + * didn't clear it for us + */ + andl $(0x0000ffff), PT_CS(%esp) + + /* Special case - entry from kernel mode via entry stack */ + testl $SEGMENT_RPL_MASK, PT_CS(%esp) + jz .Lentry_from_kernel_\@ + /* Bytes to copy */ movl $PTREGS_SIZE, %ecx @@ -333,8 +346,8 @@ */ addl $(4 * 4), %ecx -.Lcopy_pt_regs_\@: #endif +.Lcopy_pt_regs_\@: /* Allocate frame on task-stack */ subl %ecx, %edi @@ -350,6 +363,56 @@ cld rep movsl + jmp .Lend_\@ + +.Lentry_from_kernel_\@: + + /* + * This handles the case when we enter the kernel from + * kernel-mode and %esp points to the entry-stack. When this + * happens we need to switch to the task-stack to run C code, + * but switch back to the entry-stack again when we approach + * iret and return to the interrupted code-path. This usually + * happens when we hit an exception while restoring user-space + * segment registers on the way back to user-space. + * + * When we switch to the task-stack here, we can't trust the + * contents of the entry-stack anymore, as the exception handler + * might be scheduled out or moved to another CPU. Therefore we + * copy the complete entry-stack to the task-stack and set a + * marker in the iret-frame (bit 31 of the CS dword) to detect + * what we've done on the iret path. + * + * On the iret path we copy everything back and switch to the + * entry-stack, so that the interrupted kernel code-path + * continues on the same stack it was interrupted with. + * + * Be aware that an NMI can happen anytime in this code. + * + * %esi: Entry-Stack pointer (same as %esp) + * %edi: Top of the task stack + */ + + /* Calculate number of bytes on the entry stack in %ecx */ + movl %esi, %ecx + + /* %ecx to the top of entry-stack */ + andl $(MASK_entry_stack), %ecx + addl $(SIZEOF_entry_stack), %ecx + + /* Number of bytes on the entry stack to %ecx */ + sub %esi, %ecx + + /* Mark stackframe as coming from entry stack */ + orl $CS_FROM_ENTRY_STACK, PT_CS(%esp) + + /* + * %esi and %edi are unchanged, %ecx contains the number of + * bytes to copy. The code at .Lcopy_pt_regs_\@ will allocate + * the stack-frame on task-stack and copy everything over + */ + jmp .Lcopy_pt_regs_\@ + .Lend_\@: .endm @@ -408,6 +471,56 @@ .endm /* + * This macro handles the case when we return to kernel-mode on the iret + * path and have to switch back to the entry stack. + * + * See the comments below the .Lentry_from_kernel_\@ label in the + * SWITCH_TO_KERNEL_STACK macro for more details. + */ +.macro PARANOID_EXIT_TO_KERNEL_MODE + + /* + * Test if we entered the kernel with the entry-stack. Most + * likely we did not, because this code only runs on the + * return-to-kernel path. + */ + testl $CS_FROM_ENTRY_STACK, PT_CS(%esp) + jz .Lend_\@ + + /* Unlikely slow-path */ + + /* Clear marker from stack-frame */ + andl $(~CS_FROM_ENTRY_STACK), PT_CS(%esp) + + /* Copy the remaining task-stack contents to entry-stack */ + movl %esp, %esi + movl PER_CPU_VAR(cpu_tss_rw + TSS_sp0), %edi + + /* Bytes on the task-stack to ecx */ + movl PER_CPU_VAR(cpu_current_top_of_stack), %ecx + subl %esi, %ecx + + /* Allocate stack-frame on entry-stack */ + subl %ecx, %edi + + /* + * Save future stack-pointer, we must not switch until the + * copy is done, otherwise the NMI handler could destroy the + * contents of the task-stack we are about to copy. + */ + movl %edi, %ebx + + /* Do the copy */ + shrl $2, %ecx + cld + rep movsl + + /* Safe to switch to entry-stack now */ + movl %ebx, %esp + +.Lend_\@: +.endm +/* * %eax: prev task * %edx: next task */ @@ -769,6 +882,7 @@ restore_all: restore_all_kernel: TRACE_IRQS_IRET + PARANOID_EXIT_TO_KERNEL_MODE RESTORE_REGS 4 jmp .Lirq_return