From patchwork Fri Feb 16 23:54:20 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namhyung Kim X-Patchwork-Id: 202442 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:693c:2685:b0:108:e6aa:91d0 with SMTP id mn5csp60092dyc; Fri, 16 Feb 2024 15:57:45 -0800 (PST) X-Forwarded-Encrypted: i=3; AJvYcCWIh+0+NMHbQXr7z331nqIEDG/ApRjiIQItBy+CL2dykxOm7RFsjf7ULeRZ/S2cuN3LYamcLvGMqRDsUkPJKdhR2Mp81Q== X-Google-Smtp-Source: AGHT+IHyk86OZYngEDEG3pZyMmg3LYMkLQY0UtVF8Kh2gmQBO5ia1n3jGSdF0OM6e3yOiZhvPdiF X-Received: by 2002:a05:6512:b82:b0:511:a477:64aa with SMTP id b2-20020a0565120b8200b00511a47764aamr5014410lfv.51.1708127865423; Fri, 16 Feb 2024 15:57:45 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1708127865; cv=pass; d=google.com; s=arc-20160816; b=zY0cmx8EGcK6gvhodl1KRLsP5koaQD9SVfwXAioXFb1FWZuyT69Hr/Et6yLFmUlfn+ 7EYimeM3rLIKeHpyOeeYMiuR7XaPMmA8Rnljh/7guJqyh0nFIRabmCzYqHVUSGNXgcim 9a0UTbVMzOLS4hs0D3Nd1sT0V/4ErzygKfkvE7V434lnNFSWX89+Ypn3AdOH4tpxJgKp L0Za32lXgbEDJsaqZVlu2FYm7iRbv5vVUVpCvtjwXi6vlH3i8ZaK5EIbXC5Knwhj6a9g hcLFgV3rFpqo04rMPSWz/CS0sRL3OYckWD3DOOZP3l8m5bZMoOP2kZsaoEefWNYVNBbX Uhxg== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature; bh=Zp+dOLmxvWyhM0zQ5M/VC4yYqHFwzPr8XkB4otprQ1U=; fh=44lErbL5kvNUjSV6UDWgBEjJyOJpjjMpxi6K+HFi+Bc=; b=EvEKIbhwU/UOpaxBAobN6RtviNTkUZVyHd2bRuWaDwxqyuj9uV+LyhbJYbstmJW9wa SlmD2IRLkUelGJD6VfV5n1VnPnmUlMU4h+EuEXXMXas+dt2d1y4GgdY3d+Ibq/E7N4Mf jjAFg1gTL12DDxI2GxPQz4J+ojSVAqBRmblzLiTFnIM3jqZYmCUNnYi1tu+IAui9+a04 zc4Cpio13mxJ0X4FtoKiGL6Sh+rcJPdirNTwz136zr88hcA2M830Ndo7Cy43lgpdv2xo TTBv5LeDmnQq5CeSPneLTEsUqCZaeKku4pyknjTGU5qhc6iEszdBjIU4wqVjsA4sN3mh LWvw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sFFfU0DK; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-69504-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-69504-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id da23-20020a056402177700b00563d2360c90si384221edb.385.2024.02.16.15.57.45 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Feb 2024 15:57:45 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-69504-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=k20201202 header.b=sFFfU0DK; arc=pass (i=1 dkim=pass dkdomain=kernel.org); spf=pass (google.com: domain of linux-kernel+bounces-69504-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-69504-ouuuleilei=gmail.com@vger.kernel.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id ED94F1F21D1D for ; Fri, 16 Feb 2024 23:57:44 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 27C25151CF6; Fri, 16 Feb 2024 23:54:35 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="sFFfU0DK" Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 3A7B714E2FA; Fri, 16 Feb 2024 23:54:32 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708127672; cv=none; b=lBehcsa7lNPc885g44idCkkUDCyT/CMToNMKqEQNhGXKNIzF1Ndi06xc9U7Ht3KW94nBxC3stP/0fF5j5ZZL+vXiOqgwhynT62QMtF8XGx5UYdgmg4fjnP6VN/tcac+c9fSOFB44A72S2hJ02t45BLYwYavAffiJg34zAJT2L/s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1708127672; c=relaxed/simple; bh=hE1QOsjMoRBTV7VH3Rsm9gTxYJbWkglfagXVRxF52QA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=P6zUSR5G6xwuizTs36WrsJtSez6anWSpxk+VxpTQ1wAsvAVTLftOIomYW7H4rLBLUsqa5rUuqyca61DyI1FUvpILIt+9rXqsSU5HXuKChurSgWmViy8VjE/jnl34+YfHWfnBDj2EmPabapEx1Xi9UOnG4piP8j/tL6Nfo1nFKow= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=sFFfU0DK; arc=none smtp.client-ip=10.30.226.201 Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8E1C5C43601; Fri, 16 Feb 2024 23:54:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1708127672; bh=hE1QOsjMoRBTV7VH3Rsm9gTxYJbWkglfagXVRxF52QA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sFFfU0DKnsw016crE+V8gx1s8ss9Ik6x5huShitQFcFQ1lI1h/HQMAZ49c7zUA88d o5swo8klCxEgrQOJoTjsuATrV2FYcdHcXjvphKvGdCV0RHPLe8Xo2zngwVDGie5xdv Ek40jcGK4OZYgWZSrmHqCxotFM5i6caEFgQNxOAJwWTo6qkLpoAMrh40DOCBwywMaB UupHxBD3hSChVlL29j7XXDJmJMMd0o4lj7U1RKpIkmXoMzjdBzUNIJgRqVQasAH56h Vgas1hK5ue+aiInad8iHXyvS+Y/O8PncOsf9MyHT4nquTNrP9AkA+h1j09y9DK/L/c q75LuSv/HRdnA== From: Namhyung Kim To: Arnaldo Carvalho de Melo , Ian Rogers Cc: Jiri Olsa , Adrian Hunter , Peter Zijlstra , Ingo Molnar , LKML , linux-perf-users@vger.kernel.org, Linus Torvalds , Stephane Eranian , Masami Hiramatsu , linux-toolchains@vger.kernel.org, linux-trace-devel@vger.kernel.org Subject: [PATCH 11/14] perf annotate: Parse x86 segment register location Date: Fri, 16 Feb 2024 15:54:20 -0800 Message-ID: <20240216235423.2343167-12-namhyung@kernel.org> X-Mailer: git-send-email 2.44.0.rc0.258.g7320e95886-goog In-Reply-To: <20240216235423.2343167-1-namhyung@kernel.org> References: <20240216235423.2343167-1-namhyung@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1791101884974602682 X-GMAIL-MSGID: 1791101884974602682 Add a segment field in the struct annotated_insn_loc and save it for the segment based addressing like %gs:0x28. For simplicity it now handles %gs register only. Signed-off-by: Namhyung Kim --- tools/perf/util/annotate.c | 21 +++++++++++++++++++-- tools/perf/util/annotate.h | 13 +++++++++++++ 2 files changed, 32 insertions(+), 2 deletions(-) diff --git a/tools/perf/util/annotate.c b/tools/perf/util/annotate.c index 89a8d57b1bf7..86ac44c476bf 100644 --- a/tools/perf/util/annotate.c +++ b/tools/perf/util/annotate.c @@ -3557,6 +3557,12 @@ static int extract_reg_offset(struct arch *arch, const char *str, * %gs:0x18(%rbx). In that case it should skip the part. */ if (*str == arch->objdump.register_char) { + if (arch__is(arch, "x86")) { + /* FIXME: Handle other segment registers */ + if (!strncmp(str, "%gs:", 4)) + op_loc->segment = INSN_SEG_X86_GS; + } + while (*str && !isdigit(*str) && *str != arch->objdump.memory_ref_char) str++; @@ -3653,8 +3659,19 @@ int annotate_get_insn_location(struct arch *arch, struct disasm_line *dl, op_loc->multi_regs = multi_regs; extract_reg_offset(arch, insn_str, op_loc); } else { - char *s = strdup(insn_str); + char *s; + + if (arch__is(arch, "x86")) { + /* FIXME: Handle other segment registers */ + if (!strncmp(insn_str, "%gs:", 4)) { + op_loc->segment = INSN_SEG_X86_GS; + op_loc->offset = strtol(insn_str + 4, + NULL, 0); + continue; + } + } + s = strdup(insn_str); if (s) { op_loc->reg1 = get_dwarf_regnum(s, 0); free(s); @@ -3875,7 +3892,7 @@ struct annotated_data_type *hist_entry__get_data_type(struct hist_entry *he) .op = op_loc, }; - if (!op_loc->mem_ref) + if (!op_loc->mem_ref && op_loc->segment == INSN_SEG_NONE) continue; /* Recalculate IP because of LOCK prefix or insn fusion */ diff --git a/tools/perf/util/annotate.h b/tools/perf/util/annotate.h index b460785111a1..2bd654620de3 100644 --- a/tools/perf/util/annotate.h +++ b/tools/perf/util/annotate.h @@ -446,6 +446,7 @@ int annotate_check_args(void); * @reg1: First register in the operand * @reg2: Second register in the operand * @offset: Memory access offset in the operand + * @segment: Segment selector register * @mem_ref: Whether the operand accesses memory * @multi_regs: Whether the second register is used */ @@ -453,6 +454,7 @@ struct annotated_op_loc { int reg1; int reg2; int offset; + u8 segment; bool mem_ref; bool multi_regs; }; @@ -464,6 +466,17 @@ enum annotated_insn_ops { INSN_OP_MAX, }; +enum annotated_x86_segment { + INSN_SEG_NONE = 0, + + INSN_SEG_X86_CS, + INSN_SEG_X86_DS, + INSN_SEG_X86_ES, + INSN_SEG_X86_FS, + INSN_SEG_X86_GS, + INSN_SEG_X86_SS, +}; + /** * struct annotated_insn_loc - Location info of instruction * @ops: Array of location info for source and target operands