5 files changed, 113 insertions, 1 deletions

diff --git a/tools/perf/Documentation/perf-report.txt b/tools/perf/Documentation/perf-report.txt
index 00fbfb6d7f14..d2b59af62bc0 100644
--- a/tools/perf/Documentation/perf-report.txt
+++ b/tools/perf/Documentation/perf-report.txt
@@ -119,7 +119,7 @@ OPTIONS
 
         If --mem-mode option is used, following sort keys are also available
         (incompatible with --branch-stack):
-        symbol_daddr, dso_daddr, locked, tlb, mem, snoop.
+        symbol_daddr, dso_daddr, locked, tlb, mem, snoop, dcacheline.
 
         - symbol_daddr: name of data symbol being executed on at the time of sample
         - dso_daddr: name of library or module containing the data being executed
@@ -128,6 +128,7 @@ OPTIONS
         - tlb: type of tlb access for the data at the time of sample
         - mem: type of memory access for the data at the time of sample
         - snoop: type of snoop (if any) for the data at the time of sample
+        - dcacheline: the cacheline the data address is on at the time of sample
 
         And default sort keys are changed to local_weight, mem, sym, dso,
         symbol_daddr, dso_daddr, snoop, tlb, locked, see '--mem-mode'.
diff --git a/tools/perf/util/hist.c b/tools/perf/util/hist.c
index d5f47a47c4bf..30df6187ee02 100644
--- a/tools/perf/util/hist.c
+++ b/tools/perf/util/hist.c
@@ -128,6 +128,8 @@ void hists__calc_col_len(struct hists *hists, struct hist_entry *h)
                                + unresolved_col_width + 2;
                         hists__new_col_len(hists, HISTC_MEM_DADDR_SYMBOL,
                                            symlen);
+                        hists__new_col_len(hists, HISTC_MEM_DCACHELINE,
+                                           symlen + 1);
                 } else {
                         symlen = unresolved_col_width + 4 + 2;
                         hists__new_col_len(hists, HISTC_MEM_DADDR_SYMBOL,
diff --git a/tools/perf/util/hist.h b/tools/perf/util/hist.h
index d2bf03575d5f..742f49a85725 100644
--- a/tools/perf/util/hist.h
+++ b/tools/perf/util/hist.h
@@ -72,6 +72,7 @@ enum hist_column {
         HISTC_MEM_TLB,
         HISTC_MEM_LVL,
         HISTC_MEM_SNOOP,
+        HISTC_MEM_DCACHELINE,
         HISTC_TRANSACTION,
         HISTC_NR_COLS, /* Last entry */
 };
diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c
index 45512baaab67..1ec57dd82284 100644
--- a/tools/perf/util/sort.c
+++ b/tools/perf/util/sort.c
@@ -1,3 +1,4 @@
+#include <sys/mman.h>
 #include "sort.h"
 #include "hist.h"
 #include "comm.h"
@@ -784,6 +785,104 @@ static int hist_entry__snoop_snprintf(struct hist_entry *he, char *bf,
         return repsep_snprintf(bf, size, "%-*s", width, out);
 }
 
+static inline  u64 cl_address(u64 address)
+{
+        /* return the cacheline of the address */
+        return (address & ~(cacheline_size - 1));
+}
+
+static int64_t
+sort__dcacheline_cmp(struct hist_entry *left, struct hist_entry *right)
+{
+        u64 l, r;
+        struct map *l_map, *r_map;
+
+        if (!left->mem_info)  return -1;
+        if (!right->mem_info) return 1;
+
+        /* group event types together */
+        if (left->cpumode > right->cpumode) return -1;
+        if (left->cpumode < right->cpumode) return 1;
+
+        l_map = left->mem_info->daddr.map;
+        r_map = right->mem_info->daddr.map;
+
+        /* if both are NULL, jump to sort on al_addr instead */
+        if (!l_map && !r_map)
+                goto addr;
+
+        if (!l_map) return -1;
+        if (!r_map) return 1;
+
+        if (l_map->maj > r_map->maj) return -1;
+        if (l_map->maj < r_map->maj) return 1;
+
+        if (l_map->min > r_map->min) return -1;
+        if (l_map->min < r_map->min) return 1;
+
+        if (l_map->ino > r_map->ino) return -1;
+        if (l_map->ino < r_map->ino) return 1;
+
+        if (l_map->ino_generation > r_map->ino_generation) return -1;
+        if (l_map->ino_generation < r_map->ino_generation) return 1;
+
+        /*
+         * Addresses with no major/minor numbers are assumed to be
+         * anonymous in userspace.  Sort those on pid then address.
+         *
+         * The kernel and non-zero major/minor mapped areas are
+         * assumed to be unity mapped.  Sort those on address.
+         */
+
+        if ((left->cpumode != PERF_RECORD_MISC_KERNEL) &&
+            (!(l_map->flags & MAP_SHARED)) &&
+            !l_map->maj && !l_map->min && !l_map->ino &&
+            !l_map->ino_generation) {
+                /* userspace anonymous */
+
+                if (left->thread->pid_ > right->thread->pid_) return -1;
+                if (left->thread->pid_ < right->thread->pid_) return 1;
+        }
+
+addr:
+        /* al_addr does all the right addr - start + offset calculations */
+        l = cl_address(left->mem_info->daddr.al_addr);
+        r = cl_address(right->mem_info->daddr.al_addr);
+
+        if (l > r) return -1;
+        if (l < r) return 1;
+
+        return 0;
+}
+
+static int hist_entry__dcacheline_snprintf(struct hist_entry *he, char *bf,
+                                          size_t size, unsigned int width)
+{
+
+        uint64_t addr = 0;
+        struct map *map = NULL;
+        struct symbol *sym = NULL;
+        char level = he->level;
+
+        if (he->mem_info) {
+                addr = cl_address(he->mem_info->daddr.al_addr);
+                map = he->mem_info->daddr.map;
+                sym = he->mem_info->daddr.sym;
+
+                /* print [s] for shared data mmaps */
+                if ((he->cpumode != PERF_RECORD_MISC_KERNEL) &&
+                     map && (map->type == MAP__VARIABLE) &&
+                    (map->flags & MAP_SHARED) &&
+                    (map->maj || map->min || map->ino ||
+                     map->ino_generation))
+                        level = 's';
+                else if (!map)
+                        level = 'X';
+        }
+        return _hist_entry__sym_snprintf(map, sym, addr, level, bf, size,
+                                         width);
+}
+
 struct sort_entry sort_mispredict = {
         .se_header      = "Branch Mispredicted",
         .se_cmp         = sort__mispredict_cmp,
@@ -876,6 +975,13 @@ struct sort_entry sort_mem_snoop = {
         .se_width_idx   = HISTC_MEM_SNOOP,
 };
 
+struct sort_entry sort_mem_dcacheline = {
+        .se_header      = "Data Cacheline",
+        .se_cmp         = sort__dcacheline_cmp,
+        .se_snprintf    = hist_entry__dcacheline_snprintf,
+        .se_width_idx   = HISTC_MEM_DCACHELINE,
+};
+
 static int64_t
 sort__abort_cmp(struct hist_entry *left, struct hist_entry *right)
 {
@@ -1043,6 +1149,7 @@ static struct sort_dimension memory_sort_dimensions[] = {
         DIM(SORT_MEM_TLB, "tlb", sort_mem_tlb),
         DIM(SORT_MEM_LVL, "mem", sort_mem_lvl),
         DIM(SORT_MEM_SNOOP, "snoop", sort_mem_snoop),
+        DIM(SORT_MEM_DCACHELINE, "dcacheline", sort_mem_dcacheline),
 };
 
 #undef DIM
diff --git a/tools/perf/util/sort.h b/tools/perf/util/sort.h
index 6de22f838854..041f0c9cea2b 100644
--- a/tools/perf/util/sort.h
+++ b/tools/perf/util/sort.h
@@ -186,6 +186,7 @@ enum sort_type {
         SORT_MEM_TLB,
         SORT_MEM_LVL,
         SORT_MEM_SNOOP,
+        SORT_MEM_DCACHELINE,
 };
 
 /*