powerpc/perf/{hv-gpci, hv-common}: generate requests with counters annotated (9e9f6010) · Commits · 戴 / test

arch/powerpc/perf/hv-common.c

+5 −5

Original line number	Diff line number	Diff line
		@@ -9,13 +9,13 @@ unsigned long hv_perf_caps_get(struct hv_perf_caps *caps)
		unsigned long r;
		struct p {
		struct hv_get_perf_counter_info_params params;
		struct cv_system_performance_capabilities caps;
		struct hv_gpci_system_performance_capabilities caps;
		} __packed __aligned(sizeof(uint64_t));

		struct p arg = {
		.params = {
		.counter_request = cpu_to_be32(
		CIR_SYSTEM_PERFORMANCE_CAPABILITIES),
		HV_GPCI_system_performance_capabilities),
		.starting_index = cpu_to_be32(-1),
		.counter_info_version_in = 0,
		}
		@@ -31,9 +31,9 @@ unsigned long hv_perf_caps_get(struct hv_perf_caps *caps)

		caps->version = arg.params.counter_info_version_out;
		caps->collect_privileged = !!arg.caps.perf_collect_privileged;
		caps->ga = !!(arg.caps.capability_mask & CV_CM_GA);
		caps->expanded = !!(arg.caps.capability_mask & CV_CM_EXPANDED);
		caps->lab = !!(arg.caps.capability_mask & CV_CM_LAB);
		caps->ga = !!(arg.caps.capability_mask & HV_GPCI_CM_GA);
		caps->expanded = !!(arg.caps.capability_mask & HV_GPCI_CM_EXPANDED);
		caps->lab = !!(arg.caps.capability_mask & HV_GPCI_CM_LAB);

		return r;
		}

arch/powerpc/perf/hv-gpci-requests.h

0 → 100644

+76 −0

Original line number	Diff line number	Diff line

		#include "req-gen/_begin.h"

		/*
		* Based on the document "getPerfCountInfo v1.07"
		*/

		/*
		* #define REQUEST_NAME counter_request_name
		* #define REQUEST_NUM r_num
		* #define REQUEST_IDX_KIND starting_index_kind
		* #include I(REQUEST_BEGIN)
		* REQUEST(
		* __field(...)
		* __field(...)
		* __array(...)
		* __count(...)
		* )
		* #include I(REQUEST_END)
		*
		* - starting_index_kind is one of the following, depending on the event:
		*
		* chip_id: hardware chip id or -1 for current hw chip
		* phys_processor_idx:
		* 0xffffffffffffffff: or -1, which means it is irrelavant for the event
		*
		* __count(offset, bytes, name):
		* a counter that should be exposed via perf
		* __field(offset, bytes, name)
		* a normal field
		* __array(offset, bytes, name)
		* an array of bytes
		*
		*
		* @bytes for __count, and __field _must_ be a numeral token
		* in decimal, not an expression and not in hex.
		*
		*
		* TODO:
		* - expose secondary index (if any counter ever uses it, only 0xA0
		* appears to use it right now, and it doesn't have any counters)
		* - embed versioning info
		* - include counter descriptions
		*/
		#define REQUEST_NAME dispatch_timebase_by_processor
		#define REQUEST_NUM 0x10
		#define REQUEST_IDX_KIND "phys_processor_idx=?"
		#include I(REQUEST_BEGIN)
		REQUEST(__count(0, 8, processor_time_in_timebase_cycles)
		__field(0x8, 4, hw_processor_id)
		__field(0xC, 2, owning_part_id)
		__field(0xE, 1, processor_state)
		__field(0xF, 1, version)
		__field(0x10, 4, hw_chip_id)
		__field(0x14, 4, phys_module_id)
		__field(0x18, 4, primary_affinity_domain_idx)
		__field(0x1C, 4, secondary_affinity_domain_idx)
		__field(0x20, 4, processor_version)
		__field(0x24, 2, logical_processor_idx)
		__field(0x26, 2, reserved)
		__field(0x28, 4, processor_id_register)
		__field(0x2C, 4, phys_processor_idx)
		)
		#include I(REQUEST_END)

		#define REQUEST_NAME system_performance_capabilities
		#define REQUEST_NUM 0x40
		#define REQUEST_IDX_KIND "starting_index=0xffffffffffffffff"
		#include I(REQUEST_BEGIN)
		REQUEST(__field(0, 1, perf_collect_privileged)
		__field(0x1, 1, capability_mask)
		__array(0x2, 0xE, reserved)
		)
		#include I(REQUEST_END)

		#include "req-gen/_end.h"

arch/powerpc/perf/hv-gpci.c

+23 −0

