Merge tag 'efi-urgent' into x86/urgent

 * Avoid WARN_ON() when mapping BGRT on Baytrail (EFI 32-bit).

Signed-off-by: H. Peter Anvin <hpa@linux.intel.com>

8 files changed, 39 insertions, 16 deletions

diff --git a/tools/perf/util/evlist.c b/tools/perf/util/evlist.c
index 40bd2c04df8a..59ef2802fcf6 100644
--- a/tools/perf/util/evlist.c
+++ b/tools/perf/util/evlist.c
@@ -1003,9 +1003,12 @@ void perf_evlist__close(struct perf_evlist *evlist)
         struct perf_evsel *evsel;
         int ncpus = cpu_map__nr(evlist->cpus);
         int nthreads = thread_map__nr(evlist->threads);
+        int n;
 
-        evlist__for_each_reverse(evlist, evsel)
-                perf_evsel__close(evsel, ncpus, nthreads);
+        evlist__for_each_reverse(evlist, evsel) {
+                n = evsel->cpus ? evsel->cpus->nr : ncpus;
+                perf_evsel__close(evsel, n, nthreads);
+        }
 }
 
 int perf_evlist__open(struct perf_evlist *evlist)
diff --git a/tools/perf/util/evsel.c b/tools/perf/util/evsel.c
index 22e18a26b7e6..55407c594b87 100644
--- a/tools/perf/util/evsel.c
+++ b/tools/perf/util/evsel.c
@@ -1081,7 +1081,6 @@ void perf_evsel__close(struct perf_evsel *evsel, int ncpus, int nthreads)
 
         perf_evsel__close_fd(evsel, ncpus, nthreads);
         perf_evsel__free_fd(evsel);
