Skip to content

Commit e6253ea

Browse files
tuexentuexen
committed
vtnet: mark statistic counters with CTLFLAG_STATS
Reviewed by: Timo Völker MFC after: 1 week Differential Revision: https://reviews.freebsd.org/D51999
1 parent 9a4b30d commit e6253ea

File tree

1 file changed

+42
-28
lines changed

1 file changed

+42
-28
lines changed

‎sys/dev/virtio/network/if_vtnet.c‎

Lines changed: 42 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -4101,21 +4101,29 @@ vtnet_setup_rxq_sysctl(struct sysctl_ctx_list *ctx,
41014101

41024102
stats = &rxq->vtnrx_stats;
41034103

4104-
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "ipackets", CTLFLAG_RD,
4104+
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "ipackets",
4105+
CTLFLAG_RD | CTLFLAG_STATS,
41054106
&stats->vrxs_ipackets, "Receive packets");
4106-
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "ibytes", CTLFLAG_RD,
4107+
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "ibytes",
4108+
CTLFLAG_RD | CTLFLAG_STATS,
41074109
&stats->vrxs_ibytes, "Receive bytes");
4108-
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "iqdrops", CTLFLAG_RD,
4110+
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "iqdrops",
4111+
CTLFLAG_RD | CTLFLAG_STATS,
41094112
&stats->vrxs_iqdrops, "Receive drops");
4110-
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "ierrors", CTLFLAG_RD,
4113+
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "ierrors",
4114+
CTLFLAG_RD | CTLFLAG_STATS,
41114115
&stats->vrxs_ierrors, "Receive errors");
4112-
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "csum", CTLFLAG_RD,
4116+
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "csum",
4117+
CTLFLAG_RD | CTLFLAG_STATS,
41134118
&stats->vrxs_csum, "Receive checksum offloaded");
4114-
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "csum_failed", CTLFLAG_RD,
4119+
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "csum_failed",
4120+
CTLFLAG_RD | CTLFLAG_STATS,
41154121
&stats->vrxs_csum_failed, "Receive checksum offload failed");
4116-
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "host_lro", CTLFLAG_RD,
4122+
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "host_lro",
4123+
CTLFLAG_RD | CTLFLAG_STATS,
41174124
&stats->vrxs_host_lro, "Receive host segmentation offloaded");
4118-
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "rescheduled", CTLFLAG_RD,
4125+
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "rescheduled",
4126+
CTLFLAG_RD | CTLFLAG_STATS,
41194127
&stats->vrxs_rescheduled,
41204128
"Receive interrupt handler rescheduled");
41214129
}
@@ -4136,17 +4144,23 @@ vtnet_setup_txq_sysctl(struct sysctl_ctx_list *ctx,
41364144

41374145
stats = &txq->vtntx_stats;
41384146

4139-
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "opackets", CTLFLAG_RD,
4147+
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "opackets",
4148+
CTLFLAG_RD | CTLFLAG_STATS,
41404149
&stats->vtxs_opackets, "Transmit packets");
4141-
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "obytes", CTLFLAG_RD,
4150+
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "obytes",
4151+
CTLFLAG_RD | CTLFLAG_STATS,
41424152
&stats->vtxs_obytes, "Transmit bytes");
4143-
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "omcasts", CTLFLAG_RD,
4153+
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "omcasts",
4154+
CTLFLAG_RD | CTLFLAG_STATS,
41444155
&stats->vtxs_omcasts, "Transmit multicasts");
4145-
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "csum", CTLFLAG_RD,
4156+
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "csum",
4157+
CTLFLAG_RD | CTLFLAG_STATS,
41464158
&stats->vtxs_csum, "Transmit checksum offloaded");
4147-
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "tso", CTLFLAG_RD,
4159+
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "tso",
4160+
CTLFLAG_RD | CTLFLAG_STATS,
41484161
&stats->vtxs_tso, "Transmit TCP segmentation offloaded");
4149-
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "rescheduled", CTLFLAG_RD,
4162+
SYSCTL_ADD_UQUAD(ctx, list, OID_AUTO, "rescheduled",
4163+
CTLFLAG_RD | CTLFLAG_STATS,
41504164
&stats->vtxs_rescheduled,
41514165
"Transmit interrupt handler rescheduled");
41524166
}
@@ -4286,30 +4300,30 @@ vtnet_setup_stat_sysctl(struct sysctl_ctx_list *ctx,
42864300
stats->tx_task_rescheduled = txaccum.vtxs_rescheduled;
42874301

42884302
SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "mbuf_alloc_failed",
4289-
CTLFLAG_RD, &stats->mbuf_alloc_failed,
4303+
CTLFLAG_RD | CTLFLAG_STATS, &stats->mbuf_alloc_failed,
42904304
"Mbuf cluster allocation failures");
42914305

