Commit 9a752ebe authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'optee-tracepoints-for-v5.13' of... 

Merge tag 'optee-tracepoints-for-v5.13' of git://git.linaro.org/people/jens.wiklander/linux-tee into arm/drivers

Add tracepoints around calls to secure world

* tag 'optee-tracepoints-for-v5.13' of git://git.linaro.org/people/jens.wiklander/linux-tee:
  tee: optee: add invoke_fn tracepoints

Link: https://lore.kernel.org/r/20210315113733.GA1944243@jade


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents a38fd874 0101947d

drivers/tee/optee/call.c

+4 −0
Original line number Diff line number Diff line
@@ -14,6 +14,8 @@ 
#include <linux/uaccess.h>

#include "optee_private.h"

#include "optee_smc.h"

#define CREATE_TRACE_POINTS

#include "optee_trace.h"



struct optee_call_waiter {

	struct list_head list_node;
@@ -138,9 +140,11 @@ u32 optee_do_call_with_arg(struct tee_context *ctx, phys_addr_t parg) 
	while (true) {

		struct arm_smccc_res res;



		trace_optee_invoke_fn_begin(&param);

		optee->invoke_fn(param.a0, param.a1, param.a2, param.a3,

				 param.a4, param.a5, param.a6, param.a7,

				 &res);

		trace_optee_invoke_fn_end(&param, &res);



		if (res.a0 == OPTEE_SMC_RETURN_ETHREAD_LIMIT) {

			/*

drivers/tee/optee/optee_trace.h

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

/*

 * optee trace points

 *

 * Copyright (C) 2021 Synaptics Incorporated

 * Author: Jisheng Zhang <jszhang@kernel.org>

 */



#undef TRACE_SYSTEM

#define TRACE_SYSTEM optee



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

#define _TRACE_OPTEE_H



#include <linux/arm-smccc.h>

#include <linux/tracepoint.h>

#include "optee_private.h"



TRACE_EVENT(optee_invoke_fn_begin,

	TP_PROTO(struct optee_rpc_param *param),

	TP_ARGS(param),



	TP_STRUCT__entry(

		__field(void *, param)

		__array(u32, args, 8)

	),



	TP_fast_assign(

		__entry->param = param;

		BUILD_BUG_ON(sizeof(*param) < sizeof(__entry->args));

		memcpy(__entry->args, param, sizeof(__entry->args));

	),



	TP_printk("param=%p (%x, %x, %x, %x, %x, %x, %x, %x)", __entry->param,

		  __entry->args[0], __entry->args[1], __entry->args[2],

		  __entry->args[3], __entry->args[4], __entry->args[5],

		  __entry->args[6], __entry->args[7])

);



TRACE_EVENT(optee_invoke_fn_end,

	TP_PROTO(struct optee_rpc_param *param, struct arm_smccc_res *res),

	TP_ARGS(param, res),



	TP_STRUCT__entry(

		__field(void *, param)

		__array(unsigned long, rets, 4)

	),



	TP_fast_assign(

		__entry->param = param;

		BUILD_BUG_ON(sizeof(*res) < sizeof(__entry->rets));

		memcpy(__entry->rets, res, sizeof(__entry->rets));

	),



	TP_printk("param=%p ret (%lx, %lx, %lx, %lx)", __entry->param,

		  __entry->rets[0], __entry->rets[1], __entry->rets[2],

		  __entry->rets[3])

);

#endif /* _TRACE_OPTEE_H */



#undef TRACE_INCLUDE_PATH

#define TRACE_INCLUDE_PATH .

#undef TRACE_INCLUDE_FILE

#define TRACE_INCLUDE_FILE optee_trace



/* This part must be outside protection */

#include <trace/define_trace.h>