| 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
| ||
|
Date: Fri, 27 Feb 2015 12:31:13 +0900
From: Masami Hiramatsu <masami.hiramatsu.pt@...achi.com>
To: Arnaldo Carvalho de Melo <acme@...nel.org>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>,
Adrian Hunter <adrian.hunter@...el.com>,
linux-kernel@...r.kernel.org, Ingo Molnar <mingo@...hat.com>,
Paul Mackerras <paulus@...ba.org>,
Jiri Olsa <jolsa@...nel.org>,
Namhyung Kim <namhyung@...nel.org>,
Borislav Petkov <bp@...e.de>,
Hemant Kumar <hemant@...ux.vnet.ibm.com>
Subject: Re: Re: [perf/core PATCH v5 2/4] perf buildid-cache: Add --purge
FILE to remove all caches of FILE
(2015/02/27 0:05), Arnaldo Carvalho de Melo wrote:
> Em Thu, Feb 26, 2015 at 03:54:47PM +0900, Masami Hiramatsu escreveu:
>> @@ -285,6 +308,7 @@ int cmd_buildid_cache(int argc, const char **argv,
>> bool force = false;
>> char const *add_name_list_str = NULL,
>> *remove_name_list_str = NULL,
>> + *purge_name_list_str = NULL,
>> *missing_filename = NULL,
>> *update_name_list_str = NULL,
>> *kcore_filename = NULL;
>> @@ -302,6 +326,8 @@ int cmd_buildid_cache(int argc, const char **argv,
>> "file", "kcore file to add"),
>> OPT_STRING('r', "remove", &remove_name_list_str, "file list",
>> "file(s) to remove"),
>> + OPT_STRING('p', "purge", &purge_name_list_str, "path list",
>> + "path(s) to remove (remove old caches too)"),
>> OPT_STRING('M', "missing", &missing_filename, "file",
>> "to find missing build ids in the cache"),
>> OPT_BOOLEAN('f', "force", &force, "don't complain, do it"),
>> @@ -368,6 +394,24 @@ int cmd_buildid_cache(int argc, const char **argv,
>> }
>> }
>>
>> + if (purge_name_list_str) {
>> + list = strlist__new(true, purge_name_list_str);
>> + if (list) {
>> + strlist__for_each(pos, list)
>> + if (build_id_cache__purge_path(pos->s)) {
>> + if (errno == ENOENT) {
>> + pr_debug("%s wasn't in the cache\n",
>> + pos->s);
>> + continue;
>> + }
>> + pr_warning("Couldn't remove %s: %s\n",
>> + pos->s, strerror_r(errno, sbuf, sizeof(sbuf)));
>> + }
>> +
>> + strlist__delete(list);
>> + }
>
> Here we need to at least warn the user that what he/she asked couldn't
> be done, i.e. strlist__new() failed.
Ah, OK I'll update it.
>
> Seeing --remove, --purge and --update makes me think eventually we need
> a OPT_STRLIST() :-)
Agreed :)
>
> I'm going thru the other patches, the first got in already.
Thanks!
>
> Thanks for implementing --purge!
>
> - Arnaldo
>
>> + }
>> +
>> if (missing_filename)
>> ret = build_id_cache__fprintf_missing(session, stdout);
>>
>> diff --git a/tools/perf/util/build-id.c b/tools/perf/util/build-id.c
>> index 0bc33be..dcaa964 100644
>> --- a/tools/perf/util/build-id.c
>> +++ b/tools/perf/util/build-id.c
>> @@ -281,35 +281,85 @@ void disable_buildid_cache(void)
>> no_buildid_cache = true;
>> }
>>
>> +static char *build_id_cache__dirname_from_path(const char *name,
>> + bool is_kallsyms, bool is_vdso)
>> +{
>> + char *realname = (char *)name, *filename;
>> + bool slash = is_kallsyms || is_vdso;
>> +
>> + if (!slash) {
>> + realname = realpath(name, NULL);
>> + if (!realname)
>> + return NULL;
>> + }
>> +
>> + if (asprintf(&filename, "%s%s%s", buildid_dir, slash ? "/" : "",
>> + is_vdso ? DSO__NAME_VDSO : realname) < 0)
>> + filename = NULL;
>> +
>> + if (!slash)
>> + free(realname);
>> +
>> + return filename;
>> +}
>> +
>> +struct strlist *build_id_cache__list_build_ids(const char *pathname)
>> +{
>> + struct strlist *list;
>> + char *dirname;
>> + DIR *dir;
>> + struct dirent *d;
>> +
>> + list = strlist__new(true, NULL);
>> + dirname = build_id_cache__dirname_from_path(pathname, false, false);
>> + if (!list || !dirname)
>> + goto error_free;
>> +
>> + /* List up all dirents */
>> + dir = opendir(dirname);
>> + if (!dir)
>> + goto error_free;
>> + while ((d = readdir(dir)) != NULL) {
>> + if (!strcmp(d->d_name, ".") || !strcmp(d->d_name, ".."))
>> + continue;
>> + strlist__add(list, d->d_name);
>> + }
>> + closedir(dir);
>> +
>> + free(dirname);
>> + return list;
>> +
>> +error_free:
>> + free(dirname);
>> + strlist__delete(list);
>> + return NULL;
>> +}
>> +
>> int build_id_cache__add_s(const char *sbuild_id, const char *name,
>> bool is_kallsyms, bool is_vdso)
>> {
>> const size_t size = PATH_MAX;
>> - char *realname, *filename = zalloc(size),
>> + char *realname = NULL, *filename = NULL, *dirname = NULL,
>> *linkname = zalloc(size), *targetname, *tmp;
>> - int len, err = -1;
>> - bool slash = is_kallsyms || is_vdso;
>> + int err = -1;
>>
>> - if (is_kallsyms) {
>> - if (symbol_conf.kptr_restrict) {
>> - pr_debug("Not caching a kptr_restrict'ed /proc/kallsyms\n");
>> - err = 0;
>> - goto out_free;
>> - }
>> - realname = (char *) name;
>> - } else
>> + if (!is_kallsyms) {
>> realname = realpath(name, NULL);
>> + if (!realname)
>> + goto out_free;
>> + }
>>
>> - if (realname == NULL || filename == NULL || linkname == NULL)
>> + dirname = build_id_cache__dirname_from_path(name, is_kallsyms, is_vdso);
>> + if (!dirname)
>> goto out_free;
>>
>> - len = scnprintf(filename, size, "%s%s%s",
>> - buildid_dir, slash ? "/" : "",
>> - is_vdso ? DSO__NAME_VDSO : realname);
>> - if (mkdir_p(filename, 0755))
>> + if (mkdir_p(dirname, 0755))
>> goto out_free;
>>
>> - snprintf(filename + len, size - len, "/%s", sbuild_id);
>> + if (asprintf(&filename, "%s/%s", dirname, sbuild_id) < 0) {
>> + filename = NULL;
>> + goto out_free;
>> + }
>>
>> if (access(filename, F_OK)) {
>> if (is_kallsyms) {
>> @@ -337,6 +387,7 @@ out_free:
>> if (!is_kallsyms)
>> free(realname);
>> free(filename);
>> + free(dirname);
>> free(linkname);
>> return err;
>> }
>> diff --git a/tools/perf/util/build-id.h b/tools/perf/util/build-id.h
>> index 2a09498..cbcadea 100644
>> --- a/tools/perf/util/build-id.h
>> +++ b/tools/perf/util/build-id.h
>> @@ -22,6 +22,7 @@ bool perf_session__read_build_ids(struct perf_session *session, bool with_hits);
>> int perf_session__write_buildid_table(struct perf_session *session, int fd);
>> int perf_session__cache_build_ids(struct perf_session *session);
>>
>> +struct strlist *build_id_cache__list_build_ids(const char *pathname);
>> bool build_id_cache__cached(const char *sbuild_id);
>> int build_id_cache__add_s(const char *sbuild_id,
>> const char *name, bool is_kallsyms, bool is_vdso);
>>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
> the body of a message to majordomo@...r.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
> Please read the FAQ at http://www.tux.org/lkml/
>
--
Masami HIRAMATSU
Software Platform Research Dept. Linux Technology Research Center
Hitachi, Ltd., Yokohama Research Laboratory
E-mail: masami.hiramatsu.pt@...achi.com
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists