niansa-misc/linux
1
0
Fork 0
mirror of synced 2025-03-06 20:59:54 +01:00
Code Issues Projects Releases Packages Wiki Activity

perf evsel: Rename evsel__increase_rlimit to rlimit__increase_nofile

Browse source 
evsel__increase_rlimit() helper does nothing with evsel, and description
of the functionality is inaccurate, rename it and move to util/rlimit.c.

By the way, fix a checkppatch warning about misplaced license tag:

  WARNING: Misplaced SPDX-License-Identifier tag - use line 1 instead
  #160: FILE: tools/perf/util/rlimit.h:3:
  /* SPDX-License-Identifier: LGPL-2.1 */

No functional change.

Signed-off-by: Yang Jihong <yangjihong1@huawei.com>
Link: https://lore.kernel.org/r/20231023033144.1011896-1-yangjihong1@huawei.com
Signed-off-by: Namhyung Kim <namhyung@kernel.org>
This commit is contained in:
Yang Jihong 2023-10-23 03:31:44 +00:00 • committed by Namhyung Kim
parent 79a3371bdf
commit e093a222d7
5 changed files with 42 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
tools/perf/util/data.c
View file

@ -17,7 +17,7 @@
#include "util.h" // rm_rf_perf_data() #include "util.h" // rm_rf_perf_data()
#include "debug.h" #include "debug.h"
#include "header.h" #include "header.h"
#include "evsel.h" #include "rlimit.h"
#include <internal/lib.h> #include <internal/lib.h>
static void close_dir(struct perf_data_file *files, int nr) static void close_dir(struct perf_data_file *files, int nr)
@ -64,7 +64,7 @@ retry_open:
* perf record needs at least 6 fds per CPU. * perf record needs at least 6 fds per CPU.
* When we run out of them try to increase the limits. * When we run out of them try to increase the limits.
*/ */
if (errno == EMFILE && evsel__increase_rlimit(&set_rlimit)) if (errno == EMFILE && rlimit__increase_nofile(&set_rlimit))
goto retry_open; goto retry_open;
ret = -errno; ret = -errno;

30
tools/perf/util/evsel.c
View file

@ -49,6 +49,7 @@
#include "off_cpu.h" #include "off_cpu.h"
#include "pmu.h" #include "pmu.h"
#include "pmus.h" #include "pmus.h"
#include "rlimit.h"
#include "../perf-sys.h" #include "../perf-sys.h"
#include "util/parse-branch-options.h" #include "util/parse-branch-options.h"
#include "util/bpf-filter.h" #include "util/bpf-filter.h"
@ -1989,33 +1990,6 @@ bool evsel__detect_missing_features(struct evsel *evsel)
} }
} }
bool evsel__increase_rlimit(enum rlimit_action *set_rlimit)
{
int old_errno;
struct rlimit l;
if (*set_rlimit < INCREASED_MAX) {
old_errno = errno;
if (getrlimit(RLIMIT_NOFILE, &l) == 0) {
if (*set_rlimit == NO_CHANGE) {
l.rlim_cur = l.rlim_max;
} else {
l.rlim_cur = l.rlim_max + 1000;
l.rlim_max = l.rlim_cur;
}
if (setrlimit(RLIMIT_NOFILE, &l) == 0) {
(*set_rlimit) += 1;
errno = old_errno;
return true;
}
}
errno = old_errno;
}
return false;
}
static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus, static int evsel__open_cpu(struct evsel *evsel, struct perf_cpu_map *cpus,
struct perf_thread_map *threads, struct perf_thread_map *threads,
int start_cpu_map_idx, int end_cpu_map_idx) int start_cpu_map_idx, int end_cpu_map_idx)
@ -2143,7 +2117,7 @@ try_fallback:
* perf stat needs between 5 and 22 fds per CPU. When we run out * perf stat needs between 5 and 22 fds per CPU. When we run out
* of them try to increase the limits. * of them try to increase the limits.
*/ */
if (err == -EMFILE && evsel__increase_rlimit(&set_rlimit)) if (err == -EMFILE && rlimit__increase_nofile(&set_rlimit))
goto retry_open; goto retry_open;
if (err != -EINVAL || idx > 0 || thread > 0) if (err != -EINVAL || idx > 0 || thread > 0)

3
tools/perf/util/evsel.h
View file

@ -330,9 +330,6 @@ int evsel__prepare_open(struct evsel *evsel, struct perf_cpu_map *cpus,
struct perf_thread_map *threads); struct perf_thread_map *threads);
bool evsel__detect_missing_features(struct evsel *evsel); bool evsel__detect_missing_features(struct evsel *evsel);
enum rlimit_action { NO_CHANGE, SET_TO_MAX, INCREASED_MAX };
bool evsel__increase_rlimit(enum rlimit_action *set_rlimit);
bool evsel__precise_ip_fallback(struct evsel *evsel); bool evsel__precise_ip_fallback(struct evsel *evsel);
struct perf_sample; struct perf_sample;

28
tools/perf/util/rlimit.c
View file

@ -1,5 +1,6 @@
/* SPDX-License-Identifier: LGPL-2.1 */ /* SPDX-License-Identifier: LGPL-2.1 */
#include <errno.h>
#include "util/debug.h" #include "util/debug.h"
#include "util/rlimit.h" #include "util/rlimit.h"
#include <sys/time.h> #include <sys/time.h>
@ -27,3 +28,30 @@ void rlimit__bump_memlock(void)
} }
} }
} }
bool rlimit__increase_nofile(enum rlimit_action *set_rlimit)
{
int old_errno;
struct rlimit l;
if (*set_rlimit < INCREASED_MAX) {
old_errno = errno;
if (getrlimit(RLIMIT_NOFILE, &l) == 0) {
if (*set_rlimit == NO_CHANGE) {
l.rlim_cur = l.rlim_max;
} else {
l.rlim_cur = l.rlim_max + 1000;
l.rlim_max = l.rlim_cur;
}
if (setrlimit(RLIMIT_NOFILE, &l) == 0) {
(*set_rlimit) += 1;
errno = old_errno;
return true;
}
}
errno = old_errno;
}
return false;
}

11
tools/perf/util/rlimit.h
View file

@ -1,6 +1,15 @@
/* SPDX-License-Identifier: LGPL-2.1 */
#ifndef __PERF_RLIMIT_H_ #ifndef __PERF_RLIMIT_H_
#define __PERF_RLIMIT_H_ #define __PERF_RLIMIT_H_
/* SPDX-License-Identifier: LGPL-2.1 */
enum rlimit_action {
NO_CHANGE,
SET_TO_MAX,
INCREASED_MAX
};
void rlimit__bump_memlock(void); void rlimit__bump_memlock(void);
bool rlimit__increase_nofile(enum rlimit_action *set_rlimit);
#endif // __PERF_RLIMIT_H_ #endif // __PERF_RLIMIT_H_