From patchwork Thu Sep 14 04:47:39 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 139483 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp246036vqi; Thu, 14 Sep 2023 03:25:22 -0700 (PDT) X-Google-Smtp-Source: AGHT+IHj7gC7aMF77Wa1tIqM6nVJBLp8ICkC3KNxGJybuUTnDJqYDTY+rrpoN+46C7DZhyB3D9j7 X-Received: by 2002:a05:6358:98a8:b0:134:e301:2c21 with SMTP id q40-20020a05635898a800b00134e3012c21mr5902142rwa.15.1694687122589; Thu, 14 Sep 2023 03:25:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694687122; cv=none; d=google.com; s=arc-20160816; b=og/sNovmgdkMf1u006AWGpwL7gF6CzcCadxyw57gMTh/C6VX4XJXpTyRUWpGI7ZL4g 3Gs/bSrUnfd9IOwQo00DcgoTtydBnj2StY9lPBj7FnyV+8IfiMU9GgQnO3KTCmWp0hD2 UC9FPctd0qWKD+a5qR3I5NFRsm+K1nwtoiMa6p9lneX4khcJrh2GZ4kUzTkgrGwkCsm1 834fG+8feDz/+tmY2anmEZvGSzS+MIfEGhfqqDemgrkPzx+WyXIETSApeV77D54ut5Je aEb+AI9+vkh55RdYvVTVfPrp3Ob0enJARgOEaw3rgwkb4eZgEZtgVdqn4gIYR6N1IzmR u65Q== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=DlIxZmkW/yRBHvqwTfBLZbZdyuc8pX1WBRxpyakVO6w=; fh=jqCbnajAXgJ+s7A1aA7DOHJD13/+EpD442pw8d+Ofss=; b=rbM2Ceuhlc/YNKnKsJ+tpuvPM7k3U9fArAO5TjqSx9ZhPrNyYUFyY+GTW/Mgaqqg9H c3iafxsQYuJrlzC3EOQEmuIKcGoDcFT8vEmtdfklv6RyuvhSU2sOta8Usd5d5ionvWUe QBxiO1qE0C0hyiGrPeUMaJfjdmTu2vloJFTopTAaA+vymRz+l4Gnl+gac6mcrxuAJAQ5 8UZE4nGAo+1n5NazsaJ39MStWSj/0yEcGjVS8B2O8sKcIuB/+P9KNagOEIwYpgS7aMJK GLO9pdukn+Jthar74gM1qdBE4HQH7+wY+PcvCejq6b554ms2iFAnbbJIypZyMcrjAsWL qvIg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=DpfWMG31; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from pete.vger.email (pete.vger.email. [2620:137:e000::3:6]) by mx.google.com with ESMTPS id y124-20020a633282000000b0056fed6cf408si1214169pgy.602.2023.09.14.03.25.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 14 Sep 2023 03:25:22 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=DpfWMG31; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by pete.vger.email (Postfix) with ESMTP id 872F8807617E; Wed, 13 Sep 2023 22:21:25 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at pete.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235507AbjINFTy (ORCPT + 35 others); Thu, 14 Sep 2023 01:19:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49244 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234919AbjINFTU (ORCPT ); Thu, 14 Sep 2023 01:19:20 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.65]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A93E51BD7; Wed, 13 Sep 2023 22:19:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1694668756; x=1726204756; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nnaiSfOR32UqURagnGQyKATdoHKyxN7QZzCa/h9+/jY=; b=DpfWMG31kjI3waV11zJYle+YRAfUWMMwGH5B2Agi5VHWTVFRbMULKGq9 IjWSCPEVTldDr3QdonBUK/ccWJW25jq1IRdFz3iqXR05PG61nix3UG9QG jpGFbhWhVmoYKpnT5GjCUY9k29+BPG/cZ7oXidor7cDm7JlFuXh66T3Zj /yESzOUVQcoe2y+Axht5JputMbePe8YNRFiNxtOiSPFspfoyckFQTTXl2 sTU1lAAxfmKkd7+ASWPDlLF3Ky9EO0hFSGY0lrFZ0vplee1Qlp1EFpLje wsue2f+SZvRWMUWQUv5qjHzCBKCMew9TFG/ftl/Oj7j8DlXcQZQNt7KSf g==; X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="382661221" X-IronPort-AV: E=Sophos;i="6.02,145,1688454000"; d="scan'208";a="382661221" Received: from orsmga001.jf.intel.com ([10.7.209.18]) by orsmga103.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 13 Sep 2023 22:17:35 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10832"; a="779488774" X-IronPort-AV: E=Sophos;i="6.02,145,1688454000"; d="scan'208";a="779488774" Received: from unknown (HELO fred..) ([172.25.112.68]) by orsmga001.jf.intel.com with ESMTP; 13 Sep 2023 22:17:35 -0700 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 Subject: [PATCH v10 12/38] x86/objtool: Teach objtool about ERET[US] Date: Wed, 13 Sep 2023 21:47:39 -0700 Message-Id: <20230914044805.301390-13-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230914044805.301390-1-xin3.li@intel.com> References: <20230914044805.301390-1-xin3.li@intel.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Wed, 13 Sep 2023 22:21:25 -0700 (PDT) X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777008244260636108 X-GMAIL-MSGID: 1777008244260636108 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/decode.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 if (op2 == 0x01) { - if (modrm == 0xca) - insn->type = INSN_CLAC; - else if (modrm == 0xcb) - insn->type = INSN_STAC; - + switch (insn_last_prefix_id(&ins)) { + case INAT_PFX_REPE: + case INAT_PFX_REPNE: + if (modrm == 0xca) + /* eretu/erets */ + insn->type = INSN_CONTEXT_SWITCH; + break; + default: + if (modrm == 0xca) + insn->type = INSN_CLAC; + else if (modrm == 0xcb) + insn->type = INSN_STAC; + break; + } } else if (op2 >= 0x80 && op2 <= 0x8f) { insn->type = INSN_JUMP_CONDITIONAL;