Commit 35e3dbfa authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'Introduce-mbox-tracepoints-for-Octeontx2' 



Subbaraya Sundeep says:

====================
Introduce mbox tracepoints for Octeontx2

This patchset adds tracepoints support for mailbox.
In Octeontx2, PFs and VFs need to communicate with AF
for allocating and freeing resources. Once all the
configuration is done by AF for a PF/VF then packet I/O
can happen on PF/VF queues. When an interface
is brought up many mailbox messages are sent
to AF for initializing queues. Say a VF is brought up
then each message is sent to PF and PF forwards to
AF and response also traverses from AF to PF and then VF.
To aid debugging, tracepoints are added at places where
messages are allocated, sent and message interrupts.
Below is the trace of one of the messages from VF to AF
and AF response back to VF:

~ # echo 1 > /sys/kernel/tracing/events/rvu/enable
~ # ifconfig eth20 up
[  279.379559] eth20 NIC Link is UP 10000 Mbps Full duplex
~ # cat /sys/kernel/tracing/trace
        ifconfig-171   [000] ....   275.753345: otx2_msg_alloc: [0002:02:00.1] msg:(0x400) size:40

        ifconfig-171   [000] ...1   275.753347: otx2_msg_send: [0002:02:00.1] sent 1 msg(s) of size:48

          <idle>-0     [001] dNh1   275.753356: otx2_msg_interrupt: [0002:02:00.0] mbox interrupt VF(s) to PF (0x1)

    kworker/u9:1-90    [001] ...1   275.753364: otx2_msg_send: [0002:02:00.0] sent 1 msg(s) of size:48

    kworker/u9:1-90    [001] d.h.   275.753367: otx2_msg_interrupt: [0002:01:00.0] mbox interrupt PF(s) to AF (0x2)

    kworker/u9:2-167   [002] ....   275.753535: otx2_msg_process: [0002:01:00.0] msg:(0x400) error:0

    kworker/u9:2-167   [002] ...1   275.753537: otx2_msg_send: [0002:01:00.0] sent 1 msg(s) of size:32

          <idle>-0     [003] d.h1   275.753543: otx2_msg_interrupt: [0002:02:00.0] mbox interrupt AF to PF (0x1)

          <idle>-0     [001] d.h2   275.754376: otx2_msg_interrupt: [0002:02:00.1] mbox interrupt PF to VF (0x1)

v3 changes:
 Removed EXPORT_TRACEPOINT_SYMBOLS of otx2_msg_send and otx2_msg_check
 since they are called locally only

v2 changes:
 Removed otx2_msg_err tracepoint since it is similar to devlink_hwerr
 and it will be used instead when devlink supported is added.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 36493269 31a97460

drivers/net/ethernet/marvell/octeontx2/af/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -3,9 +3,10 @@ 
# Makefile for Marvell's OcteonTX2 RVU Admin Function driver

#



ccflags-y += -I$(src)

obj-$(CONFIG_OCTEONTX2_MBOX) += octeontx2_mbox.o

obj-$(CONFIG_OCTEONTX2_AF) += octeontx2_af.o



octeontx2_mbox-y := mbox.o

octeontx2_mbox-y := mbox.o rvu_trace.o

octeontx2_af-y := cgx.o rvu.o rvu_cgx.o rvu_npa.o rvu_nix.o \

		  rvu_reg.o rvu_npc.o rvu_debugfs.o ptp.o

drivers/net/ethernet/marvell/octeontx2/af/mbox.c

+10 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ 


#include "rvu_reg.h"

#include "mbox.h"

#include "rvu_trace.h"



