Received: by 2002:a25:ef43:0:0:0:0:0 with SMTP id w3csp716505ybm; Thu, 28 May 2020 13:18:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy2KH8y8vpBhOaHbZ/TEQ4s+rfqxZHmfJDF0gcD52PXDbupSOzKTdIA3iqIwYv6IWQcQxhD X-Received: by 2002:a17:906:6951:: with SMTP id c17mr4573533ejs.87.1590697086783; Thu, 28 May 2020 13:18:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1590697086; cv=none; d=google.com; s=arc-20160816; b=iWZoSffvfYL5RGpWUpWSZUqafL3RsYa3kp1lYla+zLUP92Txu1nbL9vdNZoJQm0GCb eEB03G9u8uuyORf0MBaYMun0OKbKcxA8uHa7L4567dJaRIx6k7k6iFiepB2CpqpsWK/q wv/wFOjuZFwKzbVLGGcXaQMyl2/JG/Z+f4c5KbKIMMJdlSe4zlegEUDw3AQkkw8h9Z68 a82mujZsYYd1R3jYVQIJYEYzodwZMbk9V9p+CXRGP5ywaxDfmxnQ/NdBKJsRO76/2Wy8 6udhvDbsUL7vnbDJ7rhuM4JBqTNWMCxQfmoudZiduJFIh8zT/4rw/vLRjkVeGYdilXPT wAuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=nCgqQ20BAHQ0SBtbKrVqLptvB43MKewZcahTc1OstW0=; b=LuZHGu4EKBH3C1oZ/7TftRo5vnrcTimje2oLrpRM4iNqpKMYque6IK+YDXh8aKtxpf vjuesooclWs1Gh3DNGMGjQgehb1dK6iGukwB+8fFIHTLoIGIpnKYKDh0y8EG/bHLZwGy AQgrUohiqLT3VrihgZJ/o4kyxNq7RjBzqKzlXNzfLNH3BlLE9r8efbJjRsn1el6tjofJ Ggcn2qY0NJ39w3C3XP42Ed6g4CG0pbnhCRGURXkYRrLkcUOF9i1BKbcaYJFht4ssYoUz RC8C0uigofYP2rAPwLhJtuUr1JZ9XDfoJaHbhz+A3fnm+5JvnuKWS1GU4UpHo6v79QAS fhSw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=YM2bBxic; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id y22si4252581ejb.39.2020.05.28.13.17.42; Thu, 28 May 2020 13:18:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=YM2bBxic; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 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 S2407108AbgE1UPN (ORCPT + 99 others); Thu, 28 May 2020 16:15:13 -0400 Received: from mail.kernel.org ([198.145.29.99]:42144 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2407038AbgE1UOg (ORCPT ); Thu, 28 May 2020 16:14:36 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0A8812088E; Thu, 28 May 2020 20:14:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1590696875; bh=+804rNhAGBCm5SQksEj30BPblIZwMd7TQE7+8OkopbI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YM2bBxicDWCenFL2ej/JPihY8X7swSA/lyKY5oePnGkbszYAoH0QB4P8pA4ChFJUa SrOEJoBmF+BmLf7qeOqKJ/SkBv6W0ZNzrGgtm1qmlLzrcXwDs3VX3schwtyzumpmAf U7vQRzhv9snTTMqBpi7xRUY287mRdY7Sdzj3T1ho= From: Sasha Levin To: tglx@linutronix.de, luto@kernel.org, ak@linux.intel.com Cc: corbet@lwn.net, mingo@redhat.com, bp@alien8.de, x86@kernel.org, shuah@kernel.org, gregkh@linuxfoundation.org, tony.luck@intel.com, chang.seok.bae@intel.com, dave.hansen@linux.intel.com, peterz@infradead.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, jarkko.sakkinen@linux.intel.com, Ravi Shankar , "H . Peter Anvin" , Sasha Levin Subject: [PATCH v13 12/16] x86/cpu: Enable FSGSBASE on 64bit by default and add a chicken bit Date: Thu, 28 May 2020 16:13:58 -0400 Message-Id: <20200528201402.1708239-13-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200528201402.1708239-1-sashal@kernel.org> References: <20200528201402.1708239-1-sashal@kernel.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andy Lutomirski Now that FSGSBASE is fully supported, remove unsafe_fsgsbase, enable FSGSBASE by default, and add nofsgsbase to disable it. Signed-off-by: Andy Lutomirski Signed-off-by: Chang S. Bae Signed-off-by: Thomas Gleixner Reviewed-by: Andi Kleen Cc: Ravi Shankar Cc: H. Peter Anvin Link: https://lkml.kernel.org/r/1557309753-24073-17-git-send-email-chang.seok.bae@intel.com Signed-off-by: Sasha Levin --- .../admin-guide/kernel-parameters.txt | 3 +- arch/x86/kernel/cpu/common.c | 32 ++++++++----------- 2 files changed, 15 insertions(+), 20 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index af3aaade195b..1924845c879c 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -3033,8 +3033,7 @@ no5lvl [X86-64] Disable 5-level paging mode. Forces kernel to use 4-level paging instead. - unsafe_fsgsbase [X86] Allow FSGSBASE instructions. This will be - replaced with a nofsgsbase flag. + nofsgsbase [X86] Disables FSGSBASE instructions. no_console_suspend [HW] Never suspend the console diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index 4224760c74e2..0d480cbadc7d 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -418,21 +418,21 @@ static void __init setup_cr_pinning(void) static_key_enable(&cr_pinning.key); } -/* - * Temporary hack: FSGSBASE is unsafe until a few kernel code paths are - * updated. This allows us to get the kernel ready incrementally. - * - * Once all the pieces are in place, these will go away and be replaced with - * a nofsgsbase chicken flag. - */ -static bool unsafe_fsgsbase; - -static __init int setup_unsafe_fsgsbase(char *arg) +static __init int x86_nofsgsbase_setup(char *arg) { - unsafe_fsgsbase = true; + /* Require an exact match without trailing characters. */ + if (strlen(arg)) + return 0; + + /* Do not emit a message if the feature is not present. */ + if (!boot_cpu_has(X86_FEATURE_FSGSBASE)) + return 1; + + setup_clear_cpu_cap(X86_FEATURE_FSGSBASE); + pr_info("FSGSBASE disabled via kernel command line\n"); return 1; } -__setup("unsafe_fsgsbase", setup_unsafe_fsgsbase); +__setup("nofsgsbase", x86_nofsgsbase_setup); /* * Protection Keys are not available in 32-bit mode. @@ -1495,12 +1495,8 @@ static void identify_cpu(struct cpuinfo_x86 *c) setup_umip(c); /* Enable FSGSBASE instructions if available. */ - if (cpu_has(c, X86_FEATURE_FSGSBASE)) { - if (unsafe_fsgsbase) - cr4_set_bits(X86_CR4_FSGSBASE); - else - clear_cpu_cap(c, X86_FEATURE_FSGSBASE); - } + if (cpu_has(c, X86_FEATURE_FSGSBASE)) + cr4_set_bits(X86_CR4_FSGSBASE); /* * The vendor-specific functions might have changed features. -- 2.25.1