From patchwork Wed Jul 18 09:40:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Joerg Roedel X-Patchwork-Id: 10531841 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 2BAA1600F4 for ; Wed, 18 Jul 2018 09:42:09 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1AA021FF0B for ; Wed, 18 Jul 2018 09:42:09 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 0EB89207A7; Wed, 18 Jul 2018 09:42:09 +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 890E61FF0B for ; Wed, 18 Jul 2018 09:42:08 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id B9FCE6B027B; Wed, 18 Jul 2018 05:41:32 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id AD1C46B027D; Wed, 18 Jul 2018 05:41:32 -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 9281A6B027E; Wed, 18 Jul 2018 05:41:32 -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 2ADC56B027A for ; Wed, 18 Jul 2018 05:41:32 -0400 (EDT) Received: by mail-ed1-f69.google.com with SMTP id d5-v6so1699665edq.3 for ; Wed, 18 Jul 2018 02:41:32 -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=c6G2SmF7fOl+QSH1HqotUlpv2kFWOSbHOPeLlKIqoqw=; b=QHameunTuvXU6MZGheOPDV3OET0FC1CeOxO6gUiOSKQfR3tK8gXG9h/OSifG1fVH/Y SEYM63Zr7XBWyDcj/DK/0kSnTzx1XdHKTIQKhQAtyThPCOZrMop7tD/pn6p1Tg5zbZI5 Cc7OP64j2/3JEOHi2BYP2UVdT2AvVxsASqIGvA9G8dovM09NaK2SPfbr4bC98wqHpQOJ y7NX/FGzA80w7t5vGwDpfwMLHYPUZSKYXHwzw80d5KYaiKdXt79sDW/PSq5clDZv31ow rwx9f40EuWpkLcg27r37aVsrMMpyfD/UZhKd2OsiN03vDLRPcjUZRZeZX7ePN1dBc81h KXpg== X-Gm-Message-State: AOUpUlFhcXrYPBwTkiuHEjHcRkRRGXevf0ejBWODBOC4ufZsLS4yzLAW T/l4AeXwpL0s6QADY4l0fc1B5EriS/XUrjs7GF/Rev4Oe8Gw+9WulOYfXfPi7Xzmt3hCd7LEgB3 dteDJm6/qzhZp5wte7qxVRH4GF7Ja5DqSRBwksRUKZInBiDmbuGa8x3aPoklVC0f2RA== X-Received: by 2002:a50:90e7:: with SMTP id d36-v6mr6109925eda.279.1531906891721; Wed, 18 Jul 2018 02:41:31 -0700 (PDT) X-Google-Smtp-Source: AAOMgpcpfGy1AEa/4bPj9RW1nvExdPoHHNCsL+GRSZMJk+DLKuYAl/u6+Wu3sMX3sUbVdiPGYXxu X-Received: by 2002:a50:90e7:: with SMTP id d36-v6mr6109885eda.279.1531906890987; Wed, 18 Jul 2018 02:41:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1531906890; cv=none; d=google.com; s=arc-20160816; b=jO0g4KV/e8WkfiNiz2A3NfFI4EGgR/iqEXH/LDcfdUP3rz/B5DO3Le56CSSFrLuEHj QVbkPIP8k5a1GOtS0RDslsNjFVpShwjhoKe4bxsP7Hh1m9fuyU0zA+nj1kZ53N5XDf6h sqLx3iGmbl838FUwzGNYDFFLgfdECw+uTr52/zuCdo6KvVKAqvzyRxQiIFAAMGRSyaTv jmvTT9N+KRlEMcz3Z+P4DY6ftfB0RBy2bOlR8+MQp5dwjvtuOZgNHG/dRt5JEpNjYTwx Q/3VB9dXwWKm7XWEJG1OVi7Dn26021GBxOuuYbpkBTmoH9/rOLY31fIDWo4gDzklhjZR sHzQ== 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=c6G2SmF7fOl+QSH1HqotUlpv2kFWOSbHOPeLlKIqoqw=; b=R+J5v6pdc44XthKxIOA7RIzdUIRxDHpJPdK5bLd7Y67E5ewHj9JJaPfWKQS8RjaBFJ nGO45UaLH96VFj5oEniffC3igOkRrF3F15/VMzoAFq9ryhXPHpQj+N+ntdbflkZrelQv ogV34i/1cvEkIt2LmoLvnRdmGVDI34e1sRZQ+pKEgnOb53Kkz2LcvJr6AIlZU11Pw9aK gVa3XAXmYTJbCkGU1cj/Tc69j6NT17//Yle5mCSjGa+QYygDGV5CbE+nGDjOeCSsdSVh Vb75BKKyoUuZ62C5l48QpxTGshtQSuizTqWpcUzd0AqE58kUAeM0ftBU/gQoR/N7rQJY Ml0Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass (test mode) header.i=@8bytes.org header.s=mail-1 header.b=BNA3GuFG; spf=pass (google.com: domain of joro@8bytes.org designates 81.169.241.247 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. [81.169.241.247]) by mx.google.com with ESMTPS id r47-v6si332790edr.420.2018.07.18.02.41.30 for (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 18 Jul 2018 02:41:30 -0700 (PDT) Received-SPF: pass (google.com: domain of joro@8bytes.org designates 81.169.241.247 as permitted sender) client-ip=81.169.241.247; Authentication-Results: mx.google.com; dkim=pass (test mode) header.i=@8bytes.org header.s=mail-1 header.b=BNA3GuFG; spf=pass (google.com: domain of joro@8bytes.org designates 81.169.241.247 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 5952936B; Wed, 18 Jul 2018 11:41:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=8bytes.org; s=mail-1; t=1531906881; bh=3R2HhEqt5TJK5cFHOcV7KJz4gbKUbE1kTAG5HEApY64=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BNA3GuFGYQ0pr6VppZFnJKSDhDhnyJsGQnxZSBzokJul1nEBoToH16vU0v5AdJVTL fH1w+2nJQrcAi95SKNL7VtLRlh/aXnPoeIVo7U8FwE0gaz5K8XAmzJaY0Tyvu3/o5/ APnZsEWb8A4MeOG7zFmUAfcM3YsTz/pGkBM5nIFAZsgFo0socfxwetr68nXg88axmJ LS5jmDJYUslq9/sNcjOSJLiTmo0d63zUHg0iWt/B9LI3zAOVKFFtsqA9Hvukqnl/sS o+f1n0Sa73lM7nDDHNzzEBsfznlV3Jk/fL0uOX0ZR+MRSgZVHANsQQ7NSdjCgQ3jI8 2e2ZkD6xZdW3Q== 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 14/39] x86/entry: Rename update_sp0 to update_task_stack Date: Wed, 18 Jul 2018 11:40:51 +0200 Message-Id: <1531906876-13451-15-git-send-email-joro@8bytes.org> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1531906876-13451-1-git-send-email-joro@8bytes.org> References: <1531906876-13451-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 The function does not update sp0 anymore but updates makes the task-stack visible for entry code. This is by either writing it to sp1 or by doing a hypercall. Rename the function to get rid of the misleading name. Signed-off-by: Joerg Roedel --- arch/x86/include/asm/switch_to.h | 2 +- arch/x86/kernel/process_32.c | 2 +- arch/x86/kernel/process_64.c | 2 +- arch/x86/kernel/vm86_32.c | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/arch/x86/include/asm/switch_to.h b/arch/x86/include/asm/switch_to.h index 8bc2f70..36bd243 100644 --- a/arch/x86/include/asm/switch_to.h +++ b/arch/x86/include/asm/switch_to.h @@ -87,7 +87,7 @@ static inline void refresh_sysenter_cs(struct thread_struct *thread) #endif /* This is used when switching tasks or entering/exiting vm86 mode. */ -static inline void update_sp0(struct task_struct *task) +static inline void update_task_stack(struct task_struct *task) { /* sp0 always points to the entry trampoline stack, which is constant: */ #ifdef CONFIG_X86_32 diff --git a/arch/x86/kernel/process_32.c b/arch/x86/kernel/process_32.c index 0ae659d..2924fd4 100644 --- a/arch/x86/kernel/process_32.c +++ b/arch/x86/kernel/process_32.c @@ -285,7 +285,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) * current_thread_info(). Refresh the SYSENTER configuration in * case prev or next is vm86. */ - update_sp0(next_p); + update_task_stack(next_p); refresh_sysenter_cs(next); this_cpu_write(cpu_current_top_of_stack, (unsigned long)task_stack_page(next_p) + diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 12bb445..476e3dd 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -478,7 +478,7 @@ __switch_to(struct task_struct *prev_p, struct task_struct *next_p) this_cpu_write(cpu_current_top_of_stack, task_top_of_stack(next_p)); /* Reload sp0. */ - update_sp0(next_p); + update_task_stack(next_p); /* * Now maybe reload the debug registers and handle I/O bitmaps diff --git a/arch/x86/kernel/vm86_32.c b/arch/x86/kernel/vm86_32.c index 9d0b5af..1c03e4a 100644 --- a/arch/x86/kernel/vm86_32.c +++ b/arch/x86/kernel/vm86_32.c @@ -149,7 +149,7 @@ void save_v86_state(struct kernel_vm86_regs *regs, int retval) preempt_disable(); tsk->thread.sp0 = vm86->saved_sp0; tsk->thread.sysenter_cs = __KERNEL_CS; - update_sp0(tsk); + update_task_stack(tsk); refresh_sysenter_cs(&tsk->thread); vm86->saved_sp0 = 0; preempt_enable(); @@ -374,7 +374,7 @@ static long do_sys_vm86(struct vm86plus_struct __user *user_vm86, bool plus) refresh_sysenter_cs(&tsk->thread); } - update_sp0(tsk); + update_task_stack(tsk); preempt_enable(); if (vm86->flags & VM86_SCREEN_BITMAP)