From patchwork Tue Apr 4 10:26:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 79024 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2953714vqo; Tue, 4 Apr 2023 04:35:03 -0700 (PDT) X-Google-Smtp-Source: AKy350YiECX8RZ29ECB/7QAliKfupXRUC6SaYjvqYdknkvBjR6uIaC1fE+FM/bhCcWJioRWMH7/z X-Received: by 2002:aa7:8bdb:0:b0:62a:1267:2036 with SMTP id s27-20020aa78bdb000000b0062a12672036mr1708126pfd.34.1680608102928; Tue, 04 Apr 2023 04:35:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1680608102; cv=none; d=google.com; s=arc-20160816; b=MBe/MTayw1fHoKcoSJUxBuWlbZzFYnWI6oauodBM/leEQ6J0nl97kszEmozJAD9KsK +gJi4zZtzcjbeVFIbBxsqQSZCSqBzLLiWvPYHjOvVaoFJlfRjyLhoJNApPYsbS6LQQaI qOR+n4JMpKU/tVukNQYPzzMFAeEJou+3owcb12lCqtix9QKNlS9Pb+YRuinprbvZCNJs W7qr/xROvBsvc30c/170BcMbTri8K9MuBf9+hsRnGXqD/m1u6Hyn43qg4s4gYYmtWQwY O5rHwR/drqLkLp27LLHZDxqjKuHMWDv2F0QzNB7ttRXTJ4u6EwzrC8q8aEkzFeLNxkvd Etcw== 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=tkDfrOl/uVtgxQ9PHVt8tndLfQaqM7/GlymaVGt9Xqw=; b=vNv4K7v5J3lR8S7pMtXVAsbbKUyWV4K3ZNYe72tggFAsCdf1QnP7EWxIWpF5nNvEHL d+fdSN+UEvyV1gaha1RxoL/kbH6NZ6D4de1hxNiAjr0/jXN7wDUKBA1oplSk0pffwChI MFJw5oNfdCCmyhESUriR415KRlxytAO7DMdC4q8GfhGmzprBGZU9qT31+o5ep3qUI0n+ 4CyKuHQ12ROwIG/ywuYS2vOwFHwqB9uOHb/zfRuvczh/+GPKyAySOHyo+PhjaXn1MZ+w zkPOFZmV+NfEpdKpjbas/o2rZDP2F3Jwyjp72M78B5eCNqNsn+DdCcGNCQVRrlmoKO8/ XCqQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Ucmit8aQ; 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=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j16-20020a63e750000000b00502d825633asi9874538pgk.639.2023.04.04.04.34.49; Tue, 04 Apr 2023 04:35:02 -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=@intel.com header.s=Intel header.b=Ucmit8aQ; 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=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234720AbjDDKyR (ORCPT + 99 others); Tue, 4 Apr 2023 06:54:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38782 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234600AbjDDKx2 (ORCPT ); Tue, 4 Apr 2023 06:53:28 -0400 Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 51C9F40FA; Tue, 4 Apr 2023 03:53:07 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1680605588; x=1712141588; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4lCYxmSNxB+oTxZx5ZOjZmvc7OZS0xLkR1RLWDKH14M=; b=Ucmit8aQQs/OBBj3eCM0KCqRaN2wd1JXulKlAFGkHbiou0jpLRQTNB+I TFKeTxXapAhIsBHvq2ZI46/0VLerzEGaapgfyc6Ue2SiYz/e4hQv54xUl zsOKc1GoSa5Y7RLkuitqBubhiTS5GPCPykRXcx2yApcSzncH77Q4ACd+i FsiLCV7gBwtPwlYE2VgUfcZsNVAErpY9kD531nKfEroFzQgQ1xVGQIJ+q 40LfIadJt396j4iNSMHhfdJPXINMrNZ0UjFr7Dcv3sXR0FaYm3pq/Vbq3 JNQNXrQrCcvgDDkwQXTp3Pxg2mqHgMAcHpAsypT0CQgminsTeQLErOzou A==; X-IronPort-AV: E=McAfee;i="6600,9927,10669"; a="330734005" X-IronPort-AV: E=Sophos;i="5.98,317,1673942400"; d="scan'208";a="330734005" Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga101.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 04 Apr 2023 03:53:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10669"; a="775597802" X-IronPort-AV: E=Sophos;i="5.98,317,1673942400"; d="scan'208";a="775597802" Received: from unknown (HELO fred..) ([172.25.112.68]) by FMSMGA003.fm.intel.com with ESMTP; 04 Apr 2023 03:53:01 -0700 From: Xin Li To: linux-kernel@vger.kernel.org, x86@kernel.org, kvm@vger.kernel.org Cc: tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com, peterz@infradead.org, andrew.cooper3@citrix.com, seanjc@google.com, pbonzini@redhat.com, ravi.v.shankar@intel.com, jiangshanlai@gmail.com, shan.kang@intel.com Subject: [PATCH v7 08/33] x86/objtool: teach objtool about ERETU and ERETS Date: Tue, 4 Apr 2023 03:26:51 -0700 Message-Id: <20230404102716.1795-9-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230404102716.1795-1-xin3.li@intel.com> References: <20230404102716.1795-1-xin3.li@intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.5 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED, RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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 X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1762245321921118317?= X-GMAIL-MSGID: =?utf-8?q?1762245321921118317?= From: "H. Peter Anvin (Intel)" Update the objtool decoder to know about the ERETU and ERETS 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 9ef024fd648c..8e9c802f78ec 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;