From mboxrd@z Thu Jan 1 00:00:00 1970 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 EDD351FCFF1 for ; Sat, 11 Jan 2025 19:02:18 +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=1736622140; cv=none; b=f09/gmJpEdlMN7kCuK4dvzcZePhbGHrQJi8el1cOE6vthWH+iFOFM/DH2t7F4ZyzB90gwL7VXmA0BjYiFnli1t/JdWVubOokCHX7Zc+w0tKwgBGp1jLSKoRUCN0gdmOrxpCYvIqTy4o40G6sGKYQ3y12fNDIotKnoze295UnFdo= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1736622140; c=relaxed/simple; bh=jw95DsSah39EFCB6wIos9k/jmDl0fO+APaljFVuh7GU=; h=Date:In-Reply-To:Message-Id:Mime-Version:References:Subject:From: To:Content-Type; b=opZj5Ygl0lJ7FRodqcFdk9MqHHNxA9c3WRyl4E9/Gf82R9hc9PsLfSBmHCOJEnCYva9ivKaa10gtntvfSS1EINnPGqMhnHdVH4O00sYbLGnmTHlaCpXdCdqFG9a8PMrU1/4c70CZaiw+U6uBi6ajJsYDzGl5v5CepS6QAeaqa+I= 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=Q5ViytjB; 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="Q5ViytjB" Received: by mail-yb1-f202.google.com with SMTP id 3f1490d57ef6-e573c46fd5dso1164461276.1 for ; Sat, 11 Jan 2025 11:02:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1736622138; x=1737226938; 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=4Ykf/YNCf3GJy9g72qoRrq28DSjwK5D2gHldZswBy/4=; b=Q5ViytjBU47FXLskcxJSzb7dAC1bkgPzpiBetNw6pS+pWBbLiYEd0ltpbg1Rz+eJRL UGy2Qp+mYfEF0LKBjlcPCgE7bFCH6GS2o92sF8Z3puZmKc+2xSyiVeKFTU37nR5Erf+t sRm0GulAPePdDSoANLstKwfdL0hVZkBf6xsFZ/B3ACSg1eQwhlIu/ZdKWhCot8Ps+BH1 sI6z3BuSagnwZpK7+LjCjepxcWdZgViqIuDsU9M1ZKlx0mu9VUqEBQKn5nLK2ftSAVtH Uhx3eDAGChBsASpm5nuXbSOnaCmUOLSwSV1OFf/ML/JydUT4Opgnwm5h97lolnCe98/q 9m7A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1736622138; x=1737226938; 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=4Ykf/YNCf3GJy9g72qoRrq28DSjwK5D2gHldZswBy/4=; b=J+IqmyirPyIuQtwEY27Kx6ijRX8p0yRhVklB10Q6zcmB7TfgBqp/w7MkvuFka7RFbJ MQwFD+tfM9eCiX8iNadAjP5CQ53O77X+L+IKnINv4a8Kf/Oa+orAU3U8FkNRrKEa4sou vdYGGvye2Jv8Sn6leCcDTHhcThcreIlXq0fJVAqJiTFFfk6dyPGzLlZZrU3VpdDbBTv8 qXEDqYXQuSUtHP8Egdx/n8CVEuJkxZpBbU9Xn+iKWCsS0Ihvg9C1s2UZvSbe4+vZLiBz iH0f14m6tRly63nZaj6wLJ6xnvfKtxGNEWmsxU2Pjm+/6FQNfphw37MvSmE04zBJYFFy nSLw== X-Forwarded-Encrypted: i=1; AJvYcCUQndEaoodEdm7j6/lUerpTwXbEhihMjbgLEawHz4Yzl9iocj9aVQlmHY9CfmwCHCaU66r21/hFg1dYIVE=@vger.kernel.org X-Gm-Message-State: AOJu0YzD+FLUdPGMKr7XVnSftqwhKBMbGIYiirnXoWWeWtXa7qmkGqj7 E/cYcYKOK/vY6DdaWBAzh456CFfYSBG9Aiz3SpVO5TUr+h5Z7jCpU0cosCSwUQhWT+2L20aKlqo DSHiQVQ== X-Google-Smtp-Source: AGHT+IGVdVNplEgJ1YmjInMhNR8NwXdOlknuLCSjmZ65mMLBefHVaW1iMrUjgOvx+OmIBZYgyL33UbrhR0gs X-Received: from irogers.svl.corp.google.com ([2620:15c:2c5:11:8807:d7c5:bb27:35fc]) (user=irogers job=sendgmr) by 2002:a25:b293:0:b0:e39:7a90:7b2 with SMTP id 3f1490d57ef6-e54ee1f2d7amr33639276.7.1736622138212; Sat, 11 Jan 2025 11:02:18 -0800 (PST) Date: Sat, 11 Jan 2025 11:01:41 -0800 In-Reply-To: <20250111190143.1029906-1-irogers@google.com> Message-Id: <20250111190143.1029906-9-irogers@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20250111190143.1029906-1-irogers@google.com> X-Mailer: git-send-email 2.47.1.613.gc27f4b7a9f-goog Subject: [PATCH v1 08/10] perf bench evlist-open-close: Switch user option to use BPF filter 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 , Hao Ge , James Clark , Howard Chu , Dominique Martinet , Levi Yun , Xu Yang , Tengda Wu , Yang Jihong , linux-perf-users@vger.kernel.org, linux-kernel@vger.kernel.org Content-Type: text/plain; charset="UTF-8" Finding user processes by scanning /proc is inherently racy and results in perf_event_open failures. Use a BPF filter to drop samples where the uid doesn't match. Signed-off-by: Ian Rogers --- tools/perf/bench/evlist-open-close.c | 36 ++++++++++++++++------------ 1 file changed, 21 insertions(+), 15 deletions(-) diff --git a/tools/perf/bench/evlist-open-close.c b/tools/perf/bench/evlist-open-close.c index 79cedcf94a39..bfaf50e4e519 100644 --- a/tools/perf/bench/evlist-open-close.c +++ b/tools/perf/bench/evlist-open-close.c @@ -57,7 +57,7 @@ static int evlist__count_evsel_fds(struct evlist *evlist) return cnt; } -static struct evlist *bench__create_evlist(char *evstr) +static struct evlist *bench__create_evlist(char *evstr, const char *uid_str) { struct parse_events_error err; struct evlist *evlist = evlist__new(); @@ -78,6 +78,18 @@ static struct evlist *bench__create_evlist(char *evstr) goto out_delete_evlist; } parse_events_error__exit(&err); + if (uid_str) { + uid_t uid = parse_uid(uid_str); + + if (uid == UINT_MAX) { + pr_err("Invalid User: %s", uid_str); + ret = -EINVAL; + goto out_delete_evlist; + } + ret = parse_uid_filter(evlist, uid); + if (ret) + goto out_delete_evlist; + } ret = evlist__create_maps(evlist, &opts.target); if (ret < 0) { pr_err("Not enough memory to create thread/cpu maps\n"); @@ -117,10 +129,10 @@ static int bench__do_evlist_open_close(struct evlist *evlist) return 0; } -static int bench_evlist_open_close__run(char *evstr) +static int bench_evlist_open_close__run(char *evstr, const char *uid_str) { // used to print statistics only - struct evlist *evlist = bench__create_evlist(evstr); + struct evlist *evlist = bench__create_evlist(evstr, uid_str); double time_average, time_stddev; struct timeval start, end, diff; struct stats time_stats; @@ -142,7 +154,7 @@ static int bench_evlist_open_close__run(char *evstr) for (i = 0; i < iterations; i++) { pr_debug("Started iteration %d\n", i); - evlist = bench__create_evlist(evstr); + evlist = bench__create_evlist(evstr, uid_str); if (!evlist) return -ENOMEM; @@ -206,6 +218,7 @@ static char *bench__repeat_event_string(const char *evstr, int n) int bench_evlist_open_close(int argc, const char **argv) { + const char *uid_str = NULL; const struct option options[] = { OPT_STRING('e', "event", &event_string, "event", "event selector. use 'perf list' to list available events"), @@ -221,7 +234,7 @@ int bench_evlist_open_close(int argc, const char **argv) "record events on existing process id"), OPT_STRING('t', "tid", &opts.target.tid, "tid", "record events on existing thread id"), - OPT_STRING('u', "uid", &opts.target.uid_str, "user", "user to profile"), + OPT_STRING('u', "uid", &uid_str, "user", "user to profile"), OPT_BOOLEAN(0, "per-thread", &opts.target.per_thread, "use per-thread mmaps"), OPT_END() }; @@ -245,15 +258,8 @@ int bench_evlist_open_close(int argc, const char **argv) goto out; } - err = target__parse_uid(&opts.target); - if (err) { - target__strerror(&opts.target, err, errbuf, sizeof(errbuf)); - pr_err("%s", errbuf); - goto out; - } - - /* Enable ignoring missing threads when -u/-p option is defined. */ - opts.ignore_missing_thread = opts.target.uid != UINT_MAX || opts.target.pid; + /* Enable ignoring missing threads when -p option is defined. */ + opts.ignore_missing_thread = opts.target.pid; evstr = bench__repeat_event_string(event_string, nr_events); if (!evstr) { @@ -261,7 +267,7 @@ int bench_evlist_open_close(int argc, const char **argv) goto out; } - err = bench_evlist_open_close__run(evstr); + err = bench_evlist_open_close__run(evstr, uid_str); free(evstr); out: -- 2.47.1.613.gc27f4b7a9f-goog