Skip to content

Commit 927b2de

Browse files
kliang2Ingo Molnar
authored andcommitted
perf/x86/intel/uncore: Add new data structures for free running counters
There are a number of free running counters introduced for uncore, which provide highly valuable information to a wide array of customers. For example, Skylake Server has IIO free running counters to collect Input/Output x BW/Utilization. There is NO event available on the general purpose counters, that is exactly the same as the free running counters. The generic uncore code needs to be enhanced to support the new counters. In the uncore document, there is no event-code assigned to free running counters. Some events need to be defined to indicate the free running counters. The events are encoded as event-code + umask-code. The event-code for all free running counters is 0xff, which is the same as the fixed counters: - It has not been decided what code will be used for common events on future platforms. 0xff is the only one which will definitely not be used as any common event-code. - Cannot re-use current events on the general purpose counters. Because there is NO event available, that is exactly the same as the free running counters. - Even in the existing codes, the fixed counters for core, that have the same event-code, may count different things. Hence, it should not surprise the users if the free running counters that share the same event-code also count different things. Umask will be used to distinguish the counters. The umask-code is used to distinguish a fixed counter and a free running counter, and different types of free running counters. For fixed counters, the umask-code is 0x0X, where X indicates the index of the fixed counter, which starts from 0. - Compatible with the old event encoding. - Currently, there is only one fixed counter. There are still 15 reserved spaces for extension. For free running counters, the umask-code uses the rest of the space. It would follow the format of 0xXY: - X stands for the type of free running counters, which starts from 1. - Y stands for the index of free running counters of same type, which starts from 0. - The free running counters do different thing. It can be categorized to several types, according to the MSR location, bit width and definition. E.g. there are three types of IIO free running counters on Skylake server to monitor IO CLOCKS, BANDWIDTH and UTILIZATION on different ports. It makes it easy to locate the free running counter of a specific type. - So far, there are at most 8 counters of each type. There are still 8 reserved spaces for extension. Introducing a new index to indicate the free running counters. Only one index is enough for all free running counters. Because the free running counters are always active, and the event and free running counter are always 1:1 mapped, it does not need extra index to indicate the assigned counter. Introducing a new data structure to store free running counters related information for each type. It includes the number of counters, bit width, base address, offset between counters and offset between boxes. Introducing several inline helpers to check index for fixed counter and free running counter, validate free running counter event, and retrieve the free running counter information according to box and event. Signed-off-by: Kan Liang <[email protected]> Signed-off-by: Peter Zijlstra (Intel) <[email protected]> Reviewed-by: Thomas Gleixner <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: [email protected] Cc: [email protected] Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]>
1 parent 4749f81 commit 927b2de

File tree

1 file changed

+122
-1
lines changed

1 file changed

+122
-1
lines changed

arch/x86/events/intel/uncore.h

Lines changed: 122 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,13 @@
1212

1313
#define UNCORE_FIXED_EVENT 0xff
1414
#define UNCORE_PMC_IDX_MAX_GENERIC 8
15+
#define UNCORE_PMC_IDX_MAX_FIXED 1
16+
#define UNCORE_PMC_IDX_MAX_FREERUNNING 1
1517
#define UNCORE_PMC_IDX_FIXED UNCORE_PMC_IDX_MAX_GENERIC
16-
#define UNCORE_PMC_IDX_MAX (UNCORE_PMC_IDX_FIXED + 1)
18+
#define UNCORE_PMC_IDX_FREERUNNING (UNCORE_PMC_IDX_FIXED + \
19+
UNCORE_PMC_IDX_MAX_FIXED)
20+
#define UNCORE_PMC_IDX_MAX (UNCORE_PMC_IDX_FREERUNNING + \
21+
UNCORE_PMC_IDX_MAX_FREERUNNING)
1722

1823
#define UNCORE_PCI_DEV_FULL_DATA(dev, func, type, idx) \
1924
((dev << 24) | (func << 16) | (type << 8) | idx)
@@ -35,13 +40,15 @@ struct intel_uncore_ops;
3540
struct intel_uncore_pmu;
3641
struct intel_uncore_box;
3742
struct uncore_event_desc;
43+
struct freerunning_counters;
3844

