Received: by 2002:ad5:4acb:0:0:0:0:0 with SMTP id n11csp4698756imw; Tue, 12 Jul 2022 12:39:27 -0700 (PDT) X-Google-Smtp-Source: AGRyM1tWJ65+hEDi1QHHq3eLjpM/6IZTXcae62KXQ4E68GRzuLenYMDeyhFyFby08BbqjqyqN7Yj X-Received: by 2002:a17:907:da5:b0:726:2a4d:be69 with SMTP id go37-20020a1709070da500b007262a4dbe69mr25402865ejc.208.1657654766996; Tue, 12 Jul 2022 12:39:26 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1657654766; cv=none; d=google.com; s=arc-20160816; b=BnQUYQtkVAVE7lppAJdXEG1PU+uXlDg2hEGiKkuQCtJ+/xi1oyom4VCZMSeUMs/TC8 je/DcYXZONwtvqQgJgURU74rFXaVHcyI0UV2IIyhq5y5vynp6Nq2w8H6Ue6qyhfqvDNy ZMsAyyXebcTWGcxWSFHWWDqBdce/DWoEgJpTq0GierwdB9n7tAbElV1980+75ux0M8hB G34Ty8aLfHoflLLm+ne0/lyTW/dqpCadAtYuZ0qaiEYIah6/RBt68VRpyEMLPxlRvj33 LSNJY0bqpeA+IL63UFZKyQn8O4wlz+ZgQymv2FmxmHBaY5JnKaYc0d51AKai4WG/c/ev oX9Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=dtX1u5aD5h7XRzTF454UN5yqDvDydXJRH2ix0uh/Tls=; b=f9L0qya7zJYj3RYwmpuUR5HH8zlL320TaP9cLziGpMCAszcusnm3F5YC9qQ8DGWvHk 3YgnEyxLEkhb1RIWWwilLA83cVTW6jL4jPGpA4AkMdJQYOvProjyJlr+Do3npuSLLWWW YKqnJfFON7BA1oq//WIM9VDN/VuPJGKsaSBqXNJQRP63Qvr2Ggcp+tISZ+f+14JZXVk/ icnM8w/Bahf0hwcByqHPS3O55F+4Sl9zKKFeIWDiyCZ69D3i00VPhFGSbvrW/iPsQOUj hwSfEujFDPuM2m0GeMKjSm1T1wN6VbT0zvw0e8hQ4DCT9r50c4Nse1U9m4a6SzXdBuD0 pvDQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=I18VgXOe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sa1-20020a1709076d0100b0072b7c700b99si4376759ejc.662.2022.07.12.12.39.01; Tue, 12 Jul 2022 12:39:26 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=I18VgXOe; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235134AbiGLTDd (ORCPT + 99 others); Tue, 12 Jul 2022 15:03:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52808 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235283AbiGLTCJ (ORCPT ); Tue, 12 Jul 2022 15:02:09 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EF34B6D564; Tue, 12 Jul 2022 11:49:36 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 70E3F61491; Tue, 12 Jul 2022 18:49:36 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 48F40C341C0; Tue, 12 Jul 2022 18:49:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1657651775; bh=9d+Kp6/2NX6lzNnjWTljAdV1EFVIu8UX09rYANXkE74=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=I18VgXOeNvZmDV3o/Nj6oPrZLgUJNyC7WQB88wzgQlH0IeNphCoTUNLn3/ifJRhsS dZYzcyzyhl31yQxETJnUOQOhiN3DouF6Gklu/vp7mrRj4UdbaiXuTT9RHMM80Tktq9 12i9n35iiUgIJuUAZuqtzph9Np8oI3xnfD/oJG6E= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Peter Zijlstra (Intel)" , Borislav Petkov , Josh Poimboeuf , Thadeu Lima de Souza Cascardo Subject: [PATCH 5.15 54/78] x86/xen: Add UNTRAIN_RET Date: Tue, 12 Jul 2022 20:39:24 +0200 Message-Id: <20220712183241.074396117@linuxfoundation.org> X-Mailer: git-send-email 2.37.0 In-Reply-To: <20220712183238.844813653@linuxfoundation.org> References: <20220712183238.844813653@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Peter Zijlstra commit d147553b64bad34d2f92cb7d8ba454ae95c3baac upstream. Ensure the Xen entry also passes through UNTRAIN_RET. Signed-off-by: Peter Zijlstra (Intel) Signed-off-by: Borislav Petkov Reviewed-by: Josh Poimboeuf Signed-off-by: Borislav Petkov Signed-off-by: Thadeu Lima de Souza Cascardo Signed-off-by: Greg Kroah-Hartman --- arch/x86/entry/entry_64.S | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) --- a/arch/x86/entry/entry_64.S +++ b/arch/x86/entry/entry_64.S @@ -320,6 +320,12 @@ SYM_CODE_END(ret_from_fork) #endif .endm +SYM_CODE_START_LOCAL(xen_error_entry) + UNWIND_HINT_FUNC + UNTRAIN_RET + RET +SYM_CODE_END(xen_error_entry) + /** * idtentry_body - Macro to emit code calling the C function * @cfunc: C function to be called @@ -339,7 +345,7 @@ SYM_CODE_END(ret_from_fork) * switch the CR3. So it can skip invoking error_entry(). */ ALTERNATIVE "call error_entry; movq %rax, %rsp", \ - "", X86_FEATURE_XENPV + "call xen_error_entry", X86_FEATURE_XENPV ENCODE_FRAME_POINTER UNWIND_HINT_REGS