perf_counter: uncouple data_head updates from wakeups

[platform/kernel/linux-starfive.git] / include / linux / perf_counter.h

diff --git a/include/linux/perf_counter.h b/include/linux/perf_counter.h
index 8bd1be5..17b6310 100644 (file)
--- a/include/linux/perf_counter.h
+++ b/include/linux/perf_counter.h
@@ -101,8 +101,9 @@ enum perf_counter_record_format {
        PERF_RECORD_IP          = 1U << 0,
        PERF_RECORD_TID         = 1U << 1,
        PERF_RECORD_TIME        = 1U << 2,
-       PERF_RECORD_GROUP       = 1U << 3,
-       PERF_RECORD_CALLCHAIN   = 1U << 4,
+       PERF_RECORD_ADDR        = 1U << 3,
+       PERF_RECORD_GROUP       = 1U << 4,
+       PERF_RECORD_CALLCHAIN   = 1U << 5,
 };
 
 /*
@@ -251,6 +252,7 @@ enum perf_event_type {
         *      { u64                   ip;       } && PERF_RECORD_IP
         *      { u32                   pid, tid; } && PERF_RECORD_TID
         *      { u64                   time;     } && PERF_RECORD_TIME
+        *      { u64                   addr;     } && PERF_RECORD_ADDR
         *
         *      { u64                   nr;
         *        { u64 event, val; }   cnt[nr];  } && PERF_RECORD_GROUP
@@ -316,7 +318,7 @@ struct hw_perf_counter {
                        unsigned long                   config_base;
                        unsigned long                   counter_base;
                        int                             nmi;
-                       unsigned int                    idx;
+                       int                             idx;
                };
                union { /* software */
                        atomic64_t                      count;
@@ -332,9 +334,9 @@ struct hw_perf_counter {
 struct perf_counter;
 
 /**
- * struct hw_perf_counter_ops - performance counter hw ops
+ * struct pmu - generic performance monitoring unit
  */
-struct hw_perf_counter_ops {
+struct pmu {
        int (*enable)                   (struct perf_counter *counter);
        void (*disable)                 (struct perf_counter *counter);
        void (*read)                    (struct perf_counter *counter);
@@ -356,10 +358,15 @@ struct perf_mmap_data {
        struct rcu_head                 rcu_head;
        int                             nr_pages;       /* nr of data pages  */
 
-       atomic_t                        wakeup;         /* POLL_ for wakeups */
+       atomic_t                        poll;           /* POLL_ for wakeups */
        atomic_t                        head;           /* write position    */
        atomic_t                        events;         /* event limit       */
 
+       atomic_t                        done_head;      /* completed head    */
+       atomic_t                        lock;           /* concurrent writes */
+
+       atomic_t                        wakeup;         /* needs a wakeup    */
+
        struct perf_counter_mmap_page   *user_page;
        void                            *data_pages[0];
 };
@@ -379,7 +386,7 @@ struct perf_counter {
        struct list_head                sibling_list;
        int                             nr_siblings;
        struct perf_counter             *group_leader;
-       const struct hw_perf_counter_ops *hw_ops;
+       const struct pmu                *pmu;
 
        enum perf_counter_active_state  state;
        enum perf_counter_active_state  prev_state;
@@ -510,14 +517,14 @@ struct perf_cpu_context {
        int                     recursion[4];
 };
 
+#ifdef CONFIG_PERF_COUNTERS
+
 /*
  * Set by architecture code:
  */
 extern int perf_max_counters;
 
-#ifdef CONFIG_PERF_COUNTERS
-extern const struct hw_perf_counter_ops *
-hw_perf_counter_init(struct perf_counter *counter);
+extern const struct pmu *hw_perf_counter_init(struct perf_counter *counter);
 
 extern void perf_counter_task_sched_in(struct task_struct *task, int cpu);
 extern void perf_counter_task_sched_out(struct task_struct *task, int cpu);
@@ -537,7 +544,7 @@ extern int hw_perf_group_sched_in(struct perf_counter *group_leader,
 extern void perf_counter_update_userpage(struct perf_counter *counter);
 
 extern int perf_counter_overflow(struct perf_counter *counter,
-                                int nmi, struct pt_regs *regs);
+                                int nmi, struct pt_regs *regs, u64 addr);
 /*
  * Return 1 for a software counter, 0 for a hardware counter
  */
@@ -547,7 +554,7 @@ static inline int is_software_counter(struct perf_counter *counter)
                perf_event_type(&counter->hw_event) != PERF_TYPE_HARDWARE;
 }
 
-extern void perf_swcounter_event(u32, u64, int, struct pt_regs *);
+extern void perf_swcounter_event(u32, u64, int, struct pt_regs *, u64);
 
 extern void perf_counter_mmap(unsigned long addr, unsigned long len,
                              unsigned long pgoff, struct file *file);
@@ -566,6 +573,10 @@ struct perf_callchain_entry {
 
 extern struct perf_callchain_entry *perf_callchain(struct pt_regs *regs);
 
+extern int sysctl_perf_counter_priv;
+
+extern void perf_counter_init(void);
+
 #else
 static inline void
 perf_counter_task_sched_in(struct task_struct *task, int cpu)          { }
@@ -584,8 +595,8 @@ static inline int perf_counter_task_disable(void)   { return -EINVAL; }
 static inline int perf_counter_task_enable(void)       { return -EINVAL; }
 
 static inline void
-perf_swcounter_event(u32 event, u64 nr, int nmi, struct pt_regs *regs) { }
-
+perf_swcounter_event(u32 event, u64 nr, int nmi,
+                    struct pt_regs *regs, u64 addr)                    { }
 
 static inline void
 perf_counter_mmap(unsigned long addr, unsigned long len,
@@ -593,9 +604,10 @@ perf_counter_mmap(unsigned long addr, unsigned long len,
 
 static inline void
 perf_counter_munmap(unsigned long addr, unsigned long len,
-                   unsigned long pgoff, struct file *file)             { }
+                   unsigned long pgoff, struct file *file)             { }
 
 static inline void perf_counter_comm(struct task_struct *tsk)          { }
+static inline void perf_counter_init(void)                             { }
 #endif
 
 #endif /* __KERNEL__ */