From patchwork Wed Jan 9 23:55:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 155098 Delivered-To: patch@linaro.org Received: by 2002:a02:48:0:0:0:0:0 with SMTP id 69csp1277553jaa; Wed, 9 Jan 2019 15:56:10 -0800 (PST) X-Google-Smtp-Source: ALg8bN6L7qmuHdKBn61wGvQ5NYs+FwVYN+Pg7r54rDc/rfoCSUccuEvmM7OiXZ3EOy8/GSeCmYYP X-Received: by 2002:a62:62c5:: with SMTP id w188mr8048603pfb.160.1547078170615; Wed, 09 Jan 2019 15:56:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1547078170; cv=none; d=google.com; s=arc-20160816; b=a3+zJcN39Kz/ckFnVBNpIq3nkH8SxXfr5Fiy38JKsBL4VlmsqAbyjQIeLRogg/b3HB zlaoKeZjzz02ebskva2RiGJEA4kPXpdtlgnU71QCCWr5ndWEokWAiudVdDF8Bl6TCSsw AAM2qOm6yXxGz1OjtIYiumSeUg/LSKiZ02RLvAZTc9WSFpG+VqM4vppI5erLq+6JtizD TVe+g1iyDxJTc10WuMk5r3GjNEocPJmdBkSLI2p0zpj76dF+ZmEtxvNltPReHVH95E5n eHX0XaJiX9vbXXA1KthiaksDyWCABDT9pLnk1eFt9qITwkGUssTxWyTrrbajfaqQ+z7y DuYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from; bh=OXFrg6VEV+GvadV0CYFG+ng5CczKdf6EcdEe8+mH7lI=; b=LsXM7O5v9HjVrIUVrt6Y9HBGnwfTboJHjcnPeiNFugShoOEE/i3srEk0a2CNmyrpsr p2UJsTKgierxdUIeUXhciFrp1VlwiptVC0ztBaaDTv55WlogyV4A1iv/Ppiqraumv8Lx 170+QAD05/diQMhKZ5ofRLWUSChR1YQlRmYGFscd+6BDu0l3A/dkgexYsdl9JaZRLMes E46JFFQUCwCweSCs6I4M8ryguHDpjxbfs4TFEDah5nvH81TnygfB4kr7F5wFX5JEkUP3 +XZv8W5Nvq9IgJcYXrfOrJkarcCns2/WRheHzgYyqBU4gG8kjoFIn5yq1rWtbZ+608dy 23eg== 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 v35si60524889pgl.130.2019.01.09.15.56.10; Wed, 09 Jan 2019 15:56:10 -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 S1726856AbfAIX4C (ORCPT + 31 others); Wed, 9 Jan 2019 18:56:02 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:53378 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726729AbfAIXz5 (ORCPT ); Wed, 9 Jan 2019 18:55:57 -0500 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 71001165C; Wed, 9 Jan 2019 15:55:57 -0800 (PST) Received: from beelzebub.austin.arm.com (beelzebub.austin.arm.com [10.118.12.119]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id C9AAA3F5AF; Wed, 9 Jan 2019 15:55:56 -0800 (PST) From: Jeremy Linton To: linux-arm-kernel@lists.infradead.org Cc: catalin.marinas@arm.com, will.deacon@arm.com, marc.zyngier@arm.com, suzuki.poulose@arm.com, dave.martin@arm.com, shankerd@codeaurora.org, linux-kernel@vger.kernel.org, ykaukab@suse.de, julien.thierry@arm.com, mlangsdo@redhat.com, steven.price@arm.com, stefan.wahren@i2se.com, Jeremy Linton Subject: [PATCH v3 6/7] arm64: add sysfs vulnerability show for speculative store bypass Date: Wed, 9 Jan 2019 17:55:43 -0600 Message-Id: <20190109235544.2992426-7-jeremy.linton@arm.com> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190109235544.2992426-1-jeremy.linton@arm.com> References: <20190109235544.2992426-1-jeremy.linton@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Return status based on ssbd_state and the arm64 SSBS feature. If the mitigation is disabled, or the firmware isn't responding then return the expected machine state based on a new blacklist of known vulnerable cores. Signed-off-by: Jeremy Linton --- arch/arm64/kernel/cpu_errata.c | 48 ++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) -- 2.17.2 diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index ee286d606d9b..c8ff96158b94 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -288,6 +288,7 @@ enable_smccc_arch_workaround_1(const struct arm64_cpu_capabilities *entry) DEFINE_PER_CPU_READ_MOSTLY(u64, arm64_ssbd_callback_required); int ssbd_state __read_mostly = ARM64_SSBD_KERNEL; +static bool __ssb_safe = true; static const struct ssbd_options { const char *str; @@ -385,10 +386,18 @@ static bool has_ssbd_mitigation(const struct arm64_cpu_capabilities *entry, { struct arm_smccc_res res; bool required = true; + bool is_vul; s32 val; WARN_ON(scope != SCOPE_LOCAL_CPU || preemptible()); + is_vul = is_midr_in_range_list(read_cpuid_id(), entry->midr_range_list); + + if (is_vul) + __ssb_safe = false; + + arm64_requested_vuln_attrs |= VULN_SSB; + if (this_cpu_has_cap(ARM64_SSBS)) { required = false; goto out_printmsg; @@ -422,6 +431,7 @@ static bool has_ssbd_mitigation(const struct arm64_cpu_capabilities *entry, ssbd_state = ARM64_SSBD_UNKNOWN; return false; + /* machines with mixed mitigation requirements must not return this */ case SMCCC_RET_NOT_REQUIRED: pr_info_once("%s mitigation not required\n", entry->desc); ssbd_state = ARM64_SSBD_MITIGATED; @@ -476,6 +486,17 @@ static bool has_ssbd_mitigation(const struct arm64_cpu_capabilities *entry, return required; } + +/* known vulnerable cores */ +static const struct midr_range arm64_ssb_cpus[] = { + MIDR_ALL_VERSIONS(MIDR_CORTEX_A57), + MIDR_ALL_VERSIONS(MIDR_CORTEX_A72), + MIDR_ALL_VERSIONS(MIDR_CORTEX_A73), + MIDR_ALL_VERSIONS(MIDR_CORTEX_A75), + MIDR_ALL_VERSIONS(MIDR_CORTEX_A76), + {}, +}; + #endif /* CONFIG_ARM64_SSBD */ static void __maybe_unused @@ -762,6 +783,7 @@ const struct arm64_cpu_capabilities arm64_errata[] = { .capability = ARM64_SSBD, .type = ARM64_CPUCAP_LOCAL_CPU_ERRATUM, .matches = has_ssbd_mitigation, + .midr_range_list = arm64_ssb_cpus, }, #endif #ifdef CONFIG_ARM64_ERRATUM_1188873 @@ -809,4 +831,30 @@ ssize_t cpu_show_spectre_v2(struct device *dev, struct device_attribute *attr, return sprintf(buf, "Vulnerable\n"); } +ssize_t cpu_show_spec_store_bypass(struct device *dev, + struct device_attribute *attr, char *buf) +{ + /* + * Two assumptions: First, get_ssbd_state() reflects the worse case + * for hetrogenous machines, and that if SSBS is supported its + * supported by all cores. + */ + switch (arm64_get_ssbd_state()) { + case ARM64_SSBD_MITIGATED: + return sprintf(buf, "Not affected\n"); + + case ARM64_SSBD_KERNEL: + case ARM64_SSBD_FORCE_ENABLE: + if (cpus_have_cap(ARM64_SSBS)) + return sprintf(buf, "Not affected\n"); + return sprintf(buf, + "Mitigation: Speculative Store Bypass disabled\n"); + } + + if (__ssb_safe) + return sprintf(buf, "Not affected\n"); + + return sprintf(buf, "Vulnerable\n"); +} + #endif