Received: by 10.223.176.5 with SMTP id f5csp687516wra; Fri, 9 Feb 2018 05:43:01 -0800 (PST) X-Google-Smtp-Source: AH8x227WeraY1Jzd3iEoLPOsClIZSTvwjgE6oxqiQvRJBC3FDbqgnyTS48xSX+McR3TErDtMfWGM X-Received: by 10.98.106.2 with SMTP id f2mr2354076pfc.101.1518183781606; Fri, 09 Feb 2018 05:43:01 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1518183781; cv=none; d=google.com; s=arc-20160816; b=b7nTqx+wHbwxK7bqsJCbWpq2OVdpvVRKeTHDY4UL1MWasbfvZ7sfjmNbWhhDhRgG/e /uAln/iynfiNRS3b0rGhhJtvR6S7iiYdzFSXBoQoPTbrwDnJqMuN2AkAlUJTe8VaN4CD 9WwpoUfhl6yEgznOBUfZA3mdGg44Ekvc2/JeVlUVZgUlKBNq+LIqPFpBYwVVq8ijXpe4 Kl21eSKkPRotG7WODmdAeIJUr/ebI7erNXqGogtWQVc6nH6Ii34TArsKjLiVZHSavDVV jagnFU5HB5mBcmRU6MMzB/+QFf5gBjVCc2pJAnVA+SdYM0EcFDUVitHe3W5cbgKC5++m 5xAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:user-agent:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=KwaTUJ9g5P/4A9RhxW+C35XYtoPQZGoR3xX7ixup1AI=; b=nxKGHBIP6nAWUkUkZr2edu2X9f0qBpzHntytwQ3FaLf+6uCn+a1OeLRQHzB06EVHM8 mHOjCf7SNnhuSYeZeyE5Q8QRKjN+BexloSF+dHQuks3kytiAmg7B+joAPaU8ohr3PBVJ 1SM0Vprbfm8pTzUs8qfjYOH4pps2jIbotpOfgh/zZ6Jun6/Is6RtkXzsRxJ1+l6u9YMW t3llUJxJIFgUUBg3BMc7Y4zajqceFxEXY02oo77yuvjH6RoYgXoU6wGm84m3qqZKwa6y U2nraY5f5GBAQzqhQv8U06+VKJf+78iMIrk1mIP617kiXGJqSDFpThR6LMa83wHdGXKo JxeQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k7si1403124pgp.153.2018.02.09.05.42.47; Fri, 09 Feb 2018 05:43:01 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752642AbeBINlg (ORCPT + 99 others); Fri, 9 Feb 2018 08:41:36 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:48910 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752616AbeBINla (ORCPT ); Fri, 9 Feb 2018 08:41:30 -0500 Received: from localhost (LFbn-1-12258-90.w90-92.abo.wanadoo.fr [90.92.71.90]) by mail.linuxfoundation.org (Postfix) with ESMTPSA id 1BDE5D2A; Fri, 9 Feb 2018 13:41:29 +0000 (UTC) From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Michael Ellerman , Nicholas Piggin Subject: [PATCH 4.9 11/92] powerpc/64s: Allow control of RFI flush via debugfs Date: Fri, 9 Feb 2018 14:38:40 +0100 Message-Id: <20180209133932.050028723@linuxfoundation.org> X-Mailer: git-send-email 2.16.1 In-Reply-To: <20180209133931.211869118@linuxfoundation.org> References: <20180209133931.211869118@linuxfoundation.org> User-Agent: quilt/0.65 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ From: Michael Ellerman commit 236003e6b5443c45c18e613d2b0d776a9f87540e upstream. Expose the state of the RFI flush (enabled/disabled) via debugfs, and allow it to be enabled/disabled at runtime. eg: $ cat /sys/kernel/debug/powerpc/rfi_flush 1 $ echo 0 > /sys/kernel/debug/powerpc/rfi_flush $ cat /sys/kernel/debug/powerpc/rfi_flush 0 Signed-off-by: Michael Ellerman Reviewed-by: Nicholas Piggin Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/kernel/setup_64.c | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) --- a/arch/powerpc/kernel/setup_64.c +++ b/arch/powerpc/kernel/setup_64.c @@ -38,6 +38,7 @@ #include #include +#include #include #include #include @@ -779,6 +780,35 @@ void __init setup_rfi_flush(enum l1d_flu rfi_flush_enable(enable); } +#ifdef CONFIG_DEBUG_FS +static int rfi_flush_set(void *data, u64 val) +{ + if (val == 1) + rfi_flush_enable(true); + else if (val == 0) + rfi_flush_enable(false); + else + return -EINVAL; + + return 0; +} + +static int rfi_flush_get(void *data, u64 *val) +{ + *val = rfi_flush ? 1 : 0; + return 0; +} + +DEFINE_SIMPLE_ATTRIBUTE(fops_rfi_flush, rfi_flush_get, rfi_flush_set, "%llu\n"); + +static __init int rfi_flush_debugfs_init(void) +{ + debugfs_create_file("rfi_flush", 0600, powerpc_debugfs_root, NULL, &fops_rfi_flush); + return 0; +} +device_initcall(rfi_flush_debugfs_init); +#endif + ssize_t cpu_show_meltdown(struct device *dev, struct device_attribute *attr, char *buf) { if (rfi_flush)