Commit a72e10af authored by Steven Rostedt (Red Hat)'s avatar Steven Rostedt (Red Hat) Committed by Steven Rostedt
Browse files

tracing: Do not check return values of trace_seq_p*() for mmio tracer 



The return values for trace_seq_printf() and friends are going to be
removed and they will become void functions. The mmio tracer checked
their return and even did so incorrectly.

Some of the funtions which returned the values were never checked
themselves. Removing all the checks simplifies the code.

Use trace_seq_has_overflowed() and trace_handle_return() where
necessary instead.

Reviewed-by: default avatarPetr Mladek <pmladek@suse.cz>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
parent 85224da0

kernel/trace/trace_mmiotrace.c

+21 −31
Original line number Diff line number Diff line
@@ -59,15 +59,13 @@ static void mmio_trace_start(struct trace_array *tr) 
	mmio_reset_data(tr);

}



static int mmio_print_pcidev(struct trace_seq *s, const struct pci_dev *dev)

static void mmio_print_pcidev(struct trace_seq *s, const struct pci_dev *dev)

{

	int ret = 0;

	int i;

	resource_size_t start, end;

	const struct pci_driver *drv = pci_dev_driver(dev);



	/* XXX: incomplete checks for trace_seq_printf() return value */

	ret += trace_seq_printf(s, "PCIDEV %02x%02x %04x%04x %x",

	trace_seq_printf(s, "PCIDEV %02x%02x %04x%04x %x",

			 dev->bus->number, dev->devfn,

			 dev->vendor, dev->device, dev->irq);

	/*
@@ -77,21 +75,20 @@ static int mmio_print_pcidev(struct trace_seq *s, const struct pci_dev *dev) 
	 */

	for (i = 0; i < 7; i++) {

		pci_resource_to_user(dev, i, &dev->resource[i], &start, &end);

		ret += trace_seq_printf(s, " %llx",

		trace_seq_printf(s, " %llx",

			(unsigned long long)(start |

			(dev->resource[i].flags & PCI_REGION_FLAG_MASK)));

	}

	for (i = 0; i < 7; i++) {

		pci_resource_to_user(dev, i, &dev->resource[i], &start, &end);

		ret += trace_seq_printf(s, " %llx",

		trace_seq_printf(s, " %llx",

			dev->resource[i].start < dev->resource[i].end ?

			(unsigned long long)(end - start) + 1 : 0);

	}

	if (drv)

		ret += trace_seq_printf(s, " %s\n", drv->name);

		trace_seq_printf(s, " %s\n", drv->name);

	else

		ret += trace_seq_puts(s, " \n");

	return ret;

		trace_seq_puts(s, " \n");

}



static void destroy_header_iter(struct header_iter *hiter)
@@ -179,28 +176,27 @@ static enum print_line_t mmio_print_rw(struct trace_iterator *iter) 
	unsigned long long t	= ns2usecs(iter->ts);

	unsigned long usec_rem	= do_div(t, USEC_PER_SEC);

	unsigned secs		= (unsigned long)t;

	int ret = 1;



	trace_assign_type(field, entry);

	rw = &field->rw;



	switch (rw->opcode) {

	case MMIO_READ:

		ret = trace_seq_printf(s,

		trace_seq_printf(s,

			"R %d %u.%06lu %d 0x%llx 0x%lx 0x%lx %d\n",

			rw->width, secs, usec_rem, rw->map_id,

			(unsigned long long)rw->phys,

			rw->value, rw->pc, 0);

		break;

	case MMIO_WRITE:

		ret = trace_seq_printf(s,

		trace_seq_printf(s,

			"W %d %u.%06lu %d 0x%llx 0x%lx 0x%lx %d\n",

			rw->width, secs, usec_rem, rw->map_id,

			(unsigned long long)rw->phys,

			rw->value, rw->pc, 0);

		break;

	case MMIO_UNKNOWN_OP:

		ret = trace_seq_printf(s,

		trace_seq_printf(s,

			"UNKNOWN %u.%06lu %d 0x%llx %02lx,%02lx,"

			"%02lx 0x%lx %d\n",

			secs, usec_rem, rw->map_id,
@@ -209,12 +205,11 @@ static enum print_line_t mmio_print_rw(struct trace_iterator *iter) 
			(rw->value >> 0) & 0xff, rw->pc, 0);

		break;

	default:

		ret = trace_seq_puts(s, "rw what?\n");

		trace_seq_puts(s, "rw what?\n");

		break;

	}

	if (ret)

		return TRACE_TYPE_HANDLED;

	return TRACE_TYPE_PARTIAL_LINE;



	return trace_handle_return(s);

}



static enum print_line_t mmio_print_map(struct trace_iterator *iter)
@@ -226,31 +221,29 @@ static enum print_line_t mmio_print_map(struct trace_iterator *iter) 
	unsigned long long t	= ns2usecs(iter->ts);

	unsigned long usec_rem	= do_div(t, USEC_PER_SEC);

	unsigned secs		= (unsigned long)t;

	int ret;



	trace_assign_type(field, entry);

	m = &field->map;



	switch (m->opcode) {

	case MMIO_PROBE:

		ret = trace_seq_printf(s,

		trace_seq_printf(s,

			"MAP %u.%06lu %d 0x%llx 0x%lx 0x%lx 0x%lx %d\n",

			secs, usec_rem, m->map_id,

			(unsigned long long)m->phys, m->virt, m->len,

			0UL, 0);

		break;

	case MMIO_UNPROBE:

		ret = trace_seq_printf(s,

		trace_seq_printf(s,

			"UNMAP %u.%06lu %d 0x%lx %d\n",

			secs, usec_rem, m->map_id, 0UL, 0);

		break;

	default:

		ret = trace_seq_puts(s, "map what?\n");

		trace_seq_puts(s, "map what?\n");

		break;

	}

	if (ret)

		return TRACE_TYPE_HANDLED;

	return TRACE_TYPE_PARTIAL_LINE;



	return trace_handle_return(s);

}



static enum print_line_t mmio_print_mark(struct trace_iterator *iter)
@@ -262,14 +255,11 @@ static enum print_line_t mmio_print_mark(struct trace_iterator *iter) 
	unsigned long long t	= ns2usecs(iter->ts);

	unsigned long usec_rem	= do_div(t, USEC_PER_SEC);

	unsigned secs		= (unsigned long)t;

	int ret;



	/* The trailing newline must be in the message. */

	ret = trace_seq_printf(s, "MARK %u.%06lu %s", secs, usec_rem, msg);

	if (!ret)

		return TRACE_TYPE_PARTIAL_LINE;

	trace_seq_printf(s, "MARK %u.%06lu %s", secs, usec_rem, msg);



	return TRACE_TYPE_HANDLED;

	return trace_handle_return(s);

}



static enum print_line_t mmio_print_line(struct trace_iterator *iter)

CRA Git | Maintained and supported by SUSTech CRA and CCSE