-        evsel->fd = NULL;
 }
 
 static struct {
diff --git a/tools/perf/util/header.c b/tools/perf/util/header.c
index bb3e0ede6183..893f8e2df928 100644
--- a/tools/perf/util/header.c
+++ b/tools/perf/util/header.c
@@ -930,7 +930,7 @@ static int write_topo_node(int fd, int node)
                 /* skip over invalid lines */
                 if (!strchr(buf, ':'))
                         continue;
-                if (sscanf(buf, "%*s %*d %s %"PRIu64, field, &mem) != 2)
+                if (sscanf(buf, "%*s %*d %31s %"PRIu64, field, &mem) != 2)
                         goto done;
                 if (!strcmp(field, "MemTotal:"))
                         mem_total = mem;
diff --git a/tools/perf/util/map.c b/tools/perf/util/map.c
index 9b9bd719aa19..3b97513f0e77 100644
--- a/tools/perf/util/map.c
+++ b/tools/perf/util/map.c
@@ -69,7 +69,7 @@ struct map *map__new(struct list_head *dsos__list, u64 start, u64 len,
                 map->ino = ino;
                 map->ino_generation = ino_gen;
 
-                if (anon) {
+                if ((anon || no_dso) && type == MAP__FUNCTION) {
                         snprintf(newfilename, sizeof(newfilename), "/tmp/perf-%d.map", pid);
                         filename = newfilename;
                 }
@@ -93,7 +93,7 @@ struct map *map__new(struct list_head *dsos__list, u64 start, u64 len,
                          * functions still return NULL, and we avoid the
                          * unnecessary map__load warning.
                          */
-                        if (no_dso)
+                        if (type != MAP__FUNCTION)
                                 dso__set_loaded(dso, map->type);
                 }
         }
@@ -386,7 +386,8 @@ struct symbol *map_groups__find_symbol(struct map_groups *mg,
 {
         struct map *map = map_groups__find(mg, type, addr);
 
-        if (map != NULL) {
+        /* Ensure map is loaded before using map->map_ip */
+        if (map != NULL && map__load(map, filter) >= 0) {
                 if (mapp != NULL)
                         *mapp = map;
                 return map__find_symbol(map, map->map_ip(map, addr), filter);
diff --git a/tools/perf/util/parse-events.c b/tools/perf/util/parse-events.c
index a7f1b6a91fdd..d248fca6d7ed 100644
--- a/tools/perf/util/parse-events.c
+++ b/tools/perf/util/parse-events.c
@@ -635,7 +635,7 @@ int parse_events_add_pmu(struct list_head *list, int *idx,
         struct perf_event_attr attr;
         struct perf_pmu *pmu;
         struct perf_evsel *evsel;
-        char *unit;
+        const char *unit;
         double scale;
 
         pmu = perf_pmu__find(name);
diff --git a/tools/perf/util/pmu.c b/tools/perf/util/pmu.c
index d9cab4d27192..b752ecb40d86 100644
--- a/tools/perf/util/pmu.c
+++ b/tools/perf/util/pmu.c
@@ -105,7 +105,7 @@ static int perf_pmu__parse_scale(struct perf_pmu_alias *alias, char *dir, char *
         char scale[128];
         int fd, ret = -1;
         char path[PATH_MAX];
-        char *lc;
+        const char *lc;
 
         snprintf(path, PATH_MAX, "%s/%s.scale", dir, name);
 
@@ -609,7 +609,7 @@ static struct perf_pmu_alias *pmu_find_alias(struct perf_pmu *pmu,
 
 
 static int check_unit_scale(struct perf_pmu_alias *alias,
-                            char **unit, double *scale)
+                            const char **unit, double *scale)
 {
         /*
          * Only one term in event definition can
@@ -634,14 +634,18 @@ static int check_unit_scale(struct perf_pmu_alias *alias,
  * defined for the alias
  */
 int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms,
-                          char **unit, double *scale)
+                          const char **unit, double *scale)
 {
         struct parse_events_term *term, *h;
         struct perf_pmu_alias *alias;
         int ret;
 
+        /*
+         * Mark unit and scale as not set
+         * (different from default values, see below)
+         */
         *unit   = NULL;
-        *scale  = 0;
+        *scale  = 0.0;
 
         list_for_each_entry_safe(term, h, head_terms, list) {
                 alias = pmu_find_alias(pmu, term);
@@ -658,6 +662,18 @@ int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms,
                 list_del(&term->list);
                 free(term);
         }
+
+        /*
+         * if no unit or scale foundin aliases, then
+         * set defaults as for evsel
+         * unit cannot left to NULL
+         */
+        if (*unit == NULL)
+                *unit   = "";
+
+        if (*scale == 0.0)
+                *scale  = 1.0;
+
         return 0;
 }
 
diff --git a/tools/perf/util/pmu.h b/tools/perf/util/pmu.h
index 9183380e2038..8b64125a9281 100644
--- a/tools/perf/util/pmu.h
+++ b/tools/perf/util/pmu.h
@@ -29,7 +29,7 @@ int perf_pmu__config_terms(struct list_head *formats,
                            struct perf_event_attr *attr,
                            struct list_head *head_terms);
 int perf_pmu__check_alias(struct perf_pmu *pmu, struct list_head *head_terms,
-                          char **unit, double *scale);
+                          const char **unit, double *scale);
 struct list_head *perf_pmu__alias(struct perf_pmu *pmu,
                                   struct list_head *head_terms);
 int perf_pmu_wrap(void);
diff --git a/tools/perf/util/session.c b/tools/perf/util/session.c
index 7acc03e8f3b2..0b39a48e5110 100644
--- a/tools/perf/util/session.c
+++ b/tools/perf/util/session.c
@@ -1573,7 +1573,7 @@ next:
 int perf_session__cpu_bitmap(struct perf_session *session,
                              const char *cpu_list, unsigned long *cpu_bitmap)
 {
-        int i;
+        int i, err = -1;
         struct cpu_map *map;
 
         for (i = 0; i < PERF_TYPE_MAX; ++i) {
@@ -1602,13 +1602,17 @@ int perf_session__cpu_bitmap(struct perf_session *session,
                 if (cpu >= MAX_NR_CPUS) {
                         pr_err("Requested CPU %d too large. "
                                "Consider raising MAX_NR_CPUS\n", cpu);
-                        return -1;
+                        goto out_delete_map;
                 }
 
                 set_bit(cpu, cpu_bitmap);
         }
 
-        return 0;
+        err = 0;
+
+out_delete_map:
+        cpu_map__delete(map);
+        return err;
 }
 
 void perf_session__fprintf_info(struct perf_session *session, FILE *fp,