Original line number	Diff line number	Diff line
		@@ -31,7 +31,18 @@
		/* u32 */
		EVENT_DEFINE_RANGE_FORMAT(request, config, 0, 31);
		/* u32 */
		/*
		* Note that starting_index, phys_processor_idx, sibling_part_id,
		* hw_chip_id, partition_id all refer to the same bit range. They
		* are basically aliases for the starting_index. The specific alias
		* used depends on the event. See REQUEST_IDX_KIND in hv-gpci-requests.h
		*/
		EVENT_DEFINE_RANGE_FORMAT(starting_index, config, 32, 63);
		EVENT_DEFINE_RANGE_FORMAT_LITE(phys_processor_idx, config, 32, 63);
		EVENT_DEFINE_RANGE_FORMAT_LITE(sibling_part_id, config, 32, 63);
		EVENT_DEFINE_RANGE_FORMAT_LITE(hw_chip_id, config, 32, 63);
		EVENT_DEFINE_RANGE_FORMAT_LITE(partition_id, config, 32, 63);

		/* u16 */
		EVENT_DEFINE_RANGE_FORMAT(secondary_index, config1, 0, 15);
		/* u8 */
		@@ -44,6 +55,10 @@ EVENT_DEFINE_RANGE_FORMAT(offset, config1, 32, 63);
		static struct attribute *format_attrs[] = {
		&format_attr_request.attr,
		&format_attr_starting_index.attr,
		&format_attr_phys_processor_idx.attr,
		&format_attr_sibling_part_id.attr,
		&format_attr_hw_chip_id.attr,
		&format_attr_partition_id.attr,
		&format_attr_secondary_index.attr,
		&format_attr_counter_info_version.attr,

		@@ -57,6 +72,11 @@ static struct attribute_group format_group = {
		.attrs = format_attrs,
		};

		static struct attribute_group event_group = {
		.name = "events",
		.attrs = hv_gpci_event_attrs,
		};

		#define HV_CAPS_ATTR(_name, _format) \
		static ssize_t _name##_show(struct device *dev, \
		struct device_attribute *attr, \
		@@ -102,6 +122,7 @@ static struct attribute_group interface_group = {

		static const struct attribute_group *attr_groups[] = {
		&format_group,
		&event_group,
		&interface_group,
		NULL,
		};
		@@ -265,6 +286,8 @@ static int hv_gpci_init(void)
		unsigned long hret;
		struct hv_perf_caps caps;

		hv_gpci_assert_offsets_correct();

		if (!firmware_has_feature(FW_FEATURE_LPAR)) {
		pr_debug("not a virtualized system, not enabling\n");
		return -ENODEV;

arch/powerpc/perf/hv-gpci.h

+12 −25

Original line number	Diff line number	Diff line
		@@ -42,32 +42,19 @@ struct hv_get_perf_counter_info_params {
		*/
		#define COUNTER_INFO_VERSION_CURRENT 0x8

		/*
		* These determine the counter_value[] layout and the meaning of starting_index
		* and secondary_index.
		*
		* Unless otherwise noted, @secondary_index is unused and ignored.
		*/
		enum counter_info_requests {

		/* GENERAL */

		/* @starting_index: must be -1 (to refer to the current partition)
		*/
		CIR_SYSTEM_PERFORMANCE_CAPABILITIES = 0X40,
		/* capability mask masks. */
		enum {
		HV_GPCI_CM_GA = (1 << 7),
		HV_GPCI_CM_EXPANDED = (1 << 6),
		HV_GPCI_CM_LAB = (1 << 5)
		};

		struct cv_system_performance_capabilities {
		/* If != 0, allowed to collect data from other partitions */
		__u8 perf_collect_privileged;

		/* These following are only valid if counter_info_version >= 0x3 */
		#define CV_CM_GA (1 << 7)
		#define CV_CM_EXPANDED (1 << 6)
		#define CV_CM_LAB (1 << 5)
		/* remaining bits are reserved */
		__u8 capability_mask;
		__u8 reserved[0xE];
		} __packed;
		#define REQUEST_FILE "../hv-gpci-requests.h"
		#define NAME_LOWER hv_gpci
		#define NAME_UPPER HV_GPCI
		#include "req-gen/perf.h"
		#undef REQUEST_FILE
		#undef NAME_LOWER
		#undef NAME_UPPER

		#endif

arch/powerpc/perf/req-gen/_begin.h

0 → 100644

+13 −0

Original line number	Diff line number	Diff line
		/* Include paths to be used in interface defining headers */
		#ifndef POWERPC_PERF_REQ_GEN_H_
		#define POWERPC_PERF_REQ_GEN_H_

		#define CAT2_STR_(t, s) __stringify(t/s)
		#define CAT2_STR(t, s) CAT2_STR_(t, s)
		#define I(...) __VA_ARGS__

		#endif

		#define REQ_GEN_PREFIX req-gen
		#define REQUEST_BEGIN CAT2_STR(REQ_GEN_PREFIX, _request-begin.h)
		#define REQUEST_END CAT2_STR(REQ_GEN_PREFIX, _request-end.h)

Admin message