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

Merge branch 'SMC-tracepoints' 



Tony Lu says:

====================
Tracepoints for SMC

This patch set introduces tracepoints for SMC, including the tracepoints
basic code. The tracepoitns would help us to track SMC's behaviors by
automatic tools, or other BPF tools, and zero overhead if not enabled.

Compared with kprobe and other dymatic tools, the tracepoints are
considered as stable API, and less overhead for tracing with easy-to-use
API.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 60088891 a3a0e81b

net/smc/Makefile

+2 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0-only

ccflags-y += -I$(src)

obj-$(CONFIG_SMC)	+= smc.o

obj-$(CONFIG_SMC_DIAG)	+= smc_diag.o

smc-y := af_smc.o smc_pnet.o smc_ib.o smc_clc.o smc_core.o smc_wr.o smc_llc.o

smc-y += smc_cdc.o smc_tx.o smc_rx.o smc_close.o smc_ism.o smc_netlink.o smc_stats.o

smc-y += smc_tracepoint.o

net/smc/af_smc.c

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

#include "smc_close.h"

#include "smc_stats.h"

#include "smc_tracepoint.h"



static DEFINE_MUTEX(smc_server_lgr_pending);	/* serialize link group

						 * creation on server
@@ -564,6 +565,7 @@ static void smc_switch_to_fallback(struct smc_sock *smc, int reason_code) 
	smc->use_fallback = true;

	smc->fallback_rsn = reason_code;

	smc_stat_fallback(smc);

	trace_smc_switch_to_fallback(smc, reason_code);

	if (smc->sk.sk_socket && smc->sk.sk_socket->file) {

		smc->clcsock->file = smc->sk.sk_socket->file;

		smc->clcsock->file->private_data = smc->clcsock;

net/smc/smc_core.c

+7 −2
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include "smc_ism.h"

#include "smc_netlink.h"

#include "smc_stats.h"

#include "smc_tracepoint.h"



#define SMC_LGR_NUM_INCR		256

#define SMC_LGR_FREE_DELAY_SERV		(600 * HZ)
@@ -1620,16 +1621,20 @@ static void smcr_link_down(struct smc_link *lnk) 
/* must be called under lgr->llc_conf_mutex lock */

void smcr_link_down_cond(struct smc_link *lnk)

{

	if (smc_link_downing(&lnk->state))

	if (smc_link_downing(&lnk->state)) {

		trace_smcr_link_down(lnk, __builtin_return_address(0));

		smcr_link_down(lnk);

	}

}



/* will get the lgr->llc_conf_mutex lock */

void smcr_link_down_cond_sched(struct smc_link *lnk)

{

	if (smc_link_downing(&lnk->state))

	if (smc_link_downing(&lnk->state)) {

		trace_smcr_link_down(lnk, __builtin_return_address(0));

		schedule_work(&lnk->link_down_wrk);

	}

}



void smcr_port_err(struct smc_ib_device *smcibdev, u8 ibport)

{

net/smc/smc_rx.c

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,7 @@ 
#include "smc_tx.h" /* smc_tx_consumer_update() */

#include "smc_rx.h"

#include "smc_stats.h"

#include "smc_tracepoint.h"



/* callback implementation to wakeup consumers blocked with smc_rx_wait().

 * indirectly called by smc_cdc_msg_recv_action().
@@ -438,6 +439,8 @@ int smc_rx_recvmsg(struct smc_sock *smc, struct msghdr *msg, 
			if (msg && smc_rx_update_consumer(smc, cons, copylen))

				goto out;

		}



		trace_smc_rx_recvmsg(smc, copylen);

	} while (read_remaining);

out:

	return read_done;

net/smc/smc_tracepoint.c

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



#define CREATE_TRACE_POINTS

#include "smc_tracepoint.h"



EXPORT_TRACEPOINT_SYMBOL(smc_switch_to_fallback);

EXPORT_TRACEPOINT_SYMBOL(smc_tx_sendmsg);

EXPORT_TRACEPOINT_SYMBOL(smc_rx_recvmsg);

EXPORT_TRACEPOINT_SYMBOL(smcr_link_down);