Commit c1055475 authored by Alexei Starovoitov's avatar Alexei Starovoitov Committed by Daniel Borkmann
Browse files

treewide: remove large struct-pass-by-value from tracepoint arguments 



- fix trace_hfi1_ctxt_info() to pass large struct by reference instead of by value
- convert 'type array[]' tracepoint arguments into 'type *array',
  since compiler will warn that sizeof('type array[]') == sizeof('type *array')
  and later should be used instead

The CAST_TO_U64 macro in the later patch will enforce that tracepoint
arguments can only be integers, pointers, or less than 8 byte structures.
Larger structures should be passed by reference.

Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
parent 6f5c39fa

drivers/infiniband/hw/hfi1/file_ops.c

+1 −1
Original line number Diff line number Diff line
@@ -1153,7 +1153,7 @@ static int get_ctxt_info(struct hfi1_filedata *fd, unsigned long arg, u32 len) 
	cinfo.sdma_ring_size = fd->cq->nentries;

	cinfo.rcvegr_size = uctxt->egrbufs.rcvtid_size;



	trace_hfi1_ctxt_info(uctxt->dd, uctxt->ctxt, fd->subctxt, cinfo);

	trace_hfi1_ctxt_info(uctxt->dd, uctxt->ctxt, fd->subctxt, &cinfo);

	if (copy_to_user((void __user *)arg, &cinfo, len))

		return -EFAULT;

drivers/infiniband/hw/hfi1/trace_ctxts.h

+6 −6
Original line number Diff line number Diff line
@@ -106,7 +106,7 @@ TRACE_EVENT(hfi1_uctxtdata, 
TRACE_EVENT(hfi1_ctxt_info,

	    TP_PROTO(struct hfi1_devdata *dd, unsigned int ctxt,

		     unsigned int subctxt,

		     struct hfi1_ctxt_info cinfo),

		     struct hfi1_ctxt_info *cinfo),

	    TP_ARGS(dd, ctxt, subctxt, cinfo),

	    TP_STRUCT__entry(DD_DEV_ENTRY(dd)

			     __field(unsigned int, ctxt)
@@ -120,11 +120,11 @@ TRACE_EVENT(hfi1_ctxt_info, 
	    TP_fast_assign(DD_DEV_ASSIGN(dd);

			    __entry->ctxt = ctxt;

			    __entry->subctxt = subctxt;

			    __entry->egrtids = cinfo.egrtids;

			    __entry->rcvhdrq_cnt = cinfo.rcvhdrq_cnt;

			    __entry->rcvhdrq_size = cinfo.rcvhdrq_entsize;

			    __entry->sdma_ring_size = cinfo.sdma_ring_size;

			    __entry->rcvegr_size = cinfo.rcvegr_size;

			    __entry->egrtids = cinfo->egrtids;

			    __entry->rcvhdrq_cnt = cinfo->rcvhdrq_cnt;

			    __entry->rcvhdrq_size = cinfo->rcvhdrq_entsize;

			    __entry->sdma_ring_size = cinfo->sdma_ring_size;

			    __entry->rcvegr_size = cinfo->rcvegr_size;

			    ),

	    TP_printk("[%s] ctxt %u:%u " CINFO_FMT,

		      __get_str(dev),

include/trace/events/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -491,7 +491,7 @@ DEFINE_EVENT(f2fs__truncate_node, f2fs_truncate_node, 


TRACE_EVENT(f2fs_truncate_partial_nodes,



	TP_PROTO(struct inode *inode, nid_t nid[], int depth, int err),

	TP_PROTO(struct inode *inode, nid_t *nid, int depth, int err),



	TP_ARGS(inode, nid, depth, err),

net/wireless/trace.h

+1 −1
Original line number Diff line number Diff line
@@ -3137,7 +3137,7 @@ TRACE_EVENT(rdev_start_radar_detection, 


TRACE_EVENT(rdev_set_mcast_rate,

	TP_PROTO(struct wiphy *wiphy, struct net_device *netdev,

		 int mcast_rate[NUM_NL80211_BANDS]),

		 int *mcast_rate),

	TP_ARGS(wiphy, netdev, mcast_rate),

	TP_STRUCT__entry(

		WIPHY_ENTRY

sound/firewire/amdtp-stream-trace.h

+1 −1
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 
#include <linux/tracepoint.h>



TRACE_EVENT(in_packet,

	TP_PROTO(const struct amdtp_stream *s, u32 cycles, u32 cip_header[2], unsigned int payload_length, unsigned int index),

	TP_PROTO(const struct amdtp_stream *s, u32 cycles, u32 *cip_header, unsigned int payload_length, unsigned int index),

	TP_ARGS(s, cycles, cip_header, payload_length, index),

	TP_STRUCT__entry(

		__field(unsigned int, second)

CRA Git | Maintained and supported by SUSTech CRA and CCSE