Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

perf util: Remove kernel version deadcode

fetch_kernel_version() has been unused since Ian's 2023 commit
3d6dfae889174340 ("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 <irogers@google.com>
Signed-off-by: Dr. David Alan Gilbert <linux@treblig.org>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Alexander Shishkin <alexander.shishkin@linux.intel.com>
Cc: Ingo Molnar <mingo@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Kan Liang <kan.liang@linux.intel.com>
Cc: Mark Rutland <mark.rutland@arm.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <peterz@infradead.org>
Link: https://lore.kernel.org/r/20241116155850.113129-1-linux@treblig.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

authored by

Dr. David Alan Gilbert and committed by
Arnaldo Carvalho de Melo
264708b8 0b687912

-93
-85
tools/perf/util/util.c
··· 342 342 return perf_event_paranoid() <= max_level; 343 343 } 344 344 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 - 430 345 int perf_tip(char **strp, const char *dirpath) 431 346 { 432 347 struct strlist *tips;
-8
tools/perf/util/util.h
··· 46 46 47 47 bool sysctl__nmi_watchdog_enabled(void); 48 48 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 - 57 49 int perf_tip(char **strp, const char *dirpath); 58 50 59 51 #ifndef HAVE_SCHED_GETCPU_SUPPORT