From patchwork Fri Nov 8 12:35:13 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ard Biesheuvel X-Patchwork-Id: 178895 Delivered-To: patch@linaro.org Received: by 2002:a92:38d5:0:0:0:0:0 with SMTP id g82csp2636405ilf; Fri, 8 Nov 2019 04:36:28 -0800 (PST) X-Google-Smtp-Source: APXvYqyrCd7yKr2D1cdfYOqJvzxtebxpXcDpOGOQWfGBzyy5pMSVjOUI3MGMwhiU4vR/y6ViuakU X-Received: by 2002:a50:cc07:: with SMTP id m7mr10122847edi.146.1573216588465; Fri, 08 Nov 2019 04:36:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1573216588; cv=none; d=google.com; s=arc-20160816; b=zhNhzW8irwes+fxBwH6GrFnXaaooNQDa4B/WPmOwmKNXilsE17YPIfZYCkLe7A3+Bl 1vKVP/C1n4SyC5HrJW/IsUbDUgJe3Um4cA0idjri3emuzun65jNWaGj8wc1bPI1Tcc1g 5qto2jmAgVuLwnDgmnzsTZxYJtFUsSWzjHBokBrr/68aA+cn8+DDba9+oT2HHUH/AlfL aF35M9JgNRHu+D8Q5MHyMBOJBPnShcIuHyXICgr54mmLZFZVuGqJZbgmbjDsU9pJ5+mA N051TMafSkWR7Ja4ECynCwo+nPrIJwQGYxDoZ2AhwNYaypZNhZNHOt5CBIauTyi1o06w Qfuw== 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=W9OUPUBOBsQ5xGM1+gKA8sR8pLMR37uq4R9HGBXyeKc=; b=UKRu37Rf9SEBGaRu6SvWxh0cTFW3MNQDlFnHSavz9njSW56Wo8J3zgnnLLRcEinMGB qHeWykvyq07L2dWVRxR5iBFT53trYN92ZAr0FV+sm00EHMt7hETbOOZo3Btisuek3JZm Ofv1jIjx4o3f94tfTQM8KAeu9fnJcZmnSiHzTqzxW1e3hSq7Zmp7AL909vA/OpZwwp0D q/dbZwZqVizd/NfySLPGGo0OCwEeV6iBpSHOawP27aSi9U/mPxjIE/ONDVVkqxSdIoTD nDbvUgvHVnHerilP5nVk0MDSLdjG0crhJ+6JPkTCap3EMN5YMRfRM1XYnme34npL0N5t 6JhA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zUkrh+UF; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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. [209.132.180.67]) by mx.google.com with ESMTP id o19si3411305ejc.315.2019.11.08.04.36.28; Fri, 08 Nov 2019 04:36:28 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=zUkrh+UF; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-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 S1726957AbfKHMg1 (ORCPT + 14 others); Fri, 8 Nov 2019 07:36:27 -0500 Received: from mail.kernel.org ([198.145.29.99]:43990 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726121AbfKHMg1 (ORCPT ); Fri, 8 Nov 2019 07:36:27 -0500 Received: from localhost.localdomain (lfbn-mar-1-550-151.w90-118.abo.wanadoo.fr [90.118.131.151]) (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 E09F4222C9; Fri, 8 Nov 2019 12:36:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573216587; bh=MbXatxJpsvst8ICGkSFEmESQab2TZO2tWpDaaS3zX6Q=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=zUkrh+UFeXkCwh6QVxtXf75N9DQGyTbDGiv5sQ4hI6iXgflFyXfIFik9Se192+M34 LnCVy/tqb42xqSn2MIjfOgiDZadYmNuy35QR7ol51bDHZtK+AgwCB0BNWbfBN7x7M5 wSxYeI6fF6gWQlnUET3MZLUmgv4e3VlUc7ZiYK1Y= From: Ard Biesheuvel To: stable@vger.kernel.org Cc: linus.walleij@linaro.org, rmk+kernel@armlinux.org.uk, Mark Rutland , Ard Biesheuvel Subject: [PATCH for-stable-4.4 09/50] arm64: KVM: Report SMCCC_ARCH_WORKAROUND_1 BP hardening support Date: Fri, 8 Nov 2019 13:35:13 +0100 Message-Id: <20191108123554.29004-10-ardb@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20191108123554.29004-1-ardb@kernel.org> References: <20191108123554.29004-1-ardb@kernel.org> MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Mark Rutland From: Marc Zyngier commit 6167ec5c9145cdf493722dfd80a5d48bafc4a18a upstream. A new feature of SMCCC 1.1 is that it offers firmware-based CPU workarounds. In particular, SMCCC_ARCH_WORKAROUND_1 provides BP hardening for CVE-2017-5715. If the host has some mitigation for this issue, report that we deal with it using SMCCC_ARCH_WORKAROUND_1, as we apply the host workaround on every guest exit. Tested-by: Ard Biesheuvel Reviewed-by: Christoffer Dall Signed-off-by: Marc Zyngier Signed-off-by: Catalin Marinas [v4.9: account for files moved to virt/ upstream] Signed-off-by: Mark Rutland [v4.9 backport] Tested-by: Greg Hackmann Signed-off-by: Greg Kroah-Hartman [ardb: restrict to include/linux/arm-smccc.h] Signed-off-by: Ard Biesheuvel --- include/linux/arm-smccc.h | 5 +++++ 1 file changed, 5 insertions(+) -- 2.20.1 diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h index 8bf047eab116..f2416b58367d 100644 --- a/include/linux/arm-smccc.h +++ b/include/linux/arm-smccc.h @@ -70,6 +70,11 @@ ARM_SMCCC_SMC_32, \ 0, 1) +#define ARM_SMCCC_ARCH_WORKAROUND_1 \ + ARM_SMCCC_CALL_VAL(ARM_SMCCC_FAST_CALL, \ + ARM_SMCCC_SMC_32, \ + 0, 0x8000) + #ifndef __ASSEMBLY__ #include