3945
struct intel_uncore_type {
4046
const char *name;
4147
int num_counters;
4248
int num_boxes;
4349
int perf_ctr_bits;
4450
int fixed_ctr_bits;
51+
int num_freerunning_types;
4552
unsigned perf_ctr;
4653
unsigned event_ctl;
4754
unsigned event_mask;
@@ -59,6 +66,7 @@ struct intel_uncore_type {
5966
struct intel_uncore_pmu *pmus;
6067
struct intel_uncore_ops *ops;
6168
struct uncore_event_desc *event_descs;
69+
struct freerunning_counters *freerunning;
6270
const struct attribute_group *attr_groups[4];
6371
struct pmu *pmu; /* for custom pmu ops */
6472
};
@@ -129,6 +137,14 @@ struct uncore_event_desc {
129137
const char *config;
130138
};
131139

140+
struct freerunning_counters {
141+
unsigned int counter_base;
142+
unsigned int counter_offset;
143+
unsigned int box_offset;
144+
unsigned int num_counters;
145+
unsigned int bits;
146+
};
147+
132148
struct pci2phy_map {
133149
struct list_head list;
134150
int segment;
@@ -157,6 +173,16 @@ static ssize_t __uncore_##_var##_show(struct kobject *kobj, \
157173
static struct kobj_attribute format_attr_##_var = \
158174
__ATTR(_name, 0444, __uncore_##_var##_show, NULL)
159175

176+
static inline bool uncore_pmc_fixed(int idx)
177+
{
178+
return idx == UNCORE_PMC_IDX_FIXED;
179+
}
180+
181+
static inline bool uncore_pmc_freerunning(int idx)
182+
{
183+
return idx == UNCORE_PMC_IDX_FREERUNNING;
184+
}
185+
160186
static inline unsigned uncore_pci_box_ctl(struct intel_uncore_box *box)
161187
{
162188
return box->pmu->type->box_ctl;
@@ -214,6 +240,60 @@ static inline unsigned uncore_msr_fixed_ctr(struct intel_uncore_box *box)
214240
return box->pmu->type->fixed_ctr + uncore_msr_box_offset(box);
215241
}
216242

243+
244+
/*
245+
* In the uncore document, there is no event-code assigned to free running
246+
* counters. Some events need to be defined to indicate the free running
247+
* counters. The events are encoded as event-code + umask-code.
248+
*
249+
* The event-code for all free running counters is 0xff, which is the same as
250+
* the fixed counters.
251+
*
252+
* The umask-code is used to distinguish a fixed counter and a free running
253+
* counter, and different types of free running counters.
254+
* - For fixed counters, the umask-code is 0x0X.
255+
* X indicates the index of the fixed counter, which starts from 0.
256+
* - For free running counters, the umask-code uses the rest of the space.
257+
* It would bare the format of 0xXY.
258+
* X stands for the type of free running counters, which starts from 1.
259+
* Y stands for the index of free running counters of same type, which
260+
* starts from 0.
261+
*
262+
* For example, there are three types of IIO free running counters on Skylake
263+
* server, IO CLOCKS counters, BANDWIDTH counters and UTILIZATION counters.
264+
* The event-code for all the free running counters is 0xff.
265+
* 'ioclk' is the first counter of IO CLOCKS. IO CLOCKS is the first type,
266+
* which umask-code starts from 0x10.
267+
* So 'ioclk' is encoded as event=0xff,umask=0x10
268+
* 'bw_in_port2' is the third counter of BANDWIDTH counters. BANDWIDTH is
269+
* the second type, which umask-code starts from 0x20.
270+
* So 'bw_in_port2' is encoded as event=0xff,umask=0x22
271+
*/
272+
static inline unsigned int uncore_freerunning_idx(u64 config)
273+
{
274+
return ((config >> 8) & 0xf);
275+
}
276+
277+
#define UNCORE_FREERUNNING_UMASK_START 0x10
278+
279+
static inline unsigned int uncore_freerunning_type(u64 config)
280+
{
281+
return ((((config >> 8) - UNCORE_FREERUNNING_UMASK_START) >> 4) & 0xf);
282+
}
283+
284+
static inline
285+
unsigned int uncore_freerunning_counter(struct intel_uncore_box *box,
286+
struct perf_event *event)
287+
{
288+
unsigned int type = uncore_freerunning_type(event->attr.config);
289+
unsigned int idx = uncore_freerunning_idx(event->attr.config);
290+
struct intel_uncore_pmu *pmu = box->pmu;
291+
292+
return pmu->type->freerunning[type].counter_base +
293+
pmu->type->freerunning[type].counter_offset * idx +
294+
pmu->type->freerunning[type].box_offset * pmu->pmu_idx;
295+
}
296+
217297
static inline
218298
unsigned uncore_msr_event_ctl(struct intel_uncore_box *box, int idx)
219299
{
@@ -276,11 +356,52 @@ static inline int uncore_fixed_ctr_bits(struct intel_uncore_box *box)
276356
return box->pmu->type->fixed_ctr_bits;
277357
}
278358

359+
static inline
360+
unsigned int uncore_freerunning_bits(struct intel_uncore_box *box,
361+
struct perf_event *event)
362+
{
363+
unsigned int type = uncore_freerunning_type(event->attr.config);
364+
365+
return box->pmu->type->freerunning[type].bits;
366+
}
367+
368+
static inline int uncore_num_freerunning(struct intel_uncore_box *box,
369+
struct perf_event *event)
370+
{
371+
unsigned int type = uncore_freerunning_type(event->attr.config);
372+
373+
return box->pmu->type->freerunning[type].num_counters;
374+
}
375+
376+
static inline int uncore_num_freerunning_types(struct intel_uncore_box *box,
377+
struct perf_event *event)
378+
{
379+
return box->pmu->type->num_freerunning_types;
380+
}
381+
382+
static inline bool check_valid_freerunning_event(struct intel_uncore_box *box,
383+
struct perf_event *event)
384+
{
385+
unsigned int type = uncore_freerunning_type(event->attr.config);
386+
unsigned int idx = uncore_freerunning_idx(event->attr.config);
387+
388+
return (type < uncore_num_freerunning_types(box, event)) &&
389+
(idx < uncore_num_freerunning(box, event));
390+
}
391+
279392
static inline int uncore_num_counters(struct intel_uncore_box *box)
280393
{
281394
return box->pmu->type->num_counters;
282395
}
283396

397+
static inline bool is_freerunning_event(struct perf_event *event)
398+
{
399+
u64 cfg = event->attr.config;
400+
401+
return ((cfg & UNCORE_FIXED_EVENT) == UNCORE_FIXED_EVENT) &&
402+
(((cfg >> 8) & 0xff) >= UNCORE_FREERUNNING_UMASK_START);
403+
}
404+
284405
static inline void uncore_disable_box(struct intel_uncore_box *box)
285406
{
286407
if (box->pmu->type->ops->disable_box)

0 commit comments

Comments
 (0)