linux-kernel - Re: [PATCH] perf util: Remove kernel version deadcode

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <CAP-5=fXqig=qHAa26d5-8pHPCtS0ZyCNs4FJGr4c4BSjFe+-eg@mail.gmail.com>
Date: Sat, 16 Nov 2024 10:37:32 -0800
From: Ian Rogers <irogers@...gle.com>
To: linux@...blig.org
Cc: namhyung@...nel.org, peterz@...radead.org, mingo@...hat.com, 
	acme@...nel.org, mark.rutland@....com, alexander.shishkin@...ux.intel.com, 
	jolsa@...nel.org, adrian.hunter@...el.com, kan.liang@...ux.intel.com, 
	linux-perf-users@...r.kernel.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH] perf util: Remove kernel version deadcode

On Sat, Nov 16, 2024 at 7:58 AM <linux@...blig.org> wrote:
>
> From: "Dr. David Alan Gilbert" <linux@...blig.org>
>
> fetch_kernel_version() has been unused since Ian's 2013
> commit 3d6dfae88917 ("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.
>
> Signed-off-by: Dr. David Alan Gilbert <linux@...blig.org>

Reviewed-by: Ian Rogers <irogers@...gle.com>

Thanks,
Ian

> ---
>  tools/perf/util/util.c | 85 ------------------------------------------
>  tools/perf/util/util.h |  8 ----
>  2 files changed, 93 deletions(-)
>
> diff --git a/tools/perf/util/util.c b/tools/perf/util/util.c
> index 9d55a13787ce..855aac5150a0 100644
> --- a/tools/perf/util/util.c
> +++ b/tools/perf/util/util.c
> @@ -336,91 +336,6 @@ bool perf_event_paranoid_check(int max_level)
>         return perf_event_paranoid() <= max_level;
>  }
>
> -static int
> -fetch_ubuntu_kernel_version(unsigned int *puint)
> -{
> -       ssize_t len;
> -       size_t line_len = 0;
> -       char *ptr, *line = NULL;
> -       int version, patchlevel, sublevel, err;
> -       FILE *vsig;
> -
> -       if (!puint)
> -               return 0;
> -
> -       vsig = fopen("/proc/version_signature", "r");
> -       if (!vsig) {
> -               pr_debug("Open /proc/version_signature failed: %s\n",
> -                        strerror(errno));
> -               return -1;
> -       }
> -
> -       len = getline(&line, &line_len, vsig);
> -       fclose(vsig);
> -       err = -1;
> -       if (len <= 0) {
> -               pr_debug("Reading from /proc/version_signature failed: %s\n",
> -                        strerror(errno));
> -               goto errout;
> -       }
> -
> -       ptr = strrchr(line, ' ');
> -       if (!ptr) {
> -               pr_debug("Parsing /proc/version_signature failed: %s\n", line);
> -               goto errout;
> -       }
> -
> -       err = sscanf(ptr + 1, "%d.%d.%d",
> -                    &version, &patchlevel, &sublevel);
> -       if (err != 3) {
> -               pr_debug("Unable to get kernel version from /proc/version_signature '%s'\n",
> -                        line);
> -               goto errout;
> -       }
> -
> -       *puint = (version << 16) + (patchlevel << 8) + sublevel;
> -       err = 0;
> -errout:
> -       free(line);
> -       return err;
> -}
> -
> -int
> -fetch_kernel_version(unsigned int *puint, char *str,
> -                    size_t str_size)
> -{
> -       struct utsname utsname;
> -       int version, patchlevel, sublevel, err;
> -       bool int_ver_ready = false;
> -
> -       if (access("/proc/version_signature", R_OK) == 0)
> -               if (!fetch_ubuntu_kernel_version(puint))
> -                       int_ver_ready = true;
> -
> -       if (uname(&utsname))
> -               return -1;
> -
> -       if (str && str_size) {
> -               strncpy(str, utsname.release, str_size);
> -               str[str_size - 1] = '\0';
> -       }
> -
> -       if (!puint || int_ver_ready)
> -               return 0;
> -
> -       err = sscanf(utsname.release, "%d.%d.%d",
> -                    &version, &patchlevel, &sublevel);
> -
> -       if (err != 3) {
> -               pr_debug("Unable to get kernel version from uname '%s'\n",
> -                        utsname.release);
> -               return -1;
> -       }
> -
> -       *puint = (version << 16) + (patchlevel << 8) + sublevel;
> -       return 0;
> -}
> -
>  int perf_tip(char **strp, const char *dirpath)
>  {
>         struct strlist *tips;
> diff --git a/tools/perf/util/util.h b/tools/perf/util/util.h
> index 9966c21aaf04..b5e7becfc803 100644
> --- a/tools/perf/util/util.h
> +++ b/tools/perf/util/util.h
> @@ -43,14 +43,6 @@ int sysctl__max_stack(void);
>
>  bool sysctl__nmi_watchdog_enabled(void);
>
> -int fetch_kernel_version(unsigned int *puint,
> -                        char *str, size_t str_sz);
> -#define KVER_VERSION(x)                (((x) >> 16) & 0xff)
> -#define KVER_PATCHLEVEL(x)     (((x) >> 8) & 0xff)
> -#define KVER_SUBLEVEL(x)       ((x) & 0xff)
> -#define KVER_FMT       "%d.%d.%d"
> -#define KVER_PARAM(x)  KVER_VERSION(x), KVER_PATCHLEVEL(x), KVER_SUBLEVEL(x)
> -
>  int perf_tip(char **strp, const char *dirpath);
>
>  #ifndef HAVE_SCHED_GETCPU_SUPPORT
> --
> 2.47.0
>