Received: by 2002:ac0:da4c:0:0:0:0:0 with SMTP id a12csp458780imi; Fri, 22 Jul 2022 02:50:46 -0700 (PDT) X-Google-Smtp-Source: AGRyM1u9sgzW/qhROpDihuJIX5TCOTdlsm27w7DMb0PH4Is4+feLfUrzalV9WhEskY7js3HWxCMz X-Received: by 2002:a17:90a:1485:b0:1ec:788e:a053 with SMTP id k5-20020a17090a148500b001ec788ea053mr3146291pja.16.1658483446040; Fri, 22 Jul 2022 02:50:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658483446; cv=none; d=google.com; s=arc-20160816; b=UID01gedqngqCLR2Y4mA0qwRAoqE84FFze24o8oRLS97VAc1989B0PtqeEFWOkSzBw zMqlyh+zqlIHjG/bHiXeXq+lyuHAOUDSd8Hs1SIasxiYko36JYnnkNYycgRSGMfNdjEH ozpJQGeX11lsMOttiYD/Vv1H38FJGxblrrK150wn23c/t+Shcm8JHzoT1fZHLRNvrQTM x7qmYhdZSN2sCOLAJ7OaQkIN9winyIJtNkIZZOypTlslSMFlsBvfdjLPeEp/MSk9VmZn 9TojqyFpToutFSOk0uNVHpzPzFpc039TT1V0ghiv2PylcpHV4+zs6MP+jpamueBlPW2d 9PUQ== 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=idRiuOzBaN3Ugfetgr2JtIu0KLNKJBv9stSBxG6zjgfn2AFfJndJqKpohTZw4mNo0k GjJwgU0XEUyroaMuXnspfrTDLITR74zkWiIFO0bfp5nFcLNeL2fNVsfAFu6NfmkQkbhP fyKMekceFrrr80TsfNusaCbfKaDRVflbgTpPQQ4wsRk3jhDW5QeY3ALvfk4R8+8xsQ40 VFbLMrP3/pJTnjifRX/79a5/BxpR1sMEBT6ZVrf9qpBh/48H28GzLmfByetP4SMtohRI AqinKPZZN88lsuIFRbkD2RxKjXCdfYJXxlnsUHfFPLDCpRqIrWfjMzvljJ7QA891xRda vNcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=sPmL8EQL; 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 m11-20020a634c4b000000b003fe2bc67bbdsi5052776pgl.116.2022.07.22.02.50.31; Fri, 22 Jul 2022 02:50:46 -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=sPmL8EQL; 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 S236213AbiGVJWy (ORCPT + 99 others); Fri, 22 Jul 2022 05:22:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38310 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S236177AbiGVJWY (ORCPT ); Fri, 22 Jul 2022 05:22:24 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EDA25BF9AC; Fri, 22 Jul 2022 02:14: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 ams.source.kernel.org (Postfix) with ESMTPS id 36B26B827C1; Fri, 22 Jul 2022 09:14:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96BE1C341C6; Fri, 22 Jul 2022 09:14:33 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1658481274; bh=9d+Kp6/2NX6lzNnjWTljAdV1EFVIu8UX09rYANXkE74=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sPmL8EQLKjQaVuqAY/G+UTqhSsXYgJxl/a0Z2xbMcFIYchGs0L20MWoS2w2nAHif2 8G75XVdntmtNJ/fDwdtSiIbcghSlliBHim73DHT4P+d9NT5k1sarNhkqPC0o9aLtFC HDj31sgDt9fL5ATsM8I7dL6n/N40AXSaQb4KAXZE= 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/89] x86/xen: Add UNTRAIN_RET Date: Fri, 22 Jul 2022 11:11:28 +0200 Message-Id: <20220722091136.385237728@linuxfoundation.org> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20220722091133.320803732@linuxfoundation.org> References: <20220722091133.320803732@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.8 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 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