Commit c556b6b8 authored by Konrad Sztyber's avatar Konrad Sztyber Committed by Jim Harris
Browse files

lib/trace: don't pass zero as a non-argument 



Now that the trace library can handle multiple arguments, there's no
point in passing 0 for tracepoints that don't have any arguments.  This
patch removes all such instances.  It allows us to to verify that
`spdk_trace_record()` was issued with the exact number of arguments as
specified in the definition of the tracepoint.

Signed-off-by: default avatarKonrad Sztyber <konrad.sztyber@intel.com>
Change-Id: Idbdb6f5111bd6175e145a12c1f0c095b62d744a9
Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/8125


Tested-by: default avatarSPDK CI Jenkins <sys_sgci@intel.com>
Community-CI: Mellanox Build Bot
Reviewed-by: default avatarZiye Yang <ziye.yang@intel.com>
Reviewed-by: default avatarJim Harris <james.r.harris@intel.com>
Reviewed-by: default avatarAleksey Marchuk <alexeymar@mellanox.com>
parent c514ba50

lib/bdev/bdev.c

+4 −4
Original line number Diff line number Diff line
@@ -2152,7 +2152,7 @@ bdev_io_split_submit(struct spdk_bdev_io *bdev_io, struct iovec *iov, int iovcnt 
		} else {

			bdev_io->internal.status = SPDK_BDEV_IO_STATUS_FAILED;

			if (bdev_io->u.bdev.split_outstanding == 0) {

				spdk_trace_record(TRACE_BDEV_IO_DONE, 0, 0, (uintptr_t)bdev_io, 0);

				spdk_trace_record(TRACE_BDEV_IO_DONE, 0, 0, (uintptr_t)bdev_io);

				TAILQ_REMOVE(&bdev_io->internal.ch->io_submitted, bdev_io, internal.ch_link);

				bdev_io->internal.cb(bdev_io, false, bdev_io->internal.caller_ctx);

			}
@@ -2267,7 +2267,7 @@ _bdev_rw_split(void *_bdev_io) 
							if (bdev_io->u.bdev.split_outstanding == 0) {

								SPDK_ERRLOG("The first child io was less than a block size\n");

								bdev_io->internal.status = SPDK_BDEV_IO_STATUS_FAILED;

								spdk_trace_record(TRACE_BDEV_IO_DONE, 0, 0, (uintptr_t)bdev_io, 0);

								spdk_trace_record(TRACE_BDEV_IO_DONE, 0, 0, (uintptr_t)bdev_io);

								TAILQ_REMOVE(&bdev_io->internal.ch->io_submitted, bdev_io, internal.ch_link);

								bdev_io->internal.cb(bdev_io, false, bdev_io->internal.caller_ctx);

							}
@@ -2368,7 +2368,7 @@ bdev_io_split_done(struct spdk_bdev_io *bdev_io, bool success, void *cb_arg) 
	 */

	if (parent_io->u.bdev.split_remaining_num_blocks == 0) {

		assert(parent_io->internal.cb != bdev_io_split_done);

		spdk_trace_record(TRACE_BDEV_IO_DONE, 0, 0, (uintptr_t)parent_io, 0);

		spdk_trace_record(TRACE_BDEV_IO_DONE, 0, 0, (uintptr_t)parent_io);

		TAILQ_REMOVE(&parent_io->internal.ch->io_submitted, parent_io, internal.ch_link);

		parent_io->internal.cb(parent_io, parent_io->internal.status == SPDK_BDEV_IO_STATUS_SUCCESS,

				       parent_io->internal.caller_ctx);
@@ -5198,7 +5198,7 @@ bdev_io_complete(void *ctx) 


	tsc = spdk_get_ticks();

	tsc_diff = tsc - bdev_io->internal.submit_tsc;

	spdk_trace_record_tsc(tsc, TRACE_BDEV_IO_DONE, 0, 0, (uintptr_t)bdev_io, 0);

	spdk_trace_record_tsc(tsc, TRACE_BDEV_IO_DONE, 0, 0, (uintptr_t)bdev_io);



	TAILQ_REMOVE(&bdev_ch->io_submitted, bdev_io, internal.ch_link);

lib/iscsi/conn.c

+5 −5
Original line number Diff line number Diff line
@@ -1212,7 +1212,7 @@ iscsi_task_cpl(struct spdk_scsi_task *scsi_task) 
	struct spdk_iscsi_conn *conn = task->conn;

	struct spdk_iscsi_pdu *pdu = task->pdu;



	spdk_trace_record(TRACE_ISCSI_TASK_DONE, conn->id, 0, (uintptr_t)task, 0);

	spdk_trace_record(TRACE_ISCSI_TASK_DONE, conn->id, 0, (uintptr_t)task);



	task->is_queued = false;

	primary = iscsi_task_get_primary(task);
@@ -1223,7 +1223,7 @@ iscsi_task_cpl(struct spdk_scsi_task *scsi_task) 
		process_non_read_task_completion(conn, task, primary);

	}

	if (!task->parent) {

		spdk_trace_record(TRACE_ISCSI_PDU_COMPLETED, 0, 0, (uintptr_t)pdu, 0);

		spdk_trace_record(TRACE_ISCSI_PDU_COMPLETED, 0, 0, (uintptr_t)pdu);

	}

}
@@ -1321,7 +1321,7 @@ iscsi_conn_read_data(struct spdk_iscsi_conn *conn, int bytes, 
	ret = spdk_sock_recv(conn->sock, buf, bytes);



	if (ret > 0) {

		spdk_trace_record(TRACE_ISCSI_READ_FROM_SOCKET_DONE, conn->id, ret, 0, 0);

		spdk_trace_record(TRACE_ISCSI_READ_FROM_SOCKET_DONE, conn->id, ret, 0);

		return ret;

	}
@@ -1362,7 +1362,7 @@ iscsi_conn_readv_data(struct spdk_iscsi_conn *conn, 
	ret = spdk_sock_readv(conn->sock, iov, iovcnt);



	if (ret > 0) {

		spdk_trace_record(TRACE_ISCSI_READ_FROM_SOCKET_DONE, conn->id, ret, 0, 0);

		spdk_trace_record(TRACE_ISCSI_READ_FROM_SOCKET_DONE, conn->id, ret, 0);

		return ret;

	}
@@ -1439,7 +1439,7 @@ _iscsi_conn_pdu_write_done(void *cb_arg, int err) 
	if (err != 0) {

		conn->state = ISCSI_CONN_STATE_EXITING;

	} else {

		spdk_trace_record(TRACE_ISCSI_FLUSH_WRITEBUF_DONE, conn->id, pdu->mapped_length, (uintptr_t)pdu, 0);

		spdk_trace_record(TRACE_ISCSI_FLUSH_WRITEBUF_DONE, conn->id, pdu->mapped_length, (uintptr_t)pdu);

	}



	if ((conn->full_feature) &&

lib/iscsi/iscsi.c

+1 −1
Original line number Diff line number Diff line
@@ -4813,7 +4813,7 @@ iscsi_read_pdu(struct spdk_iscsi_conn *conn) 
				rc = 0;

			}

			if (rc == 0) {

				spdk_trace_record(TRACE_ISCSI_TASK_EXECUTED, 0, 0, (uintptr_t)pdu, 0);

				spdk_trace_record(TRACE_ISCSI_TASK_EXECUTED, 0, 0, (uintptr_t)pdu);

				iscsi_put_pdu(pdu);

				conn->pdu_in_progress = NULL;

				conn->pdu_recv_state = ISCSI_PDU_RECV_STATE_AWAIT_PDU_READY;

lib/nvmf/fc.c

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ nvmf_fc_record_req_trace_point(struct spdk_nvmf_fc_request *fc_req, 
	}

	if (tpoint_id != SPDK_TRACE_MAX_TPOINT_ID) {

		spdk_trace_record(tpoint_id, fc_req->poller_lcore, 0,

				  (uint64_t)(&fc_req->req), 0);

				  (uint64_t)(&fc_req->req));

	}

}

lib/nvmf/rdma.c

+3 −3
Original line number Diff line number Diff line
@@ -884,7 +884,7 @@ nvmf_rdma_qpair_destroy(struct spdk_nvmf_rdma_qpair *rqpair) 
	struct ibv_recv_wr		*bad_recv_wr = NULL;

	int				rc;



	spdk_trace_record(TRACE_RDMA_QP_DESTROY, 0, 0, (uintptr_t)rqpair, 0);

	spdk_trace_record(TRACE_RDMA_QP_DESTROY, 0, 0, (uintptr_t)rqpair);



	if (rqpair->qd != 0) {

		struct spdk_nvmf_qpair *qpair = &rqpair->qpair;
@@ -1043,7 +1043,7 @@ nvmf_rdma_qpair_initialize(struct spdk_nvmf_qpair *qpair) 
					  qp_init_attr.cap.max_send_wr);

	rqpair->max_send_sge = spdk_min(NVMF_DEFAULT_TX_SGE, qp_init_attr.cap.max_send_sge);

	rqpair->max_recv_sge = spdk_min(NVMF_DEFAULT_RX_SGE, qp_init_attr.cap.max_recv_sge);

	spdk_trace_record(TRACE_RDMA_QP_CREATE, 0, 0, (uintptr_t)rqpair, 0);

	spdk_trace_record(TRACE_RDMA_QP_CREATE, 0, 0, (uintptr_t)rqpair);

	SPDK_DEBUGLOG(rdma, "New RDMA Connection: %p\n", qpair);



	if (rqpair->poller->srq == NULL) {
@@ -2811,7 +2811,7 @@ nvmf_rdma_disconnect(struct rdma_cm_event *evt) 


	rqpair = SPDK_CONTAINEROF(qpair, struct spdk_nvmf_rdma_qpair, qpair);



	spdk_trace_record(TRACE_RDMA_QP_DISCONNECT, 0, 0, (uintptr_t)rqpair, 0);

	spdk_trace_record(TRACE_RDMA_QP_DISCONNECT, 0, 0, (uintptr_t)rqpair);



	spdk_nvmf_qpair_disconnect(&rqpair->qpair, NULL, NULL);