From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-11.5 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_SANE_1 autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3B719C55178 for ; Mon, 26 Oct 2020 13:27:02 +0000 (UTC) Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DE40520809 for ; Mon, 26 Oct 2020 13:27:01 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="h6DtkONN"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="dDutW0cj" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DE40520809 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=kernel.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References:Message-ID: Subject:To:From:Date:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=bcKbjoIOMy+OCJyQDsAKrRkDEtvxukMJyxEqoxCm+S0=; b=h6DtkONN5hNP/hhPQCpH2hFzj wpv6n5dgcX0jWj6yW24u6yIA6t868j9U5PJIBMfqejVjS6yNinjHzoY5qmiQseneN6dJwatiaJrQ8 cHuS3MU94914N2iewczK2nqJEo0Qjr/eQkb3AjRn9ycQco2tq/WqTfjYMJQCY+D5XAGqI3+8wBHKx rvj3WicYDPiKsVLyZD/uC7WyvQ5Xn21VZIW4qnkRh63Tnb3sDrUvx+R45+OqPbIFtSvai5JJQh0/w f6QCtdrFSVcJSna39AryQXex9TcxewMXkXXJfBn2iKD/kG6RTHGCSNb+ob3xXGg5nniN04z5tXsRm t/N/Hpd1Q==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX2VL-000519-Ca; Mon, 26 Oct 2020 13:25:43 +0000 Received: from mail.kernel.org ([198.145.29.99]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kX2VH-00050i-HU for linux-arm-kernel@lists.infradead.org; Mon, 26 Oct 2020 13:25:40 +0000 Received: from willie-the-truck (236.31.169.217.in-addr.arpa [217.169.31.236]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 0DB6F207DE; Mon, 26 Oct 2020 13:25:36 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1603718738; bh=jd8Q4kdtlWtB7AqNBmkjiRnWiSHI9D/KJeUPOz0AWy8=; h=Date:From:To:Cc:Subject:References:In-Reply-To:From; b=dDutW0cjwSot8W7ueOoUKhlVqjhB3NvSXX77NINI32JVn73xZ0rWMtxzgygBDDEOa kHgcprUXPxAEii0VTmxURoKug47KR2ZzRLq8SFN3W5hbyF4rwuAfW+qrcY+OJlHZV6 m0/ID1gn5yRTapIXHf0c9zeLqHrviQWbsqs5nLmA= Date: Mon, 26 Oct 2020 13:25:33 +0000 From: Will Deacon To: Stephen Boyd Subject: Re: [PATCH v3] KVM: arm64: ARM_SMCCC_ARCH_WORKAROUND_1 doesn't return SMCCC_RET_NOT_REQUIRED Message-ID: <20201026132533.GC24349@willie-the-truck> References: <20201023154751.1973872-1-swboyd@chromium.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20201023154751.1973872-1-swboyd@chromium.org> User-Agent: Mutt/1.10.1 (2018-07-13) X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201026_092539_730106_081A6C58 X-CRM114-Status: GOOD ( 27.67 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Catalin Marinas , linux-kernel@vger.kernel.org, stable@vger.kernel.org, Steven Price , Andre Przywara , Marc Zyngier , linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Fri, Oct 23, 2020 at 08:47:50AM -0700, Stephen Boyd wrote: > According to the SMCCC spec[1](7.5.2 Discovery) the > ARM_SMCCC_ARCH_WORKAROUND_1 function id only returns 0, 1, and > SMCCC_RET_NOT_SUPPORTED. > > 0 is "workaround required and safe to call this function" > 1 is "workaround not required but safe to call this function" > SMCCC_RET_NOT_SUPPORTED is "might be vulnerable or might not be, who knows, I give up!" > > SMCCC_RET_NOT_SUPPORTED might as well mean "workaround required, except > calling this function may not work because it isn't implemented in some > cases". Wonderful. We map this SMC call to > > 0 is SPECTRE_MITIGATED > 1 is SPECTRE_UNAFFECTED > SMCCC_RET_NOT_SUPPORTED is SPECTRE_VULNERABLE > > For KVM hypercalls (hvc), we've implemented this function id to return > SMCCC_RET_NOT_SUPPORTED, 0, and SMCCC_RET_NOT_REQUIRED. One of those > isn't supposed to be there. Per the code we call > arm64_get_spectre_v2_state() to figure out what to return for this > feature discovery call. > > 0 is SPECTRE_MITIGATED > SMCCC_RET_NOT_REQUIRED is SPECTRE_UNAFFECTED > SMCCC_RET_NOT_SUPPORTED is SPECTRE_VULNERABLE > > Let's clean this up so that KVM tells the guest this mapping: > > 0 is SPECTRE_MITIGATED > 1 is SPECTRE_UNAFFECTED > SMCCC_RET_NOT_SUPPORTED is SPECTRE_VULNERABLE > > Note: SMCCC_RET_NOT_AFFECTED is 1 but isn't part of the SMCCC spec > > Cc: Andre Przywara > Cc: Steven Price > Cc: Marc Zyngier > Cc: stable@vger.kernel.org > Link: https://developer.arm.com/documentation/den0028/latest [1] > Fixes: c118bbb52743 ("arm64: KVM: Propagate full Spectre v2 workaround state to KVM guests") > Signed-off-by: Stephen Boyd > --- > > I see that before commit c118bbb52743 ("arm64: KVM: Propagate full > Spectre v2 workaround state to KVM guests") we had this mapping: > > 0 is SPECTRE_MITIGATED > SMCCC_RET_NOT_SUPPORTED is SPECTRE_VULNERABLE > > so the return value '1' wasn't there then. Once the commit was merged we > introduced the notion of NOT_REQUIRED here when it shouldn't have been > introduced. > > Changes from v2: > * Moved define to header file and used it > > Changes from v1: > * Way longer commit text, more background (sorry) > * Dropped proton-pack part because it was wrong > * Rebased onto other patch accepted upstream > > arch/arm64/kernel/proton-pack.c | 2 -- > arch/arm64/kvm/hypercalls.c | 2 +- > include/linux/arm-smccc.h | 2 ++ > 3 files changed, 3 insertions(+), 3 deletions(-) > > diff --git a/arch/arm64/kernel/proton-pack.c b/arch/arm64/kernel/proton-pack.c > index 25f3c80b5ffe..c18eb7d41274 100644 > --- a/arch/arm64/kernel/proton-pack.c > +++ b/arch/arm64/kernel/proton-pack.c > @@ -135,8 +135,6 @@ static enum mitigation_state spectre_v2_get_cpu_hw_mitigation_state(void) > return SPECTRE_VULNERABLE; > } > > -#define SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED (1) > - > static enum mitigation_state spectre_v2_get_cpu_fw_mitigation_state(void) > { > int ret; > diff --git a/arch/arm64/kvm/hypercalls.c b/arch/arm64/kvm/hypercalls.c > index 9824025ccc5c..25ea4ecb6449 100644 > --- a/arch/arm64/kvm/hypercalls.c > +++ b/arch/arm64/kvm/hypercalls.c > @@ -31,7 +31,7 @@ int kvm_hvc_call_handler(struct kvm_vcpu *vcpu) > val = SMCCC_RET_SUCCESS; > break; > case SPECTRE_UNAFFECTED: > - val = SMCCC_RET_NOT_REQUIRED; > + val = SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED; > break; > } > break; > diff --git a/include/linux/arm-smccc.h b/include/linux/arm-smccc.h > index 15c706fb0a37..0e50ba3e88d7 100644 > --- a/include/linux/arm-smccc.h > +++ b/include/linux/arm-smccc.h > @@ -86,6 +86,8 @@ > ARM_SMCCC_SMC_32, \ > 0, 0x7fff) > > +#define SMCCC_ARCH_WORKAROUND_RET_UNAFFECTED 1 I thought we'd stick this in asm/spectre.h, but here is also good: Acked-by: Will Deacon Will _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel