Procházet zdrojové kódy

[netdevice] Retain and report detailed error breakdowns

netdev_rx_err() and netdev_tx_complete_err() get passed the error
code, but currently use it only in debug messages.

Retain error numbers and frequencey counts for up to
NETDEV_MAX_UNIQUE_ERRORS (4) different errors for each of TX and RX.
This allows the "ifstat" command to report the reasons for TX/RX
errors in most cases, even in non-debug builds.
tags/v0.9.6
Michael Brown před 16 roky
rodič
revize
9a52ba0cfa

+ 21
- 10
src/include/gpxe/netdevice.h Zobrazit soubor

@@ -193,16 +193,25 @@ struct net_device_operations {
193 193
 	void ( * irq ) ( struct net_device *netdev, int enable );
194 194
 };
195 195
 
196
+/** Network device error */
197
+struct net_device_error {
198
+	/** Error status code */
199
+	int rc;
200
+	/** Error count */
201
+	unsigned int count;
202
+};
203
+
204
+/** Maximum number of unique errors that we will keep track of */
205
+#define NETDEV_MAX_UNIQUE_ERRORS 4
206
+
196 207
 /** Network device statistics */
197 208
 struct net_device_stats {
198
-	/** Count of successfully completed transmissions */
199
-	unsigned int tx_ok;
200
-	/** Count of transmission errors */
201
-	unsigned int tx_err;
202
-	/** Count of successfully received packets */
203
-	unsigned int rx_ok;
204
-	/** Count of reception errors */
205
-	unsigned int rx_err;
209
+	/** Count of successful completions */
210
+	unsigned int good;
211
+	/** Count of error completions */
212
+	unsigned int bad;
213
+	/** Error breakdowns */
214
+	struct net_device_error errors[NETDEV_MAX_UNIQUE_ERRORS];
206 215
 };
207 216
 
208 217
 /**
@@ -250,8 +259,10 @@ struct net_device {
250 259
 	struct list_head tx_queue;
251 260
 	/** RX packet queue */
252 261
 	struct list_head rx_queue;
253
-	/** Device statistics */
254
-	struct net_device_stats stats;
262
+	/** TX statistics */
263
+	struct net_device_stats tx_stats;
264
+	/** RX statistics */
265
+	struct net_device_stats rx_stats;
255 266
 
256 267
 	/** Configuration settings applicable to this device */
257 268
 	struct simple_settings settings;

+ 12
- 10
src/interface/efi/efi_snp.c Zobrazit soubor

