From nobody Mon May 6 00:09:50 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) client-ip=192.237.175.120; envelope-from=xen-devel-bounces@lists.xenproject.org; helo=lists.xenproject.org; Authentication-Results: mx.zohomail.com; dkim=pass header.i=@amazon.de; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass(p=quarantine dis=none) header.from=amazon.de ARC-Seal: i=1; a=rsa-sha256; t=1652805139; cv=none; d=zohomail.com; s=zohoarc; b=WH2T9sE/Gqp+F9Hz6GLDsLTxT/UvassxcblE3zxRPriqKDt2ar4kmjNx1DiEtnFfwGwoz4yv+7tTi8VwKdrrq91arFhUwId9TLSDDxK/yV7CE1cqkobkXrW52rrvIN0/K1mB6q8Wjd6F49+rPAQk962MPFtYWMc6SHwclF1ys4s= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1652805139; h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:Sender:Subject; bh=IteN9ICL3vHHQMXeE78rzjKCW/+s+R1bzkPHD4BhrHE=; b=Xe2hST3oR7d2spVGxCX9y8fTk2I2v5ZSG8gOtjp7JwMtBOFjShB2XAia/MJvawyVxr6yhPTqNPZxbGcjgKbajEyuIZdtWGDelupGImqtV9MbtytLDnItvElk1qVLTcDePAUvWwAOaN6+mePdAfkkCpxmcfDAm0tfPKt9ItywodU= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@amazon.de; spf=pass (zohomail.com: domain of lists.xenproject.org designates 192.237.175.120 as permitted sender) smtp.mailfrom=xen-devel-bounces@lists.xenproject.org; dmarc=pass header.from= (p=quarantine dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1652805139493373.8656371845552; Tue, 17 May 2022 09:32:19 -0700 (PDT) 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 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-Outflank-Mailman: Message body and most headers restored to incoming version 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 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @amazon.de) X-ZM-MESSAGEID: 1652805141712100001 Content-Type: text/plain; charset="utf-8" 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 =20 #include #include @@ -165,7 +164,6 @@ static void xen_cpuid(unsigned int *ax, unsigned int *b= x, =20 *bx &=3D maskebx; } -STACK_FRAME_NON_STANDARD(xen_cpuid); /* XEN_EMULATE_PREFIX */ =20 static bool __init xen_check_mwait(void) { --=20 2.32.0 Amazon Development Center Germany GmbH Krausenstr. 38 10117 Berlin Geschaeftsfuehrung: Christian Schlaeger, Jonathan Weiss Eingetragen am Amtsgericht Charlottenburg unter HRB 149173 B Sitz: Berlin Ust-ID: DE 289 237 879