spapr_llan: convert to trace framework instead of DPRINTF (e8bb33de) · Commits · SUMMER2020 / students / proj-2021291

hw/net/spapr_llan.c

+25 −36

Original line number	Diff line number	Diff line
		@@ -34,20 +34,13 @@
		#include "hw/ppc/spapr.h"
		#include "hw/ppc/spapr_vio.h"
		#include "sysemu/sysemu.h"
		#include "trace.h"

		#include <libfdt.h>

		#define ETH_ALEN 6
		#define MAX_PACKET_SIZE 65536

		/#define DEBUG/

		#ifdef DEBUG
		#define DPRINTF(fmt...) do { fprintf(stderr, fmt); } while (0)
		#else
		#define DPRINTF(fmt...)
		#endif

		/* Compatibility flags for migration */
		#define SPAPRVLAN_FLAG_RX_BUF_POOLS_BIT 0
		#define SPAPRVLAN_FLAG_RX_BUF_POOLS (1 << SPAPRVLAN_FLAG_RX_BUF_POOLS_BIT)
		@@ -158,8 +151,10 @@ static vlan_bd_t spapr_vlan_get_rx_bd_from_pool(VIOsPAPRVLANDevice *dev,
		return 0;
		}

		DPRINTF("Found buffer: pool=%d count=%d rxbufs=%d\n", pool,
		dev->rx_pool[pool]->count, dev->rx_bufs);

		trace_spapr_vlan_get_rx_bd_from_pool_found(pool,
		dev->rx_pool[pool]->count,
		dev->rx_bufs);

		/* Remove the buffer from the pool */
		dev->rx_pool[pool]->count--;
		@@ -186,8 +181,8 @@ static vlan_bd_t spapr_vlan_get_rx_bd_from_page(VIOsPAPRVLANDevice *dev,
		}

		bd = vio_ldq(&dev->sdev, dev->buf_list + buf_ptr);
		DPRINTF("use_buf_ptr=%d bd=0x%016llx\n",
		buf_ptr, (unsigned long long)bd);

		trace_spapr_vlan_get_rx_bd_from_page(buf_ptr, (uint64_t)bd);
		} while ((!(bd & VLAN_BD_VALID) \|\| VLAN_BD_LEN(bd) < size + 8)
		&& buf_ptr != dev->use_buf_ptr);

		@@ -200,7 +195,7 @@ static vlan_bd_t spapr_vlan_get_rx_bd_from_page(VIOsPAPRVLANDevice *dev,
		dev->use_buf_ptr = buf_ptr;
		vio_stq(&dev->sdev, dev->buf_list + dev->use_buf_ptr, 0);

		DPRINTF("Found buffer: ptr=%d rxbufs=%d\n", dev->use_buf_ptr, dev->rx_bufs);
		trace_spapr_vlan_get_rx_bd_from_page_found(dev->use_buf_ptr, dev->rx_bufs);

		return bd;
		}
		@@ -215,8 +210,7 @@ static ssize_t spapr_vlan_receive(NetClientState nc, const uint8_t buf,
		uint64_t handle;
		uint8_t control;

		DPRINTF("spapr_vlan_receive() [%s] rx_bufs=%d\n", sdev->qdev.id,
		dev->rx_bufs);
		trace_spapr_vlan_receive(sdev->qdev.id, dev->rx_bufs);

		if (!dev->isopen) {
		return -1;
		@@ -244,7 +238,7 @@ static ssize_t spapr_vlan_receive(NetClientState nc, const uint8_t buf,
		return -1;
		}

		DPRINTF("spapr_vlan_receive: DMA write completed\n");
		trace_spapr_vlan_receive_dma_completed();

		/* Update the receive queue */
		control = VLAN_RXQC_TOGGLE \| VLAN_RXQC_VALID;
		@@ -258,11 +252,10 @@ static ssize_t spapr_vlan_receive(NetClientState nc, const uint8_t buf,
		vio_sth(sdev, VLAN_BD_ADDR(rxq_bd) + dev->rxq_ptr + 2, 8);
		vio_stb(sdev, VLAN_BD_ADDR(rxq_bd) + dev->rxq_ptr, control);

		DPRINTF("wrote rxq entry (ptr=0x%llx): 0x%016llx 0x%016llx\n",
		(unsigned long long)dev->rxq_ptr,
		(unsigned long long)vio_ldq(sdev, VLAN_BD_ADDR(rxq_bd) +
		trace_spapr_vlan_receive_wrote(dev->rxq_ptr,
		vio_ldq(sdev, VLAN_BD_ADDR(rxq_bd) +
		dev->rxq_ptr),
		(unsigned long long)vio_ldq(sdev, VLAN_BD_ADDR(rxq_bd) +
		vio_ldq(sdev, VLAN_BD_ADDR(rxq_bd) +
		dev->rxq_ptr + 8));

		dev->rxq_ptr += 16;
		@@ -580,7 +573,7 @@ static target_long spapr_vlan_add_rxbuf_to_pool(VIOsPAPRVLANDevice *dev,
		qsort(dev->rx_pool, RX_MAX_POOLS, sizeof(dev->rx_pool[0]),
		rx_pool_size_compare);
		pool = spapr_vlan_get_rx_pool_id(dev, size);
		DPRINTF("created RX pool %d for size %lld\n", pool,
		trace_spapr_vlan_add_rxbuf_to_pool_create(pool,
		VLAN_BD_LEN(buf));
		break;
		}
		@@ -591,8 +584,8 @@ static target_long spapr_vlan_add_rxbuf_to_pool(VIOsPAPRVLANDevice *dev,
		return H_RESOURCE;
		}

		DPRINTF("h_add_llan_buf(): Add buf using pool %i (size %lli, count=%i)\n",
		pool, VLAN_BD_LEN(buf), dev->rx_pool[pool]->count);
		trace_spapr_vlan_add_rxbuf_to_pool(pool, VLAN_BD_LEN(buf),
		dev->rx_pool[pool]->count);

		dev->rx_pool[pool]->bds[dev->rx_pool[pool]->count++] = buf;

		@@ -623,8 +616,7 @@ static target_long spapr_vlan_add_rxbuf_to_page(VIOsPAPRVLANDevice *dev,

		vio_stq(&dev->sdev, dev->buf_list + dev->add_buf_ptr, buf);

		DPRINTF("h_add_llan_buf(): Added buf ptr=%d rx_bufs=%d bd=0x%016llx\n",
		dev->add_buf_ptr, dev->rx_bufs, (unsigned long long)buf);
		trace_spapr_vlan_add_rxbuf_to_page(dev->add_buf_ptr, dev->rx_bufs, buf);

		return 0;
		}
		@@ -640,8 +632,7 @@ static target_ulong h_add_logical_lan_buffer(PowerPCCPU *cpu,
		VIOsPAPRVLANDevice *dev = VIO_SPAPR_VLAN_DEVICE(sdev);
		target_long ret;

		DPRINTF("H_ADD_LOGICAL_LAN_BUFFER(0x" TARGET_FMT_lx
		", 0x" TARGET_FMT_lx ")\n", reg, buf);
		trace_spapr_vlan_h_add_logical_lan_buffer(reg, buf);

		if (!sdev) {
		hcall_dprintf("Bad device\n");
		@@ -694,14 +685,13 @@ static target_ulong h_send_logical_lan(PowerPCCPU *cpu,
		int i, nbufs;
		int ret;

		DPRINTF("H_SEND_LOGICAL_LAN(0x" TARGET_FMT_lx ", <bufs>, 0x"
		TARGET_FMT_lx ")\n", reg, continue_token);
		trace_spapr_vlan_h_send_logical_lan(reg, continue_token);

		if (!sdev) {
		return H_PARAMETER;
		}

		DPRINTF("rxbufs = %d\n", dev->rx_bufs);
		trace_spapr_vlan_h_send_logical_lan_rxbufs(dev->rx_bufs);

		if (!dev->isopen) {
		return H_DROPPED;
		@@ -713,7 +703,7 @@ static target_ulong h_send_logical_lan(PowerPCCPU *cpu,

		total_len = 0;
		for (i = 0; i < 6; i++) {
		DPRINTF(" buf desc: 0x" TARGET_FMT_lx "\n", bufs[i]);
		trace_spapr_vlan_h_send_logical_lan_buf_desc(bufs[i]);
		if (!(bufs[i] & VLAN_BD_VALID)) {
		break;
		}
		@@ -721,8 +711,7 @@ static target_ulong h_send_logical_lan(PowerPCCPU *cpu,
		}

		nbufs = i;
		DPRINTF("h_send_logical_lan() %d buffers, total length 0x%x\n",
		nbufs, total_len);
		trace_spapr_vlan_h_send_logical_lan_total(nbufs, total_len);

		if (total_len == 0) {
		return H_SUCCESS;

hw/net/trace-events

+16 −0

Original line number	Diff line number	Diff line
		@@ -270,3 +270,19 @@ e1000e_cfg_support_virtio(bool support) "Virtio header supported: %d"

		e1000e_vm_state_running(void) "VM state is running"
		e1000e_vm_state_stopped(void) "VM state is stopped"

		# hw/net/spapr_llan.c
		spapr_vlan_get_rx_bd_from_pool_found(int pool, int32_t count, uint32_t rx_bufs) "pool=%d count=%"PRId32" rxbufs=%"PRIu32
		spapr_vlan_get_rx_bd_from_page(int buf_ptr, uint64_t bd) "use_buf_ptr=%d bd=0x%016"PRIx64
		spapr_vlan_get_rx_bd_from_page_found(uint32_t use_buf_ptr, uint32_t rx_bufs) "ptr=%"PRIu32" rxbufs=%"PRIu32
		spapr_vlan_receive(const char *id, uint32_t rx_bufs) "[%s] rx_bufs=%"PRIu32
		spapr_vlan_receive_dma_completed(void) "DMA write completed"
		spapr_vlan_receive_wrote(uint64_t ptr, uint64_t hi, uint64_t lo) "rxq entry (ptr=0x%"PRIx64"): 0x%016"PRIx64" 0x%016"PRIx64
		spapr_vlan_add_rxbuf_to_pool_create(int pool, uint64_t len) "created RX pool %d for size %"PRIu64
		spapr_vlan_add_rxbuf_to_pool(int pool, uint64_t len, int32_t count) "add buf using pool %d (size %"PRIu64", count=%"PRId32")"
		spapr_vlan_add_rxbuf_to_page(uint32_t ptr, uint32_t rx_bufs, uint64_t bd) "added buf ptr=%"PRIu32" rx_bufs=%"PRIu32" bd=0x%016"PRIx64
		spapr_vlan_h_add_logical_lan_buffer(uint64_t reg, uint64_t buf) "H_ADD_LOGICAL_LAN_BUFFER(0x%"PRIx64", 0x%"PRIx64")"
		spapr_vlan_h_send_logical_lan(uint64_t reg, uint64_t continue_token) "H_SEND_LOGICAL_LAN(0x%"PRIx64", <bufs>, 0x%"PRIx64")"
		spapr_vlan_h_send_logical_lan_rxbufs(uint32_t rx_bufs) "rxbufs = %"PRIu32
		spapr_vlan_h_send_logical_lan_buf_desc(uint64_t buf) " buf desc: 0x%"PRIx64
		spapr_vlan_h_send_logical_lan_total(int nbufs, unsigned total_len) "%d buffers, total length 0x%x"