From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f201.google.com (mail-pl1-f201.google.com [209.85.214.201]) (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 B1BB91E0DFE for ; Wed, 9 Apr 2025 06:11:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744179064; cv=none; b=ppEK8JgR1uS+cDnXNOn8v3Q+CddY7HJ+YmhoHBKq4g36847IN9Xp9U3Lb+UGtE7NEKkbLMPAC8koGKLlWqSGOvS9dmV5xrRAQrxS+I5oh/yUWF+ZYOQeNfl8zhfJ7IPqJfcOWvBsnGkshEzddBIMf5hkQP1rTDwiw+yiPtT/cUY= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744179064; c=relaxed/simple; bh=yUglDtEpwZVjaGPveMCOEFvdP87AB0tTSBss9c6TB98=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Content-Type; b=p1d8W4RLZC8MZTNUKpNW92i96AwL8l73aD1yWseBxpO+qLkRse0Js3F5JVI4ZqbBEq0PEI5f1S9WameCgubPV5gQP5Q0Rt1VT/Gbc03xZaoYCY707ZlMttchm5CzJZFjCS9+ySnZs/gV1VVMYpeZBuQZWVyiLWOShEpRd2Qgt1k= 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=w3//U1kr; arc=none smtp.client-ip=209.85.214.201 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="w3//U1kr" Received: by mail-pl1-f201.google.com with SMTP id d9443c01a7336-2241e7e3addso52836425ad.1 for ; Tue, 08 Apr 2025 23:11:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1744179062; x=1744783862; darn=vger.kernel.org; h=to:from:subject:message-id:references:mime-version:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=XafRrptC07unstJw1HreG0n5lBFJ2gSj/BsZTF4fwvk=; b=w3//U1krDENNW54Mgc8dkdn/RH1PBFufqJbfe9aftDkaLfuNVJcihdI0Ln/ENHqOiE lJ8gZIlXVGSAJ44o2RrWl0zqzjCwBFkPzjamAN7wXshSZ6VzXhOOq9xFgDmQhE6eHzgM Cs8QGPQn+xtRftvmCQRDHjDSfOxxjJJbJL0eXHfdD6IqA9RrHEIdVWuVpEHd0BRS22SB +77kzi3HyLLWBFNf+tcQim23rwUYC/KdSSkvyyp3LwvipMPhxOZRBmNMMnN53W19RgbN sxZh/EOCvMr32uMsLXxs/VujxGL3xI2HngfehIQdqG71Tm48hfFee15rrkkJevf+p8xC 1Rew== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744179062; x=1744783862; h=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=XafRrptC07unstJw1HreG0n5lBFJ2gSj/BsZTF4fwvk=; b=EiUGFr1JGKtY99hNelMRiJ5UFLKX+FGqnaVj8Iw+TfQ4ESE5hyGdF07GhhSrhRNIYi ExuEDlwprELzK/cCQPiuTBn4EXJRcRaJI4THMbj/sa0S71MK130oQTJazf6Os9I0bJQQ A1pJ7CUSZArzVyZDgBThaoE4Jn0ECE5SZ2phJms+m4avrq+JJ0G6tuPw3pDs2Z5taVsX 1b0WEF8o/i7j0e9VExIFpHSjjBS4V1GeXJ9xPrSw9d8MB5yCxKY07P1uDTZxRL+9BVBX ntrqU/nm9JUGiw2erl1/yG3pk1IkgCXJqzKVSkN+tucHJhIrGxqk2w3vgRaxcvj2D4eb hYig== X-Forwarded-Encrypted: i=1; AJvYcCUZtDacXsRPlgtJpcgI0A603Ge6kbP2AcnWT3Bdbj+WJU3eiwJwM6Y4eMiRSaFUkwhiaSJYmmZ6d0oBSyU=@vger.kernel.org X-Gm-Message-State: AOJu0YwCHNkTdOViUrrvOPXTLzebXGv6rTt5geab9jmIGzgAfCahqVVw gimTotZbW464D44RJ+bjpvXetPjrCz91W8TXHBQ4kliD0Jq8hcZYVLJmhdJEzKrUfH7zel1U6Hh X8tTX4w== X-Google-Smtp-Source: AGHT+IEBeLFisPAqUiTchaGbpoO4ST/mLlKRoEISv+smJtgjEjtjnZMTLV06vQsaAYIzaoP6don6AGG5jumO X-Received: from pltl6.prod.google.com ([2002:a17:902:70c6:b0:223:4c5f:3494]) (user=irogers job=prod-delivery.src-stubby-dispatcher) by 2002:a17:903:98b:b0:224:910:23f6 with SMTP id d9443c01a7336-22ac2a2e856mr28630585ad.45.1744179062007; Tue, 08 Apr 2025 23:11:02 -0700 (PDT) Date: Tue, 8 Apr 2025 23:10:32 -0700 In-Reply-To: <20250409061043.700792-1-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250409061043.700792-1-irogers@google.com> X-Mailer: git-send-email 2.49.0.504.g3bcea36a83-goog Message-ID: <20250409061043.700792-6-irogers@google.com> Subject: [PATCH v4 05/16] perf intel-tpebs: Move cpumap_buf out of evsel__tpebs_open 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 , Weilin Wang , James Clark , Xu Yang , John Garry , Howard Chu , Levi Yun , Dominique Martinet , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" The buffer holds the cpumap to pass to the perf record command, so move it down to the perf record function. Make this function an evsel function given the need for the evsel for the cpumap. Signed-off-by: Ian Rogers --- tools/perf/util/intel-tpebs.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/tools/perf/util/intel-tpebs.c b/tools/perf/util/intel-tpebs.c index 2186818b2c9b..2b04deaf66ff 100644 --- a/tools/perf/util/intel-tpebs.c +++ b/tools/perf/util/intel-tpebs.c @@ -83,12 +83,15 @@ static int get_perf_record_args(const char **record_argv, char buf[], return 0; } -static int start_perf_record(int control_fd[], int ack_fd[], - const char *cpumap_buf) +static int evsel__tpebs_start_perf_record(struct evsel *evsel, int control_fd[], int ack_fd[]) { const char **record_argv; int ret; char buf[32]; + char cpumap_buf[50]; + + cpu_map__snprint(evsel->evlist->core.user_requested_cpus, cpumap_buf, + sizeof(cpumap_buf)); scnprintf(buf, sizeof(buf), "--control=fd:%d,%d", control_fd[0], ack_fd[1]); @@ -287,8 +290,6 @@ int evsel__tpebs_open(struct evsel *evsel) return ret; if (tpebs_event_size > 0) { - struct evlist *evsel_list = evsel->evlist; - char cpumap_buf[50]; struct pollfd pollfd = { .events = POLLIN, }; int control_fd[2], ack_fd[2], len; char ack_buf[8]; @@ -305,10 +306,7 @@ int evsel__tpebs_open(struct evsel *evsel) goto out; } - cpu_map__snprint(evsel_list->core.user_requested_cpus, cpumap_buf, - sizeof(cpumap_buf)); - - ret = start_perf_record(control_fd, ack_fd, cpumap_buf); + ret = evsel__tpebs_start_perf_record(evsel, control_fd, ack_fd); if (ret) goto out; -- 2.49.0.504.g3bcea36a83-goog