static const u16 msgs_offset = ALIGN(sizeof(struct mbox_hdr), MBOX_MSG_ALIGN);
@@ -199,6 +200,9 @@ void otx2_mbox_msg_send(struct otx2_mbox *mbox, int devid) 
	 */

	tx_hdr->num_msgs = mdev->num_msgs;

	rx_hdr->num_msgs = 0;



	trace_otx2_msg_send(mbox->pdev, tx_hdr->num_msgs, tx_hdr->msg_size);



	spin_unlock(&mdev->mbox_lock);



	/* The interrupt should be fired after num_msgs is written
@@ -295,10 +299,15 @@ int otx2_mbox_check_rsp_msgs(struct otx2_mbox *mbox, int devid) 
		struct mbox_msghdr *preq = mdev->mbase + ireq;

		struct mbox_msghdr *prsp = mdev->mbase + irsp;



		if (preq->id != prsp->id)

		if (preq->id != prsp->id) {

			trace_otx2_msg_check(mbox->pdev, preq->id,

					     prsp->id, prsp->rc);

			goto exit;

		}

		if (prsp->rc) {

			rc = prsp->rc;

			trace_otx2_msg_check(mbox->pdev, preq->id,

					     prsp->id, prsp->rc);

			goto exit;

		}

drivers/net/ethernet/marvell/octeontx2/af/rvu.c

+7 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ 
#include "rvu_reg.h"

#include "ptp.h"



#include "rvu_trace.h"



#define DRV_NAME	"octeontx2-af"

#define DRV_STRING      "Marvell OcteonTX2 RVU Admin Function Driver"
@@ -1549,6 +1551,7 @@ static int rvu_process_mbox_msg(struct otx2_mbox *mbox, int devid, 
		if (rsp && err)						\

			rsp->hdr.rc = err;				\

									\

		trace_otx2_msg_process(mbox->pdev, _id, err);		\

		return rsp ? err : -ENOMEM;				\

	}

MBOX_MESSAGES
@@ -1881,6 +1884,8 @@ static irqreturn_t rvu_mbox_intr_handler(int irq, void *rvu_irq) 
	intr = rvu_read64(rvu, BLKADDR_RVUM, RVU_AF_PFAF_MBOX_INT);

	/* Clear interrupts */

	rvu_write64(rvu, BLKADDR_RVUM, RVU_AF_PFAF_MBOX_INT, intr);

	if (intr)

		trace_otx2_msg_interrupt(rvu->pdev, "PF(s) to AF", intr);



	/* Sync with mbox memory region */

	rmb();
@@ -1898,6 +1903,8 @@ static irqreturn_t rvu_mbox_intr_handler(int irq, void *rvu_irq) 


	intr = rvupf_read64(rvu, RVU_PF_VFPF_MBOX_INTX(0));

	rvupf_write64(rvu, RVU_PF_VFPF_MBOX_INTX(0), intr);

	if (intr)

		trace_otx2_msg_interrupt(rvu->pdev, "VF(s) to AF", intr);



	rvu_queue_work(&rvu->afvf_wq_info, 0, vfs, intr);

drivers/net/ethernet/marvell/octeontx2/af/rvu_cgx.c

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
#include "rvu.h"

#include "cgx.h"

#include "rvu_reg.h"

#include "rvu_trace.h"



struct cgx_evq_entry {

	struct list_head evq_node;
@@ -34,6 +35,7 @@ static struct _req_type __maybe_unused \ 
		return NULL;						\

	req->hdr.sig = OTX2_MBOX_REQ_SIG;				\

	req->hdr.id = _id;						\

	trace_otx2_msg_alloc(rvu->pdev, _id, sizeof(*req));		\

	return req;							\

}

drivers/net/ethernet/marvell/octeontx2/af/rvu_trace.c

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

/* Marvell OcteonTx2 RVU Admin Function driver tracepoints

 *

 * Copyright (C) 2020 Marvell International Ltd.

 */



#define CREATE_TRACE_POINTS

#include "rvu_trace.h"



EXPORT_TRACEPOINT_SYMBOL(otx2_msg_alloc);

EXPORT_TRACEPOINT_SYMBOL(otx2_msg_interrupt);

EXPORT_TRACEPOINT_SYMBOL(otx2_msg_process);

CRA Git | Maintained and supported by SUSTech CRA and CCSE