From patchwork Tue Oct 3 06:24:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Xin3" X-Patchwork-Id: 147675 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:2a8e:b0:403:3b70:6f57 with SMTP id in14csp1899708vqb; Mon, 2 Oct 2023 23:58:20 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGS8fUVjvvyCeTxZTx/rYYhE5Kw7C80zgyvHNAekoo4H1jHNOitjSX7dRQH2+Hk+rECsg96 X-Received: by 2002:a05:6a00:1f0f:b0:68f:b5a3:5ec6 with SMTP id be15-20020a056a001f0f00b0068fb5a35ec6mr2420156pfb.0.1696316299985; Mon, 02 Oct 2023 23:58:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1696316299; cv=none; d=google.com; s=arc-20160816; b=MtD/N4QFdPIMJjbY4rmaGDh8ElYj2heh4wkRgtBh35VxNPffY8tJrTz3HzPjdg51ni 9hliNA3CDKN22BVDI4huSNczmnx12Jcg17K4490K/RwU3tiyCHLcJqkB4NaBfSQ/DIEx DiABUi8WO8MMtf9IFe+DRLxpaSpCGpZMKW4ivPndzuOxNttwE/+oSVoEWF9ykq3P0uwI o2Fi+TL6PpW0H/NDbpqyDh6YHl8FzLwv+ncjBWnlKYogg2hdze4yQD/SmIIQkIsi53l7 xRKCdVfIdSgIY+naVuHhIPZqJGoo3hthazu/scqRhgmZl1Cipfjbw+E3j72Awy9QFboy kILA== 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=Tb1p8S3iOxe/kX/WSNC3xEJzSVgGJ5DaxSrKb+pzH+4=; b=qqpk7ikj///KD6QYIeVH7IyZu7LCbBnhXNsecU+rWOt/L4b23Qf3gg6rdDVMebSTAi aAXIYTtpCdgyrguggNQgvI9u8i4t9McnHLOt6C0hHe38hyzzku0zNTY8OgK/oLon4N1+ 74eZAKCqr8fZix4WhoFw/ke29rEW1ENgi7Mtluy1avmscGQfjvEdWw4k9WHPEVRK/Rkr vMUsN0EB9sTasiAUJlUzSeaQRKPuNCGj+AHWpdHPL5eZ7AIeSM7xPTVylLJbq4v93KDM oiOfxI0IBg8rgVuVsgw2kNBD4rJ0O7Npd89SuqW5n9bi/HPnwPN+f7d5+biVop4svIBP zsfw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mYQJghx5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (groat.vger.email. [2620:137:e000::3:5]) by mx.google.com with ESMTPS id b4-20020a056a00114400b00690f9ca0f99si876497pfm.12.2023.10.02.23.58.19 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 02 Oct 2023 23:58:19 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 as permitted sender) client-ip=2620:137:e000::3:5; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=mYQJghx5; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:5 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 groat.vger.email (Postfix) with ESMTP id 329218098494; Mon, 2 Oct 2023 23:57:57 -0700 (PDT) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.10 at groat.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239414AbjJCGzo (ORCPT + 18 others); Tue, 3 Oct 2023 02:55:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37600 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239156AbjJCGyt (ORCPT ); Tue, 3 Oct 2023 02:54:49 -0400 Received: from mgamail.intel.com (mgamail.intel.com [134.134.136.126]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B5263E0; Mon, 2 Oct 2023 23:54:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1696316083; x=1727852083; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=nnaiSfOR32UqURagnGQyKATdoHKyxN7QZzCa/h9+/jY=; b=mYQJghx5+ZYjU99/6b9cpAIhI0Tl1nLjZX+DvnvVmRCeSjQiM46n61mW ZtMAww0b1iCTbl77/f0GrDod8pW0K7TeU82cIZFaHraSAt8Sg+BQJaX/r pBiiAck3vQ99pHtvApiT/qccBB/oi30R/LHtG/BlbR29GdZASkIhSN+Q5 Qj6AMrDuGWuk89PN4GdHBzZYSnpXYNXGY4d9I+X7kXlS2LUlU7Y39YSpU qrMxWdFM0wAGC14ReXwoDJIc5h8OCwzRGrz2yuHU48C6uErBQbpHUjg7+ T1UH4WZqgolVCLZicYfxLlLYfyHUyRJAGcSraUvtJqp6PuDGXUV/7Ot42 Q==; X-IronPort-AV: E=McAfee;i="6600,9927,10851"; a="367858039" X-IronPort-AV: E=Sophos;i="6.03,196,1694761200"; d="scan'208";a="367858039" 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 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" Received: from unknown (HELO fred..) ([172.25.112.68]) by fmsmga005.fm.intel.com with ESMTP; 02 Oct 2023 23:54:40 -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, 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 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 groat.vger.email 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 (groat.vger.email [0.0.0.0]); Mon, 02 Oct 2023 23:57:57 -0700 (PDT) X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1778716560880604004 X-GMAIL-MSGID: 1778716560880604004 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;