Skip to content

Commit 264708b

Browse files
Dr. David Alan Gilbertacmel
authored andcommitted
perf util: Remove kernel version deadcode
fetch_kernel_version() has been unused since Ian's 2023 commit 3d6dfae ("perf parse-events: Remove BPF event support") Remove it, and it's helpers. I noticed there are a bunch of kernel-version macros that are also unused nearby. Also remove them. Reviewed-by: Ian Rogers <[email protected]> Signed-off-by: Dr. David Alan Gilbert <[email protected]> Cc: Adrian Hunter <[email protected]> Cc: Alexander Shishkin <[email protected]> Cc: Ingo Molnar <[email protected]> Cc: Jiri Olsa <[email protected]> Cc: Kan Liang <[email protected]> Cc: Mark Rutland <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Peter Zijlstra <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 0b68791 commit 264708b

File tree

2 files changed

+0
-93
lines changed

2 files changed

+0
-93
lines changed

tools/perf/util/util.c

Lines changed: 0 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -342,91 +342,6 @@ bool perf_event_paranoid_check(int max_level)
342342
return perf_event_paranoid() <= max_level;
343343
}
344344

345-
static int
346-
fetch_ubuntu_kernel_version(unsigned int *puint)
347-
{
348-
ssize_t len;
349-
size_t line_len = 0;
350-
char *ptr, *line = NULL;
351-
int version, patchlevel, sublevel, err;
352-
FILE *vsig;
353-
354-
if (!puint)
355-
return 0;
356-
357-
vsig = fopen("/proc/version_signature", "r");
358-
if (!vsig) {
359-
pr_debug("Open /proc/version_signature failed: %s\n",
360-
strerror(errno));
361-
return -1;
362-
}
363-
364-
len = getline(&line, &line_len, vsig);
365-
fclose(vsig);
366-
err = -1;
367-
if (len <= 0) {
368-
pr_debug("Reading from /proc/version_signature failed: %s\n",
369-
strerror(errno));
370-
goto errout;
371-
}
372-
373-
ptr = strrchr(line, ' ');
374-
if (!ptr) {
375-
pr_debug("Parsing /proc/version_signature failed: %s\n", line);
376-
goto errout;
377-
}
378-
379-
err = sscanf(ptr + 1, "%d.%d.%d",
380-
&version, &patchlevel, &sublevel);
381-
if (err != 3) {
382-
pr_debug("Unable to get kernel version from /proc/version_signature '%s'\n",
383-
line);
384-
goto errout;
385-
}
386-
387-
*puint = (version << 16) + (patchlevel << 8) + sublevel;
388-
err = 0;
389-
errout:
390-
free(line);
391-
return err;
392-
}
393-
394-
int
395-
fetch_kernel_version(unsigned int *puint, char *str,
396-
size_t str_size)
397-
{
398-
struct utsname utsname;
399-
int version, patchlevel, sublevel, err;
400-
bool int_ver_ready = false;
401-
402-
if (access("/proc/version_signature", R_OK) == 0)
403-
if (!fetch_ubuntu_kernel_version(puint))
404-
int_ver_ready = true;
405-
406-
if (uname(&utsname))
407-
return -1;
408-
409-
if (str && str_size) {
410-
strncpy(str, utsname.release, str_size);
411-
str[str_size - 1] = '\0';
412-
}
413-
414-
if (!puint || int_ver_ready)
415-
return 0;
416-
417-
err = sscanf(utsname.release, "%d.%d.%d",
418-
&version, &patchlevel, &sublevel);
419-
420-
if (err != 3) {
421-
pr_debug("Unable to get kernel version from uname '%s'\n",
422-
utsname.release);
423-
return -1;
424-
}
425-
426-
*puint = (version << 16) + (patchlevel << 8) + sublevel;
427-
return 0;
428-
}
429-
430345
int perf_tip(char **strp, const char *dirpath)
431346
{
432347
struct strlist *tips;

tools/perf/util/util.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -46,14 +46,6 @@ int sysctl__max_stack(void);
4646

4747
bool sysctl__nmi_watchdog_enabled(void);
4848

49-
int fetch_kernel_version(unsigned int *puint,
50-
char *str, size_t str_sz);
51-
#define KVER_VERSION(x) (((x) >> 16) & 0xff)
52-
#define KVER_PATCHLEVEL(x) (((x) >> 8) & 0xff)
53-
#define KVER_SUBLEVEL(x) ((x) & 0xff)
54-
#define KVER_FMT "%d.%d.%d"
55-
#define KVER_PARAM(x) KVER_VERSION(x), KVER_PATCHLEVEL(x), KVER_SUBLEVEL(x)
56-
5749
int perf_tip(char **strp, const char *dirpath);
5850

5951
#ifndef HAVE_SCHED_GETCPU_SUPPORT

0 commit comments

Comments
 (0)