From patchwork Tue Dec 11 10:36:54 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: tip-bot for Kobe Wu X-Patchwork-Id: 10723481 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 146561751 for ; Tue, 11 Dec 2018 10:37:02 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 01B452A0AA for ; Tue, 11 Dec 2018 10:37:02 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E7FFD2A0D7; Tue, 11 Dec 2018 10:37:01 +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=-2.9 required=2.0 tests=BAYES_00,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 092D82A0DC for ; Tue, 11 Dec 2018 10:37:01 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 367FE8E0080; Tue, 11 Dec 2018 05:37:00 -0500 (EST) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id 2F05C8E004D; Tue, 11 Dec 2018 05:37:00 -0500 (EST) 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 16AE28E0080; Tue, 11 Dec 2018 05:37:00 -0500 (EST) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pf1-f197.google.com (mail-pf1-f197.google.com [209.85.210.197]) by kanga.kvack.org (Postfix) with ESMTP id B80AF8E004D for ; Tue, 11 Dec 2018 05:36:59 -0500 (EST) Received: by mail-pf1-f197.google.com with SMTP id l22so12379825pfb.2 for ; Tue, 11 Dec 2018 02:36:59 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-original-authentication-results:x-gm-message-state:date:sender :from:message-id:cc:reply-to:in-reply-to:references:to:subject :git-commit-id:robot-id:robot-unsubscribe:mime-version :content-transfer-encoding:content-disposition:precedence; bh=z4W/Q7JmL1wkK8L5Xv70zHJjDBoLdNpkXH7YqvDJ72M=; b=XCL4SUIyOA5x4rr+s4Vba7M+622fP06JExMn/z2gNZAibFBTxZ+x1022tdXHQu4Hgn xsG1c7Gy0NF9yaGbAfkAZAvJAD4RpQaqy6JjgG/yptSyiTLh7vA3lBhpYPfwBfa5qCbj 8xCel4dHFIo2TXzJ9Cg2pxUvLndXGN1TrFKanF3yOVK8BmH/rF6rDXVTLDMsEGZSaWml /0BinmE8A6yJYiiPbRQImyTR60DWSD/kLhOeF4uktupnEQJc/+MEunzMaA91uoqYF0/Z K5y9HhUd8Ay3Vst0OwdosihrSEbcymI9auOvTZO+ZSWXxd4f28dcwC53oeAisMkpcvfF yiOQ== X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of tipbot@zytor.com designates 198.137.202.136 as permitted sender) smtp.mailfrom=tipbot@zytor.com X-Gm-Message-State: AA+aEWY7tzahhRkMlAf4JlHUP9iqF85EkbImL4HABu/O/wyJMN/8b41b 04t9JdQuYukMqWG9COcCPvtVV66Ur9dMXnJHLJLsZcSlO5xIP3cg7ejAyhO+GQ8BWyM2LweMd81 zaEV8iEuooVorPk5Cu4zH76jqZTFS1gXrS2kun/aitwORzu7Nj3er1twb9Hs5ucrDBg== X-Received: by 2002:a63:104d:: with SMTP id 13mr14151045pgq.303.1544524619331; Tue, 11 Dec 2018 02:36:59 -0800 (PST) X-Google-Smtp-Source: AFSGD/U2m3J+OPkcotmNVQp95xTK8rzVJ9Fm7fv3aLWkJzUY00v0oGNt1T6Fp31/l8bXa6HOBL8/ X-Received: by 2002:a63:104d:: with SMTP id 13mr14151022pgq.303.1544524618635; Tue, 11 Dec 2018 02:36:58 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1544524618; cv=none; d=google.com; s=arc-20160816; b=V56GVFGmCr+5naMfgWbtaVKc3Yc50Dij/crFU57uZBdns1dxEr+WPfDAb8fWqZxlHu saBiQ+m1bpPP4aUMEZJjj3/Gdf1nfLYXTHON0P7W5P00flLUN1cgaiPH0e1QRbE3LOhQ nkkExBBc3s/buw21Cr3L/HPPDp+Li+HdiyBQ3XRErZanuprrSaPP4hrxvGggrUvJmaoC O8fJhkxq+TuBsPXqcH89yVJbKIsX2FQSUAvvMx7iK7W7+gDgpCj/O6iC7AsOrb4eGHzi Aks8tO/Z6t9uWvdj9PKCFjqzulw8sQQMlC1qVyfW6KIhy382l04yLgg6oERLS4CnpsSd Ji9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=precedence:content-disposition:content-transfer-encoding :mime-version:robot-unsubscribe:robot-id:git-commit-id:subject:to :references:in-reply-to:reply-to:cc:message-id:from:sender:date; bh=z4W/Q7JmL1wkK8L5Xv70zHJjDBoLdNpkXH7YqvDJ72M=; b=gWBbhGbSrgKss4BQpqzaE2q2eN43e+qCwudcHqClddAVvDpWctwxbe2IiiISbMe2Ec mO9yr0kFCNLYBkqKAkz5e17M7OpF1zOiQfZVec6R94gS3eJAce1PpY+LGLqcyUOYRE64 6IkpALbN4bKvmzWIXPdCihkN4LSfZKbvUgpPgvVNYZLBMSBZFUQen717vqQ9WeYG8xBF 33r9MPxtb2Rr1tYOG6mdxKC+yDb/EsqCnyyqY1MLJSIoq8VtxjSMQfs6S5evAYiEaZV+ 9d9n/CkZmI8yi6TAiWUrr7U5EcA9t0od9I5llKYM54VXPh9JzfQ7lP9JRWmj5UOdmTiF d7PQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of tipbot@zytor.com designates 198.137.202.136 as permitted sender) smtp.mailfrom=tipbot@zytor.com Received: from terminus.zytor.com (terminus.zytor.com. [198.137.202.136]) by mx.google.com with ESMTPS id e11si11990602pgf.450.2018.12.11.02.36.58 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 11 Dec 2018 02:36:58 -0800 (PST) Received-SPF: pass (google.com: domain of tipbot@zytor.com designates 198.137.202.136 as permitted sender) client-ip=198.137.202.136; Authentication-Results: mx.google.com; spf=pass (google.com: domain of tipbot@zytor.com designates 198.137.202.136 as permitted sender) smtp.mailfrom=tipbot@zytor.com Received: from terminus.zytor.com (localhost [127.0.0.1]) by terminus.zytor.com (8.15.2/8.15.2) with ESMTPS id wBBAasVE3949364 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Tue, 11 Dec 2018 02:36:54 -0800 Received: (from tipbot@localhost) by terminus.zytor.com (8.15.2/8.15.2/Submit) id wBBAasWA3949361; Tue, 11 Dec 2018 02:36:54 -0800 Date: Tue, 11 Dec 2018 02:36:54 -0800 X-Authentication-Warning: terminus.zytor.com: tipbot set sender to tipbot@zytor.com using -f From: tip-bot for Michal Hocko Message-ID: Cc: jkosina@suse.cz, tglx@linutronix.de, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, pasha.tatashin@soleen.com, dave.hansen@intel.com, hpa@zytor.com, ak@linux.intel.com, mhocko@suse.com, linux-mm@kvack.org, bp@suse.de, mingo@kernel.org Reply-To: tglx@linutronix.de, jkosina@suse.cz, torvalds@linux-foundation.org, linux-kernel@vger.kernel.org, pasha.tatashin@soleen.com, dave.hansen@intel.com, ak@linux.intel.com, hpa@zytor.com, bp@suse.de, mingo@kernel.org, mhocko@suse.com, linux-mm@kvack.org In-Reply-To: <20181113184910.26697-1-mhocko@kernel.org> References: <20181113184910.26697-1-mhocko@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:x86/pti] x86/speculation/l1tf: Drop the swap storage limit restriction when l1tf=off Git-Commit-ID: d7409e79dbec2d2834fb6ccca53664197ab65505 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Disposition: inline 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 Commit-ID: d7409e79dbec2d2834fb6ccca53664197ab65505 Gitweb: https://git.kernel.org/tip/d7409e79dbec2d2834fb6ccca53664197ab65505 Author: Michal Hocko AuthorDate: Tue, 13 Nov 2018 19:49:10 +0100 Committer: Thomas Gleixner CommitDate: Tue, 11 Dec 2018 11:13:32 +0100 x86/speculation/l1tf: Drop the swap storage limit restriction when l1tf=off Swap storage is restricted to max_swapfile_size (~16TB on x86_64) whenever the system is deemed affected by L1TF vulnerability. Even though the limit is quite high for most deployments it seems to be too restrictive for deployments which are willing to live with the mitigation disabled. We have a customer to deploy 8x 6,4TB PCIe/NVMe SSD swap devices which is clearly out of the limit. Drop the swap restriction when l1tf=off is specified. It also doesn't make much sense to warn about too much memory for the l1tf mitigation when it is forcefully disabled by the administrator. [ tglx: Folded the documentation delta change ] Fixes: 377eeaa8e11f ("x86/speculation/l1tf: Limit swap file size to MAX_PA/2") Signed-off-by: Michal Hocko Signed-off-by: Thomas Gleixner Reviewed-by: Pavel Tatashin Reviewed-by: Andi Kleen Acked-by: Jiri Kosina Cc: Linus Torvalds Cc: Dave Hansen Cc: Andi Kleen Cc: Borislav Petkov Cc: Cc: stable@vger.kernel.org Link: https://lkml.kernel.org/r/20181113184910.26697-1-mhocko@kernel.org --- Documentation/admin-guide/kernel-parameters.txt | 3 +++ Documentation/admin-guide/l1tf.rst | 6 +++++- arch/x86/kernel/cpu/bugs.c | 3 ++- arch/x86/mm/init.c | 2 +- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index 05a252e5178d..835e422572eb 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -2095,6 +2095,9 @@ off Disables hypervisor mitigations and doesn't emit any warnings. + It also drops the swap size and available + RAM limit restriction on both hypervisor and + bare metal. Default is 'flush'. diff --git a/Documentation/admin-guide/l1tf.rst b/Documentation/admin-guide/l1tf.rst index b85dd80510b0..2e65e6cb033e 100644 --- a/Documentation/admin-guide/l1tf.rst +++ b/Documentation/admin-guide/l1tf.rst @@ -405,6 +405,9 @@ time with the option "l1tf=". The valid arguments for this option are: off Disables hypervisor mitigations and doesn't emit any warnings. + It also drops the swap size and available RAM limit restrictions + on both hypervisor and bare metal. + ============ ============================================================= The default is 'flush'. For details about L1D flushing see :ref:`l1d_flush`. @@ -576,7 +579,8 @@ Default mitigations The kernel default mitigations for vulnerable processors are: - PTE inversion to protect against malicious user space. This is done - unconditionally and cannot be controlled. + unconditionally and cannot be controlled. The swap storage is limited + to ~16TB. - L1D conditional flushing on VMENTER when EPT is enabled for a guest. diff --git a/arch/x86/kernel/cpu/bugs.c b/arch/x86/kernel/cpu/bugs.c index a68b32cb845a..58689ac64440 100644 --- a/arch/x86/kernel/cpu/bugs.c +++ b/arch/x86/kernel/cpu/bugs.c @@ -1002,7 +1002,8 @@ static void __init l1tf_select_mitigation(void) #endif half_pa = (u64)l1tf_pfn_limit() << PAGE_SHIFT; - if (e820__mapped_any(half_pa, ULLONG_MAX - half_pa, E820_TYPE_RAM)) { + if (l1tf_mitigation != L1TF_MITIGATION_OFF && + e820__mapped_any(half_pa, ULLONG_MAX - half_pa, E820_TYPE_RAM)) { pr_warn("System has more than MAX_PA/2 memory. L1TF mitigation not effective.\n"); pr_info("You may make it effective by booting the kernel with mem=%llu parameter.\n", half_pa); diff --git a/arch/x86/mm/init.c b/arch/x86/mm/init.c index ef99f3892e1f..427a955a2cf2 100644 --- a/arch/x86/mm/init.c +++ b/arch/x86/mm/init.c @@ -931,7 +931,7 @@ unsigned long max_swapfile_size(void) pages = generic_max_swapfile_size(); - if (boot_cpu_has_bug(X86_BUG_L1TF)) { + if (boot_cpu_has_bug(X86_BUG_L1TF) && l1tf_mitigation != L1TF_MITIGATION_OFF) { /* Limit the swap file size to MAX_PA/2 for L1TF workaround */ unsigned long long l1tf_limit = l1tf_pfn_limit(); /*