From nobody Tue Dec 16 19:40:51 2025 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=@intel.com; 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=none dis=none) header.from=intel.com ARC-Seal: i=1; a=rsa-sha256; t=1696316126; cv=none; d=zohomail.com; s=zohoarc; b=m4/CVpYyr6cJ1MNChoIU6BZbhyMLFKr9P6bPORQ+jg68PzcW8smv3V6h6nF8PEZuI4KOjKe7BQKxDvTC5I/YKakWoMCrzrAQkKyTXzBub4qVhF/YkI9y2sswUSCtic+KtYgHs+pehNAcHlw0bq9SpTrJf0WTsfHICB5nwAbUnS8= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1696316126; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To; bh=DlIxZmkW/yRBHvqwTfBLZbZdyuc8pX1WBRxpyakVO6w=; b=V2PCgxGtiWu901czY4zYBV6/Tv41lklFOe0FTDEjeSgMYKMUGS/7F6fd7cw2/0EsEdISoHvJ7o2NvaSA/HFs4c5RKlEJ+QKfchvgAif41EI8XJB/MorEFY6xll4Xgg77nX/Chyli7xa0YSAybnZ//qEId0w3zSuW4uVsOLv1+Pc= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass header.i=@intel.com; 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=none dis=none) Return-Path: Received: from lists.xenproject.org (lists.xenproject.org [192.237.175.120]) by mx.zohomail.com with SMTPS id 1696316126315386.31310179131617; Mon, 2 Oct 2023 23:55:26 -0700 (PDT) Received: from list by lists.xenproject.org with outflank-mailman.611897.951600 (Exim 4.92) (envelope-from ) id 1qnZIw-00068m-Hk; Tue, 03 Oct 2023 06:54:50 +0000 Received: by outflank-mailman (output) from mailman id 611897.951600; Tue, 03 Oct 2023 06:54:50 +0000 Received: from localhost ([127.0.0.1] helo=lists.xenproject.org) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qnZIw-00067c-8Q; Tue, 03 Oct 2023 06:54:50 +0000 Received: by outflank-mailman (input) for mailman id 611897; Tue, 03 Oct 2023 06:54:48 +0000 Received: from se1-gles-sth1-in.inumbo.com ([159.253.27.254] helo=se1-gles-sth1.inumbo.com) by lists.xenproject.org with esmtp (Exim 4.92) (envelope-from ) id 1qnZIt-00040o-UD for xen-devel@lists.xenproject.org; Tue, 03 Oct 2023 06:54:47 +0000 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by se1-gles-sth1.inumbo.com (Halon) with ESMTPS id bd44dbdd-61b9-11ee-98d2-6d05b1d4d9a1; Tue, 03 Oct 2023 08:54:47 +0200 (CEST) Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Oct 2023 23:54:41 -0700 Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga005.fm.intel.com with ESMTP; 02 Oct 2023 23:54:40 -0700 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 Precedence: list Sender: "Xen-devel" X-Inumbo-ID: bd44dbdd-61b9-11ee-98d2-6d05b1d4d9a1 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696316087; x=1727852087; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nnaiSfOR32UqURagnGQyKATdoHKyxN7QZzCa/h9+/jY=; b=K7J43ENcKXjVGxOPe5R6Gz5slG4qObfYzZjs3UyWlC/0eTbSLaFkYKvi 6n9God6f4bv4smcHC5azeQ7MEyjbvleJM3tScboJlByXsFst/JR/BGaxN vDomCJNcLAGwdavZJTjXcMCY3D7I8Wjq2n2Uvji9NgsCM0Hm030ygVCHK nQaQOcPW/QDsfPVWL8OUqaf2TrVffnlmKgjczbKP5eIRMJNaugaP0peNR VN2oRu8KYGhjMpiWuxVBIEOUzZjhD352v4OnHliti4vQttMWFsz5C1pm0 jDfATlKXslbP0KB5m34jXq7IwYCtknU/w+x3INVqLoQ+reYXwRb5dSbPW w==; X-IronPort-AV: E=McAfee;i="6600,9927,10851"; a="367858040" X-IronPort-AV: E=Sophos;i="6.03,196,1694761200"; d="scan'208";a="367858040" X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10851"; a="1081900931" X-IronPort-AV: E=Sophos;i="6.03,196,1694761200"; d="scan'208";a="1081900931" From: Xin Li To: linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-edac@vger.kernel.org, linux-hyperv@vger.kernel.org, kvm@vger.kernel.org, xen-devel@lists.xenproject.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, x86@kernel.org, hpa@zytor.com, luto@kernel.org, pbonzini@redhat.com, seanjc@google.com, peterz@infradead.org, jgross@suse.com, ravi.v.shankar@intel.com, mhiramat@kernel.org, andrew.cooper3@citrix.com, jiangshanlai@gmail.com, nik.borisov@suse.com Subject: [PATCH v12 12/37] x86/objtool: Teach objtool about ERET[US] Date: Mon, 2 Oct 2023 23:24:33 -0700 Message-Id: <20231003062458.23552-13-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231003062458.23552-1-xin3.li@intel.com> References: <20231003062458.23552-1-xin3.li@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ZohoMail-DKIM: pass (identity @intel.com) X-ZM-MESSAGEID: 1696316127838100005 Content-Type: text/plain; charset="utf-8" From: "H. Peter Anvin (Intel)" Update the objtool decoder to know about the ERET[US] instructions (type INSN_CONTEXT_SWITCH). Signed-off-by: H. Peter Anvin (Intel) Tested-by: Shan Kang Signed-off-by: Xin Li --- tools/objtool/arch/x86/decode.c | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/tools/objtool/arch/x86/decode.c b/tools/objtool/arch/x86/decod= e.c index c0f25d00181e..6999f478c155 100644 --- a/tools/objtool/arch/x86/decode.c +++ b/tools/objtool/arch/x86/decode.c @@ -509,11 +509,20 @@ int arch_decode_instruction(struct objtool_file *file= , const struct section *sec =20 if (op2 =3D=3D 0x01) { =20 - if (modrm =3D=3D 0xca) - insn->type =3D INSN_CLAC; - else if (modrm =3D=3D 0xcb) - insn->type =3D INSN_STAC; - + switch (insn_last_prefix_id(&ins)) { + case INAT_PFX_REPE: + case INAT_PFX_REPNE: + if (modrm =3D=3D 0xca) + /* eretu/erets */ + insn->type =3D INSN_CONTEXT_SWITCH; + break; + default: + if (modrm =3D=3D 0xca) + insn->type =3D INSN_CLAC; + else if (modrm =3D=3D 0xcb) + insn->type =3D INSN_STAC; + break; + } } else if (op2 >=3D 0x80 && op2 <=3D 0x8f) { =20 insn->type =3D INSN_JUMP_CONDITIONAL; --=20 2.34.1