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=-9.9 required=3.0 tests=DKIMWL_WL_HIGH, DKIM_ADSP_CUSTOM_MED,DKIM_SIGNED,DKIM_VALID,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 6FC6CC2BA17 for ; Mon, 6 Apr 2020 16:44:12 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 28BDD2493B for ; Mon, 6 Apr 2020 16:44:12 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Y6ZwIMcU"; dkim=fail reason="signature verification failed" (2048-bit key) header.d=google.com header.i=@google.com header.b="sFTilaim" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 28BDD2493B Authentication-Results: mail.kernel.org; dmarc=fail (p=reject dis=none) header.from=google.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-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=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:To:From:Subject:References:Mime-Version :Message-Id:In-Reply-To:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=DTz8WpCuIRMerKEw/1VTwcOhlj3N9Lgf08vlDzqnW0Y=; b=Y6ZwIMcU582uJe gJDGdM1AZKYNRWFbGn5CGF6+7LFnwnFrac+CRjvjQA9EOc16ePC1uUoXZand7nFXrhx+ArbSloA/L IL9xKbsmSA68zVikObocUtDXAGJ6UHdCQ7r/oRG9b74a684vRB+7Nj5LyVRY7E5xCwLdJVcm7it+6 AjMpybnnh+UoHpTw0dl+u5YVaghBLIchIyHFKqvDAIg/9Nsysi6hcchg/EXHD/W2lOjKmZawzUVqE Fbdf7Hyoi4phy4tA0+upAbQW62CbiE5tpjx8pTUXmdtjeDXWfMTnJAGHK9RmZnRapMQntuYggSOLe xmIPYvl8YcRnEfKsojWg==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1jLUr3-0006IC-U8; Mon, 06 Apr 2020 16:44:09 +0000 Received: from mail-pl1-x649.google.com ([2607:f8b0:4864:20::649]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1jLUp0-0004Kc-Il for linux-arm-kernel@lists.infradead.org; Mon, 06 Apr 2020 16:42:04 +0000 Received: by mail-pl1-x649.google.com with SMTP id w16so117795plq.1 for ; Mon, 06 Apr 2020 09:42:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=og4BfgkxEdyP0L7K3K2SXksO/AChbKUXMouXqYPSA00=; b=sFTilaimS0olRUWr52P6NjZp8iOs10uO0Z0JxM5Uuc4SjrkX4akRPhGMMko6yn6Vjl ws3NQWWVJtJ3ueU7u0ytNYHOplXfphbPsUfJrc6hmnfKIl9LG70ErBmGNeEAaScsBIsa 8pzQNL6ueTZCTceiNxzsBsZ4KCIrIv1gusx7ObuDw8OyHYxmtcP4Mhcku3xGZumdZOoc 822uP7JCGsr7Bd/cARY+mTanl8Xs4pkuavmztPyJ4QiMT2w19+ROUOHp2IOOfM+O1hNX 7nYMkWpEpPknWEovRK6lAkDgfAOYFuYN4lNw2My6u1IqRuL++rFvl2FIx6OjAvMIwUcN E4oA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=og4BfgkxEdyP0L7K3K2SXksO/AChbKUXMouXqYPSA00=; b=f6sS7/ylAmtS7q5ai2J8Ocf2yFUja2w+9JV5JAebFHX12sq/86iUuXJrTwm0ff5iOM urg3L1VlpQ30kIlMk3wT0MLYHkOQeDc3yBXfn2PrZwbxupyjy0LTiwB4Oqegs/5ms32E EGRQ4A4EmnYn7QQTrCbPz6UVjar2PxZZWxOzK9Sbl3Dl5h3L9cPsbwb0JFfXqxIngut7 2C1bQ+45aqZiMAu/8iU0Nrm3+/9bGNMe1gKqa2J/Zc3fh0uRGF8mLLDM+Je/zQjPZ9lG uM7W6ED5DoR+yZT1P4m/EvTHmxToQbxLxvNl9Nv4E6Tu3E3rQCgIJKhlHYbKbAX0EPIJ PRvw== X-Gm-Message-State: AGi0Pub7n4LUVB/ESXaTVo7swlyO/3dymTbCI3c4IUBP6S4k4zizHq4a xnf+4PI67ZJk8jJ+cmpx6NCKlD4Y+/wcgU4fQ/4= X-Google-Smtp-Source: APiQypJDVItbvdsaAcfKFSSNsMelQNBO6U0MvHJemAJCSTnqHm4EIsriO2lzZR7x/iXYclFFASObx3hqbCBuu2Gzn3g= X-Received: by 2002:a63:c504:: with SMTP id f4mr1623499pgd.292.1586191321112; Mon, 06 Apr 2020 09:42:01 -0700 (PDT) Date: Mon, 6 Apr 2020 09:41:18 -0700 In-Reply-To: <20200406164121.154322-1-samitolvanen@google.com> Message-Id: <20200406164121.154322-10-samitolvanen@google.com> Mime-Version: 1.0 References: <20191018161033.261971-1-samitolvanen@google.com> <20200406164121.154322-1-samitolvanen@google.com> X-Mailer: git-send-email 2.26.0.292.g33ef6b2f38-goog Subject: [PATCH v10 09/12] arm64: disable SCS for hypervisor code From: Sami Tolvanen To: Will Deacon , Catalin Marinas , James Morse , Steven Rostedt , Masami Hiramatsu , Ard Biesheuvel , Mark Rutland X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20200406_094202_668315_CB3AE146 X-CRM114-Status: GOOD ( 10.88 ) 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: Kees Cook , Jann Horn , Masahiro Yamada , Marc Zyngier , kernel-hardening@lists.openwall.com, Nick Desaulniers , linux-kernel@vger.kernel.org, Miguel Ojeda , clang-built-linux@googlegroups.com, Sami Tolvanen , Laura Abbott , Dave Martin , 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+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org Disable SCS for code that runs at a different exception level by adding __noscs to __hyp_text. Suggested-by: James Morse Signed-off-by: Sami Tolvanen Acked-by: Marc Zyngier --- arch/arm64/include/asm/kvm_hyp.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/kvm_hyp.h b/arch/arm64/include/asm/kvm_hyp.h index fe57f60f06a8..875b106c5d98 100644 --- a/arch/arm64/include/asm/kvm_hyp.h +++ b/arch/arm64/include/asm/kvm_hyp.h @@ -13,7 +13,7 @@ #include #include -#define __hyp_text __section(.hyp.text) notrace +#define __hyp_text __section(.hyp.text) notrace __noscs #define read_sysreg_elx(r,nvh,vh) \ ({ \ -- 2.26.0.292.g33ef6b2f38-goog _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel