perf: Use sample_flags for data_src

Use the new sample_flags to indicate whether the data_src field is
filled by the PMU driver.

Remove the data_src field from the perf_sample_data_init() to minimize
the number of cache lines touched.

Signed-off-by: Kan Liang <kan.liang@linux.intel.com>
Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org>
Link: https://lore.kernel.org/r/20220901130959.1285717-6-kan.liang@linux.intel.com

diff --git a/arch/powerpc/perf/core-book3s.c b/arch/powerpc/perf/core-book3s.c
index a5c95a2006eac2da8ba4dc8f38dc153e8c828110..6ec7069e6482d0a8838db1836a6523ec1819bc48 100644 (file)
--- a/arch/powerpc/perf/core-book3s.c
+++ b/arch/powerpc/perf/core-book3s.c
@@ -2301,8 +2301,10 @@ static void record_and_restart(struct perf_event *event, unsigned long val,
                }
 
                if (event->attr.sample_type & PERF_SAMPLE_DATA_SRC &&
-                                               ppmu->get_mem_data_src)
+                                               ppmu->get_mem_data_src) {
                        ppmu->get_mem_data_src(&data.data_src, ppmu->flags, regs);
+                       data.sample_flags |= PERF_SAMPLE_DATA_SRC;
+               }
 
                if (event->attr.sample_type & PERF_SAMPLE_WEIGHT_TYPE &&
                                                ppmu->get_mem_weight) {

diff --git a/arch/x86/events/intel/ds.c b/arch/x86/events/intel/ds.c
index 4c51118e4add92352ddde0e062a244ee992c821c..bde73d492889d513229c42c1e7e5db62efa3bdc5 100644 (file)
--- a/arch/x86/events/intel/ds.c
+++ b/arch/x86/events/intel/ds.c
@@ -1535,8 +1535,10 @@ static void setup_pebs_fixed_sample_data(struct perf_event *event,
        /*
         * data.data_src encodes the data source
         */
-       if (sample_type & PERF_SAMPLE_DATA_SRC)
+       if (sample_type & PERF_SAMPLE_DATA_SRC) {
                data->data_src.val = get_data_src(event, pebs->dse);
+               data->sample_flags |= PERF_SAMPLE_DATA_SRC;
+       }
 
        /*
         * We must however always use iregs for the unwinder to stay sane; the
@@ -1770,8 +1772,10 @@ static void setup_pebs_adaptive_sample_data(struct perf_event *event,
                        data->sample_flags |= PERF_SAMPLE_WEIGHT_TYPE;
                }
 
-               if (sample_type & PERF_SAMPLE_DATA_SRC)
+               if (sample_type & PERF_SAMPLE_DATA_SRC) {
                        data->data_src.val = get_data_src(event, meminfo->aux);
+                       data->sample_flags |= PERF_SAMPLE_DATA_SRC;
+               }
 
                if (sample_type & PERF_SAMPLE_ADDR_TYPE)
                        data->addr = meminfo->address;

diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index 06a587b5faa9e965e3f1087d275974ad1828cf6a..6849f10dfc7ece3bdd2affd6093f16d508c4cfb5 100644 (file)
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -1013,7 +1013,6 @@ struct perf_sample_data {
        struct perf_raw_record          *raw;
        u64                             period;
        u64                             txn;
-       union  perf_mem_data_src        data_src;
 
        /*
         * The other fields, optionally {set,used} by
@@ -1021,6 +1020,7 @@ struct perf_sample_data {
         */
        struct perf_branch_stack        *br_stack;
        union perf_sample_weight        weight;
+       union  perf_mem_data_src        data_src;
 
        u64                             type;
        u64                             ip;
@@ -1063,7 +1063,6 @@ static inline void perf_sample_data_init(struct perf_sample_data *data,
        data->addr = addr;
        data->raw  = NULL;
        data->period = period;
-       data->data_src.val = PERF_MEM_NA;
        data->txn = 0;
 }
 

diff --git a/kernel/events/core.c b/kernel/events/core.c
index f0af45db02b31b508f20f533538887671b291411..163e2f478e616610f26277c3bb01ed27c285a0e2 100644 (file)
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -7411,6 +7411,9 @@ void perf_prepare_sample(struct perf_event_header *header,
        if (filtered_sample_type & PERF_SAMPLE_WEIGHT_TYPE)
                data->weight.full = 0;
 
+       if (filtered_sample_type & PERF_SAMPLE_DATA_SRC)
+               data->data_src.val = PERF_MEM_NA;
+
        if (sample_type & PERF_SAMPLE_REGS_INTR) {
                /* regs dump ABI info */
                int size = sizeof(u64);