From patchwork Tue May 17 16:24:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maximilian Heyne X-Patchwork-Id: 12852736 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 72CADC433EF for ; Tue, 17 May 2022 16:32:11 +0000 (UTC) Received: from list by lists.xenproject.org with outflank-mailman.331261.554746 (Exim 4.92) (envelope-from ) id 1nr073-0005WM-T8; Tue, 17 May 2022 16:31:57 +0000 X-Outflank-Mailman: Message body and most headers restored to incoming version Received: by outflank-mailman (output) from mailman id 331261.554746; Tue, 17 May 2022 16:31:57 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nr073-0005WF-Pf; Tue, 17 May 2022 16:31:57 +0000 Received: by outflank-mailman (input) for mailman id 331261; Tue, 17 May 2022 16:31:56 +0000 Received: from se1-gles-flk1-in.inumbo.com ([94.247.172.50] helo=se1-gles-flk1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1nr071-0005Ee-Tp for xen-devel@lists.xenproject.org; Tue, 17 May 2022 16:31:56 +0000 Received: from smtp-fw-80007.amazon.com (smtp-fw-80007.amazon.com [99.78.197.218]) by se1-gles-flk1.inumbo.com (Halon) with ESMTPS id dbe3f5b8-d5fe-11ec-837e-e5687231ffcc; Tue, 17 May 2022 18:31:54 +0200 (CEST) Received: from pdx4-co-svc-p1-lb2-vlan2.amazon.com (HELO email-inbound-relay-pdx-2b-718d0906.us-west-2.amazon.com) ([10.25.36.210]) by smtp-border-fw-80007.pdx80.corp.amazon.com with ESMTP; 17 May 2022 16:24:43 +0000 Received: from EX13D08EUC002.ant.amazon.com (pdx1-ws-svc-p6-lb9-vlan2.pdx.amazon.com [10.236.137.194]) by email-inbound-relay-pdx-2b-718d0906.us-west-2.amazon.com (Postfix) with ESMTPS id 2584E3E00E4; Tue, 17 May 2022 16:24:43 +0000 (UTC) Received: from EX13MTAUEA002.ant.amazon.com (10.43.61.77) by EX13D08EUC002.ant.amazon.com (10.43.164.124) with Microsoft SMTP Server (TLS) id 15.0.1497.32; Tue, 17 May 2022 16:24:41 +0000 Received: from dev-dsk-mheyne-1b-c1524648.eu-west-1.amazon.com (10.15.60.66) by mail-relay.amazon.com (10.43.61.169) with Microsoft SMTP Server id 15.0.1497.32 via Frontend Transport; Tue, 17 May 2022 16:24:40 +0000 Received: by dev-dsk-mheyne-1b-c1524648.eu-west-1.amazon.com (Postfix, from userid 5466572) id DC06A41146; Tue, 17 May 2022 16:24:40 +0000 (UTC) X-BeenThere: xen-devel@lists.xenproject.org List-Id: Xen developer discussion List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Errors-To: xen-devel-bounces@lists.xenproject.org Sender: "Xen-devel" X-Inumbo-ID: dbe3f5b8-d5fe-11ec-837e-e5687231ffcc DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=amazon.de; i=@amazon.de; q=dns/txt; s=amazon201209; t=1652805114; x=1684341114; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=IteN9ICL3vHHQMXeE78rzjKCW/+s+R1bzkPHD4BhrHE=; b=r0j9UaflDNMhTAhfz6UReLXYA9FR/Ts003RsaUOrJ2fyLmzyuyWkd54Y Ql2+hqQ5CxaLBZnXsja/J4mAk6bhRHYcvJLoirb6IO+tWYB8GosO6ZkLe wPR176wVQ77zwodsmaqyD4lZdK+iEOgUW58orEZ6O8xfycAQieUC88CqY k=; X-IronPort-AV: E=Sophos;i="5.91,233,1647302400"; d="scan'208";a="89313648" From: Maximilian Heyne To: CC: Maximilian Heyne , Josh Poimboeuf , Boris Ostrovsky , Juergen Gross , Stefano Stabellini , Thomas Gleixner , Ingo Molnar , Borislav Petkov , Dave Hansen , , "H. Peter Anvin" , , Subject: [PATCH] x86: xen: remove STACK_FRAME_NON_STANDARD from xen_cpuid Date: Tue, 17 May 2022 16:24:25 +0000 Message-ID: <20220517162425.100567-1-mheyne@amazon.de> X-Mailer: git-send-email 2.32.0 MIME-Version: 1.0 Precedence: Bulk Since commit 4d65adfcd119 ("x86: xen: insn: Decode Xen and KVM emulate-prefix signature"), objtool is able to correctly parse the prefixed instruction in xen_cpuid and emit correct orc unwind information. Hence, marking the function as STACKFRAME_NON_STANDARD is no longer needed. This commit is basically a revert of commit 983bb6d254c7 ("x86/xen: Mark xen_cpuid() stack frame as non-standard"). Signed-off-by: Maximilian Heyne CC: Josh Poimboeuf cr: https://code.amazon.com/reviews/CR-69645080 Acked-by: Josh Poimboeuf Reviewed-by: Juergen Gross --- arch/x86/xen/enlighten_pv.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/arch/x86/xen/enlighten_pv.c b/arch/x86/xen/enlighten_pv.c index 5038edb79ad5..ca85d1409917 100644 --- a/arch/x86/xen/enlighten_pv.c +++ b/arch/x86/xen/enlighten_pv.c @@ -30,7 +30,6 @@ #include #include #include -#include #include #include @@ -165,7 +164,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *bx, *bx &= maskebx; } -STACK_FRAME_NON_STANDARD(xen_cpuid); /* XEN_EMULATE_PREFIX */ static bool __init xen_check_mwait(void) {