42924306
SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "rx_frame_too_large",
4293-
CTLFLAG_RD, &stats->rx_frame_too_large,
4307+
CTLFLAG_RD | CTLFLAG_STATS, &stats->rx_frame_too_large,
42944308
"Received frame larger than the mbuf chain");
42954309
SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "rx_enq_replacement_failed",
4296-
CTLFLAG_RD, &stats->rx_enq_replacement_failed,
4310+
CTLFLAG_RD | CTLFLAG_STATS, &stats->rx_enq_replacement_failed,
42974311
"Enqueuing the replacement receive mbuf failed");
42984312
SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "rx_mergeable_failed",
4299-
CTLFLAG_RD, &stats->rx_mergeable_failed,
4313+
CTLFLAG_RD | CTLFLAG_STATS, &stats->rx_mergeable_failed,
43004314
"Mergeable buffers receive failures");
43014315
SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "rx_csum_bad_ethtype",
4302-
CTLFLAG_RD, &stats->rx_csum_bad_ethtype,
4316+
CTLFLAG_RD | CTLFLAG_STATS, &stats->rx_csum_bad_ethtype,
43034317
"Received checksum offloaded buffer with unsupported "
43044318
"Ethernet type");
43054319
SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "rx_csum_bad_ipproto",
4306-
CTLFLAG_RD, &stats->rx_csum_bad_ipproto,
4320+
CTLFLAG_RD | CTLFLAG_STATS, &stats->rx_csum_bad_ipproto,
43074321
"Received checksum offloaded buffer with incorrect IP protocol");
43084322
SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "rx_csum_bad_offset",
4309-
CTLFLAG_RD, &stats->rx_csum_bad_offset,
4323+
CTLFLAG_RD | CTLFLAG_STATS, &stats->rx_csum_bad_offset,
43104324
"Received checksum offloaded buffer with incorrect offset");
43114325
SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "rx_csum_bad_proto",
4312-
CTLFLAG_RD, &stats->rx_csum_bad_proto,
4326+
CTLFLAG_RD | CTLFLAG_STATS, &stats->rx_csum_bad_proto,
43134327
"Received checksum offloaded buffer with incorrect protocol");
43144328
SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "rx_csum_failed",
43154329
CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_STATS,
@@ -4325,24 +4339,24 @@ vtnet_setup_stat_sysctl(struct sysctl_ctx_list *ctx,
43254339
"Times the receive interrupt task rescheduled itself");
43264340

43274341
SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "tx_csum_unknown_ethtype",
4328-
CTLFLAG_RD, &stats->tx_csum_unknown_ethtype,
4342+
CTLFLAG_RD | CTLFLAG_STATS, &stats->tx_csum_unknown_ethtype,
43294343
"Aborted transmit of checksum offloaded buffer with unknown "
43304344
"Ethernet type");
43314345
SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "tx_csum_proto_mismatch",
4332-
CTLFLAG_RD, &stats->tx_csum_proto_mismatch,
4346+
CTLFLAG_RD | CTLFLAG_STATS, &stats->tx_csum_proto_mismatch,
43334347
"Aborted transmit of checksum offloaded buffer because mismatched "
43344348
"protocols");
43354349
SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "tx_tso_not_tcp",
4336-
CTLFLAG_RD, &stats->tx_tso_not_tcp,
4350+
CTLFLAG_RD | CTLFLAG_STATS, &stats->tx_tso_not_tcp,
43374351
"Aborted transmit of TSO buffer with non TCP protocol");
43384352
SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "tx_tso_without_csum",
4339-
CTLFLAG_RD, &stats->tx_tso_without_csum,
4353+
CTLFLAG_RD | CTLFLAG_STATS, &stats->tx_tso_without_csum,
43404354
"Aborted transmit of TSO buffer without TCP checksum offload");
43414355
SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "tx_defragged",
4342-
CTLFLAG_RD, &stats->tx_defragged,
4356+
CTLFLAG_RD | CTLFLAG_STATS, &stats->tx_defragged,
43434357
"Transmit mbufs defragged");
43444358
SYSCTL_ADD_UQUAD(ctx, child, OID_AUTO, "tx_defrag_failed",
4345-
CTLFLAG_RD, &stats->tx_defrag_failed,
4359+
CTLFLAG_RD | CTLFLAG_STATS, &stats->tx_defrag_failed,
43464360
"Aborted transmit of buffer because defrag failed");
43474361
SYSCTL_ADD_PROC(ctx, child, OID_AUTO, "tx_csum_offloaded",
43484362
CTLTYPE_U64 | CTLFLAG_RD | CTLFLAG_STATS,

0 commit comments

Comments
 (0)