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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 74FD2C76195 for ; Fri, 19 Jul 2019 04:00:42 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4597C21873 for ; Fri, 19 Jul 2019 04:00:42 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563508842; bh=tZ8sBwu7/Pn4WLf4hymHgONnvNj/gFVPXWjKYdjIz4U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=u9EkJGbq6cT5NFaha66oZ2ry1HQOLyXEG7Jiu0WmRtkB8opx2+SwKyPZhviN6aTub VqidR7acUIlhrqeMJPvkNnsQ7f0ddoblugXtyNHX8CKE+P3gMJ8nQxRfgjkJB5sPqi U3Iv5V898TzXhn0XkbpMAjcZDhVwKlw1B5rgERLU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729171AbfGSEAl (ORCPT ); Fri, 19 Jul 2019 00:00:41 -0400 Received: from mail.kernel.org ([198.145.29.99]:60402 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729079AbfGSEAd (ORCPT ); Fri, 19 Jul 2019 00:00:33 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (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 BD6C721852; Fri, 19 Jul 2019 04:00:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563508832; bh=tZ8sBwu7/Pn4WLf4hymHgONnvNj/gFVPXWjKYdjIz4U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=jckTg3MmKiARJvvKkfXmy11IWuQNcKM4CKhAabGfm4e+v7WInOAx2UEx43w70OX4C JyYAZ8wQfVloonNZzRj/UGZVaMM87L3ho0gJJ1VqMphHuNH2twizzy5t6xfiltq5qs YijX52g6BYiXcf8TkMc+TCPtEklDffQbZld2I+R4= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: James Morse , Julien Thierry , Marc Zyngier , Sasha Levin Subject: [PATCH AUTOSEL 5.2 114/171] arm64: assembler: Switch ESB-instruction with a vanilla nop if !ARM64_HAS_RAS Date: Thu, 18 Jul 2019 23:55:45 -0400 Message-Id: <20190719035643.14300-114-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190719035643.14300-1-sashal@kernel.org> References: <20190719035643.14300-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: James Morse [ Upstream commit 2b68a2a963a157f024c67c0697b16f5f792c8a35 ] The ESB-instruction is a nop on CPUs that don't implement the RAS extensions. This lets us use it in places like the vectors without having to use alternatives. If someone disables CONFIG_ARM64_RAS_EXTN, this instruction still has its RAS extensions behaviour, but we no longer read DISR_EL1 as this register does depend on alternatives. This could go wrong if we want to synchronize an SError from a KVM guest. On a CPU that has the RAS extensions, but the KConfig option was disabled, we consume the pending SError with no chance of ever reading it. Hide the ESB-instruction behind the CONFIG_ARM64_RAS_EXTN option, outputting a regular nop if the feature has been disabled. Reported-by: Julien Thierry Signed-off-by: James Morse Signed-off-by: Marc Zyngier Signed-off-by: Sasha Levin --- arch/arm64/include/asm/assembler.h | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/arch/arm64/include/asm/assembler.h b/arch/arm64/include/asm/assembler.h index 570d195a184d..e3a15c751b13 100644 --- a/arch/arm64/include/asm/assembler.h +++ b/arch/arm64/include/asm/assembler.h @@ -96,7 +96,11 @@ * RAS Error Synchronization barrier */ .macro esb +#ifdef CONFIG_ARM64_RAS_EXTN hint #16 +#else + nop +#endif .endm /* -- 2.20.1