Received: by 2002:a05:6358:f14:b0:e5:3b68:ec04 with SMTP id b20csp3656351rwj; Mon, 19 Dec 2022 23:24:45 -0800 (PST) X-Google-Smtp-Source: AMrXdXtm187uP/uzwtSXPUgAwxiGgatIgRA9tgOTrKF/fwju2PNgrr0EU+NAbQgSXJVwNvdh1DIa X-Received: by 2002:a17:902:ee4c:b0:18e:e03b:f1bd with SMTP id 12-20020a170902ee4c00b0018ee03bf1bdmr14227909plo.53.1671521085568; Mon, 19 Dec 2022 23:24:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671521085; cv=none; d=google.com; s=arc-20160816; b=h01vjTsZRrYz7dRfvdym62CWOP9Y7g3dfS6up8Hg4jv4bPSSOSK2M5zpTr3wSw7fda lIkIa0DJACnByN4V3A9hBL1MuWZMwgtC3sjPf4yV558ePlkT97kvGEhGu0UIc6dnteFi U0/Wl8Ylntg399DUnBjEgzo/5WVgLJvHYAao5lYvMVb1n186HDdMwVO4bhGmD0SUr5G2 +I3VMPta9TGbHQ4bwMEVKDdWiHO6+luZIbauxGCG1qZYfvV188GjE1UH800ZrNJKDnSQ njAdiT7jjGhHifTSc4zfbB1zdSqo6WhXfgjnoTwciutGIAZcjDUSHSbXcEyawjUoufMx bJKg== 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=YsklPMr2zMr+wFjhfIa/jHpGj9Al1iYx9F8xep99B+E=; b=L/YhezyNYhlB9NgAABoFVqWi3ugPl1wkSyNefBi3BLPhVEwG1XOGrCT2r8VLra2EhY YeoT0V+c9nWjjSNn9G4RK1phi/xjcBiRGoxeN3UnWppNkWC9VLMyAkPQBufOx6BgyhxK 5xYOoC7cWy0LIdbDJqc/V9ogxf0GYXwMQEv4bPBramiO9ENbWSvRBMK3KmQdhcZMmzQp qM8zRSj+E67xBXjgVsCvi0YekRS4dwUDPp+e2vAnf0adogokigUHuE5nkNVz34bHmfj1 eZyrnEOc16D+k4lE6pdoDqxx0teUUFjQ6wuT+TX7nBfw/g3I7OTcdB1682j8FjsRTvkn kuKg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=DLiKuLaS; 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 a8-20020a170902b58800b00191191fe7absi6523301pls.448.2022.12.19.23.24.36; Mon, 19 Dec 2022 23:24:45 -0800 (PST) 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=DLiKuLaS; 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 S233463AbiLTHC3 (ORCPT + 70 others); Tue, 20 Dec 2022 02:02:29 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53296 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233142AbiLTHBe (ORCPT ); Tue, 20 Dec 2022 02:01:34 -0500 Received: from mga18.intel.com (mga18.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3D799DEE4; Mon, 19 Dec 2022 23:01:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1671519693; x=1703055693; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=o7a+0760MneBwxPKzFiaj9Nq7KFWmVxmzGnbcDhAUFY=; b=DLiKuLaS+NtpbVg2WFWwFmhTDlSJQHLW62FhwMqTvKIidYiWVsPOCa4r CD3YcsCOp3edUNsSjSl8+eONlND7eWBb9mMpNuc2MV957JaVg+Edxeq49 nT+ffZ7LJib2oZFnSn7FvMZNn9+4xmLnK6aO1OmZu1WRlWsln2Pa0OO0H vxuGoGPO22EdT00u4iYoXHRSwKFKjEztL8ykt9Cc/tJPlU90YAWBLBOah 1/YWig30ndsEAUTWVqx2b49d9Il+kTuIhsUvbCO6le90cv18sV/u4V16h yBnYwV/nUK6/3WUK1U00ydQuHAT0AUjFSHFk6VKDf08tRJRXYMs+STcpm g==; X-IronPort-AV: E=McAfee;i="6500,9779,10566"; a="302971959" X-IronPort-AV: E=Sophos;i="5.96,258,1665471600"; d="scan'208";a="302971959" Received: from orsmga007.jf.intel.com ([10.7.209.58]) by orsmga106.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 19 Dec 2022 23:01:11 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10566"; a="644326440" X-IronPort-AV: E=Sophos;i="5.96,258,1665471600"; d="scan'208";a="644326440" Received: from unknown (HELO fred..) ([172.25.112.68]) by orsmga007.jf.intel.com with ESMTP; 19 Dec 2022 23:01:11 -0800 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 Subject: [RFC PATCH 08/32] x86/objtool: teach objtool about ERETU and ERETS Date: Mon, 19 Dec 2022 22:36:34 -0800 Message-Id: <20221220063658.19271-9-xin3.li@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20221220063658.19271-1-xin3.li@intel.com> References: <20221220063658.19271-1-xin3.li@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE, SPF_NONE autolearn=ham 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) Signed-off-by: Xin Li --- tools/objtool/arch/x86/decode.c | 22 ++++++++++++++++------ 1 file changed, 16 insertions(+), 6 deletions(-) diff --git a/tools/objtool/arch/x86/decode.c b/tools/objtool/arch/x86/decode.c index 1c253b4b7ce0..fbfe0a39599a 100644 --- a/tools/objtool/arch/x86/decode.c +++ b/tools/objtool/arch/x86/decode.c @@ -480,12 +480,22 @@ int arch_decode_instruction(struct objtool_file *file, const struct section *sec case 0x0f: if (op2 == 0x01) { - - if (modrm == 0xca) - *type = INSN_CLAC; - else if (modrm == 0xcb) - *type = INSN_STAC; - + switch (insn_last_prefix_id(&insn)) { + case INAT_PFX_REPE: + case INAT_PFX_REPNE: + if (modrm == 0xca) { + /* eretu/erets */ + *type = INSN_CONTEXT_SWITCH; + } + break; + default: + if (modrm == 0xca) { + *type = INSN_CLAC; + } else if (modrm == 0xcb) { + *type = INSN_STAC; + } + break; + } } else if (op2 >= 0x80 && op2 <= 0x8f) { *type = INSN_JUMP_CONDITIONAL; -- 2.34.1