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=-12.3 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 87A63C433DF for ; Mon, 24 Aug 2020 18:36:10 +0000 (UTC) Received: from mm01.cs.columbia.edu (mm01.cs.columbia.edu [128.59.11.253]) by mail.kernel.org (Postfix) with ESMTP id 3A8EA2074D for ; Mon, 24 Aug 2020 18:36:10 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="vc6dI0Sk" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 3A8EA2074D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=kvmarm-bounces@lists.cs.columbia.edu Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id E85BB4CB32; Mon, 24 Aug 2020 14:36:09 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Authentication-Results: mm01.cs.columbia.edu (amavisd-new); dkim=softfail (fail, message has been altered) header.i=@gmail.com Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id efodN8yx8jYZ; Mon, 24 Aug 2020 14:36:08 -0400 (EDT) Received: from mm01.cs.columbia.edu (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id CD1A44CC8C; Mon, 24 Aug 2020 14:36:08 -0400 (EDT) Received: from localhost (localhost [127.0.0.1]) by mm01.cs.columbia.edu (Postfix) with ESMTP id 7526F4CC7F for ; Mon, 24 Aug 2020 14:36:06 -0400 (EDT) X-Virus-Scanned: at lists.cs.columbia.edu Received: from mm01.cs.columbia.edu ([127.0.0.1]) by localhost (mm01.cs.columbia.edu [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id u5uTu5SMFawd for ; Mon, 24 Aug 2020 14:36:05 -0400 (EDT) Received: from mail-pf1-f194.google.com (mail-pf1-f194.google.com [209.85.210.194]) by mm01.cs.columbia.edu (Postfix) with ESMTPS id 7D0604CC6F for ; Mon, 24 Aug 2020 14:36:05 -0400 (EDT) Received: by mail-pf1-f194.google.com with SMTP id d22so5304249pfn.5 for ; Mon, 24 Aug 2020 11:36:05 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=addwi+DuL+3In4jU8eTGvwYHm2hYzX6lkO3UYwBb/tE=; b=vc6dI0Skbh92KdhKcVQmbgbIz8zrp7NX2TL+pDNCWRMOmhEq78EETPi0jYncIEg8pE GJfJEHHqPbG+aH5PsJ4KsQr0tfA57DSH9u8qxqFgY5j4zsod+ze93XXmjQSi7/qkAPv5 poTsfxPpPQ+4mngHTY8zKO+9i4qbkPbKQGwbFgMktJ2NMUGSBv0fysS12rcL5n5fuFLA w/HSd9dqXG8DPhu1aRRFZBmnV32qEeGH7XDfjOs10EIqrB93FK8NWlB7vqnsLaDKvBvf g39Rz2PADypNU5TC4Col2JevZqeextTMdln1yA4oun1QHSfSCL2et1kgcMfngQxF9U4d EqtA== 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; bh=addwi+DuL+3In4jU8eTGvwYHm2hYzX6lkO3UYwBb/tE=; b=ljBUEjbhvnbWoUx4QhmSNoymjYciNEd5bDBhcsYbzFwRIbrQHCe8jHIHv39FIvDVda U0+zsuTPlrSmkWHa4r4wFw/H+MYpJ519ovJI0R1CrykRzGv1mjvK4Gh80MrCmQLgKLgC C28wQGpZfMrILX6n/0xPHUw10aZbWs38ZCVbwBOrg+Ioy09WODDpU0KCnFBBfDIypLYe M6AHvergzn32pGq4+8IaoCydULYt40eF7hNzcVC2eKXcGOafkhyPF9heK2pfxZhp9bKU XGzUj33VVFl9Kwd5PEhhuxQMmcFrG/Jay3RNchHck0sV58XiKFQ5UsvprbfWvq+V3rW8 x5aQ== X-Gm-Message-State: AOAM530vX1XdJnfn1rOTNN5RTOHNRYciwqOoqSpPdj7v9DOCYwpNtwBJ dnVOFGbKXnvrom4o7lt4VD0= X-Google-Smtp-Source: ABdhPJzoksw/EyZJ9KdYrRMgXJ+MLx0l2lfCD2Dyj/Mjal/XTfEZX2oBb8RIB+0xeXksj9e7svHmuA== X-Received: by 2002:a17:902:788e:: with SMTP id q14mr4624503pll.140.1598294164572; Mon, 24 Aug 2020 11:36:04 -0700 (PDT) Received: from stbirv-lnx-3.igp.broadcom.net ([192.19.223.252]) by smtp.gmail.com with ESMTPSA id j10sm12167900pff.171.2020.08.24.11.36.02 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 24 Aug 2020 11:36:03 -0700 (PDT) From: Florian Fainelli To: linux-arm-kernel@lists.infradead.org Subject: [PATCH stable 4.19 v2 2/2] arm64: entry: Place an SB sequence following an ERET instruction Date: Mon, 24 Aug 2020 11:35:12 -0700 Message-Id: <1598294112-19197-3-git-send-email-f.fainelli@gmail.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1598294112-19197-1-git-send-email-f.fainelli@gmail.com> References: <1598294112-19197-1-git-send-email-f.fainelli@gmail.com> Cc: Marc Zyngier , Florian Fainelli , Fangrui Song , Nick Desaulniers , Greg KH , Will Deacon , open list , stable@vger.kernel.org, "open list:KERNEL VIRTUAL MACHINE FOR ARM64 \(KVM/arm64\)" , Mark Brown , Kristina Martsenko , Sami Tolvanen , Catalin Marinas , Will Deacon , Ard Biesheuvel X-BeenThere: kvmarm@lists.cs.columbia.edu X-Mailman-Version: 2.1.14 Precedence: list List-Id: Where KVM/ARM decisions are made List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: kvmarm-bounces@lists.cs.columbia.edu Sender: kvmarm-bounces@lists.cs.columbia.edu From: Will Deacon commit 679db70801da9fda91d26caf13bf5b5ccc74e8e8 upstream Some CPUs can speculate past an ERET instruction and potentially perform speculative accesses to memory before processing the exception return. Since the register state is often controlled by a lower privilege level at the point of an ERET, this could potentially be used as part of a side-channel attack. This patch emits an SB sequence after each ERET so that speculation is held up on exception return. Signed-off-by: Will Deacon Signed-off-by: Florian Fainelli --- arch/arm64/kernel/entry.S | 2 ++ arch/arm64/kvm/hyp/entry.S | 1 + arch/arm64/kvm/hyp/hyp-entry.S | 4 ++++ 3 files changed, 7 insertions(+) diff --git a/arch/arm64/kernel/entry.S b/arch/arm64/kernel/entry.S index 5f800384cb9a..49f80b5627fa 100644 --- a/arch/arm64/kernel/entry.S +++ b/arch/arm64/kernel/entry.S @@ -363,6 +363,7 @@ alternative_insn eret, nop, ARM64_UNMAP_KERNEL_AT_EL0 .else eret .endif + sb .endm .macro irq_stack_entry @@ -994,6 +995,7 @@ alternative_insn isb, nop, ARM64_WORKAROUND_QCOM_FALKOR_E1003 mrs x30, far_el1 .endif eret + sb .endm .align 11 diff --git a/arch/arm64/kvm/hyp/entry.S b/arch/arm64/kvm/hyp/entry.S index fad1e164fe48..675fdc186e3b 100644 --- a/arch/arm64/kvm/hyp/entry.S +++ b/arch/arm64/kvm/hyp/entry.S @@ -83,6 +83,7 @@ ENTRY(__guest_enter) // Do not touch any register after this! eret + sb ENDPROC(__guest_enter) ENTRY(__guest_exit) diff --git a/arch/arm64/kvm/hyp/hyp-entry.S b/arch/arm64/kvm/hyp/hyp-entry.S index 24b4fbafe3e4..e35abf84eb96 100644 --- a/arch/arm64/kvm/hyp/hyp-entry.S +++ b/arch/arm64/kvm/hyp/hyp-entry.S @@ -96,6 +96,7 @@ el1_sync: // Guest trapped into EL2 do_el2_call eret + sb el1_hvc_guest: /* @@ -146,6 +147,7 @@ wa_epilogue: mov x0, xzr add sp, sp, #16 eret + sb el1_trap: get_vcpu_ptr x1, x0 @@ -185,6 +187,7 @@ el2_error: b.ne __hyp_panic mov x0, #(1 << ARM_EXIT_WITH_SERROR_BIT) eret + sb ENTRY(__hyp_do_panic) mov lr, #(PSR_F_BIT | PSR_I_BIT | PSR_A_BIT | PSR_D_BIT |\ @@ -193,6 +196,7 @@ ENTRY(__hyp_do_panic) ldr lr, =panic msr elr_el2, lr eret + sb ENDPROC(__hyp_do_panic) ENTRY(__hyp_panic) -- 2.7.4 _______________________________________________ kvmarm mailing list kvmarm@lists.cs.columbia.edu https://lists.cs.columbia.edu/mailman/listinfo/kvmarm