From patchwork Fri Jul 17 20:52:31 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 11671183 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 89EA013B6 for ; Fri, 17 Jul 2020 20:54:19 +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 642E12074B for ; Fri, 17 Jul 2020 20:54:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="uuaSDJ34" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 642E12074B 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+patchwork-linux-arm=patchwork.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:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=RrOa5TUAX1aO1i0zq/v14CK07sZ/SM1DgYkfLHY5IFc=; b=uuaSDJ34Cjhey6MHcHQZkoIDg j6jvm9dSFaCOMGvKsgZtLuPXnsj8JiX2H8iEyrS3lBovCth8xtj/Yyjk+4teR36gvRi72Hke5B2kA fiQL01D5WiS4mw6nOzjpQCIFe/ENYiJxs0LKnKwe87SEP/jhgdALx7Mo0xdpqmamFH7T8MeB8HQ4M 8wgpVt+9LKnDYGw3YSYIC5hoDZaPSUoi7Z/uTjVXlA9YsSMlZpdEm80DSgXi8JS5tH0saCq9CMVZQ rjH1833RnttwOLroecIMXp92l5HuZSDexi6BYX25D6aHoZGZGb3MCk0SaPjT2cihKnU+NIGiOIjvF moNGlpNYg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwXLV-0002eg-NO; Fri, 17 Jul 2020 20:52:42 +0000 Received: from mail-il1-f193.google.com ([209.85.166.193]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwXLS-0002dJ-FT for linux-arm-kernel@lists.infradead.org; Fri, 17 Jul 2020 20:52:39 +0000 Received: by mail-il1-f193.google.com with SMTP id t18so8463684ilh.2 for ; Fri, 17 Jul 2020 13:52:36 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lA6y1484mCfujwLhJ510Qn2HTKproByu1gKdBQz37Eo=; b=ED/afckgfsrJcy8pm+NBfA+UHPR6NBVSl5FjNZ2q4yM3/tyUczF12gsOwfWiaXEF0e XWrMvqYrktMPUW9FDJWGjzyRsTa2xn4xhfFyW0OciokeXPSDUnNMenMETz9XmQt8qoRb 0nfh9Gh69W8lRcY635GqNXtWkFPNOtRZRqGB1iuCTYbD//URnvTVxRjeKz0UDeRUCZLl TS4glOUQ7hC/2bmrzSSRAvPtMtBGUle0l2eKwhknh8OgoYPWytvfSwafftkCiIje+zUR PrsmX5qDndtRuawD8qJ+bgrmbdy9X08stfaGoO7wB1wlwXygkqct+48CkgtBVWsqvfOe ikvA== X-Gm-Message-State: AOAM530QSZW4CEtSBayDBrbTOW5BzoPtn2UL3247cVADi0GA7AqHvGi7 Y0LD0dCMnPp+GrVeM13tDw== X-Google-Smtp-Source: ABdhPJyx/gulu/KTsFX3iauAwSag59A89mCNqY2i4r9k8OMUlJTecA50WQpkSdggWHrYVxGOD+Zqdw== X-Received: by 2002:a05:6e02:ead:: with SMTP id u13mr11850062ilj.46.1595019156351; Fri, 17 Jul 2020 13:52:36 -0700 (PDT) Received: from xps15.herring.priv ([64.188.179.252]) by smtp.googlemail.com with ESMTPSA id 136sm4737492iou.50.2020.07.17.13.52.35 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 13:52:35 -0700 (PDT) From: Rob Herring To: Catalin Marinas , Will Deacon , Marc Zyngier Subject: [PATCH v3 1/3] KVM: arm64: Print warning when cpu erratum can cause guests to deadlock Date: Fri, 17 Jul 2020 14:52:31 -0600 Message-Id: <20200717205233.903344-2-robh@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200717205233.903344-1-robh@kernel.org> References: <20200717205233.903344-1-robh@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200717_165238_541217_D8097847 X-CRM114-Status: GOOD ( 10.85 ) X-Spam-Score: 0.3 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [robherring2[at]gmail.com] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [robherring2[at]gmail.com] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.166.193 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.166.193 listed in list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different 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: kvmarm@lists.cs.columbia.edu, James Morse , Julien Thierry , linux-arm-kernel@lists.infradead.org, Suzuki K Poulose Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org If guests don't have certain CPU erratum workarounds implemented, then there is a possibility a guest can deadlock the system. IOW, only trusted guests should be used on systems with the erratum. This is the case for Cortex-A57 erratum 832075. Cc: Marc Zyngier Cc: James Morse Cc: Julien Thierry Cc: Suzuki K Poulose Cc: Catalin Marinas Cc: Will Deacon Cc: kvmarm@lists.cs.columbia.edu Signed-off-by: Rob Herring --- v3: - s/work-arounds/workarounds/ arch/arm64/kvm/arm.c | 4 ++++ 1 file changed, 4 insertions(+) -- 2.25.1 diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 90cb90561446..9b070b5e212b 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -1653,6 +1653,10 @@ int kvm_arch_init(void *opaque) return -ENODEV; } + if (cpus_have_const_cap(ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE)) + kvm_info("Guests without required CPU erratum workarounds can deadlock system!\n" \ + "Only trusted guests should be used on this system.\n"); + for_each_online_cpu(cpu) { smp_call_function_single(cpu, check_kvm_target_cpu, &ret, 1); if (ret < 0) { From patchwork Fri Jul 17 20:52:32 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 11671181 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 80E0260D for ; Fri, 17 Jul 2020 20:54:19 +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 5A64D2070E for ; Fri, 17 Jul 2020 20:54:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="aVWhtx9v" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 5A64D2070E 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+patchwork-linux-arm=patchwork.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:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=icpEDBBMCC0CJKIw18lNXuLjIk+nY3RYec1QHgIjbws=; b=aVWhtx9vcDGuu0Gs4eyvy6gnx MPBjtwl5NbzLIQgxW1T6/Ktoc1BCr5GDY02yDp/a5qcnSq0Clx0Iertka2EKemai2PZ1JcMKY2a8x 1acFj17T6LOoXX9nUSb6YVxHAt82G+YYZO5eA7pLl2CMOJjS1ZWWC7BClMWKExnB0FJXoCnOftpce v+63+Z6QU5PmmUNhlN4EmSC2m1jT8LA/Z5WRnNF3Vx+RPggor+ZOrKhPwHZ6LxUmgRg5YATF5VKft EPBE47Is2hJtULDtMt2toUdCQq3Yz55/s2LtO+yFOvjylpl8UFAgZo8Z/kAaVXLN1k1IjAeSDypWe IQTvL5Q2w==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwXLZ-0002f3-2a; Fri, 17 Jul 2020 20:52:45 +0000 Received: from mail-il1-f194.google.com ([209.85.166.194]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwXLS-0002dM-Hl for linux-arm-kernel@lists.infradead.org; Fri, 17 Jul 2020 20:52:40 +0000 Received: by mail-il1-f194.google.com with SMTP id p15so8410753ilh.13 for ; Fri, 17 Jul 2020 13:52:38 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8xBC3nAXSULrgwmXIdCxH6li3ZbD31n6G3URGbOpyNA=; b=sN7kg1Wf6vlH1UCGcEU9mfEpXtzlbDn0wEtYQxTtB2mAB9LwnxZgPU7KN2D9Cb3Aco ekpMwoOyLDMu9tlO8z74rJ8mNm520xeXa85E2sJtbnBYrnKu6TpgiyVAlSlviXArE1qg JMown0cDQjhFVU75jnAo2HQA9C2I2dcMh+ms8T1xxG/tFf0y6XyeOX8/TApZsZNxxgkp 27Prc7bmXIG8u10kVw6i1StlNqub83wmq/lclQghGeaiQVItA8FXeHL1I8Ckob8kQ3QD KmM1O0Cq2O0ZyRhhVczwkI5gITuyvf/QEzq3CxC22R4uNwVJOdT0sPYj434WEmKPIROx KaUg== X-Gm-Message-State: AOAM533pn7DvpX5HJk+w/hf5Wp9u5LF7J41Tc1oHgR8gPIINzELetoMn 43JuTWB4gTMVc5Oaa7HG8w== X-Google-Smtp-Source: ABdhPJy8mgc4UM9YOfWN2tVTpEn8zFJxxWpEna2HHMu6Jr2fMtP0xf94c7w434YTdNuK6Qh4nl9epw== X-Received: by 2002:a92:1b8c:: with SMTP id f12mr11194653ill.93.1595019157750; Fri, 17 Jul 2020 13:52:37 -0700 (PDT) Received: from xps15.herring.priv ([64.188.179.252]) by smtp.googlemail.com with ESMTPSA id 136sm4737492iou.50.2020.07.17.13.52.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 13:52:37 -0700 (PDT) From: Rob Herring To: Catalin Marinas , Will Deacon , Marc Zyngier Subject: [PATCH v3 2/3] arm64: Add part number for Arm Cortex-A77 Date: Fri, 17 Jul 2020 14:52:32 -0600 Message-Id: <20200717205233.903344-3-robh@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200717205233.903344-1-robh@kernel.org> References: <20200717205233.903344-1-robh@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200717_165238_656192_19963AA3 X-CRM114-Status: GOOD ( 10.86 ) X-Spam-Score: 1.0 (+) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (1.0 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [robherring2[at]gmail.com] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [robherring2[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.166.194 listed in wl.mailspike.net] -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.166.194 listed in list.dnswl.org] 0.8 UPPERCASE_50_75 message body is 50-75% uppercase 0.0 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different 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: kvmarm@lists.cs.columbia.edu, James Morse , Julien Thierry , linux-arm-kernel@lists.infradead.org, Suzuki K Poulose Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Add the MIDR part number info for the Arm Cortex-A77. Cc: Catalin Marinas Cc: Will Deacon Signed-off-by: Rob Herring --- arch/arm64/include/asm/cputype.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/arch/arm64/include/asm/cputype.h b/arch/arm64/include/asm/cputype.h index a87a93f67671..7a2d3c336579 100644 --- a/arch/arm64/include/asm/cputype.h +++ b/arch/arm64/include/asm/cputype.h @@ -71,6 +71,7 @@ #define ARM_CPU_PART_CORTEX_A55 0xD05 #define ARM_CPU_PART_CORTEX_A76 0xD0B #define ARM_CPU_PART_NEOVERSE_N1 0xD0C +#define ARM_CPU_PART_CORTEX_A77 0xD0D #define APM_CPU_PART_POTENZA 0x000 @@ -104,6 +105,7 @@ #define MIDR_CORTEX_A55 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A55) #define MIDR_CORTEX_A76 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A76) #define MIDR_NEOVERSE_N1 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_NEOVERSE_N1) +#define MIDR_CORTEX_A77 MIDR_CPU_MODEL(ARM_CPU_IMP_ARM, ARM_CPU_PART_CORTEX_A77) #define MIDR_THUNDERX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX) #define MIDR_THUNDERX_81XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_81XX) #define MIDR_THUNDERX_83XX MIDR_CPU_MODEL(ARM_CPU_IMP_CAVIUM, CAVIUM_CPU_PART_THUNDERX_83XX) From patchwork Fri Jul 17 20:52:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Rob Herring (Arm)" X-Patchwork-Id: 11671185 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9C0141751 for ; Fri, 17 Jul 2020 20:54:19 +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 699C92076A for ; Fri, 17 Jul 2020 20:54:19 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="HTyHiDzD" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 699C92076A 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+patchwork-linux-arm=patchwork.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:MIME-Version:References:In-Reply-To:Message-Id:Date: Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=HzcOUwk7rhnjRd1UwUmZAlFRCwy2DsYc8UnRJr5ytfs=; b=HTyHiDzDu49X+SXl6nWqBwpzU Y2UMy+41Xcv5Jv3F/iTfP9snEyjyJkA4BfhWxdA//0PP1LDV7uo/cHrGb18/GYFU9qvoUySBv4RwR J2GjFRd2KrRynwAvWVMOOiPFUeERJtuMNo1MYEv4lbWVnGAEM381dIuO8LfiApXwwxvsE0S8Zszc/ upeapkHGjGUEzS9c+L2UldXUURR2CAZoZZHl9esKwmXllkZ8Y6N1EQi04UnWhbmC1CbzcNSuKd4F8 it4Awah+MZmSUPVokX0NjQ05lsDJtHCd0DA7C9mrQEpByt06v8xoh6lZg9AlQkf+oHQwqyyT5mY89 4Fa1BCyTg==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwXLg-0002g0-Ni; Fri, 17 Jul 2020 20:52:52 +0000 Received: from mail-il1-f195.google.com ([209.85.166.195]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jwXLU-0002e5-0O for linux-arm-kernel@lists.infradead.org; Fri, 17 Jul 2020 20:52:41 +0000 Received: by mail-il1-f195.google.com with SMTP id a11so8489157ilk.0 for ; Fri, 17 Jul 2020 13:52:39 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=lEoAxhqLPgn3cqCZQSTojwbGR+UiP81fjYDXmaBuTgY=; b=tJc9Bf5fbq7eaWrH7t0FD0Z8ivQUWy8a5ebeI3fJMCdPlz5/m4ABZjAPkr3jMUW7mH AGm+eRuLIfCHB7MbMtDqYV1xMuoZNJX0pnDiNRsgJaCW8YOorB/XnaV7PBfAqV55fXNY Tcp7uCZjcGe9q+0zj7oYTHJrdNsJ49JA8180hUsQlzEWkBA9cEs2WBFnbq/J+IdeGVOq +FRpbQpFOWxgcStG5QQ20LnaLZ+XqVrCmB03wDTWYOL7hkZxJXwV/Yakf8A6hkyZuSlZ aYoS6SReIH/Pi323tQ+kpdyBJy4veMyidT1UDCxFCWFpYXqgV/fRI+zPhgGQwh+WrrY4 3cKg== X-Gm-Message-State: AOAM532rNOLRNamO13obPvj7TGkrokmBTZylZpmvZ68ZDpJ/sG6O6IXg bERVTPrtk+Zvpvb0lsWfPg== X-Google-Smtp-Source: ABdhPJy5NKK2SHhoDUWvVU0fyJpIDarffE7f4rG/PnCLaXN1HuY+E7uZiV6aXI1J1VvsV3FoZCGRsQ== X-Received: by 2002:a92:1547:: with SMTP id v68mr11895540ilk.294.1595019159140; Fri, 17 Jul 2020 13:52:39 -0700 (PDT) Received: from xps15.herring.priv ([64.188.179.252]) by smtp.googlemail.com with ESMTPSA id 136sm4737492iou.50.2020.07.17.13.52.37 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 17 Jul 2020 13:52:38 -0700 (PDT) From: Rob Herring To: Catalin Marinas , Will Deacon , Marc Zyngier Subject: [PATCH v3 3/3] arm64: Add workaround for Arm Cortex-A77 erratum 1508412 Date: Fri, 17 Jul 2020 14:52:33 -0600 Message-Id: <20200717205233.903344-4-robh@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200717205233.903344-1-robh@kernel.org> References: <20200717205233.903344-1-robh@kernel.org> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200717_165240_153132_C2B8F50A X-CRM114-Status: GOOD ( 23.89 ) X-Spam-Score: 0.3 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (0.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [robherring2[at]gmail.com] 0.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit [robherring2[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [209.85.166.195 listed in list.dnswl.org] -0.0 RCVD_IN_MSPIKE_H2 RBL: Average reputation (+2) [209.85.166.195 listed in wl.mailspike.net] 0.0 FREEMAIL_FORGED_FROMDOMAIN 2nd level domains in From and EnvelopeFrom freemail headers are different 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: kvmarm@lists.cs.columbia.edu, James Morse , Julien Thierry , linux-arm-kernel@lists.infradead.org, Suzuki K Poulose Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org On Cortex-A77 r0p0 and r1p0, a sequence of a non-cacheable or device load and a store exclusive or PAR_EL1 read can cause a deadlock. The workaround requires a DMB SY before and after a PAR_EL1 register read. A deadlock is still possible with the workaround as KVM guests must also have the workaround. IOW, a malicious guest can deadlock an affected systems. This workaround also depends on a firmware counterpart to enable the h/w to insert DMB SY after load and store exclusive instructions. See the errata document SDEN-1152370 v10 [1] for more information. [1] https://static.docs.arm.com/101992/0010/Arm_Cortex_A77_MP074_Software_Developer_Errata_Notice_v10.pdf Cc: Catalin Marinas Cc: James Morse Cc: Suzuki K Poulose Cc: Will Deacon Cc: Marc Zyngier Cc: Julien Thierry Cc: kvmarm@lists.cs.columbia.edu Signed-off-by: Rob Herring --- v3: - Add dmbs around PAR reads in KVM code - Clean-up 'work-around' and 'errata' v2: - Don't disable KVM, just print warning --- Documentation/arm64/silicon-errata.rst | 2 ++ arch/arm64/Kconfig | 19 +++++++++++++++++++ arch/arm64/include/asm/cpucaps.h | 3 ++- arch/arm64/include/asm/kvm_hyp.h | 11 +++++++++++ arch/arm64/kernel/cpu_errata.c | 10 ++++++++++ arch/arm64/kvm/arm.c | 3 ++- arch/arm64/kvm/hyp/switch.c | 7 ++++--- arch/arm64/kvm/hyp/sysreg-sr.c | 2 +- arch/arm64/kvm/sys_regs.c | 8 +++++++- arch/arm64/mm/fault.c | 10 ++++++++++ 10 files changed, 68 insertions(+), 7 deletions(-) diff --git a/Documentation/arm64/silicon-errata.rst b/Documentation/arm64/silicon-errata.rst index 936cf2a59ca4..716b279e3b33 100644 --- a/Documentation/arm64/silicon-errata.rst +++ b/Documentation/arm64/silicon-errata.rst @@ -90,6 +90,8 @@ stable kernels. +----------------+-----------------+-----------------+-----------------------------+ | ARM | Cortex-A76 | #1463225 | ARM64_ERRATUM_1463225 | +----------------+-----------------+-----------------+-----------------------------+ +| ARM | Cortex-A77 | #1508412 | ARM64_ERRATUM_1508412 | ++----------------+-----------------+-----------------+-----------------------------+ | ARM | Neoverse-N1 | #1188873,1418040| ARM64_ERRATUM_1418040 | +----------------+-----------------+-----------------+-----------------------------+ | ARM | Neoverse-N1 | #1349291 | N/A | diff --git a/arch/arm64/Kconfig b/arch/arm64/Kconfig index a4a094bedcb2..6638444ce0d8 100644 --- a/arch/arm64/Kconfig +++ b/arch/arm64/Kconfig @@ -626,6 +626,25 @@ config ARM64_ERRATUM_1542419 If unsure, say Y. +config ARM64_ERRATUM_1508412 + bool "Cortex-A77: 1508412: workaround deadlock on sequence of NC/Device load and store exclusive or PAR read" + default y + help + This option adds a workaround for Arm Cortex-A77 erratum 1508412. + + Affected Cortex-A77 cores (r0p0, r1p0) could deadlock on a sequence + of a store-exclusive or read of PAR_EL1 and a load with device or + non-cacheable memory attributes. The workaround depends on a firmware + counterpart. + + KVM guests must also have the workaround implemented or they can + deadlock the system. + + Work around the issue by inserting DMB SY barriers around PAR_EL1 + register reads and warning KVM users. + + If unsure, say Y. + config CAVIUM_ERRATUM_22375 bool "Cavium erratum 22375, 24313" default y diff --git a/arch/arm64/include/asm/cpucaps.h b/arch/arm64/include/asm/cpucaps.h index d7b3bb0cb180..2a2cdb4ced8b 100644 --- a/arch/arm64/include/asm/cpucaps.h +++ b/arch/arm64/include/asm/cpucaps.h @@ -62,7 +62,8 @@ #define ARM64_HAS_GENERIC_AUTH 52 #define ARM64_HAS_32BIT_EL1 53 #define ARM64_BTI 54 +#define ARM64_WORKAROUND_1508412 55 -#define ARM64_NCAPS 55 +#define ARM64_NCAPS 56 #endif /* __ASM_CPUCAPS_H */ diff --git a/arch/arm64/include/asm/kvm_hyp.h b/arch/arm64/include/asm/kvm_hyp.h index ce3080834bfa..ce5b0d9b12bf 100644 --- a/arch/arm64/include/asm/kvm_hyp.h +++ b/arch/arm64/include/asm/kvm_hyp.h @@ -46,6 +46,17 @@ #define read_sysreg_el2(r) read_sysreg_elx(r, _EL2, _EL1) #define write_sysreg_el2(v,r) write_sysreg_elx(v, r, _EL2, _EL1) +static inline u64 __hyp_text read_sysreg_par(void) +{ + u64 par; + if (cpus_have_const_cap(ARM64_WORKAROUND_1508412)) + dmb(sy); + par = read_sysreg(par_el1); + if (cpus_have_const_cap(ARM64_WORKAROUND_1508412)) + dmb(sy); + return par; +} + /* * Without an __arch_swab32(), we fall back to ___constant_swab32(), but the * static inline can allow the compiler to out-of-line this. KVM always wants diff --git a/arch/arm64/kernel/cpu_errata.c b/arch/arm64/kernel/cpu_errata.c index ad06d6802d2e..5eee8a75540c 100644 --- a/arch/arm64/kernel/cpu_errata.c +++ b/arch/arm64/kernel/cpu_errata.c @@ -938,6 +938,16 @@ const struct arm64_cpu_capabilities arm64_errata[] = { .matches = has_neoverse_n1_erratum_1542419, .cpu_enable = cpu_enable_trap_ctr_access, }, +#endif +#ifdef CONFIG_ARM64_ERRATUM_1508412 + { + /* we depend on the firmware portion for correctness */ + .desc = "ARM erratum 1508412 (kernel portion)", + .capability = ARM64_WORKAROUND_1508412, + ERRATA_MIDR_RANGE(MIDR_CORTEX_A77, + 0, 0, + 1, 0), + }, #endif { } diff --git a/arch/arm64/kvm/arm.c b/arch/arm64/kvm/arm.c index 9b070b5e212b..21d8b3ca5bd7 100644 --- a/arch/arm64/kvm/arm.c +++ b/arch/arm64/kvm/arm.c @@ -1653,7 +1653,8 @@ int kvm_arch_init(void *opaque) return -ENODEV; } - if (cpus_have_const_cap(ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE)) + if (cpus_have_const_cap(ARM64_WORKAROUND_DEVICE_LOAD_ACQUIRE) || + cpus_have_const_cap(ARM64_WORKAROUND_1508412)) kvm_info("Guests without required CPU erratum workarounds can deadlock system!\n" \ "Only trusted guests should be used on this system.\n"); diff --git a/arch/arm64/kvm/hyp/switch.c b/arch/arm64/kvm/hyp/switch.c index db1c4487d95d..d76b6638b705 100644 --- a/arch/arm64/kvm/hyp/switch.c +++ b/arch/arm64/kvm/hyp/switch.c @@ -298,11 +298,12 @@ static bool __hyp_text __translate_far_to_hpfar(u64 far, u64 *hpfar) * We do need to save/restore PAR_EL1 though, as we haven't * saved the guest context yet, and we may return early... */ - par = read_sysreg(par_el1); + par = read_sysreg_par(); + asm volatile("at s1e1r, %0" : : "r" (far)); isb(); - tmp = read_sysreg(par_el1); + tmp = read_sysreg_par(); write_sysreg(par, par_el1); if (unlikely(tmp & SYS_PAR_EL1_F)) @@ -925,7 +926,7 @@ void __hyp_text __noreturn hyp_panic(struct kvm_cpu_context *host_ctxt) { u64 spsr = read_sysreg_el2(SYS_SPSR); u64 elr = read_sysreg_el2(SYS_ELR); - u64 par = read_sysreg(par_el1); + u64 par = read_sysreg_par(); if (!has_vhe()) __hyp_call_panic_nvhe(spsr, elr, par, host_ctxt); diff --git a/arch/arm64/kvm/hyp/sysreg-sr.c b/arch/arm64/kvm/hyp/sysreg-sr.c index cc7e957f5b2c..f522cbff291d 100644 --- a/arch/arm64/kvm/hyp/sysreg-sr.c +++ b/arch/arm64/kvm/hyp/sysreg-sr.c @@ -52,7 +52,7 @@ static void __hyp_text __sysreg_save_el1_state(struct kvm_cpu_context *ctxt) ctxt->sys_regs[CONTEXTIDR_EL1] = read_sysreg_el1(SYS_CONTEXTIDR); ctxt->sys_regs[AMAIR_EL1] = read_sysreg_el1(SYS_AMAIR); ctxt->sys_regs[CNTKCTL_EL1] = read_sysreg_el1(SYS_CNTKCTL); - ctxt->sys_regs[PAR_EL1] = read_sysreg(par_el1); + ctxt->sys_regs[PAR_EL1] = read_sysreg_par(); ctxt->sys_regs[TPIDR_EL1] = read_sysreg(tpidr_el1); ctxt->gp_regs.sp_el1 = read_sysreg(sp_el1); diff --git a/arch/arm64/kvm/sys_regs.c b/arch/arm64/kvm/sys_regs.c index baf5ce9225ce..3f798e0f1419 100644 --- a/arch/arm64/kvm/sys_regs.c +++ b/arch/arm64/kvm/sys_regs.c @@ -94,10 +94,16 @@ static bool __vcpu_read_sys_reg_from_cpu(int reg, u64 *val) case TPIDR_EL1: *val = read_sysreg_s(SYS_TPIDR_EL1); break; case AMAIR_EL1: *val = read_sysreg_s(SYS_AMAIR_EL12); break; case CNTKCTL_EL1: *val = read_sysreg_s(SYS_CNTKCTL_EL12); break; - case PAR_EL1: *val = read_sysreg_s(SYS_PAR_EL1); break; case DACR32_EL2: *val = read_sysreg_s(SYS_DACR32_EL2); break; case IFSR32_EL2: *val = read_sysreg_s(SYS_IFSR32_EL2); break; case DBGVCR32_EL2: *val = read_sysreg_s(SYS_DBGVCR32_EL2); break; + case PAR_EL1: + if (cpus_have_const_cap(ARM64_WORKAROUND_1508412)) + dmb(sy); + *val = read_sysreg_s(SYS_PAR_EL1); + if (cpus_have_const_cap(ARM64_WORKAROUND_1508412)) + dmb(sy); + break; default: return false; } diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c index 8afb238ff335..98609532e61a 100644 --- a/arch/arm64/mm/fault.c +++ b/arch/arm64/mm/fault.c @@ -260,7 +260,17 @@ static bool __kprobes is_spurious_el1_translation_fault(unsigned long addr, local_irq_save(flags); asm volatile("at s1e1r, %0" :: "r" (addr)); isb(); + /* + * Arm Erratum 1508412 requires dmb(sy) before and after reads of + * PAR_EL1. + * As this location is not a hot path, just condition it on the config + * option. + */ + if (IS_ENABLED(CONFIG_ARM64_ERRATUM_1508412)) + dmb(sy); par = read_sysreg(par_el1); + if (IS_ENABLED(CONFIG_ARM64_ERRATUM_1508412)) + dmb(sy); local_irq_restore(flags); /*