Commit 270f00bc authored by James Morse's avatar James Morse Committed by Borislav Petkov (AMD)
Browse files

x86/resctrl: Split trace.h 



trace.h contains all the tracepoints. After the move to /fs/resctrl, some
of these will be left behind. All the pseudo_lock tracepoints remain part
of the architecture. The lone tracepoint in monitor.c moves to /fs/resctrl.

Split trace.h so that each C file includes a different trace header file.
This means the trace header files are not modified when they are moved.

Signed-off-by: default avatarJames Morse <james.morse@arm.com>
Signed-off-by: default avatarBorislav Petkov (AMD) <bp@alien8.de>
Reviewed-by: default avatarShaopeng Tan <tan.shaopeng@jp.fujitsu.com>
Reviewed-by: default avatarTony Luck <tony.luck@intel.com>
Reviewed-by: default avatarFenghua Yu <fenghuay@nvidia.com>
Reviewed-by: default avatarReinette Chatre <reinette.chatre@intel.com>
Tested-by: default avatarFenghua Yu <fenghuay@nvidia.com>
Tested-by: default avatarShaopeng Tan <tan.shaopeng@jp.fujitsu.com>
Tested-by: default avatarPeter Newman <peternewman@google.com>
Tested-by: Amit Singh Tomar <amitsinght@marvell.com> # arm64
Tested-by: Shanker Donthineni <sdonthineni@nvidia.com> # arm64
Tested-by: default avatarBabu Moger <babu.moger@amd.com>
Tested-by: default avatarTony Luck <tony.luck@intel.com>
Link: https://lore.kernel.org/20250515165855.31452-14-james.morse@arm.com
parent 2a656603

arch/x86/kernel/cpu/resctrl/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -2,4 +2,7 @@ 
obj-$(CONFIG_X86_CPU_RESCTRL)		+= core.o rdtgroup.o monitor.o

obj-$(CONFIG_X86_CPU_RESCTRL)		+= ctrlmondata.o

obj-$(CONFIG_RESCTRL_FS_PSEUDO_LOCK)	+= pseudo_lock.o



# To allow define_trace.h's recursive include:

CFLAGS_pseudo_lock.o = -I$(src)

CFLAGS_monitor.o = -I$(src)

arch/x86/kernel/cpu/resctrl/monitor.c

+3 −1
Original line number Diff line number Diff line
@@ -26,7 +26,9 @@ 
#include <asm/resctrl.h>



#include "internal.h"

#include "trace.h"



#define CREATE_TRACE_POINTS

#include "monitor_trace.h"



/**

 * struct rmid_entry - dirty tracking for all RMID.

arch/x86/kernel/cpu/resctrl/monitor_trace.h

0 → 100644
+31 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

#undef TRACE_SYSTEM

#define TRACE_SYSTEM resctrl



#if !defined(_FS_RESCTRL_MONITOR_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)

#define _FS_RESCTRL_MONITOR_TRACE_H



#include <linux/tracepoint.h>



TRACE_EVENT(mon_llc_occupancy_limbo,

	    TP_PROTO(u32 ctrl_hw_id, u32 mon_hw_id, int domain_id, u64 llc_occupancy_bytes),

	    TP_ARGS(ctrl_hw_id, mon_hw_id, domain_id, llc_occupancy_bytes),

	    TP_STRUCT__entry(__field(u32, ctrl_hw_id)

			     __field(u32, mon_hw_id)

			     __field(int, domain_id)

			     __field(u64, llc_occupancy_bytes)),

	    TP_fast_assign(__entry->ctrl_hw_id = ctrl_hw_id;

			   __entry->mon_hw_id = mon_hw_id;

			   __entry->domain_id = domain_id;

			   __entry->llc_occupancy_bytes = llc_occupancy_bytes;),

	    TP_printk("ctrl_hw_id=%u mon_hw_id=%u domain_id=%d llc_occupancy_bytes=%llu",

		      __entry->ctrl_hw_id, __entry->mon_hw_id, __entry->domain_id,

		      __entry->llc_occupancy_bytes)

	   );



#endif /* _FS_RESCTRL_MONITOR_TRACE_H */



#undef TRACE_INCLUDE_PATH

#define TRACE_INCLUDE_PATH .

#define TRACE_INCLUDE_FILE monitor_trace

#include <trace/define_trace.h>

arch/x86/kernel/cpu/resctrl/pseudo_lock.c

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
#include "internal.h"



#define CREATE_TRACE_POINTS

#include "trace.h"

#include "pseudo_lock_trace.h"



/*

 * The bits needed to disable hardware prefetching varies based on the

arch/x86/kernel/cpu/resctrl/trace.h→arch/x86/kernel/cpu/resctrl/pseudo_lock_trace.h

+4 −20
Original line number Diff line number Diff line
@@ -2,8 +2,8 @@ 
#undef TRACE_SYSTEM

#define TRACE_SYSTEM resctrl



#if !defined(_TRACE_RESCTRL_H) || defined(TRACE_HEADER_MULTI_READ)

#define _TRACE_RESCTRL_H

#if !defined(_X86_RESCTRL_PSEUDO_LOCK_TRACE_H) || defined(TRACE_HEADER_MULTI_READ)

#define _X86_RESCTRL_PSEUDO_LOCK_TRACE_H



#include <linux/tracepoint.h>
@@ -35,25 +35,9 @@ TRACE_EVENT(pseudo_lock_l3, 
	    TP_printk("hits=%llu miss=%llu",

		      __entry->l3_hits, __entry->l3_miss));



TRACE_EVENT(mon_llc_occupancy_limbo,

	    TP_PROTO(u32 ctrl_hw_id, u32 mon_hw_id, int domain_id, u64 llc_occupancy_bytes),

	    TP_ARGS(ctrl_hw_id, mon_hw_id, domain_id, llc_occupancy_bytes),

	    TP_STRUCT__entry(__field(u32, ctrl_hw_id)

			     __field(u32, mon_hw_id)

			     __field(int, domain_id)

			     __field(u64, llc_occupancy_bytes)),

	    TP_fast_assign(__entry->ctrl_hw_id = ctrl_hw_id;

			   __entry->mon_hw_id = mon_hw_id;

			   __entry->domain_id = domain_id;

			   __entry->llc_occupancy_bytes = llc_occupancy_bytes;),

	    TP_printk("ctrl_hw_id=%u mon_hw_id=%u domain_id=%d llc_occupancy_bytes=%llu",

		      __entry->ctrl_hw_id, __entry->mon_hw_id, __entry->domain_id,

		      __entry->llc_occupancy_bytes)

	   );



#endif /* _TRACE_RESCTRL_H */

#endif /* _X86_RESCTRL_PSEUDO_LOCK_TRACE_H */



#undef TRACE_INCLUDE_PATH

#define TRACE_INCLUDE_PATH .

#define TRACE_INCLUDE_FILE trace

#define TRACE_INCLUDE_FILE pseudo_lock_trace

#include <trace/define_trace.h>