From nobody Sun Feb 8 13:11:58 2026 Received: from mail-yb1-f202.google.com (mail-yb1-f202.google.com [209.85.219.202]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B7B86364DC for ; Sat, 29 Jun 2024 04:54:15 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.219.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719636857; cv=none; b=e6qyTVlBOmhSMNushYqm/qaKxO2v57nArJI2w4oE0MSFa9HG86GGjq4+BIvVabjDBr310WLri4DIqtAtKhvkTdt+CMojhOSVvuY88MADZ1kTQTabX7YU1+A+I5U6J4//gCm/7bO+ncMnhInwFYxjOicE2UtN9roPQ11bd2nfJL8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719636857; c=relaxed/simple; bh=gqyDi0O1/ve3RAF6Mkbp2f1MdyDz0lrbGCH1RCO8mHM=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=P6xqq/Auix6emZYfzbMLJPoTm3JHV2Lo4nCLYQ7Cnow5niAoLSHPxOIVqwCZMApbQ5UUafFD43+Y5YrP5gOPvdRr/Gz96CCgU6dF4RBkIudT+2LoYWNjN4e8pBbeyzqkw/gYTL+iEkT7Jq3yHzfRLQeJpwIdRDNiGyNb7sxPm2M= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=XPSoyJt9; arc=none smtp.client-ip=209.85.219.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--irogers.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="XPSoyJt9" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e035f7f715cso1166372276.1 for ; Fri, 28 Jun 2024 21:54:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1719636855; x=1720241655; darn=vger.kernel.org; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=f+WpsI3yIr9mN4RMcQsfbBJbpJrC2f0IEM8v/SsuTU8=; b=XPSoyJt9Y0c2HHwiZfIA1kIFvWSGlFli7Jq/FbN2zRCbAvft7ZFa9hlbPfmXE397nc kLU2sbYen7KXx+SxJE19ah4l5nx7jS6F095r9XKh5cbeql0qPW7ah85OQc9usGqkFPrt Porsdp3PhvwoMvkiVlbgazRvcCgC0ZE8EdJ7++y+KmMcv7S1eqhvN6FlKdbr57S4yDSy kH3SUAVkYNWTRrzjsgXffXVazc84EeWCWd4AleLPFHBPX6J0TAdY00sDsmVfNxSWYnqC OQ6Z3esLji8ZifxqNtyvaVvG5QF4Wz6sFeYNME+g6P1WL9/jEHr78ynclcuK5d5U89Ty /6HA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1719636855; x=1720241655; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=f+WpsI3yIr9mN4RMcQsfbBJbpJrC2f0IEM8v/SsuTU8=; b=GiaCxC6cWqkrw3V3Im8cckTyeZ+1LyLq6KrKp2YpGKNjsWvqb7vxmLabt3pK8TUBp9 Vc+UFEqF9jScwB9UcyeSxx6WrrRmfjMPiwxvd3zHLE9heZrOo6pLawefxBlsOTxYZOSs sKKVLHfQKzOc+3IpmoyJiFfjtWrvdX7BGPo3RnQaafhn1mJ4KqY77x6s1qYsryJpDfDa X4NiPMCKp/nWJtt1wOm38GJX5wEOzxFNtOV5ZNUe0pwqhJ7YWQmmFAj/EDdPcuTd8v7/ USqs6RiuMRvOyk4VDjDF6Aw0oueBDzgHbE3A+tklcQonaHoxEONwnPKQMhT5AxKualtv USaw== X-Forwarded-Encrypted: i=1; AJvYcCXqMevHfz539stOO7d5R5tddIwZ/UmiCAXxZp89byPzSXdJ8fwYC2CFWBbe1b/YDa02ySh00o2A76HTuIqfo3bE2MjwdNU2JEg/V3wE X-Gm-Message-State: AOJu0YxuSNQO+xPd/xoUE6DBv+xTThS4sBN4uolRUsWOXxlOdWVcTnIe sWU3gJPpf8T1AZ9bjVFWlT50/LDA1jazxAiEMYl16ZnPCNLSjoU1I4CCcKuOc27TSj2wLSb1k3W oD8LHrg== X-Google-Smtp-Source: AGHT+IGMi/lHrEFtm0Z40jfIFCI9s35ScBy5zlFP4QYSWWuLbXB3dXTlsTE45QCbr4hFKjzKSU0BaZaSc2PA X-Received: from irogers.svl.corp.google.com ([2620:15c:2a3:200:f9fe:7acd:496e:4edb]) (user=irogers job=sendgmr) by 2002:a05:6902:102f:b0:dfa:ff27:db9 with SMTP id 3f1490d57ef6-e036e0b506bmr33645276.5.1719636854757; Fri, 28 Jun 2024 21:54:14 -0700 (PDT) Date: Fri, 28 Jun 2024 21:53:25 -0700 In-Reply-To: <20240629045350.285243-1-irogers@google.com> Message-Id: <20240629045350.285243-4-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240629045350.285243-1-irogers@google.com> X-Mailer: git-send-email 2.45.2.803.g4e1b14247a-goog Subject: [PATCH v3 03/28] perf cs-etm: Fix address sanitizer dso build failure From: Ian Rogers To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter , Kan Liang , John Garry , Will Deacon , James Clark , Mike Leach , Leo Yan , Suzuki K Poulose , Yicong Yang , Jonathan Cameron , Nick Terrell , Nick Desaulniers , Oliver Upton , Anshuman Khandual , Song Liu , Ilkka Koskinen , Athira Rajeev , Huacai Chen , Yanteng Si , Sun Haiyong , linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" cs-etm.c had been missed from having accessor functions added for the sake of reference count checking. Add the function calls and missing dso accessor functions. Fixes: ee756ef7491e ("perf dso: Add reference count checking and accessor f= unctions") Signed-off-by: Ian Rogers --- tools/perf/util/cs-etm.c | 10 +++++----- tools/perf/util/dso.h | 10 ++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/tools/perf/util/cs-etm.c b/tools/perf/util/cs-etm.c index c53812f343e9..7fd976ea954b 100644 --- a/tools/perf/util/cs-etm.c +++ b/tools/perf/util/cs-etm.c @@ -1013,7 +1013,7 @@ static u32 cs_etm__mem_access(struct cs_etm_queue *et= mq, u8 trace_chan_id, if (!dso) goto out; =20 - if (dso->data.status =3D=3D DSO_DATA_STATUS_ERROR && + if (dso__data(dso)->status =3D=3D DSO_DATA_STATUS_ERROR && dso__data_status_seen(dso, DSO_DATA_STATUS_SEEN_ITRACE)) goto out; =20 @@ -1027,11 +1027,11 @@ static u32 cs_etm__mem_access(struct cs_etm_queue *= etmq, u8 trace_chan_id, if (len <=3D 0) { ui__warning_once("CS ETM Trace: Missing DSO. Use 'perf archive' or debug= infod to export data from the traced system.\n" " Enable CONFIG_PROC_KCORE or use option '-k /path/to/vm= linux' for kernel symbols.\n"); - if (!dso->auxtrace_warned) { + if (!dso__auxtrace_warned(dso)) { pr_err("CS ETM Trace: Debug data not found for address %#"PRIx64" in %s= \n", - address, - dso->long_name ? dso->long_name : "Unknown"); - dso->auxtrace_warned =3D true; + address, + dso__long_name(dso) ? dso__long_name(dso) : "Unknown"); + dso__set_auxtrace_warned(dso); } goto out; } diff --git a/tools/perf/util/dso.h b/tools/perf/util/dso.h index d72f3b8c37f6..878c1f441868 100644 --- a/tools/perf/util/dso.h +++ b/tools/perf/util/dso.h @@ -280,6 +280,16 @@ static inline void dso__set_annotate_warned(struct dso= *dso) RC_CHK_ACCESS(dso)->annotate_warned =3D 1; } =20 +static inline bool dso__auxtrace_warned(const struct dso *dso) +{ + return RC_CHK_ACCESS(dso)->auxtrace_warned; +} + +static inline void dso__set_auxtrace_warned(struct dso *dso) +{ + RC_CHK_ACCESS(dso)->auxtrace_warned =3D 1; +} + static inline struct auxtrace_cache *dso__auxtrace_cache(struct dso *dso) { return RC_CHK_ACCESS(dso)->auxtrace_cache; --=20 2.45.2.803.g4e1b14247a-goog