From nobody Sat Feb 28 02:44:42 2026 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.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 65CF94D9F6 for ; Fri, 10 May 2024 19:14:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715368492; cv=none; b=aVsArS/aYbJ5lf09+dsn/Nm4HtbeI4Xl1PcrUDlQKTLpRiaJHB4IlqOO+pYHzt7NvbcFmwOF3RV+PB3V6yrI9vl7a7xCv13Dg2/euYa4JsGK/OAbDWw2qz7TXa+7BofGXOrpcuQlTuoPS1Xps27V9b6dX6JE/5B/cgamSF1xZIg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1715368492; c=relaxed/simple; bh=Ef717kLuVBT1fbqK3xWzMcLvVUsMivpXuO9N8M0ap+U=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=A1zMnjAZ4eigGSM+Pe4yOeyAEH0T+Dv77HPPTt6YU4+DNmQcq+/of2Go/CHJqprlhk/Px4w+o2bauauzIukg0Rf7Lp10DbwimYPwvgsHKBrspl5lrQvuBeHuHqDhA+Epvh5cNfwpk4Dl8uYaKSV8iTTvA5A2LirMSxCtYvMSouA= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--yabinc.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=NXbZzlWE; arc=none smtp.client-ip=209.85.128.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--yabinc.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="NXbZzlWE" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6202fd268c1so40077697b3.2 for ; Fri, 10 May 2024 12:14:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1715368490; x=1715973290; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=B7TYqXtK1Mk6NWoqrVFRwUxJwKqSCgyVFtFSV6E0LeA=; b=NXbZzlWEmSuq5zm4d594QWpJwFOdYp1PQ/9mfoL/3sovgdpfVqG54GWcyapOlk3Wep 9O+2ngEtdBULUxJDdCkbLaptbyBe5anlw+LYtxXqmdok5d2G67yKOxWKUUiLRrbsRtWW a8w3G+XV63sKdwXPtwNrp6g8XmotuIlvwvv2cqVW2u9WFoznGtMlhyxwpii6gBvPwFrO VPcIjRO5TGMWmbW+gb4rjsCAZ5Lgsjn0QNf7oNGuHOkvguFv2YyKFwP8xFHc8QDE+Tvs V28sO0EVNKiMMlVUweZVbBNO086P6BM7bMkS2NgTpPHAJw0E6nsnOgiAntoZIf7BYyb1 khWw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715368490; x=1715973290; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=B7TYqXtK1Mk6NWoqrVFRwUxJwKqSCgyVFtFSV6E0LeA=; b=iEqhjw9J4jIpcponJ3ZGz/0ZoXpGbCEweu/CNjdJUlfSUjzugeTPGh9KlX/Zhgsdhs xK29Kmi0PM5qwkwZLtbBbL1/RVTW1UkInKKdgVYcEnDvJo2anAwB0YGfYuKEPqvHPcBP dv0OX4vb8pnnwK9ApbWKU/NGdDAYFon9dhWZm4J7R2c7fQIt9j8z/QhC6pZZihUOM/+W 0aYhUvHAgZ3BlA80u5DBG+/7xLxpPJHJw9Mw/m3orgzk+Jn7WYCf8/vSXrKNrO7LsX4e Gb87dhOBh5VWMmyE6v3GfwdhHm/TMtDAGtWW4DHd7Apuw6kIOiM8GZp06xV6XfhvkxNA Vzyg== X-Forwarded-Encrypted: i=1; AJvYcCWieIWI4Ppc9gkGN0MBg13UN/YkM8E/r8NlhkDCEg4arjqpJv+2HRPlpz5SVsMsyTu0Nr+doRJplYR4lW51fWklWVmSoRiRY4qrQyZV X-Gm-Message-State: AOJu0Yyzg8rk19JEl+267yknsGlNumVKFvRk3zDi7bXecwpEk0H2uOkF D3/8mQTQOyU66Hnc9+cXd52wY7qHXIKCvC0qqdgEI4ii8oONzQC3cHstjD9FdfuLEem3kvTQjHc 7 X-Google-Smtp-Source: AGHT+IFb8jxmN6r68G4DcrXpnFSPXecUXaoio7CsPUw8x8nZIcXrAKCeTWV/1YMYhzP0k+gAt9nnkPiev4A= X-Received: from yabinc-desktop.mtv.corp.google.com ([2620:15c:211:202:d3a5:c745:caa1:83ed]) (user=yabinc job=sendgmr) by 2002:a05:6902:1109:b0:dee:5dc9:7e45 with SMTP id 3f1490d57ef6-dee5dc993ebmr313635276.5.1715368490439; Fri, 10 May 2024 12:14:50 -0700 (PDT) Date: Fri, 10 May 2024 12:14:23 -0700 In-Reply-To: <20240510191423.2297538-1-yabinc@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240510191423.2297538-1-yabinc@google.com> X-Mailer: git-send-email 2.45.0.118.g7fe29c98d7-goog Message-ID: <20240510191423.2297538-4-yabinc@google.com> Subject: [PATCH v4 3/3] perf/core: Check sample_type in perf_sample_save_brstack From: Yabin Cui To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Namhyung Kim , Mark Rutland , Alexander Shishkin , Jiri Olsa , Ian Rogers , Adrian Hunter Cc: linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, Yabin Cui Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" Check sample_type in perf_sample_save_brstack() to prevent saving branch stack data when it isn't required. Suggested-by: Namhyung Kim Signed-off-by: Yabin Cui --- arch/x86/events/amd/core.c | 3 +-- arch/x86/events/core.c | 3 +-- arch/x86/events/intel/ds.c | 3 +-- include/linux/perf_event.h | 13 ++++++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/arch/x86/events/amd/core.c b/arch/x86/events/amd/core.c index 985ef3b47919..fb9bf3aa1b42 100644 --- a/arch/x86/events/amd/core.c +++ b/arch/x86/events/amd/core.c @@ -967,8 +967,7 @@ static int amd_pmu_v2_handle_irq(struct pt_regs *regs) if (!x86_perf_event_set_period(event)) continue; =20 - if (has_branch_stack(event)) - perf_sample_save_brstack(&data, event, &cpuc->lbr_stack, NULL); + perf_sample_save_brstack(&data, event, &cpuc->lbr_stack, NULL); =20 if (perf_event_overflow(event, &data, regs)) x86_pmu_stop(event, 0); diff --git a/arch/x86/events/core.c b/arch/x86/events/core.c index 5b0dd07b1ef1..ff5577315938 100644 --- a/arch/x86/events/core.c +++ b/arch/x86/events/core.c @@ -1702,8 +1702,7 @@ int x86_pmu_handle_irq(struct pt_regs *regs) =20 perf_sample_data_init(&data, 0, event->hw.last_period); =20 - if (has_branch_stack(event)) - perf_sample_save_brstack(&data, event, &cpuc->lbr_stack, NULL); + perf_sample_save_brstack(&data, event, &cpuc->lbr_stack, NULL); =20 if (perf_event_overflow(event, &data, regs)) x86_pmu_stop(event, 0); diff --git a/arch/x86/events/intel/ds.c b/arch/x86/events/intel/ds.c index c2b5585aa6d1..f25236ffa28f 100644 --- a/arch/x86/events/intel/ds.c +++ b/arch/x86/events/intel/ds.c @@ -1754,8 +1754,7 @@ static void setup_pebs_fixed_sample_data(struct perf_= event *event, if (x86_pmu.intel_cap.pebs_format >=3D 3) setup_pebs_time(event, data, pebs->tsc); =20 - if (has_branch_stack(event)) - perf_sample_save_brstack(data, event, &cpuc->lbr_stack, NULL); + perf_sample_save_brstack(data, event, &cpuc->lbr_stack, NULL); } =20 static void adaptive_pebs_save_regs(struct pt_regs *regs, diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h index 8617815456b0..ecfbe22ff299 100644 --- a/include/linux/perf_event.h +++ b/include/linux/perf_event.h @@ -1269,6 +1269,11 @@ static inline void perf_sample_save_raw_data(struct = perf_sample_data *data, data->sample_flags |=3D PERF_SAMPLE_RAW; } =20 +static inline bool has_branch_stack(struct perf_event *event) +{ + return event->attr.sample_type & PERF_SAMPLE_BRANCH_STACK; +} + static inline void perf_sample_save_brstack(struct perf_sample_data *data, struct perf_event *event, struct perf_branch_stack *brs, @@ -1276,6 +1281,9 @@ static inline void perf_sample_save_brstack(struct pe= rf_sample_data *data, { int size =3D sizeof(u64); /* nr */ =20 + if (!has_branch_stack(event)) + return; + if (branch_sample_hw_index(event)) size +=3D sizeof(u64); size +=3D brs->nr * sizeof(struct perf_branch_entry); @@ -1665,11 +1673,6 @@ extern void perf_bp_event(struct perf_event *event, = void *data); # define perf_arch_bpf_user_pt_regs(regs) regs #endif =20 -static inline bool has_branch_stack(struct perf_event *event) -{ - return event->attr.sample_type & PERF_SAMPLE_BRANCH_STACK; -} - static inline bool needs_branch_stack(struct perf_event *event) { return event->attr.branch_sample_type !=3D 0; --=20 2.45.0.118.g7fe29c98d7-goog