From patchwork Fri Nov 10 00:00:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Namhyung Kim X-Patchwork-Id: 163682 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b129:0:b0:403:3b70:6f57 with SMTP id q9csp788933vqs; Thu, 9 Nov 2023 16:07:13 -0800 (PST) X-Google-Smtp-Source: AGHT+IG8w7YIbShuPptWdbCN7PdTPUhHR3hm8RUZC0CcCfni3gfWmtSKUoGU/SxEQxX7zDIfPtIW X-Received: by 2002:a05:6870:1382:b0:1d6:8b7f:ce89 with SMTP id 2-20020a056870138200b001d68b7fce89mr5816898oas.51.1699574833649; Thu, 09 Nov 2023 16:07:13 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1699574833; cv=none; d=google.com; s=arc-20160816; b=Jr9ArTFpowaDD07CraceTzvcrEkOZ95cJBHNQ8UlI75nz5Ly5/1RueQ5zKz+lKE9nx ova/CiL0xzQhpMSyRc/MhVAh40CvMewko80MF8XFEysn820Y4bgNCFlv/ZvXYysH9q1j d8sT7+dz9wRuOa+9iKpkVyI60xceDW4kkPmiersSek0Nq8HC2NFOWJp0nUGDDK7klcNc ELCo9IQ1R5KdvhshuGCEokWCQGUYs+5WU3hkP9cKkWa3hrGpo8jBLr3M41WWCpH/KLc5 ZP/tXpZc24L6+3F1wS7QkQBiZc5pPM2mZlq7RsfMx5b8Qz0y9pzhsI5T+x+OkwrkeJ67 ba1w== 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:sender :dkim-signature; bh=7LQMqcV8+xKPMkuCeGhhLbjMOgNrw0IhfnrFjgWw4W4=; fh=K//si1Hi/RYC7s39rVvmvh0YbZGmBrdWWHQg3cPF7Xc=; b=HlBpDOhl35kTfRCKMIBN2Sq2krWO7Hlen6Y/wm1Pd7ldqvAlSG8p8uoVtmdAN9rGGQ sZDfa2fSOgn0rwluvGwfjnLhRG5gKQRhyXmgOGQQY4LzdOHIhyIreUNrazS2l4SatiE2 An+bflODYPsNFtgz63XG8aTAcx9kdb9ojtbNdARhjG9d9SMRrwSjxsawM4cCP4yaMThC JaQafUpZQeHKm5X7flkvDOUZD0ehj9TMaFOQlaYJo7zakec8P+31bQwEPNPcWjbbJS/r REuCOzGOz80VNVwDXXs/nyvoO+0alu+vviRUkJJ+e3u1Jne2oK/QZIZQkreJKhkKC78E Ha2w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Q3u4WB7t; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from fry.vger.email (fry.vger.email. [23.128.96.38]) by mx.google.com with ESMTPS id b21-20020a05687061d500b001c4f2b596f9si6812560oah.13.2023.11.09.16.07.13 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 16:07:13 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) client-ip=23.128.96.38; Authentication-Results: mx.google.com; dkim=pass header.i=@gmail.com header.s=20230601 header.b=Q3u4WB7t; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.38 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: from out1.vger.email (depot.vger.email [IPv6:2620:137:e000::3:0]) by fry.vger.email (Postfix) with ESMTP id C882A83417FE; Thu, 9 Nov 2023 16:06:33 -0800 (PST) X-Virus-Status: Clean X-Virus-Scanned: clamav-milter 0.103.11 at fry.vger.email Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1345560AbjKJAEr (ORCPT + 30 others); Thu, 9 Nov 2023 19:04:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60318 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1345641AbjKJADz (ORCPT ); Thu, 9 Nov 2023 19:03:55 -0500 Received: from mail-pl1-x634.google.com (mail-pl1-x634.google.com [IPv6:2607:f8b0:4864:20::634]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B6CBD5B8B; Thu, 9 Nov 2023 16:01:33 -0800 (PST) Received: by mail-pl1-x634.google.com with SMTP id d9443c01a7336-1cc316ccc38so12761285ad.1; Thu, 09 Nov 2023 16:01:33 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1699574493; x=1700179293; darn=vger.kernel.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=7LQMqcV8+xKPMkuCeGhhLbjMOgNrw0IhfnrFjgWw4W4=; b=Q3u4WB7taRsrngFLMMtKkhcDTCLRRLdMvh2S9Ax4NvfSD4YUGXbX5RWT+tjBGYE72A coGPfKtFWNVEFzOUJ5eEHrezi0lMJdZX4o61BS7a5MCLQu98nYSs7J8IkzMmuAgccUC/ JCmvP8J/AO6ZtexOHGDJmx0SK4yEQaqR1mhq7/TpfoaHQDAHmmd3tOg6Fsx2sjdbzdIs nRXrL5hZcS/FoBgfyxjj0yBHvvIz6IqVc/01QqDTo7M7cum997oCwL9ja81pwHrpJEoY TqPks52j07Wlkzr/3zVgt8aRE/cEu308R7vY3jMRhh5McGkbZPKpVf+k8yKEY3DTw6wo BSCA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1699574493; x=1700179293; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:sender:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=7LQMqcV8+xKPMkuCeGhhLbjMOgNrw0IhfnrFjgWw4W4=; b=WL8PKJAeRxBoprpJK0XsZWhZUCyOpt2242IAKxhV4V9IiL9qVGbHXaBQnhuemUf2/C tQk81n5lmzjt7vUiXIjP6TJY+3UzmPOQF72N4M1LQXoGNY8oyLThbl4pYSQkci3kQ5gy Chxvf8bqKZE7kB+6L/eXiR0wqh4LyRCkirMHGH35zqIjYiSRqEMv4kRujXwQ1o6cOM0r DvNXeXAZaSx1AqBTId9aF3asi/tcPSCjBIDlZxyghQE7EApLlp0EiU/QzxRBDN6NmHhI AzfypziGuFLgsUNOgevwqvRcB3UjEwzR8uywMqaF+EQjkKxH3UbCVKh2FeR3ze++u7nE 0Fdw== X-Gm-Message-State: AOJu0YwB/KGRl+fYYxB3vxNsuYgx5hvAsARaQauN3ztql83s3EpjyJJI J2DKr6ks28rmlh/f+6qWSiEjp+nj3LQ= X-Received: by 2002:a17:90b:4f48:b0:281:3f1e:c26d with SMTP id pj8-20020a17090b4f4800b002813f1ec26dmr3401074pjb.45.1699574493117; Thu, 09 Nov 2023 16:01:33 -0800 (PST) Received: from bangji.corp.google.com ([2620:15c:2c0:5:d45c:ae16:d959:a5f1]) by smtp.gmail.com with ESMTPSA id k32-20020a17090a4ca300b002635db431a0sm371312pjh.45.2023.11.09.16.01.32 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 09 Nov 2023 16:01:32 -0800 (PST) Sender: Namhyung Kim From: Namhyung Kim To: Arnaldo Carvalho de Melo , Jiri Olsa , Peter Zijlstra Cc: Ian Rogers , Adrian Hunter , Ingo Molnar , LKML , linux-perf-users@vger.kernel.org, Linus Torvalds , Stephane Eranian , Masami Hiramatsu , Andi Kleen , linux-trace-devel@vger.kernel.org, linux-toolchains@vger.kernel.org Subject: [PATCH 50/52] perf annotate-data: Track instructions with a this-cpu variable Date: Thu, 9 Nov 2023 16:00:09 -0800 Message-ID: <20231110000012.3538610-51-namhyung@kernel.org> X-Mailer: git-send-email 2.42.0.869.gea05f2083d-goog In-Reply-To: <20231110000012.3538610-1-namhyung@kernel.org> References: <20231110000012.3538610-1-namhyung@kernel.org> MIME-Version: 1.0 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 (fry.vger.email [0.0.0.0]); Thu, 09 Nov 2023 16:06:33 -0800 (PST) X-Spam-Status: No, score=-1.0 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on fry.vger.email X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1782133380623341561 X-GMAIL-MSGID: 1782133380623341561 Like global variables, this per-cpu variables should be tracked correctly. Factor our get_global_var_type() to handle both global and per-cpu (for this cpu) variables in the same manner. Signed-off-by: Namhyung Kim --- tools/perf/util/annotate-data.c | 84 +++++++++++++++++++++++---------- 1 file changed, 60 insertions(+), 24 deletions(-) diff --git a/tools/perf/util/annotate-data.c b/tools/perf/util/annotate-data.c index 56dfbddb53d2..416c0b5649fc 100644 --- a/tools/perf/util/annotate-data.c +++ b/tools/perf/util/annotate-data.c @@ -409,6 +409,37 @@ void update_var_state(struct type_state *state, struct data_loc_info *dloc, } } +static bool get_global_var_type(Dwarf_Die *cu_die, struct map_symbol *ms, u64 ip, + u64 var_addr, const char *var_name, int var_offset, + Dwarf_Die *type_die) +{ + u64 pc; + int offset = var_offset; + bool is_pointer = false; + Dwarf_Die var_die; + + pc = map__rip_2objdump(ms->map, ip); + + /* Try to get the variable by address first */ + if (die_find_variable_by_addr(cu_die, pc, var_addr, &var_die, &offset) && + check_variable(&var_die, type_die, offset, is_pointer) == 0 && + die_get_member_type(type_die, offset, type_die)) + return true; + + if (var_name == NULL) + return false; + + offset = var_offset; + + /* Try to get the name of global variable */ + if (die_find_variable_at(cu_die, var_name, pc, &var_die) && + check_variable(&var_die, type_die, offset, is_pointer) == 0 && + die_get_member_type(type_die, offset, type_die)) + return true; + + return false; +} + /** * update_insn_state - Update type state for an instruction * @state: type state table @@ -472,14 +503,36 @@ void update_insn_state(struct type_state *state, struct data_loc_info *dloc, fbreg = -1; } - /* Case 1. register to register transfers */ + /* Case 1. register to register or segment:offset to register transfers */ if (!src->mem_ref && !dst->mem_ref) { if (!has_reg_type(state, dst->reg1)) return; if (has_reg_type(state, src->reg1)) state->regs[dst->reg1] = state->regs[src->reg1]; - else + else if (dloc->ms->map->dso->kernel && + src->segment == INSN_SEG_X86_GS) { + struct map_symbol *ms = dloc->ms; + int offset = src->offset; + u64 ip = ms->sym->start + dl->al.offset; + const char *var_name = NULL; + u64 var_addr; + + /* + * In kernel, %gs points to a per-cpu region for the + * current CPU. Access with a constant offset should + * be treated as a global variable access. + */ + var_addr = src->offset; + get_percpu_var_info(dloc->thread, ms, dloc->cpumode, + var_addr, &var_name, &offset); + + if (get_global_var_type(cu_die, ms, ip, var_addr, + var_name, offset, &type_die)) { + state->regs[dst->reg1].type = type_die; + state->regs[dst->reg1].ok = true; + } + } else state->regs[dst->reg1].ok = false; } /* Case 2. memory to register transers */ @@ -492,37 +545,20 @@ void update_insn_state(struct type_state *state, struct data_loc_info *dloc, retry: /* Check if it's a global variable */ if (sreg == DWARF_REG_PC) { - Dwarf_Die var_die; struct map_symbol *ms = dloc->ms; int offset = src->offset; u64 ip = ms->sym->start + dl->al.offset; - u64 pc, addr; const char *var_name = NULL; + u64 var_addr; - addr = annotate_calc_pcrel(ms, ip, offset, dl); - pc = map__rip_2objdump(ms->map, ip); - - if (die_find_variable_by_addr(cu_die, pc, addr, - &var_die, &offset) && - check_variable(&var_die, &type_die, offset, - /*is_pointer=*/false) == 0 && - die_get_member_type(&type_die, offset, &type_die)) { - state->regs[dst->reg1].type = type_die; - state->regs[dst->reg1].ok = true; - return; - } + var_addr = annotate_calc_pcrel(ms, ip, offset, dl); - /* Try to get the name of global variable */ - offset = src->offset; get_global_var_info(dloc->thread, ms, ip, dl, - dloc->cpumode, &addr, + dloc->cpumode, &var_addr, &var_name, &offset); - if (var_name && die_find_variable_at(cu_die, var_name, - pc, &var_die) && - check_variable(&var_die, &type_die, offset, - /*is_pointer=*/false) == 0 && - die_get_member_type(&type_die, offset, &type_die)) { + if (get_global_var_type(cu_die, ms, ip, var_addr, + var_name, offset, &type_die)) { state->regs[dst->reg1].type = type_die; state->regs[dst->reg1].ok = true; } else