Received: by 2002:a05:6358:11c7:b0:104:8066:f915 with SMTP id i7csp2540282rwl; Mon, 27 Mar 2023 01:25:56 -0700 (PDT) X-Google-Smtp-Source: AK7set8xcGX6Bvqwrr3fJkkW2D2ABZUZgI8tUkXTaZfeJcb+GrLczA1TgMXDF1W8mgTDH2cHRS1W X-Received: by 2002:a17:90b:4f8c:b0:23f:ef7:7897 with SMTP id qe12-20020a17090b4f8c00b0023f0ef77897mr11142938pjb.49.1679905556468; Mon, 27 Mar 2023 01:25:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679905556; cv=none; d=google.com; s=arc-20160816; b=krNBvInqVmdg8lf1FTn0qCjxXG2T7BR/TtW/TA/n/74k2UJWjCaxg/1fq2EJBfVL/N 3NWLiGobtGeSzkax7SH38JJ1D2gK5RU2OBqk+E9XPrnmsApoHXADWuoVYgCQ2FjoPlcw 9mLUmoqC8Kx6VUDyiZQHXD/wFeQl+yLlzgFgmvEamFmQ1+PXYC8X+xXix96lgOeQVQzB K4W/bc2m0xPPPR1S2JryDYoud7Fp0XWuUuP91naIX4kbUdWZkJYJqgbOp1Kv2NL4yixL JJCU1hIfZTgG0/QbCcv3NeiTDblvmHNv4h0Rl9ea7W7uIQJWn7ymaasFRldXSECOw4oK tBHA== 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=KYVr+D83wEsSHV3baEAP4YyJelDtS8fV1omhpXHg6ky83l0fq98ZdTmoqI9gEiTEQt 38dPM6/dJx2JdBu+JcKRZawFcT0MDnG8Uhl0svB77nyFJKVofXPJMQYtkjAQ3t5M/PXJ 7WtqZ79N8RdZaYjJO0PTzzJfwd6u4yB49qbtlAAlw1cKBzU8Z3yiM3pRF50SXGR9/g9R bi/gi+U+TQpskN71iMZwBKVz5MuTVBSGGcO0sZDLere/n+PDbSzhWSy5FtmZS7M8uvE9 WJqbSMy1ud5Opx4qm/D4MfRLOEjlg3hJ1NfCnr9kwRX836eeae19fxyI50nWaS2/4H0c ZUgw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=Y4pZbYuQ; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 18-20020a631552000000b004fbd23110d4si25564707pgv.773.2023.03.27.01.25.42; Mon, 27 Mar 2023 01:25:56 -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=Y4pZbYuQ; 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 S233062AbjC0IZM (ORCPT + 99 others); Mon, 27 Mar 2023 04:25:12 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59666 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232999AbjC0IYf (ORCPT ); Mon, 27 Mar 2023 04:24:35 -0400 Received: from mga04.intel.com (mga04.intel.com [192.55.52.120]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B63432D63; Mon, 27 Mar 2023 01:24:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679905473; x=1711441473; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=4lCYxmSNxB+oTxZx5ZOjZmvc7OZS0xLkR1RLWDKH14M=; b=Y4pZbYuQEnePmFsRAnGKw6Ek/Iogi1dP8YxEgpemugKr6X2D40NRiXdo 54J0iwE2prgF1Z/EPG8zHjvhltGZI/rBq7NhuidbKon6bGaRhKZykVBjT RRSvqofXHyxA15fMMDNf95nNgo7/nCko43P64RvzKFUaUf3bWt6cxbznO 49EaW0IWy3EjonJk1v7UZRtevH8YuICzmicyURyM29gIxOjT1iKhb+pXQ wkHThgwdl35ARYeqqlo0mxm8H2yCycU8A03b+inr4bLBa9GiPLRGjBM5n XYCfwxFdkBGqk5qsV6nVTpML6tGjLVee5jooDAu0F+WTD2eI9q5TVsxCw w==; X-IronPort-AV: E=McAfee;i="6600,9927,10661"; a="338930158" X-IronPort-AV: E=Sophos;i="5.98,294,1673942400"; d="scan'208";a="338930158" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 27 Mar 2023 01:24:32 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10661"; a="713787056" X-IronPort-AV: E=Sophos;i="5.98,294,1673942400"; d="scan'208";a="713787056" Received: from unknown (HELO fred..) ([172.25.112.68]) by orsmga008.jf.intel.com with ESMTP; 27 Mar 2023 01:24:32 -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 v6 08/33] x86/objtool: teach objtool about ERETU and ERETS Date: Mon, 27 Mar 2023 00:58:13 -0700 Message-Id: <20230327075838.5403-9-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230327075838.5403-1-xin3.li@intel.com> References: <20230327075838.5403-1-xin3.li@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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,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 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; -- 2.34.1