Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9bcf28cd authored by Ian Munsie's avatar Ian Munsie Committed by Michael Ellerman
Browse files

cxl: Add tracepoints 



This patch adds tracepoints throughout the cxl driver, which can provide
insight into:

- Context lifetimes
- Commands sent to the PSL and AFU and their completion status
- Segment and page table misses and their resolution
- PSL and AFU interrupts
- slbia calls from the powerpc copro_fault code

These tracepoints are mostly intended to aid in debugging (particularly
for new AFU designs), and may be useful standalone or in conjunction
with hardware traces collected by the PSL (read out via the trace
interface in debugfs) and AFUs.

Signed-off-by: default avatarIan Munsie <imunsie@au1.ibm.com>
Signed-off-by: default avatarMichael Ellerman <mpe@ellerman.id.au>
parent d3383aaa

drivers/misc/cxl/Makefile

+4 −1
Original line number Diff line number Diff line 
cxl-y				+= main.o file.o irq.o fault.o native.o context.o sysfs.o debugfs.o pci.o

cxl-y				+= main.o file.o irq.o fault.o native.o context.o sysfs.o debugfs.o pci.o trace.o

obj-$(CONFIG_CXL)		+= cxl.o

obj-$(CONFIG_CXL_BASE)		+= base.o



# For tracepoints to include our trace.h from tracepoint infrastructure:

CFLAGS_trace.o := -I$(src)

drivers/misc/cxl/fault.c

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#include <asm/mmu.h>



#include "cxl.h"

#include "trace.h"



static bool sste_matches(struct cxl_sste *sste, struct copro_slb *slb)

{
@@ -75,6 +76,7 @@ static void cxl_load_segment(struct cxl_context *ctx, struct copro_slb *slb) 


	pr_devel("CXL Populating SST[%li]: %#llx %#llx\n",

			sste - ctx->sstp, slb->vsid, slb->esid);

	trace_cxl_ste_write(ctx, sste - ctx->sstp, slb->esid, slb->vsid);



	sste->vsid_data = cpu_to_be64(slb->vsid);

	sste->esid_data = cpu_to_be64(slb->esid);
@@ -116,6 +118,7 @@ static int cxl_handle_segment_miss(struct cxl_context *ctx, 
	int rc;



	pr_devel("CXL interrupt: Segment fault pe: %i ea: %#llx\n", ctx->pe, ea);

	trace_cxl_ste_miss(ctx, ea);



	if ((rc = cxl_fault_segment(ctx, mm, ea)))

		cxl_ack_ae(ctx);
@@ -135,6 +138,8 @@ static void cxl_handle_page_fault(struct cxl_context *ctx, 
	int result;

	unsigned long access, flags, inv_flags = 0;



	trace_cxl_pte_miss(ctx, dsisr, dar);



	if ((result = copro_handle_mm_fault(mm, dar, dsisr, &flt))) {

		pr_devel("copro_handle_mm_fault failed: %#x\n", result);

		return cxl_ack_ae(ctx);

drivers/misc/cxl/file.c

+3 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <asm/copro.h>



#include "cxl.h"

#include "trace.h"



#define CXL_NUM_MINORS 256 /* Total to reserve */

#define CXL_DEV_MINORS 13   /* 1 control + 4 AFUs * 3 (dedicated/master/shared) */
@@ -184,6 +185,8 @@ static long afu_ioctl_start_work(struct cxl_context *ctx, 
	 */

	ctx->pid = get_pid(get_task_pid(current, PIDTYPE_PID));



	trace_cxl_attach(ctx, work.work_element_descriptor, work.num_interrupts, amr);



	if ((rc = cxl_attach_process(ctx, false, work.work_element_descriptor,

				     amr))) {

		afu_release_irqs(ctx);

drivers/misc/cxl/irq.c

+4 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
#include <misc/cxl.h>



#include "cxl.h"

#include "trace.h"



/* XXX: This is implementation specific */

static irqreturn_t handle_psl_slice_error(struct cxl_context *ctx, u64 dsisr, u64 errstat)
@@ -100,6 +101,8 @@ static irqreturn_t cxl_irq(int irq, void *data, struct cxl_irq_info *irq_info) 
	dsisr = irq_info->dsisr;

	dar = irq_info->dar;



	trace_cxl_psl_irq(ctx, irq, dsisr, dar);



	pr_devel("CXL interrupt %i for afu pe: %i DSISR: %#llx DAR: %#llx\n", irq, ctx->pe, dsisr, dar);



	if (dsisr & CXL_PSL_DSISR_An_DS) {
@@ -237,6 +240,7 @@ static irqreturn_t cxl_irq_afu(int irq, void *data) 
		return IRQ_HANDLED;

	}



	trace_cxl_afu_irq(ctx, afu_irq, irq, hwirq);

	pr_devel("Received AFU interrupt %i for pe: %i (virq %i hwirq %lx)\n",

	       afu_irq, ctx->pe, irq, hwirq);

drivers/misc/cxl/main.c

+2 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
#include <misc/cxl.h>



#include "cxl.h"

#include "trace.h"



static DEFINE_SPINLOCK(adapter_idr_lock);

static DEFINE_IDR(cxl_adapter_idr);
@@ -48,6 +49,7 @@ static inline void _cxl_slbia(struct cxl_context *ctx, struct mm_struct *mm) 
		 ctx->afu->adapter->adapter_num, ctx->afu->slice, ctx->pe);



	spin_lock_irqsave(&ctx->sste_lock, flags);

	trace_cxl_slbia(ctx);

	memset(ctx->sstp, 0, ctx->sst_size);

	spin_unlock_irqrestore(&ctx->sste_lock, flags);

	mb();