@@ -317,14 +317,14 @@ efi_snp_statistics ( EFI_SIMPLE_NETWORK_PROTOCOL *snp, BOOLEAN reset,
317 317
 
318 318
 	/* Gather statistics */
319 319
 	memset ( &stats_buf, 0, sizeof ( stats_buf ) );
320
-	stats_buf.TxGoodFrames = snpdev->netdev->stats.tx_ok;
321
-	stats_buf.TxDroppedFrames = snpdev->netdev->stats.tx_err;
322
-	stats_buf.TxTotalFrames = ( snpdev->netdev->stats.tx_ok +
323
-				    snpdev->netdev->stats.tx_err );
324
-	stats_buf.RxGoodFrames = snpdev->netdev->stats.rx_ok;
325
-	stats_buf.RxDroppedFrames = snpdev->netdev->stats.rx_err;
326
-	stats_buf.RxTotalFrames = ( snpdev->netdev->stats.rx_ok +
327
-				    snpdev->netdev->stats.rx_err );
320
+	stats_buf.TxGoodFrames = snpdev->netdev->tx_stats.good;
321
+	stats_buf.TxDroppedFrames = snpdev->netdev->tx_stats.bad;
322
+	stats_buf.TxTotalFrames = ( snpdev->netdev->tx_stats.good +
323
+				    snpdev->netdev->tx_stats.bad );
324
+	stats_buf.RxGoodFrames = snpdev->netdev->rx_stats.good;
325
+	stats_buf.RxDroppedFrames = snpdev->netdev->rx_stats.bad;
326
+	stats_buf.RxTotalFrames = ( snpdev->netdev->rx_stats.good +
327
+				    snpdev->netdev->rx_stats.bad );
328 328
 	if ( *stats_len > sizeof ( stats_buf ) )
329 329
 		*stats_len = sizeof ( stats_buf );
330 330
 	if ( stats )
@@ -332,8 +332,10 @@ efi_snp_statistics ( EFI_SIMPLE_NETWORK_PROTOCOL *snp, BOOLEAN reset,
332 332
 
333 333
 	/* Reset statistics if requested to do so */
334 334
 	if ( reset ) {
335
-		memset ( &snpdev->netdev->stats, 0,
336
-			 sizeof ( snpdev->netdev->stats ) );
335
+		memset ( &snpdev->netdev->tx_stats, 0,
336
+			 sizeof ( snpdev->netdev->tx_stats ) );
337
+		memset ( &snpdev->netdev->rx_stats, 0,
338
+			 sizeof ( snpdev->netdev->rx_stats ) );
337 339
 	}
338 340
 
339 341
 	return 0;

+ 6
- 5
src/interface/pxe/pxe_undi.c Zobrazit soubor

@@ -392,10 +392,10 @@ PXENV_EXIT_t pxenv_undi_get_statistics ( struct s_PXENV_UNDI_GET_STATISTICS
392 392
 					 *undi_get_statistics ) {
393 393
 	DBG ( "PXENV_UNDI_GET_STATISTICS" );
394 394
 
395
-	undi_get_statistics->XmtGoodFrames = pxe_netdev->stats.tx_ok;
396
-	undi_get_statistics->RcvGoodFrames = pxe_netdev->stats.rx_ok;
397
-	undi_get_statistics->RcvCRCErrors = pxe_netdev->stats.rx_err;
398
-	undi_get_statistics->RcvResourceErrors = pxe_netdev->stats.rx_err;
395
+	undi_get_statistics->XmtGoodFrames = pxe_netdev->tx_stats.good;
396
+	undi_get_statistics->RcvGoodFrames = pxe_netdev->rx_stats.good;
397
+	undi_get_statistics->RcvCRCErrors = pxe_netdev->rx_stats.bad;
398
+	undi_get_statistics->RcvResourceErrors = pxe_netdev->rx_stats.bad;
399 399
 
400 400
 	undi_get_statistics->Status = PXENV_STATUS_SUCCESS;
401 401
 	return PXENV_EXIT_SUCCESS;
@@ -409,7 +409,8 @@ PXENV_EXIT_t pxenv_undi_clear_statistics ( struct s_PXENV_UNDI_CLEAR_STATISTICS
409 409
 					   *undi_clear_statistics ) {
410 410
 	DBG ( "PXENV_UNDI_CLEAR_STATISTICS" );
411 411
 
412
-	memset ( &pxe_netdev->stats, 0, sizeof ( pxe_netdev->stats ) );
412
+	memset ( &pxe_netdev->tx_stats, 0, sizeof ( pxe_netdev->tx_stats ) );
413
+	memset ( &pxe_netdev->rx_stats, 0, sizeof ( pxe_netdev->rx_stats ) );
413 414
 
414 415
 	undi_clear_statistics->Status = PXENV_STATUS_SUCCESS;
415 416
 	return PXENV_EXIT_SUCCESS;

+ 42
- 4
src/net/netdevice.c Zobrazit soubor

@@ -45,6 +45,45 @@ static struct net_protocol net_protocols_end[0]
45 45
 /** List of network devices */
46 46
 struct list_head net_devices = LIST_HEAD_INIT ( net_devices );
47 47
 
48
+/**
49
+ * Record network device statistic
50
+ *
51
+ * @v stats		Network device statistics
52
+ * @v rc		Status code
53
+ */
54
+static void netdev_record_stat ( struct net_device_stats *stats, int rc ) {
55
+	struct net_device_error *error;
56
+	struct net_device_error *least_common_error;
57
+	unsigned int i;
58
+
59
+	/* If this is not an error, just update the good counter */
60
+	if ( rc == 0 ) {
61
+		stats->good++;
62
+		return;
63
+	}
64
+
65
+	/* Update the bad counter */
66
+	stats->bad++;
67
+
68
+	/* Locate the appropriate error record */
69
+	least_common_error = &stats->errors[0];
70
+	for ( i = 0 ; i < ( sizeof ( stats->errors ) /
71
+			    sizeof ( stats->errors[0] ) ) ; i++ ) {
72
+		error = &stats->errors[i];
73
+		/* Update matching record, if found */
74
+		if ( error->rc == rc ) {
75
+			error->count++;
76
+			return;
77
+		}
78
+		if ( error->count < least_common_error->count )
79
+			least_common_error = error;
80
+	}
81
+
82
+	/* Overwrite the least common error record */
83
+	least_common_error->rc = rc;
84
+	least_common_error->count = 1;
85
+}
86
+
48 87
 /**
49 88
  * Transmit raw packet via network device
50 89
  *
@@ -91,12 +130,11 @@ void netdev_tx_complete_err ( struct net_device *netdev,
91 130
 			      struct io_buffer *iobuf, int rc ) {
92 131
 
93 132
 	/* Update statistics counter */
133
+	netdev_record_stat ( &netdev->tx_stats, rc );
94 134
 	if ( rc == 0 ) {
95
-		netdev->stats.tx_ok++;
96 135
 		DBGC ( netdev, "NETDEV %p transmission %p complete\n",
97 136
 		       netdev, iobuf );
98 137
 	} else {
99
-		netdev->stats.tx_err++;
100 138
 		DBGC ( netdev, "NETDEV %p transmission %p failed: %s\n",
101 139
 		       netdev, iobuf, strerror ( rc ) );
102 140
 	}
@@ -158,7 +196,7 @@ void netdev_rx ( struct net_device *netdev, struct io_buffer *iobuf ) {
158 196
 	list_add_tail ( &iobuf->list, &netdev->rx_queue );
159 197
 
160 198
 	/* Update statistics counter */
161
-	netdev->stats.rx_ok++;
199
+	netdev_record_stat ( &netdev->rx_stats, 0 );
162 200
 }
163 201
 
164 202
 /**
@@ -183,7 +221,7 @@ void netdev_rx_err ( struct net_device *netdev,
183 221
 	free_iob ( iobuf );
184 222
 
185 223
 	/* Update statistics counter */
186
-	netdev->stats.rx_err++;
224
+	netdev_record_stat ( &netdev->rx_stats, rc );
187 225
 }
188 226
 
189 227
 /**

+ 23
- 2
src/usr/ifmgmt.c Zobrazit soubor

@@ -58,6 +58,25 @@ void ifclose ( struct net_device *netdev ) {
58 58
 	netdev_close ( netdev );
59 59
 }
60 60
 
61
+/**
62
+ * Print network device error breakdown
63
+ *
64
+ * @v stats		Network device statistics
65
+ * @v prefix		Message prefix
66
+ */
67
+static void ifstat_errors ( struct net_device_stats *stats,
68
+			    const char *prefix ) {
69
+	unsigned int i;
70
+
71
+	for ( i = 0 ; i < ( sizeof ( stats->errors ) /
72
+			    sizeof ( stats->errors[0] ) ) ; i++ ) {
73
+		if ( stats->errors[i].count )
74
+			printf ( "  [%s: %d x \"%s\"]\n", prefix,
75
+				 stats->errors[i].count,
76
+				 strerror ( stats->errors[i].rc ) );
77
+	}
78
+}
79
+
61 80
 /**
62 81
  * Print status of network device
63 82
  *
@@ -69,8 +88,10 @@ void ifstat ( struct net_device *netdev ) {
69 88
 		 netdev->name, netdev_hwaddr ( netdev ), netdev->dev->name,
70 89
 		 ( ( netdev->state & NETDEV_OPEN ) ? "open" : "closed" ),
71 90
 		 ( netdev_link_ok ( netdev ) ? "up" : "down" ),
72
-		 netdev->stats.tx_ok, netdev->stats.tx_err,
73
-		 netdev->stats.rx_ok, netdev->stats.rx_err );
91
+		 netdev->tx_stats.good, netdev->tx_stats.bad,
92
+		 netdev->rx_stats.good, netdev->rx_stats.bad );
93
+	ifstat_errors ( &netdev->tx_stats, "TXE" );
94
+	ifstat_errors ( &netdev->rx_stats, "RXE" );
74 95
 }
75 96
 
76 97
 /**

Načítá se…
Zrušit
Uložit